diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java
index 6eba588b9b..ebc4c11e3b 100644
--- a/runescape-client/src/main/java/AbstractArchive.java
+++ b/runescape-client/src/main/java/AbstractArchive.java
@@ -4,86 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lp")
+@ObfuscatedName("lh")
@Implements("AbstractArchive")
public abstract class AbstractArchive {
- @ObfuscatedName("u")
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
descriptor = "Lqj;"
)
@Export("gzipDecompressor")
static GZipDecompressor gzipDecompressor;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ae")
@ObfuscatedGetter(
- intValue = 293139291
+ intValue = 1922333433
)
- static int field4026;
- @ObfuscatedName("bk")
- @ObfuscatedSignature(
- descriptor = "Lkt;"
- )
- static GameBuild field4038;
- @ObfuscatedName("b")
+ static int field4012;
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = -1312413643
+ intValue = 1192407369
)
@Export("groupCount")
int groupCount;
- @ObfuscatedName("t")
+ @ObfuscatedName("l")
@Export("groupIds")
int[] groupIds;
- @ObfuscatedName("g")
+ @ObfuscatedName("a")
@Export("groupNameHashes")
int[] groupNameHashes;
- @ObfuscatedName("x")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
descriptor = "Lqz;"
)
@Export("groupNameHashTable")
IntHashTable groupNameHashTable;
- @ObfuscatedName("n")
+ @ObfuscatedName("b")
@Export("groupCrcs")
int[] groupCrcs;
- @ObfuscatedName("e")
+ @ObfuscatedName("n")
@Export("groupVersions")
int[] groupVersions;
- @ObfuscatedName("h")
+ @ObfuscatedName("o")
@Export("fileCounts")
int[] fileCounts;
- @ObfuscatedName("f")
+ @ObfuscatedName("m")
@Export("fileIds")
int[][] fileIds;
@ObfuscatedName("d")
@Export("fileNameHashes")
int[][] fileNameHashes;
- @ObfuscatedName("j")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
descriptor = "[Lqz;"
)
@Export("fileNameHashTables")
IntHashTable[] fileNameHashTables;
- @ObfuscatedName("z")
+ @ObfuscatedName("ak")
@Export("groups")
Object[] groups;
- @ObfuscatedName("i")
+ @ObfuscatedName("al")
@Export("files")
Object[][] files;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ab")
@ObfuscatedGetter(
- intValue = 1395137629
+ intValue = 944556193
)
@Export("hash")
public int hash;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ap")
@Export("releaseGroups")
boolean releaseGroups;
- @ObfuscatedName("am")
+ @ObfuscatedName("ac")
@Export("shallowFiles")
boolean shallowFiles;
static {
gzipDecompressor = new GZipDecompressor(); // L: 23
- field4026 = 0; // L: 27
+ field4012 = 0; // L: 27
}
AbstractArchive(boolean var1, boolean var2) {
@@ -91,612 +86,644 @@ public abstract class AbstractArchive {
this.shallowFiles = var2; // L: 33
} // L: 34
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "738299214"
+ descriptor = "(IB)V",
+ garbageValue = "20"
)
@Export("loadRegionFromGroup")
void loadRegionFromGroup(int var1) {
- } // L: 118
+ } // L: 123
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-250456045"
+ descriptor = "(IB)V",
+ garbageValue = "22"
)
@Export("loadGroup")
void loadGroup(int var1) {
- } // L: 204
+ } // L: 209
- @ObfuscatedName("r")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "-41"
+ descriptor = "(II)I",
+ garbageValue = "-227114003"
)
@Export("groupLoadPercent")
int groupLoadPercent(int var1) {
- return this.groups[var1] != null ? 100 : 0; // L: 174 175
+ return this.groups[var1] != null ? 100 : 0; // L: 179 180
}
- @ObfuscatedName("ak")
+ @ObfuscatedName("aw")
@ObfuscatedSignature(
- descriptor = "([BI)V",
- garbageValue = "-1642448854"
+ descriptor = "([BB)V",
+ garbageValue = "16"
)
@Export("decodeIndex")
void decodeIndex(byte[] var1) {
- this.hash = WorldMapArchiveLoader.method7020(var1, var1.length); // L: 37
- Buffer var2 = new Buffer(Skills.decompressBytes(var1)); // L: 38
- int var3 = var2.readUnsignedByte(); // L: 39
- if (var3 >= 5 && var3 <= 7) { // L: 40
- if (var3 >= 6) { // L: 41
- var2.readInt(); // L: 42
+ int var3 = var1.length; // L: 38
+ int var2 = class93.method2404(var1, 0, var3); // L: 40
+ this.hash = var2; // L: 42
+ Buffer var4 = new Buffer(SoundSystem.decompressBytes(var1)); // L: 43
+ int var5 = var4.readUnsignedByte(); // L: 44
+ if (var5 >= 5 && var5 <= 7) { // L: 45
+ if (var5 >= 6) { // L: 46
+ var4.readInt(); // L: 47
}
- int var4 = var2.readUnsignedByte(); // L: 45
- if (var3 >= 7) { // L: 46
- this.groupCount = var2.method7627();
+ int var6 = var4.readUnsignedByte(); // L: 50
+ if (var5 >= 7) { // L: 51
+ this.groupCount = var4.method7715();
} else {
- this.groupCount = var2.readUnsignedShort(); // L: 47
+ this.groupCount = var4.readUnsignedShort(); // L: 52
}
- int var5 = 0; // L: 48
- int var6 = -1; // L: 49
- this.groupIds = new int[this.groupCount]; // L: 50
- int var7;
- if (var3 >= 7) { // L: 51
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52
- this.groupIds[var7] = var5 += var2.method7627(); // L: 53
- if (this.groupIds[var7] > var6) { // L: 54
- var6 = this.groupIds[var7];
- }
- }
- } else {
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58
- this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59
- if (this.groupIds[var7] > var6) { // L: 60
- var6 = this.groupIds[var7];
- }
- }
- }
-
- this.groupCrcs = new int[var6 + 1]; // L: 63
- this.groupVersions = new int[var6 + 1]; // L: 64
- this.fileCounts = new int[var6 + 1]; // L: 65
- this.fileIds = new int[var6 + 1][]; // L: 66
- this.groups = new Object[var6 + 1]; // L: 67
- this.files = new Object[var6 + 1][]; // L: 68
- if (var4 != 0) { // L: 69
- this.groupNameHashes = new int[var6 + 1]; // L: 70
-
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71
- this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
- }
-
- this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72
- }
-
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74
- this.groupCrcs[this.groupIds[var7]] = var2.readInt();
- }
-
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75
- this.groupVersions[this.groupIds[var7]] = var2.readInt();
- }
-
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76
- this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
- }
-
- int var8;
+ int var7 = 0; // L: 53
+ int var8 = -1; // L: 54
+ this.groupIds = new int[this.groupCount]; // L: 55
int var9;
+ if (var5 >= 7) { // L: 56
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57
+ this.groupIds[var9] = var7 += var4.method7715(); // L: 58
+ if (this.groupIds[var9] > var8) { // L: 59
+ var8 = this.groupIds[var9];
+ }
+ }
+ } else {
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63
+ this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64
+ if (this.groupIds[var9] > var8) { // L: 65
+ var8 = this.groupIds[var9];
+ }
+ }
+ }
+
+ this.groupCrcs = new int[var8 + 1]; // L: 68
+ this.groupVersions = new int[var8 + 1]; // L: 69
+ this.fileCounts = new int[var8 + 1]; // L: 70
+ this.fileIds = new int[var8 + 1][]; // L: 71
+ this.groups = new Object[var8 + 1]; // L: 72
+ this.files = new Object[var8 + 1][]; // L: 73
+ if (var6 != 0) { // L: 74
+ this.groupNameHashes = new int[var8 + 1]; // L: 75
+
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76
+ this.groupNameHashes[this.groupIds[var9]] = var4.readInt();
+ }
+
+ this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77
+ }
+
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79
+ this.groupCrcs[this.groupIds[var9]] = var4.readInt();
+ }
+
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80
+ this.groupVersions[this.groupIds[var9]] = var4.readInt();
+ }
+
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81
+ this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort();
+ }
+
int var10;
int var11;
int var12;
- if (var3 >= 7) { // L: 77
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78
- var8 = this.groupIds[var7]; // L: 79
- var9 = this.fileCounts[var8]; // L: 80
- var5 = 0; // L: 81
- var10 = -1; // L: 82
- this.fileIds[var8] = new int[var9]; // L: 83
+ int var13;
+ int var14;
+ if (var5 >= 7) { // L: 82
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83
+ var10 = this.groupIds[var9]; // L: 84
+ var11 = this.fileCounts[var10]; // L: 85
+ var7 = 0; // L: 86
+ var12 = -1; // L: 87
+ this.fileIds[var10] = new int[var11]; // L: 88
- for (var11 = 0; var11 < var9; ++var11) { // L: 84
- var12 = this.fileIds[var8][var11] = var5 += var2.method7627(); // L: 85
- if (var12 > var10) { // L: 86
- var10 = var12;
+ for (var13 = 0; var13 < var11; ++var13) { // L: 89
+ var14 = this.fileIds[var10][var13] = var7 += var4.method7715(); // L: 90
+ if (var14 > var12) { // L: 91
+ var12 = var14;
}
}
- this.files[var8] = new Object[var10 + 1]; // L: 88
+ this.files[var10] = new Object[var12 + 1]; // L: 93
}
} else {
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 92
- var8 = this.groupIds[var7]; // L: 93
- var9 = this.fileCounts[var8]; // L: 94
- var5 = 0; // L: 95
- var10 = -1; // L: 96
- this.fileIds[var8] = new int[var9]; // L: 97
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 97
+ var10 = this.groupIds[var9]; // L: 98
+ var11 = this.fileCounts[var10]; // L: 99
+ var7 = 0; // L: 100
+ var12 = -1; // L: 101
+ this.fileIds[var10] = new int[var11]; // L: 102
- for (var11 = 0; var11 < var9; ++var11) { // L: 98
- var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); // L: 99
- if (var12 > var10) { // L: 100
- var10 = var12;
+ for (var13 = 0; var13 < var11; ++var13) { // L: 103
+ var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104
+ if (var14 > var12) { // L: 105
+ var12 = var14;
}
}
- this.files[var8] = new Object[var10 + 1]; // L: 102
+ this.files[var10] = new Object[var12 + 1]; // L: 107
}
}
- if (var4 != 0) { // L: 105
- this.fileNameHashes = new int[var6 + 1][]; // L: 106
- this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107
+ if (var6 != 0) { // L: 110
+ this.fileNameHashes = new int[var8 + 1][]; // L: 111
+ this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112
- for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 108
- var8 = this.groupIds[var7]; // L: 109
- var9 = this.fileCounts[var8]; // L: 110
- this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111
+ for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 113
+ var10 = this.groupIds[var9]; // L: 114
+ var11 = this.fileCounts[var10]; // L: 115
+ this.fileNameHashes[var10] = new int[this.files[var10].length]; // L: 116
- for (var10 = 0; var10 < var9; ++var10) { // L: 112
- this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
+ for (var12 = 0; var12 < var11; ++var12) { // L: 117
+ this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt();
}
- this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113
+ this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118
}
}
} else {
throw new RuntimeException("");
}
- } // L: 116
+ } // L: 121
- @ObfuscatedName("af")
+ @ObfuscatedName("au")
@ObfuscatedSignature(
- descriptor = "(III)[B",
- garbageValue = "9206278"
+ descriptor = "(IIB)[B",
+ garbageValue = "-78"
)
@Export("takeFile")
public byte[] takeFile(int var1, int var2) {
- return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121
+ return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126
}
- @ObfuscatedName("al")
+ @ObfuscatedName("ay")
@ObfuscatedSignature(
descriptor = "(II[II)[B",
- garbageValue = "1321797482"
+ garbageValue = "-1612440449"
)
@Export("takeFileEncrypted")
public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
- if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125
- if (this.files[var1][var2] == null) { // L: 126
- boolean var4 = this.buildFiles(var1, var3); // L: 127
- if (!var4) { // L: 128
- this.loadGroup(var1); // L: 129
- var4 = this.buildFiles(var1, var3); // L: 130
- if (!var4) { // L: 131
+ if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 130
+ if (this.files[var1][var2] == null) { // L: 131
+ boolean var4 = this.buildFiles(var1, var3); // L: 132
+ if (!var4) { // L: 133
+ this.loadGroup(var1); // L: 134
+ var4 = this.buildFiles(var1, var3); // L: 135
+ if (!var4) { // L: 136
return null;
}
}
}
- byte[] var5 = class125.method2791(this.files[var1][var2], false); // L: 134
+ byte[] var5 = Varps.method5530(this.files[var1][var2], false); // L: 139
if (this.shallowFiles) {
- this.files[var1][var2] = null; // L: 135
+ this.files[var1][var2] = null; // L: 140
}
- return var5; // L: 136
+ return var5; // L: 141
} else {
return null;
}
}
- @ObfuscatedName("aq")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
descriptor = "(III)Z",
- garbageValue = "1947570801"
+ garbageValue = "1723804313"
)
@Export("tryLoadFile")
public boolean tryLoadFile(int var1, int var2) {
- if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140
- if (this.files[var1][var2] != null) { // L: 141
- return true;
- } else if (this.groups[var1] != null) { // L: 142
+ if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145
+ if (this.files[var1][var2] != null) {
+ return true; // L: 146
+ } else if (this.groups[var1] != null) { // L: 147
return true;
} else {
- this.loadGroup(var1); // L: 143
- return this.groups[var1] != null; // L: 144
+ this.loadGroup(var1); // L: 148
+ return this.groups[var1] != null; // L: 149
}
} else {
- return false; // L: 145
+ return false; // L: 150
}
}
- @ObfuscatedName("ad")
- @ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "39"
- )
- public boolean method5668(int var1) {
- if (this.files.length == 1) { // L: 149
- return this.tryLoadFile(0, var1);
- } else if (this.files[var1].length == 1) {
- return this.tryLoadFile(var1, 0); // L: 150
- } else {
- throw new RuntimeException(); // L: 151
- }
- }
-
- @ObfuscatedName("an")
+ @ObfuscatedName("be")
@ObfuscatedSignature(
descriptor = "(II)Z",
- garbageValue = "1465759290"
+ garbageValue = "-1576123903"
+ )
+ public boolean method5849(int var1) {
+ if (this.files.length == 1) { // L: 154
+ return this.tryLoadFile(0, var1);
+ } else if (this.files[var1].length == 1) {
+ return this.tryLoadFile(var1, 0); // L: 155
+ } else {
+ throw new RuntimeException(); // L: 156
+ }
+ }
+
+ @ObfuscatedName("bz")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Z",
+ garbageValue = "75"
)
@Export("tryLoadGroup")
public boolean tryLoadGroup(int var1) {
- if (this.groups[var1] != null) { // L: 155
+ if (this.groups[var1] != null) { // L: 160
return true;
} else {
- this.loadGroup(var1); // L: 156
- return this.groups[var1] != null; // L: 157
+ this.loadGroup(var1); // L: 161
+ return this.groups[var1] != null; // L: 162
}
}
- @ObfuscatedName("aw")
+ @ObfuscatedName("bp")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "903768645"
+ garbageValue = "-445061509"
)
@Export("isFullyLoaded")
public boolean isFullyLoaded() {
- boolean var1 = true; // L: 162
+ boolean var1 = true; // L: 167
- for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163
- int var3 = this.groupIds[var2]; // L: 164
- if (this.groups[var3] == null) { // L: 165
- this.loadGroup(var3); // L: 166
- if (this.groups[var3] == null) { // L: 167
+ for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 168
+ int var3 = this.groupIds[var2]; // L: 169
+ if (this.groups[var3] == null) { // L: 170
+ this.loadGroup(var3); // L: 171
+ if (this.groups[var3] == null) { // L: 172
var1 = false;
}
}
}
- return var1; // L: 170
+ return var1; // L: 175
}
- @ObfuscatedName("ah")
+ @ObfuscatedName("bf")
@ObfuscatedSignature(
descriptor = "(II)[B",
- garbageValue = "-1699435814"
+ garbageValue = "-1760059338"
)
@Export("takeFileFlat")
public byte[] takeFileFlat(int var1) {
- if (this.files.length == 1) { // L: 179
+ if (this.files.length == 1) { // L: 184
return this.takeFile(0, var1);
} else if (this.files[var1].length == 1) {
- return this.takeFile(var1, 0); // L: 180
+ return this.takeFile(var1, 0); // L: 185
} else {
- throw new RuntimeException(); // L: 181
+ throw new RuntimeException(); // L: 186
}
}
- @ObfuscatedName("ao")
+ @ObfuscatedName("bg")
@ObfuscatedSignature(
- descriptor = "(III)[B",
- garbageValue = "1081005917"
+ descriptor = "(IIB)[B",
+ garbageValue = "-45"
)
@Export("getFile")
public byte[] getFile(int var1, int var2) {
- if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185
- if (this.files[var1][var2] == null) { // L: 186
- boolean var3 = this.buildFiles(var1, (int[])null); // L: 187
- if (!var3) { // L: 188
- this.loadGroup(var1); // L: 189
- var3 = this.buildFiles(var1, (int[])null); // L: 190
- if (!var3) { // L: 191
+ if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 190
+ if (this.files[var1][var2] == null) { // L: 191
+ boolean var3 = this.buildFiles(var1, (int[])null); // L: 192
+ if (!var3) { // L: 193
+ this.loadGroup(var1); // L: 194
+ var3 = this.buildFiles(var1, (int[])null); // L: 195
+ if (!var3) { // L: 196
return null;
}
}
}
- byte[] var4 = class125.method2791(this.files[var1][var2], false); // L: 194
- return var4; // L: 195
+ byte[] var4 = Varps.method5530(this.files[var1][var2], false); // L: 199
+ return var4; // L: 200
} else {
return null;
}
}
- @ObfuscatedName("av")
+ @ObfuscatedName("br")
@ObfuscatedSignature(
descriptor = "(II)[B",
- garbageValue = "515956954"
+ garbageValue = "1079005200"
)
@Export("getFileFlat")
public byte[] getFileFlat(int var1) {
- if (this.files.length == 1) { // L: 199
+ if (this.files.length == 1) { // L: 204
return this.getFile(0, var1);
} else if (this.files[var1].length == 1) {
- return this.getFile(var1, 0); // L: 200
+ return this.getFile(var1, 0); // L: 205
} else {
- throw new RuntimeException(); // L: 201
+ throw new RuntimeException(); // L: 206
}
}
- @ObfuscatedName("ai")
+ @ObfuscatedName("bn")
@ObfuscatedSignature(
- descriptor = "(II)[I",
- garbageValue = "100488775"
+ descriptor = "(IB)[I",
+ garbageValue = "55"
)
@Export("getGroupFileIds")
public int[] getGroupFileIds(int var1) {
- return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210
+ return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215
}
- @ObfuscatedName("ay")
+ @ObfuscatedName("bq")
@ObfuscatedSignature(
descriptor = "(II)I",
- garbageValue = "-373253911"
+ garbageValue = "416756426"
)
@Export("getGroupFileCount")
public int getGroupFileCount(int var1) {
- return this.files[var1].length; // L: 214
+ return this.files[var1].length; // L: 219
}
- @ObfuscatedName("aa")
+ @ObfuscatedName("bc")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1109930040"
+ garbageValue = "-1142795127"
)
@Export("getGroupCount")
public int getGroupCount() {
- return this.files.length; // L: 218
+ return this.files.length; // L: 223
}
- @ObfuscatedName("ax")
+ @ObfuscatedName("bl")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-2116699017"
+ garbageValue = "1890355813"
)
@Export("clearGroups")
public void clearGroups() {
- for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222
+ for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227
this.groups[var1] = null;
}
- } // L: 223
+ } // L: 228
- @ObfuscatedName("at")
+ @ObfuscatedName("bv")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "7"
+ descriptor = "(II)V",
+ garbageValue = "-624686545"
)
@Export("clearFilesGroup")
public void clearFilesGroup(int var1) {
- for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226
+ for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231
this.files[var1][var2] = null;
}
- } // L: 227
+ } // L: 232
- @ObfuscatedName("br")
+ @ObfuscatedName("bt")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1417383387"
+ garbageValue = "-2144599637"
)
@Export("clearFiles")
public void clearFiles() {
- for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230
- if (this.files[var1] != null) { // L: 231
- for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232
+ for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 235
+ if (this.files[var1] != null) { // L: 236
+ for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 237
this.files[var1][var2] = null;
}
}
}
- } // L: 235
+ } // L: 240
- @ObfuscatedName("bc")
+ @ObfuscatedName("bh")
@ObfuscatedSignature(
- descriptor = "(I[IB)Z",
- garbageValue = "53"
+ descriptor = "(I[II)Z",
+ garbageValue = "78803986"
)
@Export("buildFiles")
boolean buildFiles(int var1, int[] var2) {
- if (this.groups[var1] == null) { // L: 238
+ if (this.groups[var1] == null) { // L: 243
return false;
} else {
- int var3 = this.fileCounts[var1]; // L: 239
- int[] var4 = this.fileIds[var1]; // L: 240
- Object[] var5 = this.files[var1]; // L: 241
- boolean var6 = true; // L: 242
+ int var3 = this.fileCounts[var1]; // L: 244
+ int[] var4 = this.fileIds[var1]; // L: 245
+ Object[] var5 = this.files[var1]; // L: 246
+ boolean var6 = true; // L: 247
- for (int var7 = 0; var7 < var3; ++var7) { // L: 243
- if (var5[var4[var7]] == null) { // L: 244
- var6 = false; // L: 245
+ for (int var7 = 0; var7 < var3; ++var7) { // L: 248
+ if (var5[var4[var7]] == null) { // L: 249
+ var6 = false; // L: 250
break;
}
}
- if (var6) { // L: 249
+ if (var6) { // L: 254
return true;
} else {
byte[] var18;
- if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251
- var18 = class125.method2791(this.groups[var1], false); // L: 256
+ if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256
+ var18 = Varps.method5530(this.groups[var1], false); // L: 261
} else {
- var18 = class125.method2791(this.groups[var1], true); // L: 252
- Buffer var8 = new Buffer(var18); // L: 253
- var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254
+ var18 = Varps.method5530(this.groups[var1], true); // L: 257
+ Buffer var8 = new Buffer(var18); // L: 258
+ var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259
}
- byte[] var20 = Skills.decompressBytes(var18); // L: 259
- if (this.releaseGroups) { // L: 271
+ byte[] var20 = SoundSystem.decompressBytes(var18); // L: 264
+ if (this.releaseGroups) { // L: 283
this.groups[var1] = null;
}
- if (var3 > 1) { // L: 272
- int var9 = var20.length; // L: 273
- --var9; // L: 274
- int var10 = var20[var9] & 255;
- var9 -= var3 * var10 * 4; // L: 275
- Buffer var11 = new Buffer(var20); // L: 276
- int[] var12 = new int[var3]; // L: 277
- var11.offset = var9; // L: 278
+ if (var3 > 1) { // L: 284
+ int var9 = var20.length; // L: 285
+ --var9;
+ int var10 = var20[var9] & 255; // L: 286
+ var9 -= var3 * var10 * 4; // L: 287
+ Buffer var11 = new Buffer(var20); // L: 288
+ int[] var12 = new int[var3]; // L: 289
+ var11.offset = var9; // L: 290
int var14;
int var15;
- for (int var13 = 0; var13 < var10; ++var13) { // L: 279
- var14 = 0; // L: 280
+ for (int var13 = 0; var13 < var10; ++var13) { // L: 291
+ var14 = 0; // L: 292
- for (var15 = 0; var15 < var3; ++var15) { // L: 281
- var14 += var11.readInt(); // L: 282
- var12[var15] += var14; // L: 283
+ for (var15 = 0; var15 < var3; ++var15) { // L: 293
+ var14 += var11.readInt(); // L: 294
+ var12[var15] += var14; // L: 295
}
}
- byte[][] var19 = new byte[var3][]; // L: 286
+ byte[][] var19 = new byte[var3][]; // L: 298
- for (var14 = 0; var14 < var3; ++var14) { // L: 287
- var19[var14] = new byte[var12[var14]]; // L: 288
- var12[var14] = 0; // L: 289
+ for (var14 = 0; var14 < var3; ++var14) { // L: 299
+ var19[var14] = new byte[var12[var14]]; // L: 300
+ var12[var14] = 0; // L: 301
}
- var11.offset = var9; // L: 291
- var14 = 0; // L: 292
+ var11.offset = var9; // L: 303
+ var14 = 0; // L: 304
- for (var15 = 0; var15 < var10; ++var15) { // L: 293
- int var16 = 0; // L: 294
+ for (var15 = 0; var15 < var10; ++var15) { // L: 305
+ int var16 = 0; // L: 306
- for (int var17 = 0; var17 < var3; ++var17) { // L: 295
- var16 += var11.readInt(); // L: 296
- System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 297
- var12[var17] += var16; // L: 298
- var14 += var16; // L: 299
+ for (int var17 = 0; var17 < var3; ++var17) { // L: 307
+ var16 += var11.readInt(); // L: 308
+ System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 309
+ var12[var17] += var16; // L: 310
+ var14 += var16; // L: 311
}
}
- for (var15 = 0; var15 < var3; ++var15) { // L: 302
- if (!this.shallowFiles) { // L: 303
- var5[var4[var15]] = WorldMapEvent.method4929(var19[var15], false);
+ for (var15 = 0; var15 < var3; ++var15) { // L: 314
+ if (!this.shallowFiles) { // L: 315
+ var5[var4[var15]] = WorldMapArea.method4621(var19[var15], false);
} else {
- var5[var4[var15]] = var19[var15]; // L: 304
+ var5[var4[var15]] = var19[var15]; // L: 316
}
}
- } else if (!this.shallowFiles) { // L: 308
- var5[var4[0]] = WorldMapEvent.method4929(var20, false);
+ } else if (!this.shallowFiles) { // L: 320
+ var5[var4[0]] = WorldMapArea.method4621(var20, false);
} else {
- var5[var4[0]] = var20; // L: 309
+ var5[var4[0]] = var20; // L: 321
}
- return true; // L: 311
+ return true; // L: 323
}
}
}
- @ObfuscatedName("bo")
+ @ObfuscatedName("bs")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "-459533989"
+ garbageValue = "-563529152"
)
@Export("getGroupId")
public int getGroupId(String var1) {
- var1 = var1.toLowerCase(); // L: 315
- return this.groupNameHashTable.get(class101.hashString(var1)); // L: 316
+ var1 = var1.toLowerCase(); // L: 327
+ return this.groupNameHashTable.get(class357.hashString(var1)); // L: 328
}
- @ObfuscatedName("bl")
+ @ObfuscatedName("bk")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)I",
- garbageValue = "-99961512"
+ garbageValue = "1086643666"
)
@Export("getFileId")
public int getFileId(int var1, String var2) {
- var2 = var2.toLowerCase(); // L: 320
- return this.fileNameHashTables[var1].get(class101.hashString(var2)); // L: 321
+ var2 = var2.toLowerCase(); // L: 332
+ return this.fileNameHashTables[var1].get(class357.hashString(var2)); // L: 333
}
- @ObfuscatedName("bs")
+ @ObfuscatedName("bb")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
- garbageValue = "-1697073381"
+ garbageValue = "-2145340278"
)
@Export("isValidFileName")
public boolean isValidFileName(String var1, String var2) {
- var1 = var1.toLowerCase(); // L: 325
- var2 = var2.toLowerCase(); // L: 326
- int var3 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 327
- if (var3 < 0) { // L: 328
+ var1 = var1.toLowerCase(); // L: 337
+ var2 = var2.toLowerCase(); // L: 338
+ int var3 = this.groupNameHashTable.get(class357.hashString(var1)); // L: 339
+ if (var3 < 0) { // L: 340
return false;
} else {
- int var4 = this.fileNameHashTables[var3].get(class101.hashString(var2)); // L: 329
- return var4 >= 0; // L: 330
+ int var4 = this.fileNameHashTables[var3].get(class357.hashString(var2)); // L: 341
+ return var4 >= 0; // L: 342
}
}
- @ObfuscatedName("bx")
+ @ObfuscatedName("ba")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B",
- garbageValue = "-1285301345"
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;B)[B",
+ garbageValue = "56"
)
@Export("takeFileByNames")
public byte[] takeFileByNames(String var1, String var2) {
- var1 = var1.toLowerCase(); // L: 335
- var2 = var2.toLowerCase(); // L: 336
- int var3 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 337
- int var4 = this.fileNameHashTables[var3].get(class101.hashString(var2)); // L: 338
- return this.takeFile(var3, var4); // L: 339
+ var1 = var1.toLowerCase(); // L: 347
+ var2 = var2.toLowerCase(); // L: 348
+ int var3 = this.groupNameHashTable.get(class357.hashString(var1)); // L: 349
+ int var4 = this.fileNameHashTables[var3].get(class357.hashString(var2)); // L: 350
+ return this.takeFile(var3, var4); // L: 351
}
- @ObfuscatedName("bd")
+ @ObfuscatedName("bu")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
- garbageValue = "569165055"
+ garbageValue = "-1940545619"
)
@Export("tryLoadFileByNames")
public boolean tryLoadFileByNames(String var1, String var2) {
- var1 = var1.toLowerCase(); // L: 343
- var2 = var2.toLowerCase(); // L: 344
- int var3 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 345
- int var4 = this.fileNameHashTables[var3].get(class101.hashString(var2)); // L: 346
- return this.tryLoadFile(var3, var4); // L: 347
+ var1 = var1.toLowerCase(); // L: 355
+ var2 = var2.toLowerCase(); // L: 356
+ int var3 = this.groupNameHashTable.get(class357.hashString(var1)); // L: 357
+ int var4 = this.fileNameHashTables[var3].get(class357.hashString(var2)); // L: 358
+ return this.tryLoadFile(var3, var4); // L: 359
}
- @ObfuscatedName("bj")
+ @ObfuscatedName("bw")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)Z",
- garbageValue = "31747175"
+ garbageValue = "-613590995"
)
@Export("tryLoadGroupByName")
public boolean tryLoadGroupByName(String var1) {
- var1 = var1.toLowerCase(); // L: 351
- int var2 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 352
- return this.tryLoadGroup(var2); // L: 353
+ var1 = var1.toLowerCase(); // L: 363
+ int var2 = this.groupNameHashTable.get(class357.hashString(var1)); // L: 364
+ return this.tryLoadGroup(var2); // L: 365
}
- @ObfuscatedName("be")
+ @ObfuscatedName("bi")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "286297343"
+ garbageValue = "2089361999"
)
@Export("loadRegionFromName")
public void loadRegionFromName(String var1) {
- var1 = var1.toLowerCase(); // L: 357
- int var2 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 358
- if (var2 >= 0) { // L: 359
- this.loadRegionFromGroup(var2); // L: 360
+ var1 = var1.toLowerCase(); // L: 369
+ int var2 = this.groupNameHashTable.get(class357.hashString(var1)); // L: 370
+ if (var2 >= 0) { // L: 371
+ this.loadRegionFromGroup(var2); // L: 372
}
- } // L: 361
+ } // L: 373
- @ObfuscatedName("bf")
+ @ObfuscatedName("bo")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "-586809240"
+ garbageValue = "671301219"
)
@Export("groupLoadPercentByName")
public int groupLoadPercentByName(String var1) {
- var1 = var1.toLowerCase(); // L: 364
- int var2 = this.groupNameHashTable.get(class101.hashString(var1)); // L: 365
- return this.groupLoadPercent(var2); // L: 366
+ var1 = var1.toLowerCase(); // L: 376
+ int var2 = this.groupNameHashTable.get(class357.hashString(var1)); // L: 377
+ return this.groupLoadPercent(var2); // L: 378
}
+
+ @ObfuscatedName("gb")
+ @ObfuscatedSignature(
+ descriptor = "(ZI)V",
+ garbageValue = "-1227202994"
+ )
+ @Export("addNpcsToScene")
+ static final void addNpcsToScene(boolean var0) {
+ for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4831
+ NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4832
+ if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4833
+ int var3 = var2.x >> 7; // L: 4834
+ int var4 = var2.y >> 7; // L: 4835
+ if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4836
+ if (var2.field1205 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4837
+ if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4838
+ continue;
+ }
+
+ Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4839
+ }
+
+ long var5 = TaskHandler.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4841
+ var2.playerCycle = Client.cycle; // L: 4842
+ class356.scene.drawEntity(PacketWriter.Client_plane, var2.x, var2.y, SceneTilePaint.getTileHeight(var2.field1205 * 64 - 64 + var2.x, var2.field1205 * 64 - 64 + var2.y, PacketWriter.Client_plane), var2.field1205 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4843
+ }
+ }
+ }
+
+ } // L: 4847
}
diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index 98877f37cb..6ac9eb70e9 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -3,24 +3,37 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jc")
+@ObfuscatedName("jb")
@Implements("AbstractByteArrayCopier")
public abstract class AbstractByteArrayCopier {
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
+ )
+ @Export("runesSprite")
+ static IndexedSprite[] runesSprite;
+ @ObfuscatedName("ep")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive13")
+ static Archive archive13;
+
AbstractByteArrayCopier() {
} // L: 4
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(B)[B",
- garbageValue = "70"
+ garbageValue = "-87"
)
@Export("get")
abstract byte[] get();
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "([BI)V",
- garbageValue = "-362326915"
+ garbageValue = "2067022612"
)
@Export("set")
abstract void set(byte[] var1);
diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java
index 1b1563d6a2..b0b1935b4a 100644
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -4,76 +4,76 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mo")
+@ObfuscatedName("mw")
@Implements("AbstractFont")
public abstract class AbstractFont extends Rasterizer2D {
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "[Lqd;"
+ descriptor = "[Lqu;"
)
@Export("AbstractFont_modIconSprites")
public static IndexedSprite[] AbstractFont_modIconSprites;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("AbstractFont_strike")
static int AbstractFont_strike;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("AbstractFont_underline")
static int AbstractFont_underline;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("AbstractFont_previousShadow")
static int AbstractFont_previousShadow;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("AbstractFont_shadow")
static int AbstractFont_shadow;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("AbstractFont_previousColor")
static int AbstractFont_previousColor;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("AbstractFont_color")
static int AbstractFont_color;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("AbstractFont_alpha")
static int AbstractFont_alpha;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("AbstractFont_justificationTotal")
static int AbstractFont_justificationTotal;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("AbstractFont_justificationCurrent")
static int AbstractFont_justificationCurrent;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("AbstractFont_random")
static Random AbstractFont_random;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("AbstractFont_lines")
static String[] AbstractFont_lines;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("pixels")
byte[][] pixels;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("advances")
int[] advances;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("widths")
int[] widths;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("heights")
int[] heights;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("leftBearings")
int[] leftBearings;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("topBearings")
int[] topBearings;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("ascent")
public int ascent;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("maxAscent")
public int maxAscent;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("maxDescent")
public int maxDescent;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("kerning")
byte[] kerning;
@@ -91,9 +91,15 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_lines = new String[100]; // L: 34
}
- AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
+ AbstractFont(byte[] var1) {
this.pixels = new byte[256][];
this.ascent = 0;
+ this.readMetrics(var1); // L: 54
+ } // L: 55
+
+ AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
+ this.pixels = new byte[256][]; // L: 13
+ this.ascent = 0; // L: 19
this.leftBearings = var2; // L: 37
this.topBearings = var3; // L: 38
this.widths = var4; // L: 39
@@ -117,21 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
this.maxDescent = var9 - this.ascent; // L: 50
} // L: 51
- AbstractFont(byte[] var1) {
- this.pixels = new byte[256][]; // L: 13
- this.ascent = 0; // L: 19
- this.readMetrics(var1); // L: 54
- } // L: 55
-
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("drawGlyph")
abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("drawGlyphAlpha")
abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("readMetrics")
void readMetrics(byte[] var1) {
this.advances = new int[256]; // L: 58
@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
if (var13 != 32 && var13 != 160) { // L: 90
for (var8 = 0; var8 < 256; ++var8) { // L: 91
if (var8 != 32 && var8 != 160) { // L: 92
- this.kerning[var8 + (var13 << 8)] = (byte)method6212(var11, var12, var4, this.advances, var10, var13, var8); // L: 93
+ this.kerning[var8 + (var13 << 8)] = (byte)method6443(var11, var12, var4, this.advances, var10, var13, var8); // L: 93
}
}
}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
} // L: 98
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("charWidth")
int charWidth(char var1) {
if (var1 == 160) { // L: 123
var1 = ' ';
}
- return this.advances[UserComparator5.charToByteCp1252(var1) & 255]; // L: 124
+ return this.advances[class295.charToByteCp1252(var1) & 255]; // L: 124
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("stringWidth")
public int stringWidth(String var1) {
if (var1 == null) { // L: 128
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
if (!var7.equals("gt")) { // L: 142
if (var7.startsWith("img=")) { // L: 143
try {
- int var8 = class92.method2373(var7.substring(4)); // L: 145
+ int var8 = FaceNormal.method4344(var7.substring(4)); // L: 145
var4 += AbstractFont_modIconSprites[var8].width; // L: 146
var3 = -1; // L: 147
} catch (Exception var10) { // L: 149
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
if (var2 == -1) { // L: 155
- var4 += this.advances[(char)(UserComparator5.charToByteCp1252(var6) & 255)]; // L: 156
+ var4 += this.advances[(char)(class295.charToByteCp1252(var6) & 255)]; // L: 156
if (this.kerning != null && var3 != -1) { // L: 157
var4 += this.kerning[var6 + (var3 << 8)];
}
@@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("breakLines")
public int breakLines(String var1, int[] var2, String[] var3) {
if (var1 == null) { // L: 165
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
var11 = '>'; // L: 204
} else if (var16.startsWith("img=")) { // L: 206
try {
- int var17 = class92.method2373(var16.substring(4)); // L: 208
+ int var17 = FaceNormal.method4344(var16.substring(4)); // L: 208
var4 += AbstractFont_modIconSprites[var17].width; // L: 209
var11 = 0; // L: 210
} catch (Exception var20) { // L: 212
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
}
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("lineWidth")
public int lineWidth(String var1, int var2) {
int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 249
@@ -391,17 +391,17 @@ public abstract class AbstractFont extends Rasterizer2D {
return var4; // L: 255
}
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("lineCount")
public int lineCount(String var1, int var2) {
return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259
}
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(IILjava/lang/String;II)Lne;"
+ descriptor = "(IILjava/lang/String;II)Lns;"
)
- public Bounds method6219(int var1, int var2, String var3, int var4, int var5) {
+ public Bounds method6372(int var1, int var2, String var3, int var4, int var5) {
if (var3 != null && var3.length() >= var2 + var1) { // L: 280
int var6 = var4 - this.stringWidth(var3) / 2; // L: 283
var6 += this.stringWidth(var3.substring(0, var1)); // L: 284
@@ -414,7 +414,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
}
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("draw")
public void draw(String var1, int var2, int var3, int var4, int var5) {
if (var1 != null) { // L: 292
@@ -423,7 +423,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 295
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("drawAlpha")
public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
if (var1 != null) { // L: 298
@@ -433,7 +433,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 302
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("drawRightAligned")
public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
if (var1 != null) { // L: 305
@@ -442,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 308
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("drawCentered")
public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
if (var1 != null) { // L: 311
@@ -451,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 314
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("drawLines")
public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
if (var1 == null) { // L: 317
@@ -512,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
}
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("drawCenteredWave")
public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
if (var1 != null) { // L: 352
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 357
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("drawCenteredWave2")
public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
if (var1 != null) { // L: 360
@@ -544,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 369
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("drawCenteredShake")
public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (var1 != null) { // L: 372
@@ -564,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 379
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@Export("drawRandomAlphaAndSpacing")
public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
if (var1 != null) { // L: 382
@@ -585,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 393
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("reset")
void reset(int var1, int var2) {
AbstractFont_strike = -1; // L: 396
@@ -599,28 +599,28 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_justificationCurrent = 0; // L: 402
} // L: 403
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@Export("decodeTag")
void decodeTag(String var1) {
try {
if (var1.startsWith("col=")) { // L: 407
- AbstractFont_color = Canvas.method344(var1.substring(4), 16);
+ AbstractFont_color = ClientPacket.method5190(var1.substring(4), 16);
} else if (var1.equals("/col")) { // L: 408
AbstractFont_color = AbstractFont_previousColor;
} else if (var1.startsWith("str=")) { // L: 409
- AbstractFont_strike = Canvas.method344(var1.substring(4), 16);
+ AbstractFont_strike = ClientPacket.method5190(var1.substring(4), 16);
} else if (var1.equals("str")) { // L: 410
AbstractFont_strike = 8388608;
} else if (var1.equals("/str")) { // L: 411
AbstractFont_strike = -1;
} else if (var1.startsWith("u=")) { // L: 412
- AbstractFont_underline = Canvas.method344(var1.substring(2), 16);
+ AbstractFont_underline = ClientPacket.method5190(var1.substring(2), 16);
} else if (var1.equals("u")) { // L: 413
AbstractFont_underline = 0;
} else if (var1.equals("/u")) { // L: 414
AbstractFont_underline = -1;
} else if (var1.startsWith("shad=")) { // L: 415
- AbstractFont_shadow = Canvas.method344(var1.substring(5), 16);
+ AbstractFont_shadow = ClientPacket.method5190(var1.substring(5), 16);
} else if (var1.equals("shad")) { // L: 416
AbstractFont_shadow = 0;
} else if (var1.equals("/shad")) { // L: 417
@@ -633,7 +633,7 @@ public abstract class AbstractFont extends Rasterizer2D {
} // L: 421
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@Export("calculateLineJustification")
void calculateLineJustification(String var1, int var2) {
int var3 = 0; // L: 424
@@ -656,7 +656,7 @@ public abstract class AbstractFont extends Rasterizer2D {
} // L: 433
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("draw0")
void draw0(String var1, int var2, int var3) {
var3 -= this.ascent; // L: 436
@@ -665,7 +665,7 @@ public abstract class AbstractFont extends Rasterizer2D {
for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 439
if (var1.charAt(var6) != 0) { // L: 440
- char var7 = (char)(UserComparator5.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441
+ char var7 = (char)(class295.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441
if (var7 == '<') { // L: 442
var4 = var6; // L: 443
} else {
@@ -679,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D {
if (!var8.equals("gt")) { // L: 450
if (var8.startsWith("img=")) { // L: 451
try {
- var9 = class92.method2373(var8.substring(4)); // L: 453
+ var9 = FaceNormal.method4344(var8.substring(4)); // L: 453
IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 454
var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 455
var2 += var10.width; // L: 456
@@ -745,7 +745,7 @@ public abstract class AbstractFont extends Rasterizer2D {
} // L: 496
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@Export("drawWithOffsets0")
void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
var3 -= this.ascent; // L: 499
@@ -755,7 +755,7 @@ public abstract class AbstractFont extends Rasterizer2D {
for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 503
if (var1.charAt(var9) != 0) { // L: 504
- char var10 = (char)(UserComparator5.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505
+ char var10 = (char)(class295.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505
if (var10 == '<') { // L: 506
var6 = var9; // L: 507
} else {
@@ -784,7 +784,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
++var8; // L: 523
- var14 = class92.method2373(var11.substring(4)); // L: 524
+ var14 = FaceNormal.method4344(var11.substring(4)); // L: 524
IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 525
var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 526
var2 += var15.width; // L: 527
@@ -863,8 +863,8 @@ public abstract class AbstractFont extends Rasterizer2D {
} // L: 574
- @ObfuscatedName("p")
- static int method6212(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+ @ObfuscatedName("g")
+ static int method6443(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
int var7 = var2[var5]; // L: 101
int var8 = var7 + var4[var5]; // L: 102
int var9 = var2[var6]; // L: 103
@@ -899,7 +899,7 @@ public abstract class AbstractFont extends Rasterizer2D {
return -var13; // L: 119
}
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("escapeBrackets")
public static String escapeBrackets(String var0) {
int var1 = var0.length(); // L: 263
@@ -928,7 +928,7 @@ public abstract class AbstractFont extends Rasterizer2D {
return var6.toString(); // L: 276
}
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("AbstractFont_drawGlyph")
static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 580
@@ -970,7 +970,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 609
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("AbstractFont_placeGlyph")
static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
int var9 = -(var5 >> 2); // L: 612
@@ -1060,7 +1060,7 @@ public abstract class AbstractFont extends Rasterizer2D {
}
} // L: 664
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@Export("AbstractFont_placeGlyphAlpha")
static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 667
diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java
index 96b3ce2390..ee98d3f659 100644
--- a/runescape-client/src/main/java/AbstractRasterProvider.java
+++ b/runescape-client/src/main/java/AbstractRasterProvider.java
@@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qi")
+@ObfuscatedName("qn")
@Implements("AbstractRasterProvider")
public abstract class AbstractRasterProvider {
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("pixels")
public int[] pixels;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1186832289
+ intValue = -138324827
)
@Export("width")
public int width;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1838365041
+ intValue = -1542300623
)
@Export("height")
public int height;
@@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider {
protected AbstractRasterProvider() {
} // L: 8
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "1511692839"
+ descriptor = "(IIB)V",
+ garbageValue = "37"
)
@Export("drawFull")
public abstract void drawFull(int var1, int var2);
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IIIII)V",
- garbageValue = "-1899949578"
+ garbageValue = "2018315911"
)
@Export("draw")
public abstract void draw(int var1, int var2, int var3, int var4);
- @ObfuscatedName("e")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1981530244"
+ garbageValue = "2111327986"
)
@Export("apply")
public final void apply() {
diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java
index 705507cd3d..071189ecea 100644
--- a/runescape-client/src/main/java/AbstractSocket.java
+++ b/runescape-client/src/main/java/AbstractSocket.java
@@ -4,57 +4,66 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nf")
+@ObfuscatedName("nl")
@Implements("AbstractSocket")
public abstract class AbstractSocket {
- protected AbstractSocket() {
+ AbstractSocket() {
} // L: 7
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "731891927"
- )
- @Export("close")
- public abstract void close();
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "18"
- )
- @Export("readUnsignedByte")
- public abstract int readUnsignedByte() throws IOException;
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1429957580"
- )
- @Export("available")
- public abstract int available() throws IOException;
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "-15219997"
+ descriptor = "(IB)Z",
+ garbageValue = "1"
)
@Export("isAvailable")
public abstract boolean isAvailable(int var1) throws IOException;
- @ObfuscatedName("a")
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-439883726"
+ )
+ @Export("available")
+ public abstract int available() throws IOException;
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1889844897"
+ )
+ @Export("readUnsignedByte")
+ public abstract int readUnsignedByte() throws IOException;
+
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "([BIII)I",
- garbageValue = "-642682113"
+ garbageValue = "695516749"
)
@Export("read")
public abstract int read(byte[] var1, int var2, int var3) throws IOException;
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "([BIII)V",
- garbageValue = "257086671"
+ garbageValue = "1416716039"
)
@Export("write")
public abstract void write(byte[] var1, int var2, int var3) throws IOException;
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-17278531"
+ )
+ @Export("close")
+ public abstract void close();
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;IB)Lqu;",
+ garbageValue = "-106"
+ )
+ public static IndexedSprite method6819(AbstractArchive var0, int var1) {
+ return !class431.method7559(var0, var1) ? null : class390.method7053(); // L: 131 132
+ }
}
diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java
index fa516b560a..e304c7fe04 100644
--- a/runescape-client/src/main/java/AbstractSound.java
+++ b/runescape-client/src/main/java/AbstractSound.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("bi")
+@ObfuscatedName("bf")
@Implements("AbstractSound")
public abstract class AbstractSound extends Node {
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("position")
int position;
diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java
index 03b905a442..19ffe52694 100644
--- a/runescape-client/src/main/java/AbstractUserComparator.java
+++ b/runescape-client/src/main/java/AbstractUserComparator.java
@@ -4,26 +4,26 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ng")
+@ObfuscatedName("nn")
@Implements("AbstractUserComparator")
public abstract class AbstractUserComparator implements Comparator {
- @ObfuscatedName("ek")
+ @ObfuscatedName("ev")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Llc;"
)
- @Export("archive6")
- static Archive archive6;
- @ObfuscatedName("q")
+ @Export("archive18")
+ static Archive archive18;
+ @ObfuscatedName("v")
@Export("nextComparator")
Comparator nextComparator;
protected AbstractUserComparator() {
} // L: 8
- @ObfuscatedName("m")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Ljava/util/Comparator;B)V",
- garbageValue = "-16"
+ descriptor = "(Ljava/util/Comparator;S)V",
+ garbageValue = "3115"
)
@Export("addComparator")
final void addComparator(Comparator var1) {
@@ -35,10 +35,10 @@ public abstract class AbstractUserComparator implements Comparator {
} // L: 17
- @ObfuscatedName("p")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Lnb;Lnb;I)I",
- garbageValue = "1476396448"
+ descriptor = "(Lne;Lne;I)I",
+ garbageValue = "1110990243"
)
@Export("compareUser")
protected final int compareUser(User var1, User var2) {
@@ -48,4 +48,50 @@ public abstract class AbstractUserComparator implements Comparator {
public boolean equals(Object var1) {
return super.equals(var1); // L: 25
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lpq;I)V",
+ garbageValue = "-436787497"
+ )
+ @Export("updatePlayer")
+ static final void updatePlayer(PacketBuffer var0) {
+ var0.importIndex(); // L: 37
+ int var1 = Client.localPlayerIndex; // L: 38
+ Player var2 = class101.localPlayer = Client.players[var1] = new Player(); // L: 39
+ var2.index = var1; // L: 40
+ int var3 = var0.readBits(30); // L: 41
+ byte var4 = (byte)(var3 >> 28); // L: 42
+ int var5 = var3 >> 14 & 16383; // L: 43
+ int var6 = var3 & 16383; // L: 44
+ var2.pathX[0] = var5 - class28.baseX; // L: 45
+ var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
+ var2.pathY[0] = var6 - WorldMapLabelSize.baseY; // L: 47
+ var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
+ PacketWriter.Client_plane = var2.plane = var4; // L: 49
+ if (Players.field1307[var1] != null) { // L: 50
+ var2.read(Players.field1307[var1]);
+ }
+
+ Players.Players_count = 0; // L: 51
+ Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
+ Players.field1311[var1] = 0; // L: 53
+ Players.Players_emptyIdxCount = 0; // L: 54
+
+ for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
+ if (var1 != var7) { // L: 56
+ int var8 = var0.readBits(18); // L: 57
+ int var9 = var8 >> 16; // L: 58
+ int var10 = var8 >> 8 & 597; // L: 59
+ int var11 = var8 & 597; // L: 60
+ Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61
+ Players.Players_orientations[var7] = 0; // L: 62
+ Players.Players_targetIndices[var7] = -1; // L: 63
+ Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64
+ Players.field1311[var7] = 0; // L: 65
+ }
+ }
+
+ var0.exportIndex(); // L: 67
+ } // L: 68
}
diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java
index 255e416958..e07f1855db 100644
--- a/runescape-client/src/main/java/AbstractWorldMapData.java
+++ b/runescape-client/src/main/java/AbstractWorldMapData.java
@@ -1,3 +1,6 @@
+import java.awt.Desktop;
+import java.awt.Desktop.Action;
+import java.net.URI;
import java.util.LinkedList;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
@@ -5,167 +8,168 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ib")
+@ObfuscatedName("hd")
@Implements("AbstractWorldMapData")
public abstract class AbstractWorldMapData {
- @ObfuscatedName("tk")
- @ObfuscatedGetter(
- intValue = -508466371
+ @ObfuscatedName("pk")
+ @ObfuscatedSignature(
+ descriptor = "Lpr;"
)
- static int field2851;
- @ObfuscatedName("a")
+ @Export("HitSplatDefinition_cachedSprites")
+ static class427 HitSplatDefinition_cachedSprites;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1205484999
+ intValue = -1310599883
)
@Export("regionXLow")
int regionXLow;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1189289885
+ intValue = 1550502339
)
@Export("regionYLow")
int regionYLow;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -1037344187
+ intValue = -1231055167
)
@Export("regionX")
int regionX;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1460800009
+ intValue = -1712917707
)
@Export("regionY")
int regionY;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 716017053
+ intValue = -445502067
)
@Export("minPlane")
int minPlane;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -1555977189
+ intValue = -1847125717
)
@Export("planes")
int planes;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -1656704067
+ intValue = -1231676597
)
@Export("groupId")
int groupId;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 96165071
+ intValue = -187644203
)
@Export("fileId")
int fileId;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("floorUnderlayIds")
short[][][] floorUnderlayIds;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("floorOverlayIds")
short[][][] floorOverlayIds;
- @ObfuscatedName("t")
- byte[][][] field2845;
- @ObfuscatedName("g")
- byte[][][] field2847;
- @ObfuscatedName("x")
+ @ObfuscatedName("u")
+ byte[][][] field2796;
+ @ObfuscatedName("k")
+ byte[][][] field2795;
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "[[[[Liy;"
+ descriptor = "[[[[Lix;"
)
@Export("decorations")
WorldMapDecoration[][][][] decorations;
- @ObfuscatedName("n")
- boolean field2848;
- @ObfuscatedName("e")
- boolean field2850;
+ @ObfuscatedName("x")
+ boolean field2810;
+ @ObfuscatedName("l")
+ boolean field2808;
AbstractWorldMapData() {
this.groupId = -1; // L: 14
this.fileId = -1; // L: 15
new LinkedList();
- this.field2848 = false; // L: 26
- this.field2850 = false;
- } // L: 29
+ this.field2810 = false;
+ this.field2808 = false;
+ }
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "933342926"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-2593161"
)
@Export("readGeography")
abstract void readGeography(Buffer var1);
- @ObfuscatedName("f")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "39"
+ descriptor = "(S)Z",
+ garbageValue = "2000"
)
@Export("isFullyLoaded")
boolean isFullyLoaded() {
- return this.field2848 && this.field2850; // L: 32
+ return this.field2810 && this.field2808;
}
- @ObfuscatedName("d")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "(Llp;B)V",
- garbageValue = "1"
+ descriptor = "(Llh;B)V",
+ garbageValue = "-6"
)
@Export("loadGeography")
void loadGeography(AbstractArchive var1) {
if (!this.isFullyLoaded()) { // L: 36
- byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37
+ byte[] var2 = var1.takeFile(this.groupId, this.fileId);
if (var2 != null) { // L: 38
- this.readGeography(new Buffer(var2)); // L: 39
- this.field2848 = true; // L: 40
- this.field2850 = true; // L: 41
+ this.readGeography(new Buffer(var2));
+ this.field2810 = true; // L: 40
+ this.field2808 = true; // L: 41
}
}
- } // L: 43
+ }
- @ObfuscatedName("j")
+ @ObfuscatedName("b")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2016462267"
+ descriptor = "(B)V",
+ garbageValue = "-81"
)
@Export("reset")
void reset() {
this.floorUnderlayIds = null; // L: 46
- this.floorOverlayIds = null; // L: 47
- this.field2845 = null; // L: 48
- this.field2847 = null; // L: 49
+ this.floorOverlayIds = null;
+ this.field2796 = null; // L: 48
+ this.field2795 = null; // L: 49
this.decorations = null; // L: 50
- this.field2848 = false; // L: 51
- this.field2850 = false; // L: 52
+ this.field2810 = false; // L: 51
+ this.field2808 = false;
} // L: 53
- @ObfuscatedName("z")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "(IILpx;I)V",
- garbageValue = "1843686575"
+ descriptor = "(IILqt;I)V",
+ garbageValue = "1403402457"
)
@Export("readTile")
void readTile(int var1, int var2, Buffer var3) {
int var4 = var3.readUnsignedByte(); // L: 56
if (var4 != 0) { // L: 57
if ((var4 & 1) != 0) { // L: 60
- this.method4769(var1, var2, var3, var4); // L: 61
+ this.method4980(var1, var2, var3, var4); // L: 61
} else {
- this.method4770(var1, var2, var3, var4); // L: 64
+ this.method4960(var1, var2, var3, var4); // L: 64
}
}
} // L: 58 66
- @ObfuscatedName("i")
+ @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "(IILpx;IB)V",
- garbageValue = "18"
+ descriptor = "(IILqt;IS)V",
+ garbageValue = "-25034"
)
- void method4769(int var1, int var2, Buffer var3, int var4) {
+ void method4980(int var1, int var2, Buffer var3, int var4) {
boolean var5 = (var4 & 2) != 0; // L: 69
if (var5) { // L: 70
this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71
@@ -174,12 +178,12 @@ public abstract class AbstractWorldMapData {
this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73
} // L: 74
- @ObfuscatedName("u")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "(IILpx;IB)V",
- garbageValue = "44"
+ descriptor = "(IILqt;IB)V",
+ garbageValue = "117"
)
- void method4770(int var1, int var2, Buffer var3, int var4) {
+ void method4960(int var1, int var2, Buffer var3, int var4) {
int var5 = ((var4 & 24) >> 3) + 1; // L: 77
boolean var6 = (var4 & 2) != 0; // L: 78
boolean var7 = (var4 & 4) != 0; // L: 79
@@ -195,8 +199,8 @@ public abstract class AbstractWorldMapData {
if (var14 != 0) { // L: 85
this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86
var11 = var3.readUnsignedByte(); // L: 87
- this.field2845[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
- this.field2847[var9][var1][var2] = (byte)(var11 & 3); // L: 89
+ this.field2796[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
+ this.field2795[var9][var1][var2] = (byte)(var11 & 3); // L: 89
}
}
}
@@ -208,7 +212,7 @@ public abstract class AbstractWorldMapData {
WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99
for (var11 = 0; var11 < var9; ++var11) { // L: 100
- int var12 = var3.method7532(); // L: 101
+ int var12 = var3.method7752(); // L: 101
int var13 = var3.readUnsignedByte(); // L: 102
var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103
}
@@ -218,149 +222,87 @@ public abstract class AbstractWorldMapData {
} // L: 107
- @ObfuscatedName("ag")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "608097340"
+ garbageValue = "2061969242"
)
@Export("getRegionX")
int getRegionX() {
return this.regionX; // L: 112
}
- @ObfuscatedName("ar")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-2122627873"
+ garbageValue = "-604359036"
)
@Export("getRegionY")
int getRegionY() {
return this.regionY; // L: 116
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)Lkt;",
- garbageValue = "406038723"
+ descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V",
+ garbageValue = "383517165"
)
- public static GameBuild method4799(int var0) {
- GameBuild[] var1 = new GameBuild[]{GameBuild.LIVE, GameBuild.BUILDLIVE, GameBuild.WIP, GameBuild.RC}; // L: 21
- GameBuild[] var2 = var1; // L: 23
-
- for (int var3 = 0; var3 < var2.length; ++var3) { // L: 24
- GameBuild var4 = var2[var3]; // L: 25
- if (var0 == var4.buildId) { // L: 27
- return var4;
- }
- }
-
- return null; // L: 31
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Llp;Llp;ZII)V",
- garbageValue = "-598382128"
- )
- static void method4800(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
- if (Login.clearLoginScreen) { // L: 183
- if (var3 == 4) { // L: 184
- class126.method2799(4); // L: 185
- }
-
- } else {
- if (var3 == 0) { // L: 189
- WorldMapData_1.method4706(var2); // L: 190
- } else {
- class126.method2799(var3); // L: 193
- }
-
- Rasterizer2D.Rasterizer2D_clear(); // L: 195
- byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 196
- UserComparator6.leftTitleSprite = Frames.method4217(var4); // L: 197
- SecureRandomCallable.rightTitleSprite = UserComparator6.leftTitleSprite.mirrorHorizontally(); // L: 198
- int var5 = Client.worldProperties; // L: 199
- if ((var5 & 536870912) != 0) { // L: 201
- Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 202
- } else if ((var5 & 1073741824) != 0) { // L: 204
- Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 205
- } else {
- Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 208
- }
-
- Login.titleboxSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 211
- Login.titlebuttonSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 212
- Clock.field1839 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 213
- Login.field882 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 214
- JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 215
- int var7 = var1.getGroupId("runes"); // L: 218
- int var8 = var1.getFileId(var7, ""); // L: 219
- IndexedSprite[] var6 = ItemContainer.method2062(var1, var7, var8); // L: 220
- Login.runesSprite = var6; // L: 222
- var8 = var1.getGroupId("title_mute"); // L: 225
- int var9 = var1.getFileId(var8, ""); // L: 226
- IndexedSprite[] var11 = ItemContainer.method2062(var1, var8, var9); // L: 227
- class358.title_muteSprite = var11; // L: 229
- class67.options_buttons_0Sprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 230
- Login.field888 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 231
- class101.options_buttons_2Sprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 232
- UrlRequester.field1354 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 233
- class16.field81 = class67.options_buttons_0Sprite.subWidth; // L: 234
- class268.field3212 = class67.options_buttons_0Sprite.subHeight; // L: 235
- class193.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 236
- if (var2) { // L: 237
- Login.Login_username = ""; // L: 238
- Login.Login_password = ""; // L: 239
- Login.field876 = new String[8]; // L: 240
- Login.field896 = 0; // L: 241
- }
-
- WorldMapCacheName.field2912 = 0; // L: 243
- class92.otp = ""; // L: 244
- Login.field900 = true; // L: 245
- Login.worldSelectOpen = false; // L: 246
- if (!class12.clientPreferences.method2226()) { // L: 247
- Archive var12 = AbstractUserComparator.archive6; // L: 248
- var9 = var12.getGroupId("scape main"); // L: 250
- int var10 = var12.getFileId(var9, ""); // L: 251
- UserComparator4.method2573(2, var12, var9, var10, 255, false); // L: 252
- } else {
- UrlRequester.method2538(2); // L: 255
- }
-
- MouseRecorder.method2088(false); // L: 256
- Login.clearLoginScreen = true; // L: 257
- Login.xPadding = (GraphicsObject.canvasWidth - 765) / 2; // L: 258
- Login.loginBoxX = Login.xPadding + 202; // L: 259
- Decimator.loginBoxCenter = Login.loginBoxX + 180; // L: 260
- UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 261
- SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 262
- Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 263
- }
- } // L: 187 264
-
- @ObfuscatedName("at")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-707674670"
- )
- @Export("runWidgetOnLoadListener")
- static void runWidgetOnLoadListener(int var0) {
- if (var0 != -1) { // L: 4722
- if (WorldMapDecoration.loadInterface(var0)) { // L: 4723
- Widget[] var1 = NetSocket.Widget_interfaceComponents[var0]; // L: 4724
-
- for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725
- Widget var3 = var1[var2]; // L: 4726
- if (var3.onLoad != null) { // L: 4727
- ScriptEvent var4 = new ScriptEvent(); // L: 4728
- var4.widget = var3; // L: 4729
- var4.args = var3.onLoad; // L: 4730
- class10.runScript(var4, 5000000, 0); // L: 4731
- }
+ static void method4987(String var0, boolean var1, String var2, boolean var3) {
+ if (var1) { // L: 26
+ if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 27
+ try {
+ Desktop.getDesktop().browse(new URI(var0)); // L: 29
+ return; // L: 30
+ } catch (Exception var5) { // L: 32
}
-
}
+
+ if (class29.field169.startsWith("win") && !var3) { // L: 34 35
+ class294.method5736(var0, 0, "openjs"); // L: 37
+ return; // L: 39
+ }
+
+ if (class29.field169.startsWith("mac")) { // L: 42
+ class294.method5736(var0, 1, var2); // L: 43
+ return; // L: 44
+ }
+
+ class294.method5736(var0, 2, "openjs"); // L: 47
+ } else {
+ class294.method5736(var0, 3, "openjs"); // L: 52
}
- } // L: 4734
+
+ } // L: 55
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1305112358"
+ )
+ static void method4958() {
+ Players.Players_count = 0; // L: 664
+
+ for (int var0 = 0; var0 < 2048; ++var0) { // L: 665
+ Players.field1307[var0] = null; // L: 666
+ Players.field1304[var0] = class192.field2212; // L: 667
+ }
+
+ } // L: 669
+
+ @ObfuscatedName("gx")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-2134407784"
+ )
+ static final void method4985() {
+ if (class326.field4082) { // L: 3795
+ for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3797
+ Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3798
+ var1.method2135(); // L: 3799
+ }
+
+ class326.field4082 = false; // L: 3802
+ }
+
+ } // L: 3804
}
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index d49351e690..6c9b38ec68 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("iw")
+@ObfuscatedName("im")
@Implements("AbstractWorldMapIcon")
public abstract class AbstractWorldMapIcon {
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "Lkd;"
)
@Export("coord2")
public final Coord coord2;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "Lkd;"
)
@Export("coord1")
public final Coord coord1;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -1792317661
+ intValue = 1729910963
)
@Export("screenX")
int screenX;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -1102368635
+ intValue = -218016767
)
@Export("screenY")
int screenY;
@@ -40,109 +40,106 @@ public abstract class AbstractWorldMapIcon {
this.coord2 = var2; // L: 14
} // L: 15
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "16"
+ descriptor = "(I)I",
+ garbageValue = "781292504"
)
@Export("getElement")
public abstract int getElement();
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)Lip;",
- garbageValue = "1420245554"
+ descriptor = "(I)Liz;",
+ garbageValue = "1473728"
)
@Export("getLabel")
abstract WorldMapLabel getLabel();
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "102"
+ descriptor = "(I)I",
+ garbageValue = "-1263012412"
)
@Export("getSubWidth")
abstract int getSubWidth();
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1663406998"
+ descriptor = "(B)I",
+ garbageValue = "-34"
)
@Export("getSubHeight")
abstract int getSubHeight();
- @ObfuscatedName("b")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(III)Z",
- garbageValue = "2104661633"
+ garbageValue = "1869827620"
)
@Export("fitsScreen")
boolean fitsScreen(int var1, int var2) {
if (this.elementFitsScreen(var1, var2)) { // L: 18
- return true;
+ return true; // L: 19
} else {
- return this.labelFitsScreen(var1, var2);
+ return this.labelFitsScreen(var1, var2); // L: 21
}
}
- @ObfuscatedName("t")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1482741220"
+ descriptor = "(B)Z",
+ garbageValue = "75"
)
@Export("hasValidElement")
boolean hasValidElement() {
return this.getElement() >= 0; // L: 33
}
- @ObfuscatedName("g")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
descriptor = "(IIB)Z",
- garbageValue = "19"
+ garbageValue = "0"
)
@Export("elementFitsScreen")
boolean elementFitsScreen(int var1, int var2) {
- if (!this.hasValidElement()) {
+ if (!this.hasValidElement()) { // L: 37
return false;
} else {
- WorldMapElement var3 = class120.WorldMapElement_get(this.getElement());
- int var4 = this.getSubWidth();
- int var5 = this.getSubHeight();
- switch(var3.horizontalAlignment.value) {
+ WorldMapElement var3 = class432.WorldMapElement_get(this.getElement()); // L: 38
+ int var4 = this.getSubWidth(); // L: 39
+ int var5 = this.getSubHeight(); // L: 40
+ switch(var3.horizontalAlignment.value) { // L: 41
case 0:
- if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 54
- break;
+ if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 44
+ return false;
}
-
- return false;
+ break;
case 1:
- if (var1 >= this.screenX && var1 < var4 + this.screenX) {
+ if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49
break;
}
return false;
case 2:
- if (var1 <= this.screenX - var4 || var1 > this.screenX) {
+ if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 54
return false;
}
}
- switch(var3.verticalAlignment.value) {
+ switch(var3.verticalAlignment.value) { // L: 58
case 0:
- if (var2 > this.screenY - var5 && var2 <= this.screenY) {
- break;
+ if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71
+ return false;
}
-
- return false;
+ break;
case 1:
- if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) {
- break;
+ if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 66
+ return false;
}
-
- return false;
+ break;
case 2:
- if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61
+ if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 61
return false;
}
}
@@ -151,162 +148,20 @@ public abstract class AbstractWorldMapIcon {
}
}
- @ObfuscatedName("x")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "49"
+ descriptor = "(III)Z",
+ garbageValue = "-1782115036"
)
@Export("labelFitsScreen")
boolean labelFitsScreen(int var1, int var2) {
- WorldMapLabel var3 = this.getLabel();
- if (var3 == null) {
- return false;
- } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
- return var2 >= this.screenY && var2 <= this.screenY + var3.height;
+ WorldMapLabel var3 = this.getLabel(); // L: 79
+ if (var3 == null) { // L: 80
+ return false; // L: 81
+ } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83
+ return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84
} else {
- return false;
+ return false; // L: 85
}
}
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(IILgw;Lgh;S)Z",
- garbageValue = "128"
- )
- public static final boolean method4863(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
- int var4 = var0; // L: 19
- int var5 = var1; // L: 20
- byte var6 = 64; // L: 21
- byte var7 = 64; // L: 22
- int var8 = var0 - var6; // L: 23
- int var9 = var1 - var7; // L: 24
- class194.directions[var6][var7] = 99; // L: 25
- class194.distances[var6][var7] = 0; // L: 26
- byte var10 = 0; // L: 27
- int var11 = 0; // L: 28
- class194.bufferX[var10] = var0; // L: 29
- byte var10001 = var10;
- int var18 = var10 + 1;
- class194.bufferY[var10001] = var1; // L: 30
- int[][] var12 = var3.flags; // L: 31
-
- while (var18 != var11) { // L: 34
- var4 = class194.bufferX[var11]; // L: 35
- var5 = class194.bufferY[var11]; // L: 36
- var11 = var11 + 1 & 4095; // L: 37
- int var16 = var4 - var8; // L: 38
- int var17 = var5 - var9; // L: 39
- int var13 = var4 - var3.xInset; // L: 40
- int var14 = var5 - var3.yInset; // L: 41
- if (var2.hasArrived(1, var4, var5, var3)) { // L: 42
- Varps.field3348 = var4; // L: 43
- class194.field2255 = var5; // L: 44
- return true; // L: 45
- }
-
- int var15 = class194.distances[var16][var17] + 1; // L: 47
- if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48
- class194.bufferX[var18] = var4 - 1; // L: 49
- class194.bufferY[var18] = var5; // L: 50
- var18 = var18 + 1 & 4095; // L: 51
- class194.directions[var16 - 1][var17] = 2; // L: 52
- class194.distances[var16 - 1][var17] = var15; // L: 53
- }
-
- if (var16 < 127 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55
- class194.bufferX[var18] = var4 + 1; // L: 56
- class194.bufferY[var18] = var5; // L: 57
- var18 = var18 + 1 & 4095; // L: 58
- class194.directions[var16 + 1][var17] = 8; // L: 59
- class194.distances[var16 + 1][var17] = var15; // L: 60
- }
-
- if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62
- class194.bufferX[var18] = var4; // L: 63
- class194.bufferY[var18] = var5 - 1; // L: 64
- var18 = var18 + 1 & 4095; // L: 65
- class194.directions[var16][var17 - 1] = 1; // L: 66
- class194.distances[var16][var17 - 1] = var15; // L: 67
- }
-
- if (var17 < 127 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69
- class194.bufferX[var18] = var4; // L: 70
- class194.bufferY[var18] = var5 + 1; // L: 71
- var18 = var18 + 1 & 4095; // L: 72
- class194.directions[var16][var17 + 1] = 4; // L: 73
- class194.distances[var16][var17 + 1] = var15; // L: 74
- }
-
- if (var16 > 0 && var17 > 0 && class194.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 76
- class194.bufferX[var18] = var4 - 1; // L: 77
- class194.bufferY[var18] = var5 - 1; // L: 78
- var18 = var18 + 1 & 4095; // L: 79
- class194.directions[var16 - 1][var17 - 1] = 3; // L: 80
- class194.distances[var16 - 1][var17 - 1] = var15; // L: 81
- }
-
- if (var16 < 127 && var17 > 0 && class194.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 83
- class194.bufferX[var18] = var4 + 1; // L: 84
- class194.bufferY[var18] = var5 - 1; // L: 85
- var18 = var18 + 1 & 4095; // L: 86
- class194.directions[var16 + 1][var17 - 1] = 9; // L: 87
- class194.distances[var16 + 1][var17 - 1] = var15; // L: 88
- }
-
- if (var16 > 0 && var17 < 127 && class194.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 90
- class194.bufferX[var18] = var4 - 1; // L: 91
- class194.bufferY[var18] = var5 + 1; // L: 92
- var18 = var18 + 1 & 4095; // L: 93
- class194.directions[var16 - 1][var17 + 1] = 6; // L: 94
- class194.distances[var16 - 1][var17 + 1] = var15; // L: 95
- }
-
- if (var16 < 127 && var17 < 127 && class194.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 97
- class194.bufferX[var18] = var4 + 1; // L: 98
- class194.bufferY[var18] = var5 + 1; // L: 99
- var18 = var18 + 1 & 4095; // L: 100
- class194.directions[var16 + 1][var17 + 1] = 12; // L: 101
- class194.distances[var16 + 1][var17 + 1] = var15; // L: 102
- }
- }
-
- Varps.field3348 = var4; // L: 105
- class194.field2255 = var5; // L: 106
- return false; // L: 107
- }
-
- @ObfuscatedName("hq")
- @ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "-94279171"
- )
- @Export("worldToScreen")
- static final void worldToScreen(int var0, int var1, int var2) {
- if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5460
- int var3 = class202.getTileHeight(var0, var1, class128.Client_plane) - var2; // L: 5465
- var0 -= class343.cameraX; // L: 5466
- var3 -= class295.cameraY; // L: 5467
- var1 -= FaceNormal.cameraZ; // L: 5468
- int var4 = Rasterizer3D.Rasterizer3D_sine[GameEngine.cameraPitch]; // L: 5469
- int var5 = Rasterizer3D.Rasterizer3D_cosine[GameEngine.cameraPitch]; // L: 5470
- int var6 = Rasterizer3D.Rasterizer3D_sine[StudioGame.cameraYaw]; // L: 5471
- int var7 = Rasterizer3D.Rasterizer3D_cosine[StudioGame.cameraYaw]; // L: 5472
- int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5473
- var1 = var7 * var1 - var0 * var6 >> 16; // L: 5474
- var0 = var8; // L: 5475
- var8 = var5 * var3 - var4 * var1 >> 16; // L: 5476
- var1 = var5 * var1 + var3 * var4 >> 16; // L: 5477
- if (var1 >= 50) { // L: 5479
- Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5480
- Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5481
- } else {
- Client.viewportTempX = -1; // L: 5484
- Client.viewportTempY = -1; // L: 5485
- }
-
- } else {
- Client.viewportTempX = -1; // L: 5461
- Client.viewportTempY = -1; // L: 5462
- }
- } // L: 5463 5487
}
diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java
index 3b3c95fceb..ece1dddf7b 100644
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -9,21 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pu")
+@ObfuscatedName("pn")
@Implements("AccessFile")
public final class AccessFile {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("file")
RandomAccessFile file;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- longValue = -3826011990097739857L
+ longValue = 58684071301683743L
)
@Export("maxSize")
final long maxSize;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- longValue = -459654609599987919L
+ longValue = -1091173039723932757L
)
@Export("offset")
long offset;
@@ -49,21 +49,21 @@ public final class AccessFile {
this.file.seek(0L); // L: 23
} // L: 24
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("seek")
final void seek(long var1) throws IOException {
this.file.seek(var1); // L: 27
this.offset = var1; // L: 28
} // L: 29
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "([BIII)V",
- garbageValue = "133309999"
+ garbageValue = "-1610643924"
)
@Export("write")
public final void write(byte[] var1, int var2, int var3) throws IOException {
- if ((long)var3 + this.offset > this.maxSize) { // L: 32
+ if (this.offset + (long)var3 > this.maxSize) { // L: 32
this.file.seek(this.maxSize); // L: 33
this.file.write(1); // L: 34
throw new EOFException(); // L: 35
@@ -73,20 +73,20 @@ public final class AccessFile {
}
} // L: 39
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-16"
+ descriptor = "(I)V",
+ garbageValue = "-1702393398"
)
@Export("close")
public final void close() throws IOException {
this.closeSync(false); // L: 42
} // L: 43
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(ZB)V",
- garbageValue = "76"
+ descriptor = "(ZI)V",
+ garbageValue = "-338477110"
)
@Export("closeSync")
public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
} // L: 56
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)J",
- garbageValue = "1020700652"
+ garbageValue = "-1159049318"
)
@Export("length")
public final long length() throws IOException {
return this.file.length(); // L: 59
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "([BIIB)I",
- garbageValue = "10"
+ descriptor = "([BIII)I",
+ garbageValue = "-1419901670"
)
@Export("read")
public final int read(byte[] var1, int var2, int var3) throws IOException {
diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java
index 43fb732182..f121e94f73 100644
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -4,401 +4,404 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cx")
+@ObfuscatedName("cj")
@Implements("Actor")
public abstract class Actor extends Renderable {
+ @ObfuscatedName("hv")
+ @Export("regionLandArchives")
+ static byte[][] regionLandArchives;
@ObfuscatedName("ab")
@ObfuscatedGetter(
- intValue = 121889507
+ intValue = -1118070755
)
@Export("x")
int x;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@ObfuscatedGetter(
- intValue = 661010269
+ intValue = -1646015609
)
@Export("y")
int y;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@ObfuscatedGetter(
- intValue = -1669699483
+ intValue = -972787127
)
@Export("rotation")
int rotation;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("isWalking")
boolean isWalking;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = 1075193415
+ intValue = 2047436751
)
- int field1167;
- @ObfuscatedName("as")
+ int field1205;
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = 1662995403
+ intValue = 1050181507
)
@Export("playerCycle")
int playerCycle;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = 277443883
+ intValue = 2097702445
)
@Export("idleSequence")
int idleSequence;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@ObfuscatedGetter(
- intValue = -828957377
+ intValue = -1100537755
)
@Export("turnLeftSequence")
int turnLeftSequence;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = 541405107
+ intValue = -1115406841
)
@Export("turnRightSequence")
int turnRightSequence;
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@ObfuscatedGetter(
- intValue = 567570905
+ intValue = 615118423
)
@Export("walkSequence")
int walkSequence;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@ObfuscatedGetter(
- intValue = 181548217
+ intValue = -280732815
)
@Export("walkBackSequence")
int walkBackSequence;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@ObfuscatedGetter(
- intValue = -268256549
+ intValue = -1801716209
)
@Export("walkLeftSequence")
int walkLeftSequence;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@ObfuscatedGetter(
- intValue = -1210183331
+ intValue = -207098851
)
@Export("walkRightSequence")
int walkRightSequence;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@ObfuscatedGetter(
- intValue = -2015875653
+ intValue = 282222667
)
@Export("runSequence")
int runSequence;
- @ObfuscatedName("ah")
- @ObfuscatedGetter(
- intValue = 688372339
- )
- int field1150;
- @ObfuscatedName("ao")
- @ObfuscatedGetter(
- intValue = -1227089691
- )
- int field1183;
- @ObfuscatedName("av")
- @ObfuscatedGetter(
- intValue = 659809895
- )
- int field1152;
@ObfuscatedName("ai")
@ObfuscatedGetter(
- intValue = 850455971
+ intValue = 372349823
)
- int field1160;
- @ObfuscatedName("ay")
+ int field1180;
+ @ObfuscatedName("az")
@ObfuscatedGetter(
- intValue = 1260070347
+ intValue = 1469217257
)
- int field1154;
- @ObfuscatedName("aa")
+ int field1144;
+ @ObfuscatedName("av")
@ObfuscatedGetter(
- intValue = 1833639881
+ intValue = 1010191265
+ )
+ int field1145;
+ @ObfuscatedName("aw")
+ @ObfuscatedGetter(
+ intValue = -1730351949
)
int field1155;
- @ObfuscatedName("ax")
+ @ObfuscatedName("au")
@ObfuscatedGetter(
- intValue = -417824403
+ intValue = 756854087
)
- int field1156;
- @ObfuscatedName("at")
+ int field1179;
+ @ObfuscatedName("aa")
+ @ObfuscatedGetter(
+ intValue = 582466563
+ )
+ int field1137;
+ @ObfuscatedName("ay")
+ @ObfuscatedGetter(
+ intValue = 373349895
+ )
+ int field1149;
+ @ObfuscatedName("as")
@Export("overheadText")
String overheadText;
- @ObfuscatedName("br")
+ @ObfuscatedName("be")
@Export("isAutoChatting")
boolean isAutoChatting;
- @ObfuscatedName("ba")
- boolean field1198;
- @ObfuscatedName("bk")
+ @ObfuscatedName("bz")
+ boolean field1152;
+ @ObfuscatedName("bp")
@ObfuscatedGetter(
- intValue = -1230418907
+ intValue = -1340711323
)
@Export("overheadTextCyclesRemaining")
int overheadTextCyclesRemaining;
- @ObfuscatedName("bi")
+ @ObfuscatedName("bf")
@ObfuscatedGetter(
- intValue = -2134963039
+ intValue = 1575450167
)
@Export("overheadTextColor")
int overheadTextColor;
- @ObfuscatedName("bc")
+ @ObfuscatedName("bg")
@ObfuscatedGetter(
- intValue = 2079520011
+ intValue = -182052553
)
@Export("overheadTextEffect")
int overheadTextEffect;
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@Export("hitSplatCount")
byte hitSplatCount;
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@Export("hitSplatTypes")
int[] hitSplatTypes;
- @ObfuscatedName("bx")
+ @ObfuscatedName("bc")
@Export("hitSplatValues")
int[] hitSplatValues;
- @ObfuscatedName("bd")
+ @ObfuscatedName("bl")
@Export("hitSplatCycles")
int[] hitSplatCycles;
- @ObfuscatedName("bj")
+ @ObfuscatedName("bv")
@Export("hitSplatTypes2")
int[] hitSplatTypes2;
- @ObfuscatedName("be")
+ @ObfuscatedName("bt")
@Export("hitSplatValues2")
int[] hitSplatValues2;
- @ObfuscatedName("bf")
+ @ObfuscatedName("bh")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "Llk;"
)
@Export("healthBars")
IterableNodeDeque healthBars;
- @ObfuscatedName("bz")
+ @ObfuscatedName("bs")
@ObfuscatedGetter(
- intValue = 16666525
+ intValue = -271055267
)
@Export("targetIndex")
int targetIndex;
- @ObfuscatedName("bv")
+ @ObfuscatedName("bk")
@Export("false0")
boolean false0;
- @ObfuscatedName("bt")
+ @ObfuscatedName("bb")
@ObfuscatedGetter(
- intValue = 1468417251
+ intValue = -79075039
)
- int field1172;
+ int field1165;
+ @ObfuscatedName("ba")
+ boolean field1161;
@ObfuscatedName("bu")
- boolean field1173;
- @ObfuscatedName("bq")
@ObfuscatedGetter(
- intValue = -87801333
+ intValue = 606824383
)
@Export("movementSequence")
int movementSequence;
- @ObfuscatedName("bh")
+ @ObfuscatedName("bw")
@ObfuscatedGetter(
- intValue = -1659027519
+ intValue = 1101086801
)
@Export("movementFrame")
int movementFrame;
- @ObfuscatedName("bb")
+ @ObfuscatedName("bi")
@ObfuscatedGetter(
- intValue = -1628370693
+ intValue = -925467467
)
@Export("movementFrameCycle")
int movementFrameCycle;
- @ObfuscatedName("bm")
+ @ObfuscatedName("bo")
@ObfuscatedGetter(
- intValue = -419918963
+ intValue = -792237997
)
@Export("sequence")
int sequence;
- @ObfuscatedName("by")
+ @ObfuscatedName("bx")
@ObfuscatedGetter(
- intValue = 647710587
+ intValue = 1937149831
)
@Export("sequenceFrame")
int sequenceFrame;
- @ObfuscatedName("bn")
+ @ObfuscatedName("bm")
@ObfuscatedGetter(
- intValue = -1189789481
+ intValue = 1066271643
)
@Export("sequenceFrameCycle")
int sequenceFrameCycle;
- @ObfuscatedName("bg")
+ @ObfuscatedName("by")
@ObfuscatedGetter(
- intValue = 1226146741
+ intValue = 1022517063
)
@Export("sequenceDelay")
int sequenceDelay;
- @ObfuscatedName("bp")
+ @ObfuscatedName("bj")
@ObfuscatedGetter(
- intValue = -1495425719
+ intValue = -1788834823
)
- int field1186;
- @ObfuscatedName("bw")
+ int field1190;
+ @ObfuscatedName("bd")
@ObfuscatedGetter(
- intValue = 556914221
+ intValue = -2008089801
)
@Export("spotAnimation")
int spotAnimation;
- @ObfuscatedName("co")
+ @ObfuscatedName("cr")
@ObfuscatedGetter(
- intValue = -861517093
+ intValue = 965779263
)
@Export("spotAnimationFrame")
int spotAnimationFrame;
- @ObfuscatedName("ck")
+ @ObfuscatedName("cq")
@ObfuscatedGetter(
- intValue = 511018915
+ intValue = -338713871
)
@Export("spotAnimationFrameCycle")
int spotAnimationFrameCycle;
- @ObfuscatedName("cr")
+ @ObfuscatedName("cw")
@ObfuscatedGetter(
- intValue = -539089199
+ intValue = 1296382665
)
- int field1185;
- @ObfuscatedName("cv")
+ int field1178;
+ @ObfuscatedName("cx")
@ObfuscatedGetter(
- intValue = 1282068867
+ intValue = -1369289223
)
@Export("spotAnimationHeight")
int spotAnimationHeight;
- @ObfuscatedName("cs")
- @ObfuscatedGetter(
- intValue = -598436523
- )
- int field1187;
- @ObfuscatedName("cm")
- @ObfuscatedGetter(
- intValue = -1307371871
- )
- int field1188;
- @ObfuscatedName("ca")
- @ObfuscatedGetter(
- intValue = 1779400399
- )
- int field1189;
- @ObfuscatedName("ci")
- @ObfuscatedGetter(
- intValue = 2006327735
- )
- int field1190;
- @ObfuscatedName("cx")
- @ObfuscatedGetter(
- intValue = -192434321
- )
- int field1191;
- @ObfuscatedName("cn")
- @ObfuscatedGetter(
- intValue = -41775789
- )
- int field1192;
@ObfuscatedName("cc")
@ObfuscatedGetter(
- intValue = -1780782035
+ intValue = -1719412661
)
- int field1139;
- @ObfuscatedName("cy")
+ int field1140;
+ @ObfuscatedName("cm")
@ObfuscatedGetter(
- intValue = 986187043
+ intValue = 960222749
+ )
+ int field1181;
+ @ObfuscatedName("ci")
+ @ObfuscatedGetter(
+ intValue = 1156188427
+ )
+ int field1182;
+ @ObfuscatedName("cg")
+ @ObfuscatedGetter(
+ intValue = 1597921931
+ )
+ int field1183;
+ @ObfuscatedName("cj")
+ @ObfuscatedGetter(
+ intValue = -379199875
+ )
+ int field1184;
+ @ObfuscatedName("cp")
+ @ObfuscatedGetter(
+ intValue = -777407565
+ )
+ int field1194;
+ @ObfuscatedName("cf")
+ @ObfuscatedGetter(
+ intValue = -1595241739
+ )
+ int field1186;
+ @ObfuscatedName("cv")
+ @ObfuscatedGetter(
+ intValue = 269273095
)
@Export("npcCycle")
int npcCycle;
- @ObfuscatedName("ct")
+ @ObfuscatedName("cn")
@ObfuscatedGetter(
- intValue = 1812690243
+ intValue = -954472933
)
@Export("defaultHeight")
int defaultHeight;
- @ObfuscatedName("cd")
+ @ObfuscatedName("co")
@ObfuscatedGetter(
- intValue = -1016685127
+ intValue = -338202467
)
- int field1196;
- @ObfuscatedName("cw")
+ int field1189;
+ @ObfuscatedName("cz")
@ObfuscatedGetter(
- intValue = -1275836225
+ intValue = 99787659
)
- int field1197;
- @ObfuscatedName("cf")
- byte field1143;
- @ObfuscatedName("cq")
- byte field1199;
- @ObfuscatedName("cg")
- byte field1153;
- @ObfuscatedName("cl")
- byte field1140;
+ int field1135;
@ObfuscatedName("cu")
+ byte field1191;
+ @ObfuscatedName("ce")
+ byte field1192;
+ @ObfuscatedName("cy")
+ byte field1193;
+ @ObfuscatedName("ca")
+ byte field1133;
+ @ObfuscatedName("ck")
@ObfuscatedGetter(
- intValue = 1211095435
+ intValue = 1887319247
)
@Export("orientation")
int orientation;
- @ObfuscatedName("ch")
+ @ObfuscatedName("cb")
@ObfuscatedGetter(
- intValue = 1602792415
+ intValue = 291062025
)
- int field1203;
- @ObfuscatedName("cz")
+ int field1196;
+ @ObfuscatedName("cs")
@ObfuscatedGetter(
- intValue = 1818380337
+ intValue = 124924459
)
- int field1204;
- @ObfuscatedName("ce")
+ int field1129;
+ @ObfuscatedName("cd")
@ObfuscatedGetter(
- intValue = -1724632665
+ intValue = 1161369831
)
@Export("pathLength")
int pathLength;
- @ObfuscatedName("cj")
+ @ObfuscatedName("cl")
@Export("pathX")
int[] pathX;
- @ObfuscatedName("cb")
+ @ObfuscatedName("ct")
@Export("pathY")
int[] pathY;
- @ObfuscatedName("cp")
+ @ObfuscatedName("ch")
@ObfuscatedSignature(
- descriptor = "[Lgd;"
+ descriptor = "[Lgn;"
)
@Export("pathTraversed")
- class193[] pathTraversed;
- @ObfuscatedName("dc")
+ class192[] pathTraversed;
+ @ObfuscatedName("dm")
@ObfuscatedGetter(
- intValue = 753559813
+ intValue = 278658953
)
- int field1194;
- @ObfuscatedName("dp")
+ int field1202;
+ @ObfuscatedName("dd")
@ObfuscatedGetter(
- intValue = 1620196957
+ intValue = 551206327
)
- int field1200;
- @ObfuscatedName("dg")
+ int field1203;
+ @ObfuscatedName("dz")
@ObfuscatedGetter(
- intValue = 731891927
+ intValue = 71404267
)
- int field1210;
+ int field1204;
Actor() {
this.isWalking = false; // L: 13
- this.field1167 = 1; // L: 14
+ this.field1205 = 1; // L: 14
this.idleSequence = -1; // L: 16
- this.turnLeftSequence = -1; // L: 17
- this.turnRightSequence = -1; // L: 18
- this.walkSequence = -1; // L: 19
+ this.turnLeftSequence = -1;
+ this.turnRightSequence = -1;
+ this.walkSequence = -1;
this.walkBackSequence = -1; // L: 20
- this.walkLeftSequence = -1; // L: 21
+ this.walkLeftSequence = -1;
this.walkRightSequence = -1; // L: 22
this.runSequence = -1; // L: 23
- this.field1150 = -1; // L: 24
- this.field1183 = -1; // L: 25
- this.field1152 = -1; // L: 26
- this.field1160 = -1; // L: 27
- this.field1154 = -1; // L: 28
- this.field1155 = -1; // L: 29
- this.field1156 = -1; // L: 30
+ this.field1180 = -1; // L: 24
+ this.field1144 = -1;
+ this.field1145 = -1; // L: 26
+ this.field1155 = -1; // L: 27
+ this.field1179 = -1; // L: 28
+ this.field1137 = -1; // L: 29
+ this.field1149 = -1; // L: 30
this.overheadText = null; // L: 31
- this.field1198 = false; // L: 33
+ this.field1152 = false; // L: 33
this.overheadTextCyclesRemaining = 100; // L: 34
this.overheadTextColor = 0; // L: 35
this.overheadTextEffect = 0; // L: 36
@@ -411,7 +414,7 @@ public abstract class Actor extends Renderable {
this.healthBars = new IterableNodeDeque(); // L: 44
this.targetIndex = -1; // L: 45
this.false0 = false; // L: 46
- this.field1172 = -1; // L: 47
+ this.field1165 = -1; // L: 47
this.movementSequence = -1; // L: 49
this.movementFrame = 0; // L: 50
this.movementFrameCycle = 0; // L: 51
@@ -419,49 +422,49 @@ public abstract class Actor extends Renderable {
this.sequenceFrame = 0; // L: 53
this.sequenceFrameCycle = 0; // L: 54
this.sequenceDelay = 0; // L: 55
- this.field1186 = 0; // L: 56
+ this.field1190 = 0; // L: 56
this.spotAnimation = -1; // L: 57
this.spotAnimationFrame = 0; // L: 58
this.spotAnimationFrameCycle = 0; // L: 59
this.npcCycle = 0; // L: 69
this.defaultHeight = 200; // L: 70
- this.field1196 = -1; // L: 71
- this.field1197 = -1; // L: 72
- this.field1203 = 0; // L: 78
- this.field1204 = 32; // L: 79
+ this.field1189 = -1; // L: 71
+ this.field1135 = -1; // L: 72
+ this.field1196 = 0; // L: 78
+ this.field1129 = 32; // L: 79
this.pathLength = 0; // L: 80
this.pathX = new int[10]; // L: 81
this.pathY = new int[10]; // L: 82
- this.pathTraversed = new class193[10]; // L: 83
- this.field1194 = 0; // L: 84
- this.field1200 = 0; // L: 85
- this.field1210 = -1; // L: 86
+ this.pathTraversed = new class192[10]; // L: 83
+ this.field1202 = 0; // L: 84
+ this.field1203 = 0; // L: 85
+ this.field1204 = -1; // L: 86
} // L: 88
- @ObfuscatedName("h")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-4"
+ descriptor = "(I)Z",
+ garbageValue = "9013641"
)
@Export("isVisible")
boolean isVisible() {
return false; // L: 96
}
- @ObfuscatedName("at")
+ @ObfuscatedName("bf")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "0"
+ descriptor = "(I)V",
+ garbageValue = "585677791"
)
- final void method2180() {
+ final void method2182() {
this.pathLength = 0; // L: 91
- this.field1200 = 0; // L: 92
+ this.field1203 = 0; // L: 92
} // L: 93
- @ObfuscatedName("br")
+ @ObfuscatedName("bg")
@ObfuscatedSignature(
- descriptor = "(IIIIIII)V",
- garbageValue = "1908161271"
+ descriptor = "(IIIIIIB)V",
+ garbageValue = "7"
)
@Export("addHitSplat")
final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -481,9 +484,9 @@ public abstract class Actor extends Renderable {
int var10 = -1; // L: 107
int var11 = 0; // L: 108
if (var1 >= 0) { // L: 109
- HitSplatDefinition var12 = UserComparator4.method2567(var1); // L: 110
- var10 = var12.field2070; // L: 111
- var11 = var12.field2071; // L: 112
+ HitSplatDefinition var12 = class122.method2800(var1); // L: 110
+ var10 = var12.field2035; // L: 111
+ var11 = var12.field2026; // L: 112
}
int var14;
@@ -539,98 +542,87 @@ public abstract class Actor extends Renderable {
}
} // L: 153
- @ObfuscatedName("bc")
+ @ObfuscatedName("br")
@ObfuscatedSignature(
- descriptor = "(IIIIIII)V",
- garbageValue = "-1476814237"
+ descriptor = "(IIIIIIS)V",
+ garbageValue = "134"
)
@Export("addHealthBar")
final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
- HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 158
- HealthBarDefinition var7;
- if (var8 != null) { // L: 159
- var7 = var8; // L: 160
- } else {
- byte[] var9 = World.HealthBarDefinition_archive.takeFile(33, var1); // L: 163
- var8 = new HealthBarDefinition(); // L: 164
- if (var9 != null) { // L: 165
- var8.decode(new Buffer(var9));
+ HealthBarDefinition var7 = MusicPatchNode2.method5244(var1); // L: 156
+ HealthBar var8 = null; // L: 157
+ HealthBar var9 = null; // L: 158
+ int var10 = var7.int2; // L: 159
+ int var11 = 0; // L: 160
+
+ HealthBar var12;
+ for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 161
+ ++var11; // L: 162
+ if (var12.definition.field1876 == var7.field1876) { // L: 163
+ var12.put(var2 + var4, var5, var6, var3); // L: 164
+ return; // L: 165
}
- HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); // L: 166
- var7 = var8; // L: 167
- }
-
- var8 = var7; // L: 169
- HealthBar var14 = null; // L: 170
- HealthBar var10 = null; // L: 171
- int var11 = var7.int2; // L: 172
- int var12 = 0; // L: 173
-
- HealthBar var13;
- for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 174
- ++var12; // L: 175
- if (var13.definition.field1908 == var8.field1908) { // L: 176
- var13.put(var2 + var4, var5, var6, var3); // L: 177
- return; // L: 178
+ if (var12.definition.int1 <= var7.int1) { // L: 167
+ var8 = var12;
}
- if (var13.definition.int1 <= var8.int1) { // L: 180
- var14 = var13;
- }
-
- if (var13.definition.int2 > var11) { // L: 181
- var10 = var13; // L: 182
- var11 = var13.definition.int2; // L: 183
+ if (var12.definition.int2 > var10) { // L: 168
+ var9 = var12; // L: 169
+ var10 = var12.definition.int2; // L: 170
}
}
- if (var10 != null || var12 < 4) { // L: 186
- var13 = new HealthBar(var8); // L: 187
- if (var14 == null) { // L: 188
- this.healthBars.addLast(var13);
+ if (var9 != null || var11 < 4) { // L: 173
+ var12 = new HealthBar(var7); // L: 174
+ if (var8 == null) { // L: 175
+ this.healthBars.addLast(var12);
} else {
- IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); // L: 189
+ IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 176
}
- var13.put(var2 + var4, var5, var6, var3); // L: 190
- if (var12 >= 4) { // L: 191
- var10.remove();
+ var12.put(var2 + var4, var5, var6, var3); // L: 177
+ if (var11 >= 4) { // L: 178
+ var9.remove();
}
}
- } // L: 192
+ } // L: 179
- @ObfuscatedName("bo")
+ @ObfuscatedName("bn")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "-3"
+ descriptor = "(II)V",
+ garbageValue = "-330258668"
)
@Export("removeHealthBar")
final void removeHealthBar(int var1) {
- HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 197
- HealthBarDefinition var2;
- if (var3 != null) { // L: 198
- var2 = var3; // L: 199
- } else {
- byte[] var4 = World.HealthBarDefinition_archive.takeFile(33, var1); // L: 202
- var3 = new HealthBarDefinition(); // L: 203
- if (var4 != null) { // L: 204
- var3.decode(new Buffer(var4));
- }
+ HealthBarDefinition var2 = MusicPatchNode2.method5244(var1); // L: 182
- HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); // L: 205
- var2 = var3; // L: 206
- }
-
- var3 = var2; // L: 208
-
- for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { // L: 209
- if (var3 == var5.definition) { // L: 210
- var5.remove(); // L: 211
- return; // L: 212
+ for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 183
+ if (var2 == var3.definition) { // L: 184
+ var3.remove(); // L: 185
+ return; // L: 186
}
}
- } // L: 215
+ } // L: 189
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "([Lla;II)Lla;",
+ garbageValue = "822359584"
+ )
+ @Export("findEnumerated")
+ public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) {
+ MouseWheel[] var2 = var0; // L: 17
+
+ for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
+ MouseWheel var4 = var2[var3]; // L: 19
+ if (var1 == var4.rsOrdinal()) {
+ return var4; // L: 21
+ }
+ }
+
+ return null; // L: 25
+ }
}
diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java
index e1d1cb881d..4c93b44458 100644
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -3,51 +3,51 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gu")
+@ObfuscatedName("gl")
@Implements("Animation")
public class Animation {
- @ObfuscatedName("o")
- static int[] field2344;
+ @ObfuscatedName("c")
+ static int[] field2303;
+ @ObfuscatedName("v")
+ static int[] field2308;
@ObfuscatedName("q")
- static int[] field2342;
- @ObfuscatedName("l")
- static int[] field2351;
- @ObfuscatedName("k")
- static int[] field2345;
- @ObfuscatedName("a")
+ static int[] field2305;
+ @ObfuscatedName("f")
+ static int[] field2304;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lgf;"
+ descriptor = "Lgm;"
)
@Export("skeleton")
Skeleton skeleton;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("transformCount")
int transformCount;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("transformSkeletonLabels")
int[] transformSkeletonLabels;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("transformXs")
int[] transformXs;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("transformYs")
int[] transformYs;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("transformZs")
int[] transformZs;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("hasAlphaTransform")
boolean hasAlphaTransform;
static {
- field2344 = new int[500]; // L: 8
- field2342 = new int[500]; // L: 9
- field2351 = new int[500]; // L: 10
- field2345 = new int[500]; // L: 11
+ field2303 = new int[500]; // L: 8
+ field2308 = new int[500]; // L: 9
+ field2305 = new int[500]; // L: 10
+ field2304 = new int[500]; // L: 11
}
@ObfuscatedSignature(
- descriptor = "([BLgf;)V"
+ descriptor = "([BLgm;)V"
)
Animation(byte[] var1, Skeleton var2) {
this.skeleton = null; // L: 12
@@ -69,38 +69,38 @@ public class Animation {
if (this.skeleton.transformTypes[var8] != 0) { // L: 32
for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33
if (this.skeleton.transformTypes[var10] == 0) { // L: 34
- field2344[var7] = var10; // L: 35
- field2342[var7] = 0; // L: 36
- field2351[var7] = 0; // L: 37
- field2345[var7] = 0; // L: 38
+ field2303[var7] = var10; // L: 35
+ field2308[var7] = 0; // L: 36
+ field2305[var7] = 0; // L: 37
+ field2304[var7] = 0; // L: 38
++var7; // L: 39
break;
}
}
}
- field2344[var7] = var8; // L: 44
+ field2303[var7] = var8; // L: 44
short var11 = 0; // L: 45
if (this.skeleton.transformTypes[var8] == 3) { // L: 46
var11 = 128;
}
if ((var9 & 1) != 0) { // L: 47
- field2342[var7] = var4.readShortSmart();
+ field2308[var7] = var4.readShortSmart();
} else {
- field2342[var7] = var11; // L: 48
+ field2308[var7] = var11; // L: 48
}
if ((var9 & 2) != 0) { // L: 49
- field2351[var7] = var4.readShortSmart();
+ field2305[var7] = var4.readShortSmart();
} else {
- field2351[var7] = var11; // L: 50
+ field2305[var7] = var11; // L: 50
}
if ((var9 & 4) != 0) { // L: 51
- field2345[var7] = var4.readShortSmart();
+ field2304[var7] = var4.readShortSmart();
} else {
- field2345[var7] = var11; // L: 52
+ field2304[var7] = var11; // L: 52
}
var6 = var8; // L: 53
@@ -121,10 +121,10 @@ public class Animation {
this.transformZs = new int[var7]; // L: 65
for (var8 = 0; var8 < var7; ++var8) { // L: 66
- this.transformSkeletonLabels[var8] = field2344[var8]; // L: 67
- this.transformXs[var8] = field2342[var8]; // L: 68
- this.transformYs[var8] = field2351[var8]; // L: 69
- this.transformZs[var8] = field2345[var8]; // L: 70
+ this.transformSkeletonLabels[var8] = field2303[var8]; // L: 67
+ this.transformXs[var8] = field2308[var8]; // L: 68
+ this.transformYs[var8] = field2305[var8]; // L: 69
+ this.transformZs[var8] = field2304[var8]; // L: 70
}
}
diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java
index 47393a35a6..2d9891a0e2 100644
--- a/runescape-client/src/main/java/ApproximateRouteStrategy.java
+++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java
@@ -1,131 +1,55 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bl")
+@ObfuscatedName("bn")
@Implements("ApproximateRouteStrategy")
public class ApproximateRouteStrategy extends RouteStrategy {
- @ObfuscatedName("bc")
+ @ObfuscatedName("ek")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Llc;"
)
- static StudioGame field473;
- @ObfuscatedName("fw")
- static String field471;
+ @Export("archive10")
+ static Archive archive10;
+ @ObfuscatedName("hp")
+ @ObfuscatedGetter(
+ intValue = 998883341
+ )
+ static int field466;
ApproximateRouteStrategy() {
- } // L: 12776
+ } // L: 12551
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIILgh;I)Z",
- garbageValue = "-425355466"
+ descriptor = "(IIILgv;I)Z",
+ garbageValue = "1278947831"
)
@Export("hasArrived")
public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
- return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12780
+ return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12555
}
- @ObfuscatedName("l")
+ @ObfuscatedName("lt")
@ObfuscatedSignature(
- descriptor = "(IIB)Lki;",
- garbageValue = "-103"
+ descriptor = "(IIB)V",
+ garbageValue = "1"
)
- @Export("getWidgetChild")
- public static Widget getWidgetChild(int var0, int var1) {
- Widget var2 = class92.getWidget(var0); // L: 239
- if (var1 == -1) { // L: 240
- return var2;
- } else {
- return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 241 242
- }
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-630623402"
- )
- public static void method1110() {
- class273.midiPcmStream.clear(); // L: 42
- class273.musicPlayerStatus = 1; // L: 43
- ClanChannelMember.musicTrackArchive = null; // L: 44
- } // L: 45
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)[Lcq;",
- garbageValue = "768338863"
- )
- static AttackOption[] method1108() {
- return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.field1285, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1283, AttackOption.AttackOption_dependsOnCombatLevels}; // L: 12729
- }
-
- @ObfuscatedName("ir")
- @ObfuscatedSignature(
- descriptor = "(Lca;IIII)V",
- garbageValue = "611280226"
- )
- @Export("addPlayerToMenu")
- static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
- if (ModelData0.localPlayer != var0) { // L: 10138
- if (Client.menuOptionsCount < 400) { // L: 10139
- String var4;
- if (var0.skillLevel == 0) { // L: 10141
- var4 = var0.actions[0] + var0.username + var0.actions[1] + IgnoreList.method6430(var0.combatLevel, ModelData0.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
- } else {
- var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10142
- }
-
- int var5;
- if (Client.isItemSelected == 1) { // L: 10143
- Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10144
- } else if (Client.isSpellSelected) { // L: 10147
- if ((class113.selectedSpellFlags & 8) == 8) { // L: 10148
- Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10149
- }
- } else {
- for (var5 = 7; var5 >= 0; --var5) { // L: 10154
- if (Client.playerMenuActions[var5] != null) { // L: 10155
- short var6 = 0; // L: 10156
- if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { // L: 10157
- if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10158
- continue;
- }
-
- if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > ModelData0.localPlayer.combatLevel) { // L: 10159
- var6 = 2000; // L: 10160
- }
-
- if (ModelData0.localPlayer.team != 0 && var0.team != 0) { // L: 10162
- if (var0.team == ModelData0.localPlayer.team) { // L: 10163
- var6 = 2000;
- } else {
- var6 = 0; // L: 10164
- }
- } else if (AttackOption.field1283 == Client.playerAttackOption && var0.isClanMember()) { // L: 10166
- var6 = 2000; // L: 10167
- }
- } else if (Client.playerOptionsPriorities[var5]) { // L: 10170
- var6 = 2000;
- }
-
- boolean var7 = false; // L: 10171
- int var8 = Client.playerMenuOpcodes[var5] + var6; // L: 10172
- Projectile.insertMenuItemNoShift(Client.playerMenuActions[var5], class166.colorStartTag(16777215) + var4, var8, var1, var2, var3); // L: 10173
- }
- }
- }
-
- for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 10178
- if (Client.menuOpcodes[var5] == 23) { // L: 10179
- Client.menuTargets[var5] = class166.colorStartTag(16777215) + var4; // L: 10180
- break;
- }
- }
-
+ static final void method1086(int var0, int var1) {
+ ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class150.guestClanChannel; // L: 12249
+ if (var2 != null && var1 >= 0 && var1 < var2.method3113()) { // L: 12250
+ ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12251
+ if (var3.rank == -1) { // L: 12252
+ String var4 = var3.username.getName(); // L: 12253
+ PacketBufferNode var5 = EnumComposition.getPacketBufferNode(ClientPacket.field2914, Client.packetWriter.isaacCipher); // L: 12254
+ var5.packetBuffer.writeByte(3 + ScriptEvent.stringCp1252NullTerminatedByteSize(var4)); // L: 12255
+ var5.packetBuffer.writeByte(var0); // L: 12256
+ var5.packetBuffer.writeShort(var1); // L: 12257
+ var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12258
+ Client.packetWriter.addNode(var5); // L: 12259
}
}
- } // L: 10184
+ } // L: 12260
}
diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java
index fe7d4f8978..6edca55373 100644
--- a/runescape-client/src/main/java/Archive.java
+++ b/runescape-client/src/main/java/Archive.java
@@ -4,390 +4,477 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("le")
+@ObfuscatedName("lc")
@Implements("Archive")
public class Archive extends AbstractArchive {
- @ObfuscatedName("r")
+ @ObfuscatedName("t")
@Export("Archive_crc")
static CRC32 Archive_crc;
- @ObfuscatedName("l")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lnc;"
+ descriptor = "Lnd;"
)
@Export("archiveDisk")
ArchiveDisk archiveDisk;
- @ObfuscatedName("k")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lnc;"
+ descriptor = "Lnd;"
)
@Export("masterDisk")
ArchiveDisk masterDisk;
- @ObfuscatedName("a")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 232250769
+ intValue = -1616385301
)
@Export("index")
int index;
- @ObfuscatedName("m")
- volatile boolean field4009;
- @ObfuscatedName("p")
- boolean field4010;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 1061047975
+ )
+ volatile int field3981;
+ @ObfuscatedName("i")
+ boolean field3979;
@ObfuscatedName("s")
@Export("validGroups")
volatile boolean[] validGroups;
- @ObfuscatedName("v")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 693751521
+ intValue = 2100182859
)
@Export("indexCrc")
int indexCrc;
- @ObfuscatedName("y")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = -1377656539
+ intValue = -121372543
)
@Export("indexVersion")
int indexVersion;
- @ObfuscatedName("c")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = -463478149
+ intValue = 735655197
)
- int field4013;
+ int field3989;
+ @ObfuscatedName("k")
+ boolean field3990;
static {
- Archive_crc = new CRC32(); // L: 17
+ Archive_crc = new CRC32(); // L: 20
}
@ObfuscatedSignature(
- descriptor = "(Lnc;Lnc;IZZZ)V"
+ descriptor = "(Lnd;Lnd;IZZZZ)V"
)
- public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
- super(var4, var5); // L: 23
- this.field4009 = false; // L: 14
- this.field4010 = false; // L: 15
- this.field4013 = -1; // L: 20
- this.archiveDisk = var1; // L: 24
- this.masterDisk = var2; // L: 25
- this.index = var3; // L: 26
- this.field4010 = var6; // L: 27
- class125.method2796(this, this.index); // L: 28
- } // L: 29
+ public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6, boolean var7) {
+ super(var4, var5); // L: 27
+ this.field3981 = 0; // L: 17
+ this.field3979 = false; // L: 18
+ this.field3989 = -1;
+ this.field3990 = false;
+ this.archiveDisk = var1; // L: 28
+ this.masterDisk = var2; // L: 29
+ this.index = var3; // L: 30
+ this.field3979 = var6; // L: 31
+ this.field3990 = var7; // L: 32
+ class93.method2403(this, this.index); // L: 33
+ } // L: 34
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-611080530"
+ garbageValue = "1214739037"
)
- public boolean method5624() {
- return this.field4009; // L: 32
+ public boolean method5795() {
+ return this.field3981 == 1; // L: 37
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1116863257"
+ )
+ @Export("percentage")
+ public int percentage() {
+ if (this.field3981 != 1 && (!this.field3990 || this.field3981 != 2)) { // L: 41
+ if (super.groups != null) { // L: 42
+ return 99;
+ } else {
+ int var2 = this.index; // L: 44
+ long var3 = (long)(var2 + 16711680); // L: 46
+ int var1;
+ if (Buddy.NetCache_currentResponse != null && Buddy.NetCache_currentResponse.key == var3) { // L: 47
+ var1 = ObjectSound.NetCache_responseArchiveBuffer.offset * 99 / (ObjectSound.NetCache_responseArchiveBuffer.array.length - Buddy.NetCache_currentResponse.padding) + 1; // L: 51
+ } else {
+ var1 = 0; // L: 48
+ }
+
+ int var5 = var1; // L: 53
+ if (var1 >= 100) { // L: 54
+ var5 = 99;
+ }
+
+ return var5; // L: 55
+ }
+ } else {
+ return 100;
+ }
}
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1253089575"
- )
- @Export("percentage")
- public int percentage() {
- if (this.field4009) { // L: 36
- return 100;
- } else if (super.groups != null) { // L: 37
- return 99;
- } else {
- int var1 = class6.method45(255, this.index); // L: 38
- if (var1 >= 100) { // L: 39
- var1 = 99;
- }
-
- return var1; // L: 40
- }
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "738299214"
+ descriptor = "(IB)V",
+ garbageValue = "20"
)
@Export("loadRegionFromGroup")
void loadRegionFromGroup(int var1) {
- DevicePcmPlayerProvider.method336(this.index, var1); // L: 44
- } // L: 45
+ FloorOverlayDefinition.method3808(this.index, var1); // L: 59
+ } // L: 60
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-250456045"
+ descriptor = "(IB)V",
+ garbageValue = "22"
)
@Export("loadGroup")
void loadGroup(int var1) {
- if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48
- Skeleton.method4022(var1, this.archiveDisk, this);
+ if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 63
+ ClientPacket.method5191(var1, this.archiveDisk, this);
} else {
- class250.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 49
+ ClanChannel.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 64
}
- } // L: 50
+ } // L: 65
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "2125886075"
+ descriptor = "(I)V",
+ garbageValue = "-927514602"
+ )
+ void method5822() {
+ this.field3981 = 2; // L: 68
+ super.groupIds = new int[0]; // L: 69
+ super.groupCrcs = new int[0]; // L: 70
+ super.groupVersions = new int[0]; // L: 71
+ super.fileCounts = new int[0]; // L: 72
+ super.fileIds = new int[0][]; // L: 73
+ super.groups = new Object[0]; // L: 74
+ super.files = new Object[0][]; // L: 75
+ } // L: 76
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)V",
+ garbageValue = "28"
)
@Export("loadIndex")
- public void loadIndex(int var1, int var2) {
- this.indexCrc = var1; // L: 53
- this.indexVersion = var2; // L: 54
- if (this.masterDisk != null) { // L: 55
- Skeleton.method4022(this.index, this.masterDisk, this);
+ void loadIndex(int var1, int var2) {
+ this.indexCrc = var1; // L: 79
+ this.indexVersion = var2; // L: 80
+ if (this.masterDisk != null) { // L: 81
+ ClientPacket.method5191(this.index, this.masterDisk, this);
} else {
- class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 56
+ ClanChannel.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 82
}
- } // L: 57
+ } // L: 83
- @ObfuscatedName("m")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I[BZZB)V",
- garbageValue = "66"
+ descriptor = "(I[BZZI)V",
+ garbageValue = "757512896"
)
@Export("write")
public void write(int var1, byte[] var2, boolean var3, boolean var4) {
- if (var3) { // L: 60
- if (this.field4009) { // L: 61
- throw new RuntimeException(); // L: 62
+ if (var3) { // L: 86
+ if (this.field3981 == 1) { // L: 87
+ throw new RuntimeException(); // L: 88
}
- if (this.masterDisk != null) { // L: 64
- ModelData0.method4378(this.index, var2, this.masterDisk);
+ if (this.masterDisk != null) { // L: 90
+ class432.method7576(this.index, var2, this.masterDisk);
}
- this.decodeIndex(var2); // L: 65
- this.loadAllLocal(); // L: 66
+ this.decodeIndex(var2); // L: 91
+ this.loadAllLocal(); // L: 92
} else {
- var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 69
- var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 70
- if (this.archiveDisk != null) { // L: 71
- ModelData0.method4378(var1, var2, this.archiveDisk); // L: 72
- this.validGroups[var1] = true; // L: 73
+ var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 95
+ var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 96
+ if (this.archiveDisk != null) { // L: 97
+ class432.method7576(var1, var2, this.archiveDisk); // L: 98
+ this.validGroups[var1] = true; // L: 99
}
- if (var4) { // L: 75
- super.groups[var1] = WorldMapEvent.method4929(var2, false);
+ if (var4) {
+ super.groups[var1] = WorldMapArea.method4621(var2, false); // L: 101
}
}
- } // L: 77
+ } // L: 103
- @ObfuscatedName("p")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Lnc;I[BZB)V",
- garbageValue = "-99"
+ descriptor = "(Lnd;I[BZI)V",
+ garbageValue = "667811563"
)
@Export("load")
public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
int var5;
- if (var1 == this.masterDisk) { // L: 80
- if (this.field4009) { // L: 81
- throw new RuntimeException(); // L: 82
- } else if (var3 == null) { // L: 84
- class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 85
- } else {
- Archive_crc.reset(); // L: 88
- Archive_crc.update(var3, 0, var3.length); // L: 89
- var5 = (int)Archive_crc.getValue(); // L: 90
- if (var5 != this.indexCrc) { // L: 91
- class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 92
- } else {
- Buffer var9 = new Buffer(Skills.decompressBytes(var3)); // L: 95
- int var7 = var9.readUnsignedByte(); // L: 96
- if (var7 != 5 && var7 != 6) { // L: 97
- throw new RuntimeException(var7 + "," + this.index + "," + var2);
- } else {
- int var8 = 0; // L: 98
- if (var7 >= 6) { // L: 99
- var8 = var9.readInt();
- }
-
- if (var8 != this.indexVersion) { // L: 100
- class250.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 101
- } else {
- this.decodeIndex(var3); // L: 104
- this.loadAllLocal(); // L: 105
- }
- }
- }
+ if (var1 == this.masterDisk) { // L: 106
+ if (this.field3981 == 1) { // L: 107
+ throw new RuntimeException(); // L: 108
}
+
+ if (var3 == null) { // L: 110
+ ClanChannel.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 111
+ return; // L: 112
+ }
+
+ Archive_crc.reset(); // L: 114
+ Archive_crc.update(var3, 0, var3.length); // L: 115
+ var5 = (int)Archive_crc.getValue(); // L: 116
+ if (var5 != this.indexCrc) { // L: 117
+ ClanChannel.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 118
+ return; // L: 119
+ }
+
+ Buffer var9 = new Buffer(SoundSystem.decompressBytes(var3)); // L: 121
+ int var7 = var9.readUnsignedByte(); // L: 122
+ if (var7 != 5 && var7 != 6) { // L: 123
+ throw new RuntimeException(var7 + "," + this.index + "," + var2);
+ }
+
+ int var8 = 0; // L: 124
+ if (var7 >= 6) { // L: 125
+ var8 = var9.readInt();
+ }
+
+ if (var8 != this.indexVersion) { // L: 126
+ ClanChannel.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 127
+ return; // L: 128
+ }
+
+ this.decodeIndex(var3); // L: 130
+ this.loadAllLocal(); // L: 131
} else {
- if (!var4 && var2 == this.field4013) { // L: 108
- this.field4009 = true; // L: 109
+ if (!var4 && var2 == this.field3989) { // L: 134
+ this.field3981 = 1; // L: 135
}
- if (var3 != null && var3.length > 2) { // L: 111
- Archive_crc.reset(); // L: 116
- Archive_crc.update(var3, 0, var3.length - 2); // L: 117
- var5 = (int)Archive_crc.getValue(); // L: 118
- int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 119
- if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { // L: 120
- this.validGroups[var2] = true; // L: 125
- if (var4) { // L: 126
- super.groups[var2] = WorldMapEvent.method4929(var3, false);
- }
-
- } else {
- this.validGroups[var2] = false; // L: 121
- if (this.field4010 || var4) { // L: 122
- class250.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
- }
-
- }
- } else {
- this.validGroups[var2] = false; // L: 112
- if (this.field4010 || var4) { // L: 113
- class250.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+ if (var3 == null || var3.length <= 2) { // L: 137
+ this.validGroups[var2] = false; // L: 138
+ if (this.field3979 || var4) { // L: 139
+ ClanChannel.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
}
+ return; // L: 140
+ }
+
+ Archive_crc.reset(); // L: 142
+ Archive_crc.update(var3, 0, var3.length - 2); // L: 143
+ var5 = (int)Archive_crc.getValue(); // L: 144
+ int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 145
+ if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 146
+ this.validGroups[var2] = false; // L: 147
+ if (this.field3979 || var4) { // L: 148
+ ClanChannel.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+ }
+
+ return; // L: 149
+ }
+
+ this.validGroups[var2] = true; // L: 151
+ if (var4) { // L: 152
+ super.groups[var2] = WorldMapArea.method4621(var3, false);
}
}
- } // L: 86 93 102 114 123 128
- @ObfuscatedName("s")
+ } // L: 154
+
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "100"
+ descriptor = "(I)V",
+ garbageValue = "-1883328836"
)
@Export("loadAllLocal")
void loadAllLocal() {
- this.validGroups = new boolean[super.groups.length]; // L: 131
+ this.validGroups = new boolean[super.groups.length]; // L: 157
int var1;
- for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 132
+ for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 158
this.validGroups[var1] = false;
}
- if (this.archiveDisk == null) { // L: 133
- this.field4009 = true; // L: 134
+ if (this.archiveDisk == null) { // L: 159
+ this.field3981 = 1; // L: 160
} else {
- this.field4013 = -1; // L: 137
+ this.field3989 = -1; // L: 163
- for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 138
- if (super.fileCounts[var1] > 0) { // L: 139
- ArchiveDisk var2 = this.archiveDisk; // L: 140
- ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 143
- var4.type = 1; // L: 144
- var4.key = (long)var1; // L: 145
- var4.archiveDisk = var2; // L: 146
- var4.archive = this; // L: 147
- synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 148
- ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 149
- } // L: 150
-
- class306.method5595(); // L: 151
- this.field4013 = var1; // L: 153
+ for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 164
+ if (super.fileCounts[var1] > 0) { // L: 165
+ class305.method5764(var1, this.archiveDisk, this); // L: 166
+ this.field3989 = var1; // L: 167
}
}
- if (this.field4013 == -1) { // L: 156
- this.field4009 = true;
+ if (this.field3989 == -1) { // L: 170
+ this.field3981 = 1;
}
}
- } // L: 135 157
+ } // L: 161 171
- @ObfuscatedName("r")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "-41"
+ descriptor = "(II)I",
+ garbageValue = "-227114003"
)
@Export("groupLoadPercent")
int groupLoadPercent(int var1) {
- if (super.groups[var1] != null) { // L: 160
+ if (super.groups[var1] != null) { // L: 174
+ return 100;
+ } else if (this.validGroups[var1]) { // L: 175
return 100;
} else {
- return this.validGroups[var1] ? 100 : class6.method45(this.index, var1); // L: 161 162
+ int var3 = this.index; // L: 177
+ long var4 = (long)((var3 << 16) + var1); // L: 179
+ int var2;
+ if (Buddy.NetCache_currentResponse != null && Buddy.NetCache_currentResponse.key == var4) { // L: 180
+ var2 = ObjectSound.NetCache_responseArchiveBuffer.offset * 99 / (ObjectSound.NetCache_responseArchiveBuffer.array.length - Buddy.NetCache_currentResponse.padding) + 1; // L: 184
+ } else {
+ var2 = 0; // L: 181
+ }
+
+ return var2; // L: 186
+ }
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(II)Z",
+ garbageValue = "1110096171"
+ )
+ public boolean method5805(int var1) {
+ return this.validGroups[var1]; // L: 190
+ }
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(II)Z",
+ garbageValue = "2097935878"
+ )
+ public boolean method5806(int var1) {
+ return this.getGroupFileIds(var1) != null; // L: 194
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1832230483"
+ )
+ @Export("loadPercent")
+ public int loadPercent() {
+ int var1 = 0; // L: 198
+ int var2 = 0; // L: 199
+
+ int var3;
+ for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 200
+ if (super.fileCounts[var3] > 0) { // L: 201
+ var1 += 100; // L: 202
+ var2 += this.groupLoadPercent(var3); // L: 203
+ }
+ }
+
+ if (var1 == 0) { // L: 206
+ return 100;
+ } else {
+ var3 = var2 * 100 / var1; // L: 207
+ return var3; // L: 208
}
}
@ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IS)Z",
- garbageValue = "9905"
+ descriptor = "(IIB)I",
+ garbageValue = "47"
)
- public boolean method5633(int var1) {
- return this.validGroups[var1]; // L: 166
- }
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "-1729381802"
- )
- public boolean method5634(int var1) {
- return this.getGroupFileIds(var1) != null; // L: 170
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-62"
- )
- @Export("loadPercent")
- public int loadPercent() {
- int var1 = 0; // L: 174
- int var2 = 0; // L: 175
-
- int var3;
- for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 176
- if (super.fileCounts[var3] > 0) { // L: 177
- var1 += 100; // L: 178
- var2 += this.groupLoadPercent(var3); // L: 179
- }
- }
-
- if (var1 == 0) { // L: 182
- return 100;
+ @Export("ItemContainer_getCount")
+ static int ItemContainer_getCount(int var0, int var1) {
+ ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21
+ if (var2 == null) { // L: 22
+ return 0;
} else {
- var3 = var2 * 100 / var1; // L: 183
- return var3; // L: 184
+ return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24
}
}
- @ObfuscatedName("ak")
+ @ObfuscatedName("kk")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "489788300"
+ descriptor = "([Lkb;II)V",
+ garbageValue = "1365503093"
)
- static int method5623(int var0, Script var1, boolean var2) {
- int var3;
- if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3789
- class12.Interpreter_intStackSize -= 2; // L: 3790
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3791
- int var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3792
- if (!Client.isCameraLocked) { // L: 3793
- Client.camAngleX = var3; // L: 3794
- Client.camAngleY = var4; // L: 3795
- }
+ @Export("drawModelComponents")
+ static final void drawModelComponents(Widget[] var0, int var1) {
+ for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11771
+ Widget var3 = var0[var2]; // L: 11772
+ if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !Frames.isComponentHidden(var3))) { // L: 11773 11774 11775
+ int var5;
+ if (var3.type == 0) { // L: 11776
+ if (!var3.isIf3 && Frames.isComponentHidden(var3) && var3 != Language.mousedOverWidgetIf1) { // L: 11777
+ continue;
+ }
- return 1; // L: 3797
- } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3799
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3800
- return 1; // L: 3801
- } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3803
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3804
- return 1; // L: 3805
- } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3807
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3808
- if (var3 < 0) { // L: 3809
- var3 = 0;
- }
+ drawModelComponents(var0, var3.id); // L: 11778
+ if (var3.children != null) { // L: 11779
+ drawModelComponents(var3.children, var3.id);
+ }
- Client.camFollowHeight = var3; // L: 3810
- return 1; // L: 3811
- } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3813
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3814
- return 1; // L: 3815
- } else {
- return 2; // L: 3817
+ InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11780
+ if (var4 != null) { // L: 11781
+ var5 = var4.group; // L: 11782
+ if (WorldMapSection2.loadInterface(var5)) { // L: 11784
+ drawModelComponents(SoundCache.Widget_interfaceComponents[var5], -1); // L: 11785
+ }
+ }
+ }
+
+ if (var3.type == 6) { // L: 11789
+ if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11790
+ boolean var7 = ObjectSound.runCs1(var3); // L: 11791
+ if (var7) { // L: 11793
+ var5 = var3.sequenceId2;
+ } else {
+ var5 = var3.sequenceId; // L: 11794
+ }
+
+ if (var5 != -1) { // L: 11795
+ SequenceDefinition var6 = ScriptFrame.SequenceDefinition_get(var5); // L: 11796
+
+ for (var3.modelFrameCycle += Client.field555; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; ChatChannel.invalidateWidget(var3)) { // L: 11797 11798 11805
+ var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11799
+ ++var3.modelFrame; // L: 11800
+ if (var3.modelFrame >= var6.frameIds.length) { // L: 11801
+ var3.modelFrame -= var6.frameCount; // L: 11802
+ if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11803
+ var3.modelFrame = 0;
+ }
+ }
+ }
+ }
+ }
+
+ if (var3.field3373 != 0 && !var3.isIf3) { // L: 11809
+ int var8 = var3.field3373 >> 16; // L: 11810
+ var5 = var3.field3373 << 16 >> 16; // L: 11811
+ var8 *= Client.field555; // L: 11812
+ var5 *= Client.field555; // L: 11813
+ var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11814
+ var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11815
+ ChatChannel.invalidateWidget(var3); // L: 11816
+ }
+ }
+ }
}
- }
+
+ } // L: 11820
}
diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java
index c7c91442d6..ed07063812 100644
--- a/runescape-client/src/main/java/ArchiveDisk.java
+++ b/runescape-client/src/main/java/ArchiveDisk.java
@@ -6,38 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nc")
+@ObfuscatedName("nd")
@Implements("ArchiveDisk")
public final class ArchiveDisk {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("ArchiveDisk_buffer")
static byte[] ArchiveDisk_buffer;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = -1281452827
- )
- static int field4363;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lpz;"
+ descriptor = "Lpa;"
)
@Export("datFile")
BufferedFile datFile;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpz;"
+ descriptor = "Lpa;"
)
@Export("idxFile")
BufferedFile idxFile;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -54530023
+ intValue = -132348199
)
@Export("archive")
int archive;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -698225049
+ intValue = -1963549357
)
@Export("maxEntrySize")
int maxEntrySize;
@@ -47,7 +42,7 @@ public final class ArchiveDisk {
}
@ObfuscatedSignature(
- descriptor = "(ILpz;Lpz;I)V"
+ descriptor = "(ILpa;Lpa;I)V"
)
public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
this.datFile = null; // L: 8
@@ -59,10 +54,10 @@ public final class ArchiveDisk {
this.maxEntrySize = var4; // L: 17
} // L: 18
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(IB)[B",
- garbageValue = "-83"
+ garbageValue = "-4"
)
@Export("read")
public byte[] read(int var1) {
@@ -86,15 +81,14 @@ public final class ArchiveDisk {
} else {
byte[] var5 = new byte[var3]; // L: 30
int var6 = 0; // L: 31
- int var7 = 0; // L: 32
- while (var6 < var3) { // L: 33
+ for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65
if (var4 == 0) { // L: 34
var10000 = null;
return (byte[])var10000;
}
- this.datFile.seek((long)var4 * 520L); // L: 35
+ this.datFile.seek(520L * (long)var4); // L: 35
int var8 = var3 - var6; // L: 36
int var9;
int var10;
@@ -107,7 +101,7 @@ public final class ArchiveDisk {
}
var13 = 10; // L: 44
- this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 45
+ this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 45
var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 46
var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 47
var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 48
@@ -118,32 +112,30 @@ public final class ArchiveDisk {
}
var13 = 8; // L: 53
- this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54
+ this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54
var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55
var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56
var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57
var12 = ArchiveDisk_buffer[7] & 255; // L: 58
}
- if (var9 == var1 && var10 == var7 && var12 == this.archive) { // L: 60
- if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61
- int var14 = var13 + var8; // L: 62
-
- for (int var15 = var13; var15 < var14; ++var15) { // L: 63
- var5[var6++] = ArchiveDisk_buffer[var15];
- }
-
- var4 = var11; // L: 64
- ++var7; // L: 65
- continue; // L: 66
- }
-
+ if (var9 != var1 || var10 != var7 || var12 != this.archive) { // L: 60
var10000 = null;
return (byte[])var10000;
}
- var10000 = null;
- return (byte[])var10000;
+ if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61
+ var10000 = null;
+ return (byte[])var10000;
+ }
+
+ int var14 = var13 + var8; // L: 62
+
+ for (int var15 = var13; var15 < var14; ++var15) { // L: 63
+ var5[var6++] = ArchiveDisk_buffer[var15];
+ }
+
+ var4 = var11; // L: 64
}
byte[] var20 = var5;
@@ -156,18 +148,18 @@ public final class ArchiveDisk {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I[BII)Z",
- garbageValue = "-1867257059"
+ garbageValue = "-425088453"
)
@Export("write")
public boolean write(int var1, byte[] var2, int var3) {
synchronized(this.datFile) { // L: 76
if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77
boolean var5 = this.write0(var1, var2, var3, true); // L: 80
- if (!var5) { // L: 81
- var5 = this.write0(var1, var2, var3, false);
+ if (!var5) {
+ var5 = this.write0(var1, var2, var3, false); // L: 81
}
return var5; // L: 82
@@ -177,10 +169,10 @@ public final class ArchiveDisk {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I[BIZI)Z",
- garbageValue = "-802708417"
+ descriptor = "(I[BIZB)Z",
+ garbageValue = "-26"
)
@Export("write0")
boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -270,7 +262,7 @@ public final class ArchiveDisk {
++var9;
}
- if (var9 == var6) { // L: 149
+ if (var6 == var9) { // L: 149
++var9;
}
}
@@ -290,7 +282,7 @@ public final class ArchiveDisk {
ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160
ArchiveDisk_buffer[8] = (byte)var9; // L: 161
ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162
- this.datFile.seek((long)var6 * 520L); // L: 163
+ this.datFile.seek(520L * (long)var6); // L: 163
this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164
var10 = var3 - var7; // L: 165
if (var10 > 510) { // L: 166
diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java
index 5c25b1d560..4e4564d273 100644
--- a/runescape-client/src/main/java/ArchiveDiskAction.java
+++ b/runescape-client/src/main/java/ArchiveDiskAction.java
@@ -1,42 +1,182 @@
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.OptionalDataException;
+import java.io.StreamCorruptedException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
-@ObfuscatedName("ky")
+@ObfuscatedName("kv")
@Implements("ArchiveDiskAction")
public class ArchiveDiskAction extends Node {
- @ObfuscatedName("m")
- @Export("PcmPlayer_stereo")
- protected static boolean PcmPlayer_stereo;
- @ObfuscatedName("ca")
- @ObfuscatedSignature(
- descriptor = "Lqd;"
- )
- static IndexedSprite field3997;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 834168287
+ intValue = -1477037843
)
@Export("type")
int type;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("data")
public byte[] data;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lnc;"
+ descriptor = "Lnd;"
)
@Export("archiveDisk")
public ArchiveDisk archiveDisk;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Llc;"
)
@Export("archive")
public Archive archive;
ArchiveDiskAction() {
} // L: 12
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Lpq;I)V",
+ garbageValue = "206933702"
+ )
+ @Export("performReflectionCheck")
+ public static void performReflectionCheck(PacketBuffer var0) {
+ ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 35
+ if (var1 != null) { // L: 36
+ int var2 = var0.offset; // L: 37
+ var0.writeInt(var1.id); // L: 38
+
+ for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39
+ if (var1.creationErrors[var3] != 0) { // L: 40
+ var0.writeByte(var1.creationErrors[var3]); // L: 41
+ } else {
+ try {
+ int var4 = var1.operations[var3]; // L: 45
+ Field var5;
+ int var6;
+ if (var4 == 0) { // L: 46
+ var5 = var1.fields[var3]; // L: 47
+ var6 = Reflection.getInt(var5, (Object)null); // L: 48
+ var0.writeByte(0); // L: 49
+ var0.writeInt(var6); // L: 50
+ } else if (var4 == 1) { // L: 52
+ var5 = var1.fields[var3]; // L: 53
+ Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54
+ var0.writeByte(0); // L: 55
+ } else if (var4 == 2) { // L: 57
+ var5 = var1.fields[var3]; // L: 58
+ var6 = var5.getModifiers(); // L: 59
+ var0.writeByte(0); // L: 60
+ var0.writeInt(var6); // L: 61
+ }
+
+ Method var25;
+ if (var4 != 3) { // L: 63
+ if (var4 == 4) { // L: 83
+ var25 = var1.methods[var3]; // L: 84
+ var6 = var25.getModifiers(); // L: 85
+ var0.writeByte(0); // L: 86
+ var0.writeInt(var6); // L: 87
+ }
+ } else {
+ var25 = var1.methods[var3]; // L: 64
+ byte[][] var10 = var1.arguments[var3]; // L: 65
+ Object[] var7 = new Object[var10.length]; // L: 66
+
+ for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67
+ ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68
+ var7[var8] = var9.readObject(); // L: 69
+ }
+
+ Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71
+ if (var11 == null) { // L: 72
+ var0.writeByte(0);
+ } else if (var11 instanceof Number) { // L: 73
+ var0.writeByte(1); // L: 74
+ var0.writeLong(((Number)var11).longValue()); // L: 75
+ } else if (var11 instanceof String) { // L: 77
+ var0.writeByte(2); // L: 78
+ var0.writeStringCp1252NullTerminated((String)var11); // L: 79
+ } else {
+ var0.writeByte(4); // L: 81
+ }
+ }
+ } catch (ClassNotFoundException var13) { // L: 90
+ var0.writeByte(-10); // L: 91
+ } catch (InvalidClassException var14) { // L: 93
+ var0.writeByte(-11); // L: 94
+ } catch (StreamCorruptedException var15) { // L: 96
+ var0.writeByte(-12); // L: 97
+ } catch (OptionalDataException var16) { // L: 99
+ var0.writeByte(-13); // L: 100
+ } catch (IllegalAccessException var17) { // L: 102
+ var0.writeByte(-14); // L: 103
+ } catch (IllegalArgumentException var18) { // L: 105
+ var0.writeByte(-15); // L: 106
+ } catch (InvocationTargetException var19) { // L: 108
+ var0.writeByte(-16); // L: 109
+ } catch (SecurityException var20) { // L: 111
+ var0.writeByte(-17); // L: 112
+ } catch (IOException var21) { // L: 114
+ var0.writeByte(-18); // L: 115
+ } catch (NullPointerException var22) { // L: 117
+ var0.writeByte(-19); // L: 118
+ } catch (Exception var23) { // L: 120
+ var0.writeByte(-20); // L: 121
+ } catch (Throwable var24) { // L: 123
+ var0.writeByte(-21); // L: 124
+ }
+ }
+ }
+
+ var0.writeCrc(var2); // L: 127
+ var1.remove(); // L: 128
+ }
+ } // L: 129
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
+ garbageValue = "1685326414"
+ )
+ public static String method5777(String var0) {
+ int var1 = var0.length(); // L: 167
+ char[] var2 = new char[var1]; // L: 168
+ byte var3 = 2; // L: 169
+
+ for (int var4 = 0; var4 < var1; ++var4) { // L: 170
+ char var5 = var0.charAt(var4); // L: 171
+ if (var3 == 0) { // L: 172
+ var5 = Character.toLowerCase(var5);
+ } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 173
+ var5 = class326.method6050(var5);
+ }
+
+ if (Character.isLetter(var5)) { // L: 174
+ var3 = 0;
+ } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 175
+ if (Character.isSpaceChar(var5)) { // L: 176
+ if (var3 != 2) { // L: 177
+ var3 = 1;
+ }
+ } else {
+ var3 = 1; // L: 179
+ }
+ } else {
+ var3 = 2;
+ }
+
+ var2[var4] = var5; // L: 180
+ }
+
+ return new String(var2); // L: 182
+ }
}
diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
index 3e03d5f7a9..733bd9dd02 100644
--- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java
+++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
@@ -1,45 +1,40 @@
-import java.io.DataInputStream;
-import java.net.URL;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lf")
+@ObfuscatedName("ks")
@Implements("ArchiveDiskActionHandler")
public class ArchiveDiskActionHandler implements Runnable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("ArchiveDiskActionHandler_requestQueue")
public static NodeDeque ArchiveDiskActionHandler_requestQueue;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("ArchiveDiskActionHandler_responseQueue")
public static NodeDeque ArchiveDiskActionHandler_responseQueue;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 996764791
+ intValue = -962043785
)
- static int field3998;
- @ObfuscatedName("k")
+ public static int field3971;
+ @ObfuscatedName("f")
@Export("ArchiveDiskActionHandler_lock")
- static Object ArchiveDiskActionHandler_lock;
- @ObfuscatedName("nc")
- @ObfuscatedGetter(
- intValue = 1167654825
- )
- @Export("selectedSpellWidget")
- static int selectedSpellWidget;
+ public static Object ArchiveDiskActionHandler_lock;
+ @ObfuscatedName("j")
+ @Export("ArchiveDiskActionHandler_thread")
+ static Thread ArchiveDiskActionHandler_thread;
static {
ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9
ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10
- field3998 = 0; // L: 11
+ field3971 = 0; // L: 11
ArchiveDiskActionHandler_lock = new Object();
} // L: 12
@@ -50,162 +45,350 @@ public class ArchiveDiskActionHandler implements Runnable {
try {
while (true) {
ArchiveDiskAction var1;
- synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63
- var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 64
- }
+ synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 75
+ var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 76
+ } // L: 77
- if (var1 != null) { // L: 66
- if (var1.type == 0) {
- var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 68
- synchronized(ArchiveDiskActionHandler_requestQueue) {
- var1.remove(); // L: 70
- } // L: 71
- } else if (var1.type == 1) {
- var1.data = var1.archiveDisk.read((int)var1.key);
- synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 75
- ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 76
- }
+ if (var1 != null) { // L: 78
+ if (var1.type == 0) { // L: 79
+ var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 80
+ synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 81
+ var1.remove(); // L: 82
+ } // L: 83
+ } else if (var1.type == 1) { // L: 85
+ var1.data = var1.archiveDisk.read((int)var1.key); // L: 86
+ synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 87
+ ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 88
+ } // L: 89
}
- synchronized(ArchiveDiskActionHandler_lock) {
- if (field3998 <= 1) { // L: 80
- field3998 = 0; // L: 81
- ArchiveDiskActionHandler_lock.notifyAll();
- return; // L: 83
+ synchronized(ArchiveDiskActionHandler_lock) { // L: 91
+ if (field3971 <= 1) { // L: 92
+ field3971 = 0; // L: 93
+ ArchiveDiskActionHandler_lock.notifyAll(); // L: 94
+ return; // L: 95
}
- field3998 = 600; // L: 85
+ field3971 = 600; // L: 97
}
} else {
- class241.method4815(100L); // L: 89
- synchronized(ArchiveDiskActionHandler_lock) {
- if (field3998 <= 1) {
- field3998 = 0;
- ArchiveDiskActionHandler_lock.notifyAll();
- return;
+ DynamicObject.method1991(100L); // L: 101
+ synchronized(ArchiveDiskActionHandler_lock) { // L: 102
+ if (field3971 <= 1) { // L: 103
+ field3971 = 0; // L: 104
+ ArchiveDiskActionHandler_lock.notifyAll(); // L: 105
+ return; // L: 106
}
- --field3998;
+ --field3971; // L: 108
}
}
}
- } catch (Exception var13) { // L: 101
- RunException_sendStackTrace((String)null, var13); // L: 102
+ } catch (Exception var13) { // L: 113
+ class249.RunException_sendStackTrace((String)null, var13); // L: 114
}
- } // L: 104
+ } // L: 116
- @ObfuscatedName("o")
+ @ObfuscatedName("hp")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V",
- garbageValue = "9"
+ descriptor = "(I)V",
+ garbageValue = "1673600098"
)
- @Export("RunException_sendStackTrace")
- public static void RunException_sendStackTrace(String var0, Throwable var1) {
- if (var1 != null) {
- var1.printStackTrace();
- } else {
- try {
- String var2 = ""; // L: 33
- if (var1 != null) { // L: 34
- var2 = class427.method7379(var1);
+ static final void method5793() {
+ Script.method1978(false); // L: 5727
+ Client.field694 = 0; // L: 5728
+ boolean var0 = true; // L: 5729
+
+ int var1;
+ for (var1 = 0; var1 < Actor.regionLandArchives.length; ++var1) { // L: 5730
+ if (PcmPlayer.regionMapArchiveIds[var1] != -1 && Actor.regionLandArchives[var1] == null) { // L: 5731 5732
+ Actor.regionLandArchives[var1] = WorldMapSectionType.archive9.takeFile(PcmPlayer.regionMapArchiveIds[var1], 0); // L: 5733
+ if (Actor.regionLandArchives[var1] == null) { // L: 5734
+ var0 = false; // L: 5735
+ ++Client.field694; // L: 5736
}
-
- if (var0 != null) { // L: 35
- if (var1 != null) {
- var2 = var2 + " | ";
- }
-
- var2 = var2 + var0;
- }
-
- System.out.println("Error: " + var2); // L: 39
- var2 = var2.replace(':', '.'); // L: 40
- var2 = var2.replace('@', '_');
- var2 = var2.replace('&', '_'); // L: 42
- var2 = var2.replace('#', '_');
- if (RunException.RunException_applet == null) { // L: 44
- return;
- }
-
- URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + class385.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class430.clientType + "&e=" + var2);
- DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46
- var4.read();
- var4.close(); // L: 48
- } catch (Exception var5) { // L: 50
}
+ if (ObjectSound.regionLandArchiveIds[var1] != -1 && class145.regionMapArchives[var1] == null) { // L: 5740 5741
+ class145.regionMapArchives[var1] = WorldMapSectionType.archive9.takeFileEncrypted(ObjectSound.regionLandArchiveIds[var1], 0, WorldMapRegion.xteaKeys[var1]); // L: 5742
+ if (class145.regionMapArchives[var1] == null) { // L: 5743
+ var0 = false; // L: 5744
+ ++Client.field694; // L: 5745
+ }
+ }
}
- }
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;Lpj;B)Ljava/lang/String;",
- garbageValue = "-25"
- )
- public static String method5612(CharSequence var0, LoginType var1) {
- if (var0 == null) { // L: 36
- return null;
+ if (!var0) { // L: 5750
+ Client.field549 = 1; // L: 5751
} else {
- int var2 = 0; // L: 37
+ Client.field547 = 0; // L: 5754
+ var0 = true; // L: 5755
int var3;
- boolean var4;
- char var5;
- for (var3 = var0.length(); var2 < var3; ++var2) { // L: 38 41 51
- var5 = var0.charAt(var2); // L: 43
- var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 45
- if (!var4) { // L: 47
- break;
+ int var4;
+ for (var1 = 0; var1 < Actor.regionLandArchives.length; ++var1) { // L: 5756
+ byte[] var15 = class145.regionMapArchives[var1]; // L: 5757
+ if (var15 != null) { // L: 5758
+ var3 = (Client.regions[var1] >> 8) * 64 - class28.baseX; // L: 5759
+ var4 = (Client.regions[var1] & 255) * 64 - WorldMapLabelSize.baseY; // L: 5760
+ if (Client.isInInstance) { // L: 5761
+ var3 = 10; // L: 5762
+ var4 = 10; // L: 5763
+ }
+
+ var0 &= UserComparator10.method2611(var15, var3, var4); // L: 5765
}
}
- while (var3 > var2) { // L: 55
- var5 = var0.charAt(var3 - 1); // L: 57
- var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 59
- if (!var4) { // L: 61
- break;
+ if (!var0) { // L: 5768
+ Client.field549 = 2; // L: 5769
+ } else {
+ if (Client.field549 != 0) { // L: 5772
+ SequenceDefinition.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true);
}
- --var3; // L: 65
- }
+ Renderable.playPcmPlayers(); // L: 5773
+ class356.scene.clear(); // L: 5774
- int var10 = var3 - var2; // L: 67
- if (var10 >= 1) { // L: 69
- byte var6;
- if (var1 == null) { // L: 73
- var6 = 12; // L: 74
- } else {
- switch(var1.field4617) { // L: 77
- case 0:
- var6 = 20; // L: 82
- break;
- default:
- var6 = 12; // L: 79
+ for (var1 = 0; var1 < 4; ++var1) { // L: 5775
+ Client.collisionMaps[var1].clear();
+ }
+
+ int var2;
+ for (var1 = 0; var1 < 4; ++var1) { // L: 5776
+ for (var2 = 0; var2 < 104; ++var2) { // L: 5777
+ for (var3 = 0; var3 < 104; ++var3) { // L: 5778
+ Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5779
+ }
}
}
- if (var10 <= var6) { // L: 86
- StringBuilder var9 = new StringBuilder(var10); // L: 90
+ Renderable.playPcmPlayers(); // L: 5783
+ class259.method5188(); // L: 5784
+ var1 = Actor.regionLandArchives.length; // L: 5785
+ Decimator.method1018(); // L: 5786
+ Script.method1978(true); // L: 5787
+ int var5;
+ if (!Client.isInInstance) { // L: 5788
+ byte[] var14;
+ for (var2 = 0; var2 < var1; ++var2) { // L: 5789
+ var3 = (Client.regions[var2] >> 8) * 64 - class28.baseX; // L: 5790
+ var4 = (Client.regions[var2] & 255) * 64 - WorldMapLabelSize.baseY; // L: 5791
+ var14 = Actor.regionLandArchives[var2]; // L: 5792
+ if (var14 != null) { // L: 5793
+ Renderable.playPcmPlayers(); // L: 5794
+ UserComparator1.method8020(var14, var3, var4, GrandExchangeOffer.field4070 * 8 - 48, ApproximateRouteStrategy.field466 * 8 - 48, Client.collisionMaps); // L: 5795
+ }
+ }
- for (int var11 = var2; var11 < var3; ++var11) { // L: 91
- char var7 = var0.charAt(var11); // L: 92
- if (BufferedSource.method6702(var7)) { // L: 93
- char var8 = Language.method5877(var7); // L: 94
- if (var8 != 0) { // L: 95
- var9.append(var8); // L: 96
+ for (var2 = 0; var2 < var1; ++var2) { // L: 5798
+ var3 = (Client.regions[var2] >> 8) * 64 - class28.baseX; // L: 5799
+ var4 = (Client.regions[var2] & 255) * 64 - WorldMapLabelSize.baseY; // L: 5800
+ var14 = Actor.regionLandArchives[var2]; // L: 5801
+ if (var14 == null && ApproximateRouteStrategy.field466 < 800) { // L: 5802
+ Renderable.playPcmPlayers(); // L: 5803
+ class11.method98(var3, var4, 64, 64); // L: 5804
+ }
+ }
+
+ Script.method1978(true); // L: 5807
+
+ for (var2 = 0; var2 < var1; ++var2) { // L: 5808
+ byte[] var13 = class145.regionMapArchives[var2]; // L: 5809
+ if (var13 != null) { // L: 5810
+ var4 = (Client.regions[var2] >> 8) * 64 - class28.baseX; // L: 5811
+ var5 = (Client.regions[var2] & 255) * 64 - WorldMapLabelSize.baseY; // L: 5812
+ Renderable.playPcmPlayers(); // L: 5813
+ VertexNormal.method4527(var13, var4, var5, class356.scene, Client.collisionMaps); // L: 5814
+ }
+ }
+ }
+
+ int var6;
+ int var7;
+ int var8;
+ if (Client.isInInstance) { // L: 5818
+ int var9;
+ int var10;
+ int var11;
+ for (var2 = 0; var2 < 4; ++var2) { // L: 5819
+ Renderable.playPcmPlayers(); // L: 5820
+
+ for (var3 = 0; var3 < 13; ++var3) { // L: 5821
+ for (var4 = 0; var4 < 13; ++var4) { // L: 5822
+ boolean var16 = false; // L: 5823
+ var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5824
+ if (var6 != -1) { // L: 5825
+ var7 = var6 >> 24 & 3; // L: 5826
+ var8 = var6 >> 1 & 3; // L: 5827
+ var9 = var6 >> 14 & 1023; // L: 5828
+ var10 = var6 >> 3 & 2047; // L: 5829
+ var11 = (var9 / 8 << 8) + var10 / 8; // L: 5830
+
+ for (int var12 = 0; var12 < Client.regions.length; ++var12) { // L: 5831
+ if (Client.regions[var12] == var11 && Actor.regionLandArchives[var12] != null) { // L: 5832
+ Canvas.method315(Actor.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5833
+ var16 = true; // L: 5834
+ break;
+ }
+ }
+ }
+
+ if (!var16) { // L: 5839
+ class28.method352(var2, var3 * 8, var4 * 8); // L: 5840
+ }
}
}
}
- if (var9.length() == 0) { // L: 98
- return null;
+ for (var2 = 0; var2 < 13; ++var2) { // L: 5845
+ for (var3 = 0; var3 < 13; ++var3) { // L: 5846
+ var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5847
+ if (var4 == -1) { // L: 5848
+ class11.method98(var2 * 8, var3 * 8, 8, 8); // L: 5849
+ }
+ }
}
- return var9.toString(); // L: 99
+ Script.method1978(true); // L: 5853
+
+ for (var2 = 0; var2 < 4; ++var2) { // L: 5854
+ Renderable.playPcmPlayers(); // L: 5855
+
+ for (var3 = 0; var3 < 13; ++var3) { // L: 5856
+ for (var4 = 0; var4 < 13; ++var4) { // L: 5857
+ var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5858
+ if (var5 != -1) { // L: 5859
+ var6 = var5 >> 24 & 3; // L: 5860
+ var7 = var5 >> 1 & 3; // L: 5861
+ var8 = var5 >> 14 & 1023; // L: 5862
+ var9 = var5 >> 3 & 2047; // L: 5863
+ var10 = (var8 / 8 << 8) + var9 / 8; // L: 5864
+
+ for (var11 = 0; var11 < Client.regions.length; ++var11) { // L: 5865
+ if (Client.regions[var11] == var10 && class145.regionMapArchives[var11] != null) { // L: 5866
+ Tiles.method2007(class145.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class356.scene, Client.collisionMaps); // L: 5867
+ break; // L: 5868
+ }
+ }
+ }
+ }
+ }
+ }
}
+
+ Script.method1978(true); // L: 5876
+ Renderable.playPcmPlayers(); // L: 5877
+ class134.method2905(class356.scene, Client.collisionMaps); // L: 5878
+ Script.method1978(true); // L: 5879
+ var2 = Tiles.Tiles_minPlane; // L: 5880
+ if (var2 > PacketWriter.Client_plane) { // L: 5881
+ var2 = PacketWriter.Client_plane;
+ }
+
+ if (var2 < PacketWriter.Client_plane - 1) { // L: 5882
+ var2 = PacketWriter.Client_plane - 1;
+ }
+
+ if (Client.isLowDetail) { // L: 5883
+ class356.scene.init(Tiles.Tiles_minPlane);
+ } else {
+ class356.scene.init(0); // L: 5884
+ }
+
+ for (var3 = 0; var3 < 104; ++var3) { // L: 5885
+ for (var4 = 0; var4 < 104; ++var4) { // L: 5886
+ class133.updateItemPile(var3, var4); // L: 5887
+ }
+ }
+
+ Renderable.playPcmPlayers(); // L: 5890
+ class4.method11(); // L: 5891
+ ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5892
+ PacketBufferNode var17;
+ if (class353.client.hasFrame()) { // L: 5893
+ var17 = EnumComposition.getPacketBufferNode(ClientPacket.field3007, Client.packetWriter.isaacCipher); // L: 5895
+ var17.packetBuffer.writeInt(1057001181); // L: 5896
+ Client.packetWriter.addNode(var17); // L: 5897
+ }
+
+ if (!Client.isInInstance) { // L: 5899
+ var3 = (GrandExchangeOffer.field4070 - 6) / 8; // L: 5900
+ var4 = (GrandExchangeOffer.field4070 + 6) / 8; // L: 5901
+ var5 = (ApproximateRouteStrategy.field466 - 6) / 8; // L: 5902
+ var6 = (ApproximateRouteStrategy.field466 + 6) / 8; // L: 5903
+
+ for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5904
+ for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5905
+ if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5906
+ WorldMapSectionType.archive9.loadRegionFromName("m" + var7 + "_" + var8); // L: 5907
+ WorldMapSectionType.archive9.loadRegionFromName("l" + var7 + "_" + var8); // L: 5908
+ }
+ }
+ }
+ }
+
+ HealthBarUpdate.updateGameState(30); // L: 5912
+ Renderable.playPcmPlayers(); // L: 5913
+ class361.method6552(); // L: 5914
+ var17 = EnumComposition.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher); // L: 5915
+ Client.packetWriter.addNode(var17); // L: 5916
+ Calendar.method5504(); // L: 5917
+ }
+ }
+ } // L: 5752 5770 5918
+
+ @ObfuscatedName("ir")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-232514392"
+ )
+ static final void method5779() {
+ int var0 = UserComparator3.menuX; // L: 8460
+ int var1 = ViewportMouse.menuY; // L: 8461
+ int var2 = Language.menuWidth; // L: 8462
+ int var3 = Player.menuHeight; // L: 8463
+ int var4 = 6116423; // L: 8464
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8465
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8466
+ Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8467
+ TileItem.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8468
+ int var5 = MouseHandler.MouseHandler_x; // L: 8469
+ int var6 = MouseHandler.MouseHandler_y; // L: 8470
+
+ int var7;
+ int var8;
+ int var9;
+ for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8471
+ var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 8472
+ var9 = 16777215; // L: 8473
+ if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8474
+ var9 = 16776960;
}
- return null; // L: 88
+ Font var12 = TileItem.fontBold12; // L: 8475
+ String var13;
+ if (var7 < 0) { // L: 8478
+ var13 = ""; // L: 8479
+ } else if (Client.menuTargets[var7].length() > 0) { // L: 8482
+ var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7];
+ } else {
+ var13 = Client.menuActions[var7]; // L: 8483
+ }
+
+ var12.draw(var13, var0 + 3, var8, var9, 0); // L: 8485
}
- }
+
+ var7 = UserComparator3.menuX; // L: 8487
+ var8 = ViewportMouse.menuY; // L: 8488
+ var9 = Language.menuWidth; // L: 8489
+ int var10 = Player.menuHeight; // L: 8490
+
+ for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 8492
+ if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 8493
+ Client.field704[var11] = true;
+ }
+ }
+
+ } // L: 8496
}
diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java
index 141bce742e..7a3ae52805 100644
--- a/runescape-client/src/main/java/ArchiveLoader.java
+++ b/runescape-client/src/main/java/ArchiveLoader.java
@@ -3,50 +3,54 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("bp")
+@ObfuscatedName("bj")
@Implements("ArchiveLoader")
public class ArchiveLoader {
- @ObfuscatedName("q")
+ @ObfuscatedName("au")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Lns;"
+ )
+ static Bounds field1022;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
)
@Export("archive")
final Archive archive;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -404162061
+ intValue = -955851169
)
@Export("groupCount")
final int groupCount;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1950157047
+ intValue = 982415587
)
@Export("loadedCount")
int loadedCount;
@ObfuscatedSignature(
- descriptor = "(Lle;Ljava/lang/String;)V"
+ descriptor = "(Llc;Ljava/lang/String;)V"
)
ArchiveLoader(Archive var1, String var2) {
this.loadedCount = 0; // L: 9
- this.archive = var1; // L: 12
- this.groupCount = var1.getGroupCount(); // L: 13
+ this.archive = var1;
+ this.groupCount = var1.getGroupCount();
} // L: 14
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1365376212"
+ descriptor = "(B)Z",
+ garbageValue = "102"
)
@Export("isLoaded")
boolean isLoaded() {
this.loadedCount = 0; // L: 17
for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18
- if (!this.archive.method5634(var1) || this.archive.method5633(var1)) {
+ if (!this.archive.method5806(var1) || this.archive.method5805(var1)) {
++this.loadedCount; // L: 19
}
}
@@ -54,578 +58,47 @@ public class ArchiveLoader {
return this.loadedCount >= this.groupCount; // L: 21
}
- @ObfuscatedName("n")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-59"
+ descriptor = "(II)I",
+ garbageValue = "1248295079"
)
- static int method2041(int var0, Script var1, boolean var2) {
- Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1248
- if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var3)); // L: 1250
- return 1; // L: 1251
- } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253
- if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260
- if (var3.dataText == null) { // L: 1261
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "";
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262
- }
+ public static int method2075(int var0) {
+ return var0 != 0 && var0 != 1 ? -1 : 0; // L: 12 13 15
+ }
- return 1; // L: 1263
+ @ObfuscatedName("ao")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "280590426"
+ )
+ static int method2073(int var0, Script var1, boolean var2) {
+ if (var0 != 3700 && var0 != 3701) { // L: 2707
+ if (var0 == 3702) { // L: 2712
+ ++class446.Interpreter_intStackSize; // L: 2713
+ return 1; // L: 2714
} else {
- return 2; // L: 1265
+ return 2; // L: 2716
}
} else {
- int var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1254
- --var4; // L: 1255
- if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "";
- }
-
- return 1; // L: 1258
+ --class446.Interpreter_intStackSize; // L: 2708
+ --Interpreter.Interpreter_stringStackSize; // L: 2709
+ return 1; // L: 2710
}
}
- @ObfuscatedName("h")
+ @ObfuscatedName("lc")
@ObfuscatedSignature(
- descriptor = "(IIII)I",
- garbageValue = "664108386"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "-818413481"
)
- @Export("hslToRgb")
- static final int hslToRgb(int var0, int var1, int var2) {
- if (var2 > 179) { // L: 990
- var1 /= 2;
+ @Export("clanKickUser")
+ static final void clanKickUser(String var0) {
+ if (Huffman.friendsChat != null) { // L: 12225
+ PacketBufferNode var1 = EnumComposition.getPacketBufferNode(ClientPacket.field2923, Client.packetWriter.isaacCipher); // L: 12226
+ var1.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var0)); // L: 12227
+ var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12228
+ Client.packetWriter.addNode(var1); // L: 12229
}
-
- if (var2 > 192) { // L: 991
- var1 /= 2;
- }
-
- if (var2 > 217) { // L: 992
- var1 /= 2;
- }
-
- if (var2 > 243) { // L: 993
- var1 /= 2;
- }
-
- int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 994
- return var3; // L: 995
- }
-
- @ObfuscatedName("ar")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-74"
- )
- static int method2045(int var0, Script var1, boolean var2) {
- int var3;
- if (var0 == 3500) { // L: 2322
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2323
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator8.method2581(var3) ? 1 : 0; // L: 2324
- return 1; // L: 2325
- } else if (var0 == 3501) { // L: 2327
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2328
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapAreaData.method4880(var3) ? 1 : 0; // L: 2329
- return 1; // L: 2330
- } else if (var0 == 3502) { // L: 2332
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2333
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class19.method257(var3) ? 1 : 0; // L: 2334
- return 1; // L: 2335
- } else {
- return 2; // L: 2337
- }
- }
-
- @ObfuscatedName("fj")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1781905177"
- )
- @Export("playPcmPlayers")
- static final void playPcmPlayers() {
- if (Fonts.pcmPlayer1 != null) { // L: 3757
- Fonts.pcmPlayer1.run();
- }
-
- if (SecureRandomCallable.pcmPlayer0 != null) { // L: 3758
- SecureRandomCallable.pcmPlayer0.run();
- }
-
- } // L: 3759
-
- @ObfuscatedName("gn")
- @ObfuscatedSignature(
- descriptor = "(IIIII)V",
- garbageValue = "-440186297"
- )
- @Export("drawEntities")
- static final void drawEntities(int var0, int var1, int var2, int var3) {
- ++Client.viewportDrawCount; // L: 4584
- if (ModelData0.localPlayer.x >> 7 == Client.destinationX && ModelData0.localPlayer.y >> 7 == Client.destinationY) { // L: 4586
- Client.destinationX = 0; // L: 4587
- }
-
- CollisionMap.method3778(); // L: 4590
- if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4592
- class263.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4593
- }
-
- class137.addNpcsToScene(true); // L: 4596
- int var4 = Players.Players_count; // L: 4598
- int[] var5 = Players.Players_indices; // L: 4599
-
- int var6;
- for (var6 = 0; var6 < var4; ++var6) { // L: 4600
- if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4601
- class263.addPlayerToScene(Client.players[var5[var6]], true); // L: 4602
- }
- }
-
- class137.addNpcsToScene(false); // L: 4605
-
- for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { // L: 4607 4608 4625
- if (var30.plane == class128.Client_plane && Client.cycle <= var30.cycleEnd) { // L: 4609
- if (Client.cycle >= var30.cycleStart) { // L: 4610
- if (var30.targetIndex > 0) { // L: 4611
- NPC var34 = Client.npcs[var30.targetIndex - 1]; // L: 4612
- if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 4613
- var30.setDestination(var34.x, var34.y, class202.getTileHeight(var34.x, var34.y, var30.plane) - var30.endHeight, Client.cycle);
- }
- }
-
- if (var30.targetIndex < 0) { // L: 4615
- var6 = -var30.targetIndex - 1; // L: 4617
- Player var35;
- if (var6 == Client.localPlayerIndex) { // L: 4618
- var35 = ModelData0.localPlayer;
- } else {
- var35 = Client.players[var6]; // L: 4619
- }
-
- if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { // L: 4620
- var30.setDestination(var35.x, var35.y, class202.getTileHeight(var35.x, var35.y, var30.plane) - var30.endHeight, Client.cycle);
- }
- }
-
- var30.advance(Client.field727); // L: 4622
- class175.scene.drawEntity(class128.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); // L: 4623
- }
- } else {
- var30.remove();
- }
- }
-
- for (GraphicsObject var37 = (GraphicsObject)Client.graphicsObjects.last(); var37 != null; var37 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4629 4630 4637
- if (var37.plane == class128.Client_plane && !var37.isFinished) { // L: 4631
- if (Client.cycle >= var37.cycleStart) { // L: 4632
- var37.advance(Client.field727); // L: 4633
- if (var37.isFinished) { // L: 4634
- var37.remove();
- } else {
- class175.scene.drawEntity(var37.plane, var37.x, var37.y, var37.z, 60, var37, 0, -1L, false); // L: 4635
- }
- }
- } else {
- var37.remove();
- }
- }
-
- GrandExchangeOfferOwnWorldComparator.setViewportShape(var0, var1, var2, var3, true); // L: 4640
- var0 = Client.viewportOffsetX; // L: 4641
- var1 = Client.viewportOffsetY; // L: 4642
- var2 = Client.viewportWidth; // L: 4643
- var3 = Client.viewportHeight; // L: 4644
- Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4645
- Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4646
- var4 = Client.camAngleX; // L: 4647
- if (Client.field578 / 256 > var4) { // L: 4648
- var4 = Client.field578 / 256;
- }
-
- if (Client.field743[4] && Client.field745[4] + 128 > var4) { // L: 4649
- var4 = Client.field745[4] + 128;
- }
-
- int var31 = Client.camAngleY & 2047; // L: 4650
- User.method6523(HorizontalAlignment.oculusOrbFocalPointX, class140.field1666, class28.oculusOrbFocalPointY, var4, var31, class10.method94(var4), var3); // L: 4651
- int var7;
- int var8;
- int var9;
- int var10;
- int var11;
- int var12;
- int var13;
- int var14;
- int var16;
- if (!Client.isCameraLocked) { // L: 4653
- if (class12.clientPreferences.method2222()) { // L: 4656
- var7 = class128.Client_plane; // L: 4657
- } else {
- label630: {
- var8 = 3; // L: 4660
- if (GameEngine.cameraPitch < 310) { // L: 4661
- label622: {
- if (Client.oculusOrbState == 1) { // L: 4664
- var9 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 4665
- var10 = class28.oculusOrbFocalPointY >> 7; // L: 4666
- } else {
- var9 = ModelData0.localPlayer.x >> 7; // L: 4669
- var10 = ModelData0.localPlayer.y >> 7; // L: 4670
- }
-
- var11 = class343.cameraX >> 7; // L: 4672
- var12 = FaceNormal.cameraZ >> 7; // L: 4673
- if (var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104) { // L: 4674
- if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4678
- if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4682
- var8 = class128.Client_plane;
- }
-
- if (var9 > var11) { // L: 4684
- var13 = var9 - var11;
- } else {
- var13 = var11 - var9; // L: 4685
- }
-
- if (var10 > var12) { // L: 4687
- var14 = var10 - var12;
- } else {
- var14 = var12 - var10; // L: 4688
- }
-
- int var15;
- if (var13 > var14) { // L: 4689
- var15 = var14 * 65536 / var13; // L: 4690
- var16 = 32768; // L: 4691
-
- while (true) {
- if (var9 == var11) { // L: 4692
- break label622;
- }
-
- if (var11 < var9) { // L: 4693
- ++var11;
- } else if (var11 > var9) { // L: 4694
- --var11;
- }
-
- if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4695
- var8 = class128.Client_plane;
- }
-
- var16 += var15; // L: 4696
- if (var16 >= 65536) { // L: 4697
- var16 -= 65536; // L: 4698
- if (var12 < var10) { // L: 4699
- ++var12;
- } else if (var12 > var10) { // L: 4700
- --var12;
- }
-
- if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4701
- var8 = class128.Client_plane;
- }
- }
- }
- } else {
- if (var14 > 0) { // L: 4705
- var15 = var13 * 65536 / var14; // L: 4706
- var16 = 32768; // L: 4707
-
- while (var12 != var10) { // L: 4708
- if (var12 < var10) { // L: 4709
- ++var12;
- } else if (var12 > var10) { // L: 4710
- --var12;
- }
-
- if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4711
- var8 = class128.Client_plane;
- }
-
- var16 += var15; // L: 4712
- if (var16 >= 65536) { // L: 4713
- var16 -= 65536; // L: 4714
- if (var11 < var9) { // L: 4715
- ++var11;
- } else if (var11 > var9) { // L: 4716
- --var11;
- }
-
- if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4717
- var8 = class128.Client_plane;
- }
- }
- }
- }
- break label622;
- }
- }
-
- var7 = class128.Client_plane; // L: 4679
- break label630; // L: 4680
- }
-
- var7 = class128.Client_plane; // L: 4675
- break label630; // L: 4676
- }
- }
-
- if (ModelData0.localPlayer.x >= 0 && ModelData0.localPlayer.y >= 0 && ModelData0.localPlayer.x < 13312 && ModelData0.localPlayer.y < 13312) { // L: 4722
- if ((Tiles.Tiles_renderFlags[class128.Client_plane][ModelData0.localPlayer.x >> 7][ModelData0.localPlayer.y >> 7] & 4) != 0) { // L: 4726
- var8 = class128.Client_plane;
- }
-
- var7 = var8; // L: 4727
- } else {
- var7 = class128.Client_plane; // L: 4723
- }
- }
- }
-
- var6 = var7; // L: 4729
- } else {
- var6 = class101.method2551(); // L: 4731
- }
-
- var7 = class343.cameraX; // L: 4732
- var8 = class295.cameraY; // L: 4733
- var9 = FaceNormal.cameraZ; // L: 4734
- var10 = GameEngine.cameraPitch; // L: 4735
- var11 = StudioGame.cameraYaw; // L: 4736
-
- for (var12 = 0; var12 < 5; ++var12) { // L: 4737
- if (Client.field743[var12]) { // L: 4738
- var13 = (int)(Math.random() * (double)(Client.field744[var12] * 2 + 1) - (double)Client.field744[var12] + Math.sin((double)Client.field714[var12] / 100.0D * (double)Client.field677[var12]) * (double)Client.field745[var12]); // L: 4739
- if (var12 == 0) { // L: 4740
- class343.cameraX += var13;
- }
-
- if (var12 == 1) { // L: 4741
- class295.cameraY += var13;
- }
-
- if (var12 == 2) { // L: 4742
- FaceNormal.cameraZ += var13;
- }
-
- if (var12 == 3) { // L: 4743
- StudioGame.cameraYaw = var13 + StudioGame.cameraYaw & 2047;
- }
-
- if (var12 == 4) { // L: 4744
- GameEngine.cameraPitch += var13; // L: 4745
- if (GameEngine.cameraPitch < 128) { // L: 4746
- GameEngine.cameraPitch = 128;
- }
-
- if (GameEngine.cameraPitch > 383) { // L: 4747
- GameEngine.cameraPitch = 383;
- }
- }
- }
- }
-
- var12 = MouseHandler.MouseHandler_x; // L: 4751
- var13 = MouseHandler.MouseHandler_y; // L: 4752
- if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4753
- var12 = MouseHandler.MouseHandler_lastPressedX; // L: 4754
- var13 = MouseHandler.MouseHandler_lastPressedY; // L: 4755
- }
-
- if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 4757
- class136.method2865(var12 - var0, var13 - var1); // L: 4758
- } else {
- ViewportMouse.ViewportMouse_isInViewport = false; // L: 4762
- ViewportMouse.ViewportMouse_entityCount = 0; // L: 4763
- }
-
- playPcmPlayers(); // L: 4766
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4767
- playPcmPlayers(); // L: 4768
- var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 4769
- Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4770
- class175.scene.draw(class343.cameraX, class295.cameraY, FaceNormal.cameraZ, GameEngine.cameraPitch, StudioGame.cameraYaw, var6); // L: 4771
- Rasterizer3D.Rasterizer3D_zoom = var14; // L: 4772
- playPcmPlayers(); // L: 4773
- class175.scene.clearTempGameObjects(); // L: 4774
- Client.overheadTextCount = 0; // L: 4776
- boolean var36 = false; // L: 4777
- var16 = -1; // L: 4778
- int var17 = -1; // L: 4779
- int var18 = Players.Players_count; // L: 4780
- int[] var19 = Players.Players_indices; // L: 4781
-
- int var20;
- for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { // L: 4782
- Object var33;
- if (var20 < var18) { // L: 4784
- var33 = Client.players[var19[var20]]; // L: 4785
- if (var19[var20] == Client.combatTargetPlayerIndex) { // L: 4786
- var36 = true; // L: 4787
- var16 = var20; // L: 4788
- continue;
- }
-
- if (var33 == ModelData0.localPlayer) { // L: 4791
- var17 = var20; // L: 4792
- continue; // L: 4793
- }
- } else {
- var33 = Client.npcs[Client.npcIndices[var20 - var18]]; // L: 4796
- }
-
- Client.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); // L: 4797
- }
-
- if (Client.renderSelf && var17 != -1) { // L: 4799
- Client.drawActor2d(ModelData0.localPlayer, var17, var0, var1, var2, var3); // L: 4800
- }
-
- if (var36) { // L: 4802
- Client.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); // L: 4803
- }
-
- for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { // L: 4805
- int var21 = Client.overheadTextXs[var20]; // L: 4806
- int var22 = Client.overheadTextYs[var20]; // L: 4807
- int var23 = Client.overheadTextXOffsets[var20]; // L: 4808
- int var24 = Client.overheadTextAscents[var20]; // L: 4809
- boolean var25 = true; // L: 4810
-
- while (var25) {
- var25 = false; // L: 4812
-
- for (int var32 = 0; var32 < var20; ++var32) { // L: 4813
- if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var21 + var23 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { // L: 4814 4815
- var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; // L: 4816
- var25 = true; // L: 4817
- }
- }
- }
-
- Client.viewportTempX = Client.overheadTextXs[var20]; // L: 4822
- Client.viewportTempY = Client.overheadTextYs[var20] = var22; // L: 4823
- String var26 = Client.overheadText[var20]; // L: 4824
- if (Client.chatEffects == 0) { // L: 4825
- int var27 = 16776960; // L: 4826
- if (Client.overheadTextColors[var20] < 6) { // L: 4827
- var27 = Client.field769[Client.overheadTextColors[var20]];
- }
-
- if (Client.overheadTextColors[var20] == 6) { // L: 4828
- var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
- }
-
- if (Client.overheadTextColors[var20] == 7) { // L: 4829
- var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
- }
-
- if (Client.overheadTextColors[var20] == 8) { // L: 4830
- var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
- }
-
- int var28;
- if (Client.overheadTextColors[var20] == 9) { // L: 4831
- var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4832
- if (var28 < 50) { // L: 4833
- var27 = var28 * 1280 + 16711680;
- } else if (var28 < 100) { // L: 4834
- var27 = 16776960 - (var28 - 50) * 327680;
- } else if (var28 < 150) { // L: 4835
- var27 = (var28 - 100) * 5 + 65280;
- }
- }
-
- if (Client.overheadTextColors[var20] == 10) { // L: 4837
- var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4838
- if (var28 < 50) { // L: 4839
- var27 = var28 * 5 + 16711680;
- } else if (var28 < 100) { // L: 4840
- var27 = 16711935 - (var28 - 50) * 327680;
- } else if (var28 < 150) { // L: 4841
- var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5;
- }
- }
-
- if (Client.overheadTextColors[var20] == 11) { // L: 4843
- var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4844
- if (var28 < 50) { // L: 4845
- var27 = 16777215 - var28 * 327685;
- } else if (var28 < 100) { // L: 4846
- var27 = (var28 - 50) * 327685 + 65280;
- } else if (var28 < 150) {
- var27 = 16777215 - (var28 - 100) * 327680; // L: 4847
- }
- }
-
- if (Client.overheadTextEffects[var20] == 0) { // L: 4849
- ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0);
- }
-
- if (Client.overheadTextEffects[var20] == 1) { // L: 4850
- ChatChannel.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
- }
-
- if (Client.overheadTextEffects[var20] == 2) { // L: 4851
- ChatChannel.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
- }
-
- if (Client.overheadTextEffects[var20] == 3) { // L: 4852
- ChatChannel.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]);
- }
-
- if (Client.overheadTextEffects[var20] == 4) { // L: 4853
- var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (ChatChannel.fontBold12.stringWidth(var26) + 100) / 150; // L: 4854
- Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4855
- ChatChannel.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); // L: 4856
- Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4857
- }
-
- if (Client.overheadTextEffects[var20] == 5) { // L: 4859
- var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4860
- int var29 = 0; // L: 4861
- if (var28 < 25) { // L: 4862
- var29 = var28 - 25;
- } else if (var28 > 125) { // L: 4863
- var29 = var28 - 125;
- }
-
- Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - ChatChannel.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4864
- ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); // L: 4865
- Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4866
- }
- } else {
- ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4870
- }
- }
-
- if (Client.hintArrowType == 2) { // L: 4875
- AbstractWorldMapIcon.worldToScreen((Client.hintArrowX - SecureRandomCallable.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GrandExchangeOfferOwnWorldComparator.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4876
- if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4877
- class21.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
- }
- }
-
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field727); // L: 4879
- class360.method6393(); // L: 4881
- class343.cameraX = var7; // L: 4883
- class295.cameraY = var8; // L: 4884
- FaceNormal.cameraZ = var9; // L: 4885
- GameEngine.cameraPitch = var10; // L: 4886
- StudioGame.cameraYaw = var11; // L: 4887
- if (Client.isLoading && HealthBarUpdate.method2181(true, false) == 0) { // L: 4888
- Client.isLoading = false;
- }
-
- if (Client.isLoading) { // L: 4889
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4890
- class259.drawLoadingMessage("Loading - please wait.", false); // L: 4891
- }
-
- } // L: 4893
+ } // L: 12230
}
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index b476e2dca7..fd9a3641d1 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -4,97 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cq")
+@ObfuscatedName("ce")
@Implements("AttackOption")
public enum AttackOption implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
@Export("AttackOption_dependsOnCombatLevels")
AttackOption_dependsOnCombatLevels(0),
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
@Export("AttackOption_alwaysRightClick")
AttackOption_alwaysRightClick(1),
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
- field1285(2),
- @ObfuscatedName("k")
+ field1288(2),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
@Export("AttackOption_hidden")
AttackOption_hidden(3),
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
- field1283(4);
+ field1294(4);
- @ObfuscatedName("fn")
- @ObfuscatedGetter(
- intValue = 1045451155
+ @ObfuscatedName("sx")
+ @ObfuscatedSignature(
+ descriptor = "Lar;"
)
- static int field1290;
- @ObfuscatedName("m")
+ @Export("pcmPlayer0")
+ static PcmPlayer pcmPlayer0;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1694685345
+ intValue = 1078797137
)
@Export("id")
final int id;
AttackOption(int var3) {
- this.id = var3; // L: 12733
- } // L: 12734
+ this.id = var3; // L: 12508
+ } // L: 12509
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.id; // L: 12738
+ return this.id; // L: 12513
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIB)I",
- garbageValue = "-59"
+ descriptor = "(Llh;IIIZI)V",
+ garbageValue = "-2127504965"
)
- public static int method2401(int var0, int var1) {
- int var2;
- for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28
- if ((var1 & 1) != 0) { // L: 26
- var2 = var0 * var2;
- }
-
- var0 *= var0; // L: 27
- }
-
- if (var1 == 1) { // L: 30
- return var0 * var2;
- } else {
- return var2; // L: 31
- }
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Lpt;ILjava/lang/String;I)Ljava/lang/String;",
- garbageValue = "-1761568873"
- )
- static String method2393(IterableNodeHashTable var0, int var1, String var2) {
- if (var0 == null) { // L: 41
- return var2;
- } else {
- ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 42
- return var3 == null ? var2 : (String)var3.obj; // L: 43 44
- }
- }
+ public static void method2410(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
+ class272.musicPlayerStatus = 1; // L: 26
+ class272.musicTrackArchive = var0; // L: 27
+ class272.musicTrackGroupId = var1; // L: 28
+ class151.musicTrackFileId = var2; // L: 29
+ class272.musicTrackVolume = var3; // L: 30
+ class11.musicTrackBoolean = var4; // L: 31
+ class272.pcmSampleLength = 10000; // L: 32
+ } // L: 33
}
diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java
index 11be3d41ad..980f131878 100644
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -3,154 +3,154 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ba")
+@ObfuscatedName("bz")
@Implements("AudioFilter")
public class AudioFilter {
- @ObfuscatedName("m")
- static float[][] field410;
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
+ static float[][] field413;
+ @ObfuscatedName("g")
@Export("coefficients")
static int[][] coefficients;
- @ObfuscatedName("s")
- static float field417;
- @ObfuscatedName("r")
+ @ObfuscatedName("w")
+ static float field409;
+ @ObfuscatedName("y")
@Export("forwardMultiplier")
static int forwardMultiplier;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("pairs")
int[] pairs;
- @ObfuscatedName("l")
- int[][][] field415;
- @ObfuscatedName("k")
- int[][][] field413;
- @ObfuscatedName("a")
- int[] field412;
+ @ObfuscatedName("q")
+ int[][][] field406;
+ @ObfuscatedName("f")
+ int[][][] field407;
+ @ObfuscatedName("j")
+ int[] field408;
static {
- field410 = new float[2][8]; // L: 13
+ field413 = new float[2][8]; // L: 13
coefficients = new int[2][8]; // L: 14
}
AudioFilter() {
this.pairs = new int[2]; // L: 8
- this.field415 = new int[2][2][4]; // L: 10
- this.field413 = new int[2][2][4]; // L: 11
- this.field412 = new int[2]; // L: 12
+ this.field406 = new int[2][2][4]; // L: 10
+ this.field407 = new int[2][2][4]; // L: 11
+ this.field408 = new int[2]; // L: 12
} // L: 21
- @ObfuscatedName("o")
- float method1042(int var1, int var2, float var3) {
- float var4 = (float)this.field413[var1][0][var2] + var3 * (float)(this.field413[var1][1][var2] - this.field413[var1][0][var2]); // L: 24
+ @ObfuscatedName("c")
+ float method1022(int var1, int var2, float var3) {
+ float var4 = (float)this.field407[var1][0][var2] + var3 * (float)(this.field407[var1][1][var2] - this.field407[var1][0][var2]); // L: 24
var4 *= 0.0015258789F; // L: 25
return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26
}
- @ObfuscatedName("l")
- float method1040(int var1, int var2, float var3) {
- float var4 = (float)this.field415[var1][0][var2] + var3 * (float)(this.field415[var1][1][var2] - this.field415[var1][0][var2]); // L: 35
+ @ObfuscatedName("q")
+ float method1023(int var1, int var2, float var3) {
+ float var4 = (float)this.field406[var1][0][var2] + var3 * (float)(this.field406[var1][1][var2] - this.field406[var1][0][var2]); // L: 35
var4 *= 1.2207031E-4F; // L: 36
return normalize(var4); // L: 37
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("compute")
int compute(int var1, float var2) {
float var3;
if (var1 == 0) { // L: 41
- var3 = (float)this.field412[0] + (float)(this.field412[1] - this.field412[0]) * var2; // L: 42
+ var3 = (float)this.field408[0] + (float)(this.field408[1] - this.field408[0]) * var2; // L: 42
var3 *= 0.0030517578F; // L: 43
- field417 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
- forwardMultiplier = (int)(field417 * 65536.0F); // L: 45
+ field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
+ forwardMultiplier = (int)(field409 * 65536.0F); // L: 45
}
if (this.pairs[var1] == 0) { // L: 47
return 0;
} else {
- var3 = this.method1042(var1, 0, var2); // L: 48
- field410[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1040(var1, 0, var2)); // L: 49
- field410[var1][1] = var3 * var3; // L: 50
+ var3 = this.method1022(var1, 0, var2); // L: 48
+ field413[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1023(var1, 0, var2)); // L: 49
+ field413[var1][1] = var3 * var3; // L: 50
float[] var10000;
int var4;
for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51
- var3 = this.method1042(var1, var4, var2); // L: 52
- float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1040(var1, var4, var2)); // L: 53
+ var3 = this.method1022(var1, var4, var2); // L: 52
+ float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1023(var1, var4, var2)); // L: 53
float var6 = var3 * var3; // L: 54
- field410[var1][var4 * 2 + 1] = field410[var1][var4 * 2 - 1] * var6; // L: 55
- field410[var1][var4 * 2] = field410[var1][var4 * 2 - 1] * var5 + field410[var1][var4 * 2 - 2] * var6; // L: 56
+ field413[var1][var4 * 2 + 1] = field413[var1][var4 * 2 - 1] * var6; // L: 55
+ field413[var1][var4 * 2] = field413[var1][var4 * 2 - 1] * var5 + field413[var1][var4 * 2 - 2] * var6; // L: 56
for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57
- var10000 = field410[var1];
- var10000[var7] += field410[var1][var7 - 1] * var5 + field410[var1][var7 - 2] * var6;
+ var10000 = field413[var1];
+ var10000[var7] += field413[var1][var7 - 1] * var5 + field413[var1][var7 - 2] * var6;
}
- var10000 = field410[var1]; // L: 58
- var10000[1] += field410[var1][0] * var5 + var6;
- var10000 = field410[var1]; // L: 59
+ var10000 = field413[var1]; // L: 58
+ var10000[1] += field413[var1][0] * var5 + var6;
+ var10000 = field413[var1]; // L: 59
var10000[0] += var5;
}
if (var1 == 0) { // L: 61
for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
- var10000 = field410[0];
- var10000[var4] *= field417;
+ var10000 = field413[0];
+ var10000[var4] *= field409;
}
}
for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62
- coefficients[var1][var4] = (int)(field410[var1][var4] * 65536.0F);
+ coefficients[var1][var4] = (int)(field413[var1][var4] * 65536.0F);
}
return this.pairs[var1] * 2; // L: 63
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpx;Laq;)V"
+ descriptor = "(Lqt;Lat;)V"
)
- final void method1044(Buffer var1, SoundEnvelope var2) {
+ final void method1025(Buffer var1, SoundEnvelope var2) {
int var3 = var1.readUnsignedByte(); // L: 67
this.pairs[0] = var3 >> 4; // L: 68
this.pairs[1] = var3 & 15; // L: 69
if (var3 != 0) { // L: 70
- this.field412[0] = var1.readUnsignedShort(); // L: 71
- this.field412[1] = var1.readUnsignedShort(); // L: 72
+ this.field408[0] = var1.readUnsignedShort(); // L: 71
+ this.field408[1] = var1.readUnsignedShort(); // L: 72
int var7 = var1.readUnsignedByte(); // L: 73
int var5;
int var6;
for (var5 = 0; var5 < 2; ++var5) { // L: 74
for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75
- this.field415[var5][0][var6] = var1.readUnsignedShort(); // L: 76
- this.field413[var5][0][var6] = var1.readUnsignedShort(); // L: 77
+ this.field406[var5][0][var6] = var1.readUnsignedShort(); // L: 76
+ this.field407[var5][0][var6] = var1.readUnsignedShort(); // L: 77
}
}
for (var5 = 0; var5 < 2; ++var5) { // L: 80
for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81
if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82
- this.field415[var5][1][var6] = var1.readUnsignedShort(); // L: 83
- this.field413[var5][1][var6] = var1.readUnsignedShort(); // L: 84
+ this.field406[var5][1][var6] = var1.readUnsignedShort(); // L: 83
+ this.field407[var5][1][var6] = var1.readUnsignedShort(); // L: 84
} else {
- this.field415[var5][1][var6] = this.field415[var5][0][var6]; // L: 87
- this.field413[var5][1][var6] = this.field413[var5][0][var6]; // L: 88
+ this.field406[var5][1][var6] = this.field406[var5][0][var6]; // L: 87
+ this.field407[var5][1][var6] = this.field407[var5][0][var6]; // L: 88
}
}
}
- if (var7 != 0 || this.field412[1] != this.field412[0]) { // L: 92
+ if (var7 != 0 || this.field408[1] != this.field408[0]) { // L: 92
var2.decodeSegments(var1);
}
} else {
- int[] var4 = this.field412; // L: 95
- this.field412[1] = 0; // L: 96
+ int[] var4 = this.field408; // L: 95
+ this.field408[1] = 0; // L: 96
var4[0] = 0; // L: 97
}
} // L: 99
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("normalize")
static float normalize(float var0) {
float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30
diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java
index 693b9aee3f..3b9ed88cd8 100644
--- a/runescape-client/src/main/java/BZip2Decompressor.java
+++ b/runescape-client/src/main/java/BZip2Decompressor.java
@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ph")
+@ObfuscatedName("qo")
@Implements("BZip2Decompressor")
public final class BZip2Decompressor {
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Lpy;"
+ descriptor = "Lqd;"
)
@Export("BZip2Decompressor_state")
static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
BZip2Decompressor_state = new BZip2State(); // L: 13
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("BZip2Decompressor_decompress")
public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
synchronized(BZip2Decompressor_state) { // L: 20
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpy;)V"
+ descriptor = "(Lqd;)V"
)
- static void method7758(BZip2State var0) {
+ static void method7979(BZip2State var0) {
byte var2 = var0.out_char; // L: 40
int var3 = var0.su_rNToGo; // L: 41
int var4 = var0.nblocks_used; // L: 42
int var5 = var0.su_ch2; // L: 43
- int[] var6 = class6.BZip2Decompressor_block; // L: 44
- int var7 = var0.field4714; // L: 45
+ int[] var6 = class136.BZip2Decompressor_block; // L: 44
+ int var7 = var0.field4722; // L: 45
byte[] var8 = var0.outputArray; // L: 46
int var9 = var0.next_out; // L: 47
int var10 = var0.outputLength; // L: 48
- int var12 = var0.field4720 + 1; // L: 50
+ int var12 = var0.field4734 + 1; // L: 50
label70:
while (true) {
@@ -157,16 +157,16 @@ public final class BZip2Decompressor {
var0.su_rNToGo = var3; // L: 137
var0.nblocks_used = var4; // L: 138
var0.su_ch2 = var5; // L: 139
- class6.BZip2Decompressor_block = var6; // L: 140
- var0.field4714 = var7; // L: 141
+ class136.BZip2Decompressor_block = var6; // L: 140
+ var0.field4722 = var7; // L: 141
var0.outputArray = var8; // L: 142
var0.next_out = var9; // L: 143
var0.outputLength = var10; // L: 144
} // L: 145
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpy;)V"
+ descriptor = "(Lqd;)V"
)
@Export("BZip2Decompressor_decompress")
static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -192,9 +192,9 @@ public final class BZip2Decompressor {
int[] var23 = null; // L: 170
int[] var24 = null; // L: 171
int[] var25 = null; // L: 172
- var0.blockSize100k = 1097769777; // L: 173
- if (class6.BZip2Decompressor_block == null) { // L: 174
- class6.BZip2Decompressor_block = new int[var0.blockSize100k * -1117648736];
+ var0.blockSize100k = 1985750633; // L: 173
+ if (class136.BZip2Decompressor_block == null) { // L: 174
+ class136.BZip2Decompressor_block = new int[var0.blockSize100k * 1474215328];
}
boolean var26 = true; // L: 175
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
}
var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396
- class6.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
+ class136.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
++var47; // L: 398
if (var45 == 0) { // L: 399
++var43; // L: 400
@@ -489,7 +489,7 @@ public final class BZip2Decompressor {
var10000 = var0.unzftab; // L: 332
for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336
- class6.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
+ class136.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
++var47; // L: 335
}
}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
}
for (var36 = 0; var36 < var47; ++var36) { // L: 426
- var1 = (byte)(class6.BZip2Decompressor_block[var36] & 255); // L: 427
- var10000 = class6.BZip2Decompressor_block; // L: 428
+ var1 = (byte)(class136.BZip2Decompressor_block[var36] & 255); // L: 427
+ var10000 = class136.BZip2Decompressor_block; // L: 428
int var10001 = var0.cftab[var1 & 255];
var10000[var10001] |= var36 << 8;
var10002 = var0.cftab[var1 & 255]++; // L: 429
}
- var0.field4714 = class6.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
+ var0.field4722 = class136.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
var0.nblocks_used = 0; // L: 432
- var0.field4714 = class6.BZip2Decompressor_block[var0.field4714]; // L: 433
- var0.su_ch2 = (byte)(var0.field4714 & 255); // L: 434
- var0.field4714 >>= 8; // L: 436
+ var0.field4722 = class136.BZip2Decompressor_block[var0.field4722]; // L: 433
+ var0.su_ch2 = (byte)(var0.field4722 & 255); // L: 434
+ var0.field4722 >>= 8; // L: 436
++var0.nblocks_used; // L: 437
- var0.field4720 = var47; // L: 438
- method7758(var0); // L: 439
- if (var0.field4720 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
+ var0.field4734 = var47; // L: 438
+ method7979(var0); // L: 439
+ if (var0.field4734 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
var26 = true;
break;
}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpy;)B"
+ descriptor = "(Lqd;)B"
)
@Export("BZip2Decompressor_readNextByte")
static byte BZip2Decompressor_readNextByte(BZip2State var0) {
return (byte)BZip2Decompressor_readBits(8, var0); // L: 447
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpy;)B"
+ descriptor = "(Lqd;)B"
)
@Export("BZip2Decompressor_readNextBit")
static byte BZip2Decompressor_readNextBit(BZip2State var0) {
return (byte)BZip2Decompressor_readBits(1, var0); // L: 451
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(ILpy;)I"
+ descriptor = "(ILqd;)I"
)
@Export("BZip2Decompressor_readBits")
static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
return var2; // L: 460
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Lpy;)V"
+ descriptor = "(Lqd;)V"
)
@Export("makeMaps")
static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
} // L: 479
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("BZip2Decompressor_createHuffmanTables")
static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) {
int var7 = 0; // L: 486
diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java
index 7b56544237..77f5e9dc6e 100644
--- a/runescape-client/src/main/java/BZip2State.java
+++ b/runescape-client/src/main/java/BZip2State.java
@@ -3,164 +3,164 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("py")
+@ObfuscatedName("qd")
@Implements("BZip2State")
public final class BZip2State {
- @ObfuscatedName("o")
- final int field4689;
+ @ObfuscatedName("c")
+ final int field4709;
+ @ObfuscatedName("v")
+ final int field4704;
@ObfuscatedName("q")
- final int field4684;
- @ObfuscatedName("l")
- final int field4685;
- @ObfuscatedName("k")
- final int field4702;
- @ObfuscatedName("a")
- final int field4687;
- @ObfuscatedName("m")
- final int field4688;
- @ObfuscatedName("p")
+ final int field4705;
+ @ObfuscatedName("f")
+ final int field4713;
+ @ObfuscatedName("j")
+ final int field4707;
+ @ObfuscatedName("e")
+ final int field4712;
+ @ObfuscatedName("g")
@Export("inputArray")
byte[] inputArray;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1006289449
+ intValue = 1626824001
)
@Export("nextByte")
int nextByte;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 213678345
+ intValue = -1971225163
)
@Export("nextBit_unused")
int nextBit_unused;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("outputArray")
byte[] outputArray;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -230908601
+ intValue = 1819049245
)
@Export("next_out")
int next_out;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 2001230231
+ intValue = 1774346175
)
@Export("outputLength")
int outputLength;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 541649199
+ intValue = -1489535775
)
int field4715;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("out_char")
byte out_char;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = -540019141
+ intValue = -709367265
)
@Export("su_rNToGo")
int su_rNToGo;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 790421793
+ intValue = 1666306837
)
@Export("bsBuff")
int bsBuff;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = -1354808017
+ intValue = 1002804521
)
@Export("bsLive")
int bsLive;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("blockSize100k")
int blockSize100k;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 1115223461
+ intValue = 1114530927
)
@Export("originalPointer")
int originalPointer;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 888729529
+ intValue = -354978331
)
- int field4714;
- @ObfuscatedName("f")
+ int field4722;
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = 1393554365
+ intValue = 819371129
)
@Export("su_ch2")
int su_ch2;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("unzftab")
int[] unzftab;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedGetter(
- intValue = 1338159051
+ intValue = 1156638647
)
@Export("nblocks_used")
int nblocks_used;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("cftab")
int[] cftab;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = -1217769335
+ intValue = -1218641305
)
@Export("nInUse")
int nInUse;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("inUse")
boolean[] inUse;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@Export("inUse16")
boolean[] inUse16;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("seqToUnseq")
byte[] seqToUnseq;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("ll8")
byte[] ll8;
@ObfuscatedName("ab")
@Export("getAndMoveToFrontDecode_yy")
int[] getAndMoveToFrontDecode_yy;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@Export("selector")
byte[] selector;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("selectorMtf")
byte[] selectorMtf;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("temp_charArray2d")
byte[][] temp_charArray2d;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@Export("limit")
int[][] limit;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@Export("base")
int[][] base;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@Export("perm")
int[][] perm;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@Export("minLens")
int[] minLens;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = -412410727
+ intValue = -1083748329
)
- int field4720;
+ int field4734;
BZip2State() {
- this.field4689 = 4096; // L: 4
- this.field4684 = 16; // L: 5
- this.field4685 = 258; // L: 6
- this.field4702 = 6; // L: 7
- this.field4687 = 50; // L: 8
- this.field4688 = 18002; // L: 9
+ this.field4709 = 4096; // L: 4
+ this.field4704 = 16; // L: 5
+ this.field4705 = 258; // L: 6
+ this.field4713 = 6; // L: 7
+ this.field4707 = 50; // L: 8
+ this.field4712 = 18002; // L: 9
this.nextByte = 0; // L: 11
this.next_out = 0; // L: 14
this.unzftab = new int[256]; // L: 25
diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java
index c13f09eafc..a3e27910e5 100644
--- a/runescape-client/src/main/java/BoundaryObject.java
+++ b/runescape-client/src/main/java/BoundaryObject.java
@@ -4,60 +4,65 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hc")
+@ObfuscatedName("hi")
@Implements("BoundaryObject")
public final class BoundaryObject {
- @ObfuscatedName("o")
+ @ObfuscatedName("tr")
@ObfuscatedGetter(
- intValue = 1657313425
+ intValue = 274182681
+ )
+ static int field2622;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1257114009
)
@Export("z")
int z;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1880399519
+ intValue = -655721437
)
@Export("x")
int x;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1024241781
+ intValue = -1527654875
)
@Export("y")
int y;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 291661833
+ intValue = 364149679
)
@Export("orientationA")
int orientationA;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -40246503
+ intValue = 1337588957
)
@Export("orientationB")
int orientationB;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("renderable1")
public Renderable renderable1;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("renderable2")
public Renderable renderable2;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- longValue = 5476522096528305987L
+ longValue = 5334859034127772709L
)
@Export("tag")
public long tag;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -214248861
+ intValue = -256459155
)
@Export("flags")
int flags;
@@ -66,4 +71,101 @@ public final class BoundaryObject {
this.tag = 0L; // L: 11
this.flags = 0; // L: 12
} // L: 14
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lcw;B)V",
+ garbageValue = "-14"
+ )
+ @Export("runScriptEvent")
+ public static void runScriptEvent(ScriptEvent var0) {
+ class135.runScript(var0, 500000, 475000);
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIB)V",
+ garbageValue = "94"
+ )
+ static void method4534(int var0, int var1, int var2, int var3) {
+ for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 93
+ if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 94
+ int var5 = 0; // L: 95
+ if (var1 > var4.maxX) { // L: 96
+ var5 += var1 - var4.maxX;
+ } else if (var1 < var4.x) { // L: 97
+ var5 += var4.x - var1;
+ }
+
+ if (var2 > var4.maxY) { // L: 98
+ var5 += var2 - var4.maxY;
+ } else if (var2 < var4.y) { // L: 99
+ var5 += var4.y - var2;
+ }
+
+ if (var5 - 64 <= var4.field812 && class19.clientPreferences.method2262() != 0 && var0 == var4.plane) { // L: 100
+ var5 -= 64; // L: 111
+ if (var5 < 0) { // L: 112
+ var5 = 0;
+ }
+
+ int var6 = (var4.field812 - var5) * class19.clientPreferences.method2262() / var4.field812; // L: 113
+ if (var4.stream1 == null) { // L: 114
+ if (var4.soundEffectId >= 0) { // L: 115
+ SoundEffect var7 = SoundEffect.readSoundEffect(Client.archive4, var4.soundEffectId, 0); // L: 116
+ if (var7 != null) { // L: 117
+ RawSound var8 = var7.toRawSound().resample(WorldMapRegion.decimator); // L: 118
+ RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 119
+ var9.setNumLoops(-1); // L: 120
+ class21.pcmStreamMixer.addSubStream(var9); // L: 121
+ var4.stream1 = var9; // L: 122
+ }
+ }
+ } else {
+ var4.stream1.method790(var6); // L: 126
+ }
+
+ if (var4.stream2 == null) { // L: 127
+ if (var4.soundEffectIds != null && (var4.field809 -= var3) <= 0) { // L: 128
+ int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 129
+ SoundEffect var12 = SoundEffect.readSoundEffect(Client.archive4, var4.soundEffectIds[var11], 0); // L: 130
+ if (var12 != null) { // L: 131
+ RawSound var13 = var12.toRawSound().resample(WorldMapRegion.decimator); // L: 132
+ RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 133
+ var10.setNumLoops(0); // L: 134
+ class21.pcmStreamMixer.addSubStream(var10); // L: 135
+ var4.stream2 = var10; // L: 136
+ var4.field809 = var4.field819 + (int)(Math.random() * (double)(var4.field811 - var4.field819)); // L: 137
+ }
+ }
+ } else {
+ var4.stream2.method790(var6); // L: 142
+ if (!var4.stream2.hasNext()) { // L: 143
+ var4.stream2 = null; // L: 144
+ }
+ }
+ } else {
+ if (var4.stream1 != null) { // L: 101
+ class21.pcmStreamMixer.removeSubStream(var4.stream1); // L: 102
+ var4.stream1 = null; // L: 103
+ }
+
+ if (var4.stream2 != null) { // L: 105
+ class21.pcmStreamMixer.removeSubStream(var4.stream2); // L: 106
+ var4.stream2 = null; // L: 107
+ }
+ }
+ }
+ }
+
+ } // L: 148
+
+ @ObfuscatedName("fp")
+ @ObfuscatedSignature(
+ descriptor = "(I)J",
+ garbageValue = "-2059501837"
+ )
+ static long method4536() {
+ return Client.field612; // L: 2945
+ }
}
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index 23e6dfa3ce..0a4480c17f 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ne")
+@ObfuscatedName("ns")
@Implements("Bounds")
public class Bounds {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -2084018151
+ intValue = 517285011
)
@Export("lowX")
public int lowX;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1161874723
+ intValue = -423053517
)
@Export("lowY")
public int lowY;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1792451045
+ intValue = 140797543
)
@Export("highX")
public int highX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -347299673
+ intValue = 1996835867
)
@Export("highY")
public int highY;
@@ -41,10 +41,10 @@ public class Bounds {
this(0, 0, var1, var2); // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIB)V",
- garbageValue = "76"
+ descriptor = "(III)V",
+ garbageValue = "1051510315"
)
@Export("setLow")
public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
this.lowY = var2; // L: 20
} // L: 21
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-2014864213"
+ garbageValue = "1045599332"
)
@Export("setHigh")
public void setHigh(int var1, int var2) {
@@ -63,40 +63,40 @@ public class Bounds {
this.highY = var2; // L: 25
} // L: 26
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(III)Z",
- garbageValue = "1837557842"
+ descriptor = "(IIB)Z",
+ garbageValue = "4"
)
- public boolean method6742(int var1, int var2) {
- return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.lowY + this.highY; // L: 29
+ public boolean method6894(int var1, int var2) {
+ return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.lowY + this.highY;
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lne;Lne;I)V",
- garbageValue = "683766141"
+ descriptor = "(Lns;Lns;I)V",
+ garbageValue = "-1054483070"
)
- public void method6758(Bounds var1, Bounds var2) {
- this.method6739(var1, var2); // L: 37
- this.method6746(var1, var2); // L: 38
+ public void method6895(Bounds var1, Bounds var2) {
+ this.method6909(var1, var2); // L: 37
+ this.method6918(var1, var2); // L: 38
} // L: 39
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lne;Lne;B)V",
- garbageValue = "-80"
+ descriptor = "(Lns;Lns;I)V",
+ garbageValue = "-261568568"
)
- void method6739(Bounds var1, Bounds var2) {
+ void method6909(Bounds var1, Bounds var2) {
var2.lowX = this.lowX; // L: 42
var2.highX = this.highX; // L: 43
if (this.lowX < var1.lowX) { // L: 44
- var2.highX = (var2.highX * -1176876013 - (var1.lowX * -1176876013 - this.lowX * -1176876013)) * -1792451045; // L: 45
+ var2.highX = (var2.highX * 1517770071 - (var1.lowX * 1517770071 - this.lowX * 1517770071)) * 140797543; // L: 45
var2.lowX = var1.lowX; // L: 46
}
- if (var2.method6747() > var1.method6747()) { // L: 48
- var2.highX -= var2.method6747() - var1.method6747(); // L: 49
+ if (var2.method6898() > var1.method6898()) { // L: 48
+ var2.highX -= var2.method6898() - var1.method6898(); // L: 49
}
if (var2.highX < 0) { // L: 51
@@ -105,21 +105,21 @@ public class Bounds {
} // L: 52
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lne;Lne;B)V",
- garbageValue = "83"
+ descriptor = "(Lns;Lns;I)V",
+ garbageValue = "-1779613636"
)
- void method6746(Bounds var1, Bounds var2) {
+ void method6918(Bounds var1, Bounds var2) {
var2.lowY = this.lowY; // L: 55
var2.highY = this.highY; // L: 56
if (this.lowY < var1.lowY) { // L: 57
- var2.highY = (var2.highY * -1533081833 - (var1.lowY * -1533081833 - this.lowY * -1533081833)) * -347299673; // L: 58
+ var2.highY = (var2.highY * -1363956205 - (var1.lowY * -1363956205 - this.lowY * -1363956205)) * 1996835867; // L: 58
var2.lowY = var1.lowY; // L: 59
}
- if (var2.method6745() > var1.method6745()) { // L: 61
- var2.highY -= var2.method6745() - var1.method6745(); // L: 62
+ if (var2.method6903() > var1.method6903()) { // L: 61
+ var2.highY -= var2.method6903() - var1.method6903(); // L: 62
}
if (var2.highY < 0) { // L: 64
@@ -128,25 +128,49 @@ public class Bounds {
} // L: 65
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1397499342"
+ descriptor = "(B)I",
+ garbageValue = "-78"
)
- int method6747() {
+ int method6898() {
return this.lowX + this.highX; // L: 68
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1908652212"
+ descriptor = "(B)I",
+ garbageValue = "-91"
)
- int method6745() {
- return this.lowY + this.highY; // L: 72
+ int method6903() {
+ return this.highY + this.lowY; // L: 72
}
public String toString() {
- return null; // L: 33
+ return null;
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)I",
+ garbageValue = "2"
+ )
+ static int method6922(int var0, int var1) {
+ ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28
+ if (var2 == null) { // L: 29
+ return 0;
+ } else if (var1 == -1) { // L: 30
+ return 0;
+ } else {
+ int var3 = 0; // L: 31
+
+ for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32
+ if (var2.ids[var4] == var1) {
+ var3 += var2.quantities[var4]; // L: 33
+ }
+ }
+
+ return var3; // L: 35
+ }
}
}
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index 9cad1d1246..1d7ca87d8c 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -4,24 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ns")
+@ObfuscatedName("nm")
@Implements("Buddy")
public class Buddy extends User {
- @ObfuscatedName("a")
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "Lle;"
+ )
+ @Export("NetCache_currentResponse")
+ public static NetFileRequest NetCache_currentResponse;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1598252079
+ intValue = 821675641
)
@Export("world")
public int world;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 960063137
+ intValue = 1716524007
)
@Export("int2")
public int int2;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -497613841
+ intValue = 1730087151
)
@Export("rank")
public int rank;
@@ -30,10 +36,10 @@ public class Buddy extends User {
this.world = -1; // L: 4
} // L: 8
- @ObfuscatedName("as")
+ @ObfuscatedName("az")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-1257664324"
+ garbageValue = "-1738253192"
)
@Export("set")
void set(int var1, int var2) {
@@ -41,20 +47,20 @@ public class Buddy extends User {
this.int2 = var2; // L: 12
} // L: 13
- @ObfuscatedName("au")
+ @ObfuscatedName("av")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "975020511"
+ garbageValue = "-983995080"
)
@Export("getWorld")
public int getWorld() {
return this.world; // L: 16
}
- @ObfuscatedName("ak")
+ @ObfuscatedName("aw")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-87"
+ descriptor = "(S)Z",
+ garbageValue = "20819"
)
@Export("hasWorld")
public boolean hasWorld() {
diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java
index bd49888e6f..1a25fb19c3 100644
--- a/runescape-client/src/main/java/BuddyRankComparator.java
+++ b/runescape-client/src/main/java/BuddyRankComparator.java
@@ -1,24 +1,21 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dx")
+@ObfuscatedName("ds")
@Implements("BuddyRankComparator")
public class BuddyRankComparator extends AbstractUserComparator {
- @ObfuscatedName("mk")
- @ObfuscatedGetter(
- intValue = 1073207223
- )
- @Export("menuX")
- static int menuX;
- @ObfuscatedName("pi")
+ @ObfuscatedName("e")
+ @Export("PcmPlayer_stereo")
+ protected static boolean PcmPlayer_stereo;
+ @ObfuscatedName("in")
@ObfuscatedSignature(
- descriptor = "[Lki;"
+ descriptor = "[Lqe;"
)
- static Widget[] field1408;
- @ObfuscatedName("o")
+ @Export("crossSprites")
+ static SpritePixels[] crossSprites;
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -26,10 +23,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;I)I",
- garbageValue = "84512734"
+ descriptor = "(Lnm;Lnm;B)I",
+ garbageValue = "114"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -44,13 +41,36 @@ public class BuddyRankComparator extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)[Ljg;",
- garbageValue = "-369068324"
+ descriptor = "(II)Lfj;",
+ garbageValue = "273043499"
)
- @Export("ServerPacket_values")
- public static ServerPacket[] ServerPacket_values() {
- return new ServerPacket[]{ServerPacket.field3166, ServerPacket.field3085, ServerPacket.field3152, ServerPacket.field3087, ServerPacket.field3088, ServerPacket.field3170, ServerPacket.field3090, ServerPacket.field3179, ServerPacket.field3149, ServerPacket.field3140, ServerPacket.field3093, ServerPacket.field3112, ServerPacket.field3096, ServerPacket.field3092, ServerPacket.field3089, ServerPacket.field3099, ServerPacket.field3100, ServerPacket.field3101, ServerPacket.field3102, ServerPacket.field3103, ServerPacket.field3187, ServerPacket.field3105, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3109, ServerPacket.field3139, ServerPacket.field3111, ServerPacket.field3182, ServerPacket.field3084, ServerPacket.field3183, ServerPacket.field3115, ServerPacket.field3091, ServerPacket.field3117, ServerPacket.field3118, ServerPacket.field3119, ServerPacket.field3120, ServerPacket.field3121, ServerPacket.field3122, ServerPacket.field3123, ServerPacket.field3161, ServerPacket.field3125, ServerPacket.field3124, ServerPacket.field3127, ServerPacket.field3154, ServerPacket.field3129, ServerPacket.field3130, ServerPacket.field3131, ServerPacket.field3188, ServerPacket.field3133, ServerPacket.field3142, ServerPacket.field3110, ServerPacket.field3114, ServerPacket.field3137, ServerPacket.field3094, ServerPacket.field3190, ServerPacket.field3126, ServerPacket.field3141, ServerPacket.field3180, ServerPacket.field3143, ServerPacket.field3144, ServerPacket.field3153, ServerPacket.field3146, ServerPacket.field3116, ServerPacket.field3148, ServerPacket.field3097, ServerPacket.field3150, ServerPacket.field3151, ServerPacket.field3134, ServerPacket.field3147, ServerPacket.field3162, ServerPacket.field3155, ServerPacket.field3156, ServerPacket.field3157, ServerPacket.field3158, ServerPacket.field3159, ServerPacket.field3160, ServerPacket.field3098, ServerPacket.field3113, ServerPacket.field3163, ServerPacket.field3164, ServerPacket.field3165, ServerPacket.field3104, ServerPacket.field3167, ServerPacket.field3168, ServerPacket.field3169, ServerPacket.field3135, ServerPacket.field3171, ServerPacket.field3172, ServerPacket.field3173, ServerPacket.field3174, ServerPacket.field3175, ServerPacket.field3176, ServerPacket.field3177, ServerPacket.field3132, ServerPacket.field3086, ServerPacket.field3145, ServerPacket.field3181, ServerPacket.field3095, ServerPacket.field3186, ServerPacket.field3184, ServerPacket.field3185, ServerPacket.field3178, ServerPacket.field3136}; // L: 113
+ @Export("getNpcDefinition")
+ public static NPCComposition getNpcDefinition(int var0) {
+ NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 65
+ if (var1 != null) { // L: 66
+ return var1;
+ } else {
+ byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 67
+ var1 = new NPCComposition(); // L: 68
+ var1.id = var0; // L: 69
+ if (var2 != null) { // L: 70
+ var1.decode(new Buffer(var2));
+ }
+
+ var1.postDecode(); // L: 71
+ NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 72
+ return var1; // L: 73
+ }
+ }
+
+ @ObfuscatedName("br")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;B)I",
+ garbageValue = "-107"
+ )
+ public static int method2620(String var0) {
+ return var0.length() + 2; // L: 128
}
}
diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java
index 3a938a334d..122677f8c6 100644
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
@@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("px")
+@ObfuscatedName("qt")
@Implements("Buffer")
public class Buffer extends Node {
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("crc32Table")
static int[] crc32Table;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("crc64Table")
static long[] crc64Table;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("array")
public byte[] array;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -271291039
+ intValue = -1883142675
)
@Export("offset")
public int offset;
@@ -61,129 +61,129 @@ public class Buffer extends Node {
} // L: 44
public Buffer(int var1) {
- this.array = class116.ByteArrayPool_getArray(var1); // L: 60
- this.offset = 0; // L: 61
- } // L: 62
+ this.array = class292.ByteArrayPool_getArray(var1); // L: 56
+ this.offset = 0; // L: 57
+ } // L: 58
public Buffer(byte[] var1) {
- this.array = var1; // L: 65
- this.offset = 0; // L: 66
- } // L: 67
-
- @ObfuscatedName("ao")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1135524166"
- )
- @Export("releaseArray")
- public void releaseArray() {
- if (this.array != null) { // L: 70
- class168.ByteArrayPool_release(this.array);
- }
-
- this.array = null; // L: 71
- } // L: 72
+ this.array = var1; // L: 61
+ this.offset = 0; // L: 62
+ } // L: 63
@ObfuscatedName("av")
@ObfuscatedSignature(
- descriptor = "(IS)V",
- garbageValue = "-14279"
+ descriptor = "(B)V",
+ garbageValue = "-36"
+ )
+ @Export("releaseArray")
+ public void releaseArray() {
+ if (this.array != null) { // L: 66
+ class93.ByteArrayPool_release(this.array);
+ }
+
+ this.array = null; // L: 67
+ } // L: 68
+
+ @ObfuscatedName("aw")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "151339125"
)
@Export("writeByte")
public void writeByte(int var1) {
- this.array[++this.offset - 1] = (byte)var1; // L: 75
- } // L: 76
+ this.array[++this.offset - 1] = (byte)var1; // L: 71
+ } // L: 72
- @ObfuscatedName("ai")
+ @ObfuscatedName("au")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "106"
+ descriptor = "(II)V",
+ garbageValue = "1514673034"
)
@Export("writeShort")
public void writeShort(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 79
- this.array[++this.offset - 1] = (byte)var1; // L: 80
- } // L: 81
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 75
+ this.array[++this.offset - 1] = (byte)var1; // L: 76
+ } // L: 77
@ObfuscatedName("ay")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "2051138228"
+ descriptor = "(IB)V",
+ garbageValue = "27"
)
@Export("writeMedium")
public void writeMedium(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 84
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 85
- this.array[++this.offset - 1] = (byte)var1; // L: 86
- } // L: 87
+ this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 80
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 81
+ this.array[++this.offset - 1] = (byte)var1; // L: 82
+ } // L: 83
- @ObfuscatedName("aa")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "-28"
+ descriptor = "(II)V",
+ garbageValue = "1371008869"
)
@Export("writeInt")
public void writeInt(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 90
- this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 91
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 92
- this.array[++this.offset - 1] = (byte)var1; // L: 93
- } // L: 94
+ this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 86
+ this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 87
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 88
+ this.array[++this.offset - 1] = (byte)var1; // L: 89
+ } // L: 90
- @ObfuscatedName("ax")
+ @ObfuscatedName("be")
@Export("writeLongMedium")
public void writeLongMedium(long var1) {
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 97
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 98
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 99
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 100
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 101
- this.array[++this.offset - 1] = (byte)((int)var1); // L: 102
- } // L: 103
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 93
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 94
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 95
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 96
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 97
+ this.array[++this.offset - 1] = (byte)((int)var1); // L: 98
+ } // L: 99
- @ObfuscatedName("at")
+ @ObfuscatedName("bz")
@Export("writeLong")
public void writeLong(long var1) {
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 106
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 107
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 108
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 109
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 110
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 111
- this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 112
- this.array[++this.offset - 1] = (byte)((int)var1); // L: 113
- } // L: 114
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 102
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 103
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 104
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 105
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 106
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 107
+ this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 108
+ this.array[++this.offset - 1] = (byte)((int)var1); // L: 109
+ } // L: 110
- @ObfuscatedName("br")
+ @ObfuscatedName("bp")
@ObfuscatedSignature(
- descriptor = "(ZB)V",
- garbageValue = "88"
+ descriptor = "(ZI)V",
+ garbageValue = "1418973998"
)
@Export("writeBoolean")
public void writeBoolean(boolean var1) {
- this.writeByte(var1 ? 1 : 0); // L: 117
- } // L: 118
+ this.writeByte(var1 ? 1 : 0); // L: 113
+ } // L: 114
- @ObfuscatedName("bo")
+ @ObfuscatedName("bg")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "43"
+ garbageValue = "115"
)
@Export("writeStringCp1252NullTerminated")
public void writeStringCp1252NullTerminated(String var1) {
- int var2 = var1.indexOf(0); // L: 125
- if (var2 >= 0) { // L: 126
+ int var2 = var1.indexOf(0); // L: 121
+ if (var2 >= 0) { // L: 122
throw new IllegalArgumentException("");
} else {
- this.offset += class194.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 127
- this.array[++this.offset - 1] = 0; // L: 128
+ this.offset += class165.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123
+ this.array[++this.offset - 1] = 0; // L: 124
}
- } // L: 129
+ } // L: 125
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "1"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "-1115427467"
)
@Export("writeStringCp1252NullCircumfixed")
public void writeStringCp1252NullCircumfixed(String var1) {
@@ -192,15 +192,15 @@ public class Buffer extends Node {
throw new IllegalArgumentException("");
} else {
this.array[++this.offset - 1] = 0; // L: 134
- this.offset += class194.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 135
+ this.offset += class165.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 135
this.array[++this.offset - 1] = 0; // L: 136
}
} // L: 137
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/CharSequence;I)V",
- garbageValue = "2009878537"
+ garbageValue = "2028256801"
)
@Export("writeCESU8")
public void writeCESU8(CharSequence var1) {
@@ -221,7 +221,7 @@ public class Buffer extends Node {
this.array[++this.offset - 1] = 0; // L: 153
this.writeVarInt(var4); // L: 154
- var4 = this.offset * -2117273951; // L: 155
+ var4 = this.offset * 1978245093; // L: 155
byte[] var6 = this.array; // L: 157
int var7 = this.offset; // L: 158
int var8 = var1.length(); // L: 160
@@ -242,13 +242,13 @@ public class Buffer extends Node {
}
var5 = var9 - var7; // L: 177
- this.offset = (var5 * -2117273951 + var4) * -271291039; // L: 179
+ this.offset = (var5 * 1978245093 + var4) * -1883142675; // L: 179
} // L: 180
- @ObfuscatedName("bx")
+ @ObfuscatedName("bc")
@ObfuscatedSignature(
- descriptor = "([BIII)V",
- garbageValue = "-1941001293"
+ descriptor = "([BIIB)V",
+ garbageValue = "61"
)
@Export("writeBytes")
public void writeBytes(byte[] var1, int var2, int var3) {
@@ -258,19 +258,19 @@ public class Buffer extends Node {
} // L: 184
- @ObfuscatedName("bd")
+ @ObfuscatedName("bl")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-95"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1400539464"
)
- public void method7530(Buffer var1) {
+ public void method7727(Buffer var1) {
this.writeBytes(var1.array, 0, var1.offset); // L: 187
} // L: 188
- @ObfuscatedName("bj")
+ @ObfuscatedName("bv")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "36"
+ descriptor = "(II)V",
+ garbageValue = "-529420858"
)
@Export("writeLengthInt")
public void writeLengthInt(int var1) {
@@ -284,10 +284,10 @@ public class Buffer extends Node {
}
} // L: 198
- @ObfuscatedName("be")
+ @ObfuscatedName("bt")
@ObfuscatedSignature(
descriptor = "(IB)V",
- garbageValue = "22"
+ garbageValue = "51"
)
@Export("writeLengthShort")
public void writeLengthShort(int var1) {
@@ -299,12 +299,12 @@ public class Buffer extends Node {
}
} // L: 206
- @ObfuscatedName("bf")
+ @ObfuscatedName("bh")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "2069892482"
+ descriptor = "(IS)V",
+ garbageValue = "1130"
)
- public void method7740(int var1) {
+ public void method7935(int var1) {
if (var1 >= 0 && var1 <= 255) { // L: 209
this.array[this.offset - var1 - 1] = (byte)var1; // L: 212
} else {
@@ -312,10 +312,10 @@ public class Buffer extends Node {
}
} // L: 213
- @ObfuscatedName("bz")
+ @ObfuscatedName("bs")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-2057774028"
+ descriptor = "(IB)V",
+ garbageValue = "70"
)
@Export("writeSmartByteShort")
public void writeSmartByteShort(int var1) {
@@ -328,10 +328,10 @@ public class Buffer extends Node {
}
} // L: 218 222
- @ObfuscatedName("bv")
+ @ObfuscatedName("bk")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "-1356313085"
+ garbageValue = "1627850032"
)
@Export("writeVarInt")
public void writeVarInt(int var1) {
@@ -354,30 +354,30 @@ public class Buffer extends Node {
this.writeByte(var1 & 127); // L: 238
} // L: 239
- @ObfuscatedName("bt")
+ @ObfuscatedName("bb")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1732070682"
+ garbageValue = "-201311106"
)
@Export("readUnsignedByte")
public int readUnsignedByte() {
return this.array[++this.offset - 1] & 255; // L: 242
}
- @ObfuscatedName("bu")
+ @ObfuscatedName("ba")
@ObfuscatedSignature(
- descriptor = "(I)B",
- garbageValue = "438739223"
+ descriptor = "(B)B",
+ garbageValue = "-71"
)
@Export("readByte")
public byte readByte() {
return this.array[++this.offset - 1]; // L: 246
}
- @ObfuscatedName("bq")
+ @ObfuscatedName("bu")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "47"
+ descriptor = "(I)I",
+ garbageValue = "-46298821"
)
@Export("readUnsignedShort")
public int readUnsignedShort() {
@@ -385,10 +385,10 @@ public class Buffer extends Node {
return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 251
}
- @ObfuscatedName("bh")
+ @ObfuscatedName("bw")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "17"
+ descriptor = "(I)I",
+ garbageValue = "-249689915"
)
@Export("readShort")
public int readShort() {
@@ -401,10 +401,10 @@ public class Buffer extends Node {
return var1; // L: 258
}
- @ObfuscatedName("bb")
+ @ObfuscatedName("bi")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "66"
+ garbageValue = "1"
)
@Export("readMedium")
public int readMedium() {
@@ -412,10 +412,10 @@ public class Buffer extends Node {
return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 263
}
- @ObfuscatedName("bm")
+ @ObfuscatedName("bo")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1472148837"
+ garbageValue = "-901053269"
)
@Export("readInt")
public int readInt() {
@@ -423,10 +423,10 @@ public class Buffer extends Node {
return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 268
}
- @ObfuscatedName("by")
+ @ObfuscatedName("bx")
@ObfuscatedSignature(
descriptor = "(I)J",
- garbageValue = "207582901"
+ garbageValue = "2116235370"
)
@Export("readLong")
public long readLong() {
@@ -435,29 +435,29 @@ public class Buffer extends Node {
return (var1 << 32) + var3; // L: 274
}
- @ObfuscatedName("bn")
+ @ObfuscatedName("bm")
@ObfuscatedSignature(
descriptor = "(B)F",
- garbageValue = "47"
+ garbageValue = "-50"
)
- public float method7570() {
+ public float method7740() {
return Float.intBitsToFloat(this.readInt()); // L: 278
}
- @ObfuscatedName("bg")
+ @ObfuscatedName("by")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-1840829970"
+ garbageValue = "-538390978"
)
@Export("readBoolean")
public boolean readBoolean() {
return (this.readUnsignedByte() & 1) == 1; // L: 282
}
- @ObfuscatedName("bp")
+ @ObfuscatedName("bj")
@ObfuscatedSignature(
descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-593040508"
+ garbageValue = "-1745591116"
)
@Export("readStringCp1252NullTerminatedOrNull")
public String readStringCp1252NullTerminatedOrNull() {
@@ -469,10 +469,10 @@ public class Buffer extends Node {
}
}
- @ObfuscatedName("bw")
+ @ObfuscatedName("bd")
@ObfuscatedSignature(
descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-1081385068"
+ garbageValue = "155229795"
)
@Export("readStringCp1252NullTerminated")
public String readStringCp1252NullTerminated() {
@@ -482,13 +482,13 @@ public class Buffer extends Node {
}
int var2 = this.offset - var1 - 1; // L: 296
- return var2 == 0 ? "" : EnumComposition.decodeStringCp1252(this.array, var1, var2); // L: 297 298
+ return var2 == 0 ? "" : SceneTilePaint.decodeStringCp1252(this.array, var1, var2); // L: 297 298
}
- @ObfuscatedName("co")
+ @ObfuscatedName("cr")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "-1"
+ descriptor = "(S)Ljava/lang/String;",
+ garbageValue = "6614"
)
@Export("readStringCp1252NullCircumfixed")
public String readStringCp1252NullCircumfixed() {
@@ -502,14 +502,14 @@ public class Buffer extends Node {
}
int var3 = this.offset - var2 - 1; // L: 306
- return var3 == 0 ? "" : EnumComposition.decodeStringCp1252(this.array, var2, var3); // L: 307 308
+ return var3 == 0 ? "" : SceneTilePaint.decodeStringCp1252(this.array, var2, var3); // L: 307 308
}
}
- @ObfuscatedName("ck")
+ @ObfuscatedName("cq")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "824150460"
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "54"
)
@Export("readCESU8")
public String readCESU8() {
@@ -579,10 +579,10 @@ public class Buffer extends Node {
}
}
- @ObfuscatedName("cr")
+ @ObfuscatedName("cw")
@ObfuscatedSignature(
descriptor = "([BIII)V",
- garbageValue = "2112522108"
+ garbageValue = "-2142383702"
)
@Export("readBytes")
public void readBytes(byte[] var1, int var2, int var3) {
@@ -592,10 +592,10 @@ public class Buffer extends Node {
} // L: 366
- @ObfuscatedName("cv")
+ @ObfuscatedName("cx")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1489286544"
+ descriptor = "(B)I",
+ garbageValue = "56"
)
@Export("readShortSmart")
public int readShortSmart() {
@@ -603,10 +603,10 @@ public class Buffer extends Node {
return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 370 371
}
- @ObfuscatedName("cs")
+ @ObfuscatedName("cc")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-467639247"
+ garbageValue = "-2108856121"
)
@Export("readUShortSmart")
public int readUShortSmart() {
@@ -617,523 +617,531 @@ public class Buffer extends Node {
@ObfuscatedName("cm")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1361013085"
+ garbageValue = "2138528151"
)
- public int method7531() {
- int var1 = 0; // L: 381
-
- int var2;
- for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 382 383 385
- var1 += 32767; // L: 384
- }
-
- var1 += var2; // L: 387
- return var1; // L: 388
- }
-
- @ObfuscatedName("ca")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1463794005"
- )
- public int method7627() {
- return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 392 393
+ public int method7749() {
+ int var1 = this.array[this.offset] & 255; // L: 381
+ return var1 < 128 ? this.readUnsignedByte() - 1 : this.readUnsignedShort() - 32769; // L: 382 383
}
@ObfuscatedName("ci")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1489274357"
- )
- public int method7532() {
- if (this.array[this.offset] < 0) { // L: 397
- return this.readInt() & Integer.MAX_VALUE;
- } else {
- int var1 = this.readUnsignedShort(); // L: 398
- return var1 == 32767 ? -1 : var1; // L: 399
- }
- }
-
- @ObfuscatedName("cx")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "80"
+ garbageValue = "48"
)
- @Export("readVarInt")
- public int readVarInt() {
- byte var1 = this.array[++this.offset - 1]; // L: 404
+ public int method7770() {
+ int var1 = 0; // L: 387
int var2;
- for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 405 406 408
- var2 = (var2 | var1 & 127) << 7; // L: 407
+ for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 388 389 391
+ var1 += 32767; // L: 390
}
- return var2 | var1; // L: 410
+ var1 += var2; // L: 393
+ return var1; // L: 394
}
- @ObfuscatedName("cn")
- @ObfuscatedSignature(
- descriptor = "([IB)V",
- garbageValue = "1"
- )
- @Export("xteaEncryptAll")
- public void xteaEncryptAll(int[] var1) {
- int var2 = this.offset / 8; // L: 414
- this.offset = 0; // L: 415
-
- for (int var3 = 0; var3 < var2; ++var3) { // L: 416
- int var4 = this.readInt(); // L: 417
- int var5 = this.readInt(); // L: 418
- int var6 = 0; // L: 419
- int var7 = -1640531527; // L: 420
-
- for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 421 422 425
- var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 423
- var6 += var7; // L: 424
- }
-
- this.offset -= 8; // L: 427
- this.writeInt(var4); // L: 428
- this.writeInt(var5); // L: 429
- }
-
- } // L: 431
-
- @ObfuscatedName("cc")
- @ObfuscatedSignature(
- descriptor = "([II)V",
- garbageValue = "946112408"
- )
- @Export("xteaDecryptAll")
- public void xteaDecryptAll(int[] var1) {
- int var2 = this.offset / 8; // L: 434
- this.offset = 0; // L: 435
-
- for (int var3 = 0; var3 < var2; ++var3) { // L: 436
- int var4 = this.readInt(); // L: 437
- int var5 = this.readInt(); // L: 438
- int var6 = -957401312; // L: 439
- int var7 = -1640531527; // L: 440
-
- for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 441 442 445
- var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 443
- var6 -= var7; // L: 444
- }
-
- this.offset -= 8; // L: 447
- this.writeInt(var4); // L: 448
- this.writeInt(var5); // L: 449
- }
-
- } // L: 451
-
- @ObfuscatedName("cy")
- @ObfuscatedSignature(
- descriptor = "([IIII)V",
- garbageValue = "-2082307716"
- )
- @Export("xteaEncrypt")
- public void xteaEncrypt(int[] var1, int var2, int var3) {
- int var4 = this.offset; // L: 454
- this.offset = var2; // L: 455
- int var5 = (var3 - var2) / 8; // L: 456
-
- for (int var6 = 0; var6 < var5; ++var6) { // L: 457
- int var7 = this.readInt(); // L: 458
- int var8 = this.readInt(); // L: 459
- int var9 = 0; // L: 460
- int var10 = -1640531527; // L: 461
-
- for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 462 463 466
- var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 464
- var9 += var10; // L: 465
- }
-
- this.offset -= 8; // L: 468
- this.writeInt(var7); // L: 469
- this.writeInt(var8); // L: 470
- }
-
- this.offset = var4; // L: 472
- } // L: 473
-
- @ObfuscatedName("ct")
- @ObfuscatedSignature(
- descriptor = "([IIIB)V",
- garbageValue = "-102"
- )
- @Export("xteaDecrypt")
- public void xteaDecrypt(int[] var1, int var2, int var3) {
- int var4 = this.offset; // L: 476
- this.offset = var2; // L: 477
- int var5 = (var3 - var2) / 8; // L: 478
-
- for (int var6 = 0; var6 < var5; ++var6) { // L: 479
- int var7 = this.readInt(); // L: 480
- int var8 = this.readInt(); // L: 481
- int var9 = -957401312; // L: 482
- int var10 = -1640531527; // L: 483
-
- for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 484 485 488
- var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 486
- var9 -= var10; // L: 487
- }
-
- this.offset -= 8; // L: 490
- this.writeInt(var7); // L: 491
- this.writeInt(var8); // L: 492
- }
-
- this.offset = var4; // L: 494
- } // L: 495
-
- @ObfuscatedName("cd")
- @ObfuscatedSignature(
- descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V",
- garbageValue = "-384695033"
- )
- @Export("encryptRsa")
- public void encryptRsa(BigInteger var1, BigInteger var2) {
- int var3 = this.offset; // L: 498
- this.offset = 0; // L: 499
- byte[] var4 = new byte[var3]; // L: 500
- this.readBytes(var4, 0, var3); // L: 501
- BigInteger var5 = new BigInteger(var4); // L: 502
- BigInteger var6 = var5.modPow(var1, var2); // L: 503
- byte[] var7 = var6.toByteArray(); // L: 504
- this.offset = 0; // L: 505
- this.writeShort(var7.length); // L: 506
- this.writeBytes(var7, 0, var7.length); // L: 507
- } // L: 508
-
- @ObfuscatedName("cw")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "-21"
- )
- @Export("writeCrc")
- public int writeCrc(int var1) {
- int var2 = Clock.method3249(this.array, var1, this.offset); // L: 511
- this.writeInt(var2); // L: 512
- return var2; // L: 513
- }
-
- @ObfuscatedName("cf")
- @ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "58"
- )
- @Export("checkCrc")
- public boolean checkCrc() {
- this.offset -= 4; // L: 517
- int var1 = Clock.method3249(this.array, 0, this.offset); // L: 518
- int var2 = this.readInt(); // L: 519
- return var1 == var2; // L: 520
- }
-
- @ObfuscatedName("cq")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1876057688"
- )
- public void method7687(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 525
- } // L: 526
-
@ObfuscatedName("cg")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1275499645"
- )
- public void method7542(int var1) {
- this.array[++this.offset - 1] = (byte)(0 - var1); // L: 529
- } // L: 530
-
- @ObfuscatedName("cl")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1692588218"
- )
- public void method7596(int var1) {
- this.array[++this.offset - 1] = (byte)(128 - var1); // L: 533
- } // L: 534
-
- @ObfuscatedName("cu")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-248110695"
+ garbageValue = "-1085782298"
)
- public int method7593() {
- return this.array[++this.offset - 1] - 128 & 255; // L: 537
- }
-
- @ObfuscatedName("ch")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1212667249"
- )
- public int method7545() {
- return 0 - this.array[++this.offset - 1] & 255; // L: 541
- }
-
- @ObfuscatedName("cz")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "2131850798"
- )
- public int method7546() {
- return 128 - this.array[++this.offset - 1] & 255; // L: 545
- }
-
- @ObfuscatedName("ce")
- @ObfuscatedSignature(
- descriptor = "(I)B",
- garbageValue = "1103987135"
- )
- public byte method7547() {
- return (byte)(this.array[++this.offset - 1] - 128); // L: 549
+ public int method7715() {
+ return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 398 399
}
@ObfuscatedName("cj")
@ObfuscatedSignature(
- descriptor = "(B)B",
- garbageValue = "1"
+ descriptor = "(I)I",
+ garbageValue = "1323097871"
)
- public byte method7548() {
- return (byte)(0 - this.array[++this.offset - 1]); // L: 553
- }
-
- @ObfuscatedName("cb")
- @ObfuscatedSignature(
- descriptor = "(B)B",
- garbageValue = "-70"
- )
- public byte method7549() {
- return (byte)(128 - this.array[++this.offset - 1]); // L: 557
+ public int method7752() {
+ if (this.array[this.offset] < 0) { // L: 403
+ return this.readInt() & Integer.MAX_VALUE;
+ } else {
+ int var1 = this.readUnsignedShort(); // L: 404
+ return var1 == 32767 ? -1 : var1; // L: 405
+ }
}
@ObfuscatedName("cp")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1933917266"
+ descriptor = "(I)I",
+ garbageValue = "340244581"
)
- public void method7550(int var1) {
- this.array[++this.offset - 1] = (byte)var1; // L: 561
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 562
- } // L: 563
+ @Export("readVarInt")
+ public int readVarInt() {
+ byte var1 = this.array[++this.offset - 1]; // L: 410
- @ObfuscatedName("dc")
- @ObfuscatedSignature(
- descriptor = "(IS)V",
- garbageValue = "-8848"
- )
- public void method7551(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 566
- this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 567
- } // L: 568
+ int var2;
+ for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 411 412 414
+ var2 = (var2 | var1 & 127) << 7; // L: 413
+ }
- @ObfuscatedName("dp")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1549973680"
- )
- public void method7641(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 571
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 572
- } // L: 573
+ return var2 | var1; // L: 416
+ }
- @ObfuscatedName("dg")
+ @ObfuscatedName("cf")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-329336731"
+ garbageValue = "-2025161944"
)
- public int method7716() {
- this.offset += 2; // L: 576
- return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 577
+ public int method7754() {
+ int var2 = 0; // L: 421
+ int var3 = 0; // L: 422
+
+ int var1;
+ do {
+ var1 = this.readUnsignedByte(); // L: 424
+ var2 |= (var1 & 127) << var3; // L: 425
+ var3 += 7; // L: 426
+ } while(var1 > 127); // L: 427
+
+ return var2; // L: 428
}
- @ObfuscatedName("dy")
+ @ObfuscatedName("cv")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "125"
+ descriptor = "([II)V",
+ garbageValue = "-479355866"
)
- public int method7554() {
- this.offset += 2; // L: 581
- return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 582
- }
+ @Export("xteaEncryptAll")
+ public void xteaEncryptAll(int[] var1) {
+ int var2 = this.offset / 8; // L: 432
+ this.offset = 0; // L: 433
- @ObfuscatedName("dh")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "0"
- )
- public int method7576() {
- this.offset += 2; // L: 586
- return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 587
- }
+ for (int var3 = 0; var3 < var2; ++var3) { // L: 434
+ int var4 = this.readInt(); // L: 435
+ int var5 = this.readInt(); // L: 436
+ int var6 = 0; // L: 437
+ int var7 = -1640531527; // L: 438
- @ObfuscatedName("dj")
- @ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "-14964"
- )
- public int method7556() {
- this.offset += 2; // L: 591
- int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 592
- if (var1 > 32767) { // L: 593
- var1 -= 65536;
+ for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 439 440 443
+ var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 441
+ var6 += var7; // L: 442
+ }
+
+ this.offset -= 8; // L: 445
+ this.writeInt(var4); // L: 446
+ this.writeInt(var5); // L: 447
}
- return var1; // L: 594
- }
+ } // L: 449
- @ObfuscatedName("dx")
+ @ObfuscatedName("cn")
@ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "5507"
+ descriptor = "([II)V",
+ garbageValue = "1150734409"
)
- public int method7522() {
- this.offset += 2; // L: 598
- int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 599
- if (var1 > 32767) { // L: 600
- var1 -= 65536;
+ @Export("xteaDecryptAll")
+ public void xteaDecryptAll(int[] var1) {
+ int var2 = this.offset / 8; // L: 452
+ this.offset = 0; // L: 453
+
+ for (int var3 = 0; var3 < var2; ++var3) { // L: 454
+ int var4 = this.readInt(); // L: 455
+ int var5 = this.readInt(); // L: 456
+ int var6 = -957401312; // L: 457
+ int var7 = -1640531527; // L: 458
+
+ for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 459 460 463
+ var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 461
+ var6 -= var7; // L: 462
+ }
+
+ this.offset -= 8; // L: 465
+ this.writeInt(var4); // L: 466
+ this.writeInt(var5); // L: 467
}
- return var1; // L: 601
+ } // L: 469
+
+ @ObfuscatedName("co")
+ @ObfuscatedSignature(
+ descriptor = "([IIII)V",
+ garbageValue = "-610547163"
+ )
+ @Export("xteaEncrypt")
+ public void xteaEncrypt(int[] var1, int var2, int var3) {
+ int var4 = this.offset; // L: 472
+ this.offset = var2; // L: 473
+ int var5 = (var3 - var2) / 8; // L: 474
+
+ for (int var6 = 0; var6 < var5; ++var6) { // L: 475
+ int var7 = this.readInt(); // L: 476
+ int var8 = this.readInt(); // L: 477
+ int var9 = 0; // L: 478
+ int var10 = -1640531527; // L: 479
+
+ for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 480 481 484
+ var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 482
+ var9 += var10; // L: 483
+ }
+
+ this.offset -= 8; // L: 486
+ this.writeInt(var7); // L: 487
+ this.writeInt(var8); // L: 488
+ }
+
+ this.offset = var4; // L: 490
+ } // L: 491
+
+ @ObfuscatedName("cz")
+ @ObfuscatedSignature(
+ descriptor = "([IIII)V",
+ garbageValue = "271624033"
+ )
+ @Export("xteaDecrypt")
+ public void xteaDecrypt(int[] var1, int var2, int var3) {
+ int var4 = this.offset; // L: 494
+ this.offset = var2; // L: 495
+ int var5 = (var3 - var2) / 8; // L: 496
+
+ for (int var6 = 0; var6 < var5; ++var6) { // L: 497
+ int var7 = this.readInt(); // L: 498
+ int var8 = this.readInt(); // L: 499
+ int var9 = -957401312; // L: 500
+ int var10 = -1640531527; // L: 501
+
+ for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 502 503 506
+ var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 504
+ var9 -= var10; // L: 505
+ }
+
+ this.offset -= 8; // L: 508
+ this.writeInt(var7); // L: 509
+ this.writeInt(var8); // L: 510
+ }
+
+ this.offset = var4; // L: 512
+ } // L: 513
+
+ @ObfuscatedName("cu")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V",
+ garbageValue = "2045732819"
+ )
+ @Export("encryptRsa")
+ public void encryptRsa(BigInteger var1, BigInteger var2) {
+ int var3 = this.offset; // L: 516
+ this.offset = 0; // L: 517
+ byte[] var4 = new byte[var3]; // L: 518
+ this.readBytes(var4, 0, var3); // L: 519
+ BigInteger var5 = new BigInteger(var4); // L: 520
+ BigInteger var6 = var5.modPow(var1, var2); // L: 521
+ byte[] var7 = var6.toByteArray(); // L: 522
+ this.offset = 0; // L: 523
+ this.writeShort(var7.length); // L: 524
+ this.writeBytes(var7, 0, var7.length); // L: 525
+ } // L: 526
+
+ @ObfuscatedName("ce")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-1915568779"
+ )
+ @Export("writeCrc")
+ public int writeCrc(int var1) {
+ int var2 = class93.method2404(this.array, var1, this.offset); // L: 529
+ this.writeInt(var2); // L: 530
+ return var2; // L: 531
+ }
+
+ @ObfuscatedName("cy")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "822358683"
+ )
+ @Export("checkCrc")
+ public boolean checkCrc() {
+ this.offset -= 4; // L: 535
+ int var1 = class93.method2404(this.array, 0, this.offset); // L: 536
+ int var2 = this.readInt(); // L: 537
+ return var1 == var2; // L: 538
+ }
+
+ @ObfuscatedName("ca")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "619719503"
+ )
+ public void method7762(int var1) {
+ this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 543
+ } // L: 544
+
+ @ObfuscatedName("ck")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-473301254"
+ )
+ public void method7763(int var1) {
+ this.array[++this.offset - 1] = (byte)(0 - var1); // L: 547
+ } // L: 548
+
+ @ObfuscatedName("cb")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "666329941"
+ )
+ public void method7764(int var1) {
+ this.array[++this.offset - 1] = (byte)(128 - var1); // L: 551
+ } // L: 552
+
+ @ObfuscatedName("cs")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1632273244"
+ )
+ public int method7765() {
+ return this.array[++this.offset - 1] - 128 & 255; // L: 555
+ }
+
+ @ObfuscatedName("cd")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1669846078"
+ )
+ public int method7766() {
+ return 0 - this.array[++this.offset - 1] & 255; // L: 559
+ }
+
+ @ObfuscatedName("cl")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1192268151"
+ )
+ public int method7767() {
+ return 128 - this.array[++this.offset - 1] & 255; // L: 563
+ }
+
+ @ObfuscatedName("ct")
+ @ObfuscatedSignature(
+ descriptor = "(I)B",
+ garbageValue = "1645158393"
+ )
+ public byte method7768() {
+ return (byte)(this.array[++this.offset - 1] - 128); // L: 567
+ }
+
+ @ObfuscatedName("ch")
+ @ObfuscatedSignature(
+ descriptor = "(I)B",
+ garbageValue = "1729941736"
+ )
+ public byte method7769() {
+ return (byte)(0 - this.array[++this.offset - 1]); // L: 571
+ }
+
+ @ObfuscatedName("dm")
+ @ObfuscatedSignature(
+ descriptor = "(I)B",
+ garbageValue = "2111803583"
+ )
+ public byte method7952() {
+ return (byte)(128 - this.array[++this.offset - 1]); // L: 575
}
@ObfuscatedName("dd")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-545549715"
- )
- public int method7558() {
- this.offset += 2; // L: 605
- int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 606
- if (var1 > 32767) { // L: 607
- var1 -= 65536;
- }
-
- return var1; // L: 608
- }
-
- @ObfuscatedName("do")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "65533"
- )
- public void method7559(int var1) {
- this.array[++this.offset - 1] = (byte)var1; // L: 612
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 613
- this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 614
- } // L: 615
-
- @ObfuscatedName("di")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "497671822"
- )
- public int method7544() {
- this.offset += 3; // L: 618
- return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 619
- }
-
- @ObfuscatedName("de")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "278130601"
- )
- public int method7561() {
- this.offset += 3; // L: 623
- return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 624
- }
-
- @ObfuscatedName("db")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "29"
- )
- public int method7503() {
- this.offset += 3; // L: 628
- return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 629
- }
-
- @ObfuscatedName("dn")
@ObfuscatedSignature(
descriptor = "(IB)V",
- garbageValue = "1"
- )
- public void method7563(int var1) {
- this.array[++this.offset - 1] = (byte)var1; // L: 633
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 634
- this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 635
- this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 636
- } // L: 637
-
- @ObfuscatedName("dz")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-864588772"
+ garbageValue = "9"
)
@Export("writeIntME")
public void writeIntME(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 640
- this.array[++this.offset - 1] = (byte)var1; // L: 641
- this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 642
- this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 643
- } // L: 644
+ this.array[++this.offset - 1] = (byte)var1; // L: 579
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 580
+ } // L: 581
- @ObfuscatedName("dl")
+ @ObfuscatedName("dz")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1980166371"
+ descriptor = "(IB)V",
+ garbageValue = "-13"
)
- public void method7565(int var1) {
- this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 647
- this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 648
- this.array[++this.offset - 1] = (byte)var1; // L: 649
- this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 650
- } // L: 651
+ public void method7863(int var1) {
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 584
+ this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 585
+ } // L: 586
- @ObfuscatedName("da")
+ @ObfuscatedName("dr")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "421037189"
+ descriptor = "(IB)V",
+ garbageValue = "28"
)
- public int method7701() {
- this.offset += 4; // L: 654
- return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 655
- }
+ public void method7929(int var1) {
+ this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 589
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 590
+ } // L: 591
@ObfuscatedName("dv")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1322409525"
+ garbageValue = "-62610324"
)
- public int method7567() {
- this.offset += 4; // L: 659
- return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 660
+ public int method7774() {
+ this.offset += 2; // L: 594
+ return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 595
}
- @ObfuscatedName("dr")
+ @ObfuscatedName("dy")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-19"
+ descriptor = "(I)I",
+ garbageValue = "-1993381368"
)
- public int method7568() {
- this.offset += 4; // L: 664
- return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 665
+ public int method7775() {
+ this.offset += 2; // L: 599
+ return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 600
}
@ObfuscatedName("ds")
@ObfuscatedSignature(
- descriptor = "([BIII)V",
- garbageValue = "-1520989243"
+ descriptor = "(I)I",
+ garbageValue = "-1071222046"
)
- public void method7569(byte[] var1, int var2, int var3) {
- for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) {
- var1[var4] = this.array[++this.offset - 1]; // L: 669
+ public int method7776() {
+ this.offset += 2; // L: 604
+ return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 605
+ }
+
+ @ObfuscatedName("dg")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-8"
+ )
+ public int method7777() {
+ this.offset += 2; // L: 609
+ int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 610
+ if (var1 > 32767) { // L: 611
+ var1 -= 65536;
}
- } // L: 670
+ return var1; // L: 612
+ }
+
+ @ObfuscatedName("dp")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-123"
+ )
+ public int method7813() {
+ this.offset += 2; // L: 616
+ int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 617
+ if (var1 > 32767) { // L: 618
+ var1 -= 65536;
+ }
+
+ return var1; // L: 619
+ }
+
+ @ObfuscatedName("dx")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "36"
+ )
+ public int method7779() {
+ this.offset += 2; // L: 623
+ int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 624
+ if (var1 > 32767) { // L: 625
+ var1 -= 65536;
+ }
+
+ return var1; // L: 626
+ }
+
+ @ObfuscatedName("dl")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "0"
+ )
+ public int method7780() {
+ this.offset += 3; // L: 630
+ return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 631
+ }
+
+ @ObfuscatedName("dc")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "1"
+ )
+ public int method7848() {
+ this.offset += 3; // L: 635
+ return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 636
+ }
+
+ @ObfuscatedName("dn")
+ @ObfuscatedSignature(
+ descriptor = "(IS)V",
+ garbageValue = "-9895"
+ )
+ public void method7760(int var1) {
+ this.array[++this.offset - 1] = (byte)var1; // L: 640
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 641
+ this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 642
+ this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 643
+ } // L: 644
+
+ @ObfuscatedName("do")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-408580075"
+ )
+ public void method7783(int var1) {
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 647
+ this.array[++this.offset - 1] = (byte)var1; // L: 648
+ this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 649
+ this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 650
+ } // L: 651
+
+ @ObfuscatedName("dq")
+ @ObfuscatedSignature(
+ descriptor = "(IB)V",
+ garbageValue = "-93"
+ )
+ public void method7784(int var1) {
+ this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 654
+ this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 655
+ this.array[++this.offset - 1] = (byte)var1; // L: 656
+ this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 657
+ } // L: 658
+
+ @ObfuscatedName("dt")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "5"
+ )
+ public int method7785() {
+ this.offset += 4; // L: 661
+ return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 662
+ }
+
+ @ObfuscatedName("dw")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "2015577981"
+ )
+ public int method7786() {
+ this.offset += 4; // L: 666
+ return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 667
+ }
+
+ @ObfuscatedName("di")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1155925608"
+ )
+ public int method7787() {
+ this.offset += 4; // L: 671
+ return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 672
+ }
+
+ @ObfuscatedName("da")
+ @ObfuscatedSignature(
+ descriptor = "([BIIB)V",
+ garbageValue = "-65"
+ )
+ public void method7828(byte[] var1, int var2, int var3) {
+ for (int var4 = var2; var4 < var3 + var2; ++var4) {
+ var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 676
+ }
+
+ } // L: 677
}
diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java
index 07deb8839d..2f67f82520 100644
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pz")
+@ObfuscatedName("pa")
@Implements("BufferedFile")
public class BufferedFile {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lpu;"
+ descriptor = "Lpn;"
)
@Export("accessFile")
AccessFile accessFile;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("readBuffer")
byte[] readBuffer;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- longValue = 4178581375858547737L
+ longValue = 3461057141034577181L
)
@Export("readBufferOffset")
long readBufferOffset;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1786515893
+ intValue = -1261273471
)
@Export("readBufferLength")
int readBufferLength;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("writeBuffer")
byte[] writeBuffer;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- longValue = 6839484550665134849L
+ longValue = -6943671534476856581L
)
@Export("writeBufferOffset")
long writeBufferOffset;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -701786655
+ intValue = -564469473
)
@Export("writeBufferLength")
int writeBufferLength;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- longValue = -2293352918490760827L
+ longValue = 1363033922781830683L
)
@Export("offset")
long offset;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- longValue = 7360496597180127129L
+ longValue = -5349398713648498269L
)
@Export("fileLength")
long fileLength;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- longValue = -2587246494180126439L
+ longValue = 1302214850585941089L
)
@Export("length")
long length;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- longValue = -8363977910986430751L
+ longValue = 3745266913589254919L
)
@Export("fileOffset")
long fileOffset;
@ObfuscatedSignature(
- descriptor = "(Lpu;II)V"
+ descriptor = "(Lpn;II)V"
)
public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
this.readBufferOffset = -1L; // L: 9
@@ -84,10 +84,10 @@ public class BufferedFile {
this.offset = 0L; // L: 24
} // L: 25
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "983004264"
+ garbageValue = "2069912993"
)
@Export("close")
public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
this.accessFile.close(); // L: 29
} // L: 30
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("seek")
public void seek(long var1) throws IOException {
if (var1 < 0L) { // L: 33
@@ -105,30 +105,30 @@ public class BufferedFile {
}
} // L: 35
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(S)J",
- garbageValue = "185"
+ descriptor = "(I)J",
+ garbageValue = "-1709142664"
)
@Export("length")
public long length() {
return this.length; // L: 38
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "([BI)V",
- garbageValue = "-2124163169"
+ garbageValue = "-1798748173"
)
@Export("readFully")
public void readFully(byte[] var1) throws IOException {
this.read(var1, 0, var1.length); // L: 42
} // L: 43
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "([BIII)V",
- garbageValue = "2088441068"
+ garbageValue = "-722573918"
)
@Export("read")
public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,7 @@ public class BufferedFile {
throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
}
- if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48
+ if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48
System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49
this.offset += (long)var3; // L: 50
return; // L: 51
@@ -146,7 +146,7 @@ public class BufferedFile {
long var4 = this.offset; // L: 53
int var7 = var3; // L: 55
int var8;
- if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56
+ if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56
var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57
if (var8 > var3) { // L: 58
var8 = var3;
@@ -184,7 +184,7 @@ public class BufferedFile {
this.offset += (long)var8; // L: 83
}
- if (-1L != this.writeBufferOffset) { // L: 85
+ if (this.writeBufferOffset != -1L) { // L: 85
if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86
var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87
if (var8 > var3 + var2) { // L: 88
@@ -206,10 +206,10 @@ public class BufferedFile {
var13 = var4; // L: 101
}
- if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { // L: 103
+ if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103
var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104
- } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106
- var10 = var4 + (long)var7; // L: 107
+ } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106
+ var10 = (long)var7 + var4; // L: 107
}
if (var13 > -1L && var10 > var13) { // L: 109
@@ -231,15 +231,15 @@ public class BufferedFile {
}
} // L: 125
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1238511464"
+ descriptor = "(B)V",
+ garbageValue = "125"
)
@Export("load")
void load() throws IOException {
this.readBufferLength = 0; // L: 128
- if (this.offset != this.fileOffset) { // L: 129
+ if (this.fileOffset != this.offset) { // L: 129
this.accessFile.seek(this.offset); // L: 130
this.fileOffset = this.offset; // L: 131
}
@@ -261,23 +261,23 @@ public class BufferedFile {
} // L: 142
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "([BIII)V",
- garbageValue = "-1049933636"
+ descriptor = "([BIIB)V",
+ garbageValue = "83"
)
@Export("write")
public void write(byte[] var1, int var2, int var3) throws IOException {
try {
if ((long)var3 + this.offset > this.length) { // L: 146
- this.length = this.offset + (long)var3;
+ this.length = (long)var3 + this.offset;
}
if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147
this.flush(); // L: 148
}
- if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150
+ if (-1L != this.writeBufferOffset && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150
int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151
System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152
this.offset += (long)var4; // L: 153
@@ -301,7 +301,7 @@ public class BufferedFile {
}
} else {
- if (this.offset != this.fileOffset) { // L: 160
+ if (this.fileOffset != this.offset) { // L: 160
this.accessFile.seek(this.offset); // L: 161
this.fileOffset = this.offset; // L: 162
}
@@ -316,19 +316,19 @@ public class BufferedFile {
long var6 = -1L; // L: 168
if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169
var9 = this.offset; // L: 170
- } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172
+ } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172
var9 = this.readBufferOffset; // L: 173
}
- if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175
- var6 = (long)var3 + this.offset; // L: 176
- } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178
+ if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 175
+ var6 = this.offset + (long)var3; // L: 176
+ } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178
var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179
}
if (var9 > -1L && var6 > var9) { // L: 181
int var8 = (int)(var6 - var9); // L: 182
- System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183
+ System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183
}
this.offset += (long)var3; // L: 185
@@ -339,21 +339,21 @@ public class BufferedFile {
}
} // L: 186 193 200
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-692867927"
+ descriptor = "(B)V",
+ garbageValue = "-103"
)
@Export("flush")
void flush() throws IOException {
- if (this.writeBufferOffset != -1L) { // L: 203
- if (this.writeBufferOffset != this.fileOffset) { // L: 204
+ if (-1L != this.writeBufferOffset) { // L: 203
+ if (this.fileOffset != this.writeBufferOffset) { // L: 204
this.accessFile.seek(this.writeBufferOffset); // L: 205
this.fileOffset = this.writeBufferOffset; // L: 206
}
this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208
- this.fileOffset += (long)this.writeBufferLength * 714010520226627585L; // L: 209
+ this.fileOffset += (long)this.writeBufferLength * -238507462456508415L; // L: 209
if (this.fileOffset > this.fileLength) { // L: 210
this.fileLength = this.fileOffset;
}
@@ -366,9 +366,9 @@ public class BufferedFile {
var1 = this.readBufferOffset; // L: 217
}
- if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219
- var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220
- } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222
+ if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219
+ var3 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 220
+ } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222
var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223
}
diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java
index 81ac185db5..c554c2c211 100644
--- a/runescape-client/src/main/java/BufferedNetSocket.java
+++ b/runescape-client/src/main/java/BufferedNetSocket.java
@@ -1,30 +1,33 @@
import java.io.IOException;
import java.net.Socket;
+import java.util.Date;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ni")
+@ObfuscatedName("np")
@Implements("BufferedNetSocket")
public class BufferedNetSocket extends AbstractSocket {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("socket")
Socket socket;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lnp;"
+ descriptor = "Lnw;"
)
@Export("source")
BufferedSource source;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lno;"
+ descriptor = "Lnc;"
)
@Export("sink")
BufferedSink sink;
- public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
+ BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
this.socket = var1; // L: 12
this.socket.setSoTimeout(30000); // L: 13
this.socket.setTcpNoDelay(true); // L: 14
@@ -34,10 +37,58 @@ public class BufferedNetSocket extends AbstractSocket {
this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Z",
+ garbageValue = "1"
+ )
+ @Export("isAvailable")
+ public boolean isAvailable(int var1) throws IOException {
+ return this.source.isAvailable(var1); // L: 23
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-439883726"
+ )
+ public int available() throws IOException {
+ return this.source.available(); // L: 28
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1889844897"
+ )
+ public int readUnsignedByte() throws IOException {
+ return this.source.readUnsignedByte(); // L: 33
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "([BIII)I",
+ garbageValue = "695516749"
+ )
+ @Export("read")
+ public int read(byte[] var1, int var2, int var3) throws IOException {
+ return this.source.read(var1, var2, var3); // L: 38
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "([BIII)V",
+ garbageValue = "1416716039"
+ )
+ @Export("write")
+ public void write(byte[] var1, int var2, int var3) throws IOException {
+ this.sink.write(var1, var2, var3); // L: 43
+ } // L: 44
+
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "731891927"
+ garbageValue = "-17278531"
)
@Export("close")
public void close() {
@@ -51,57 +102,92 @@ public class BufferedNetSocket extends AbstractSocket {
this.source.close(); // L: 53
} // L: 54
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "18"
- )
- @Export("readUnsignedByte")
- public int readUnsignedByte() throws IOException {
- return this.source.readUnsignedByte(); // L: 33
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1429957580"
- )
- @Export("available")
- public int available() throws IOException {
- return this.source.available(); // L: 28
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "-15219997"
- )
- @Export("isAvailable")
- public boolean isAvailable(int var1) throws IOException {
- return this.source.isAvailable(var1); // L: 23
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "([BIII)I",
- garbageValue = "-642682113"
- )
- @Export("read")
- public int read(byte[] var1, int var2, int var3) throws IOException {
- return this.source.read(var1, var2, var3); // L: 38
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "([BIII)V",
- garbageValue = "257086671"
- )
- @Export("write")
- public void write(byte[] var1, int var2, int var3) throws IOException {
- this.sink.write(var1, var2, var3); // L: 43
- } // L: 44
-
protected void finalize() {
- this.close(); // L: 58
+ this.close();
} // L: 59
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(B)Ljava/util/Date;",
+ garbageValue = "-61"
+ )
+ static Date method6835() {
+ java.util.Calendar var0 = java.util.Calendar.getInstance(); // L: 1119
+ var0.set(2, 0); // L: 1120
+ var0.set(5, 1); // L: 1121
+ var0.set(1, 1900); // L: 1122
+ return var0.getTime(); // L: 1123
+ }
+
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ descriptor = "(Lfr;IIS)Lar;",
+ garbageValue = "8848"
+ )
+ public static final PcmPlayer method6849(TaskHandler var0, int var1, int var2) {
+ if (var1 >= 0 && var1 < 2) { // L: 57
+ if (var2 < 256) { // L: 58
+ var2 = 256;
+ }
+
+ try {
+ PcmPlayer var3 = ModelData0.pcmPlayerProvider.player(); // L: 60
+ var3.samples = new int[256 * (BuddyRankComparator.PcmPlayer_stereo ? 2 : 1)]; // L: 61
+ var3.field282 = var2; // L: 62
+ var3.init(); // L: 63
+ var3.capacity = (var2 & -1024) + 1024; // L: 64
+ if (var3.capacity > 16384) { // L: 65
+ var3.capacity = 16384;
+ }
+
+ var3.open(var3.capacity); // L: 66
+ if (HealthBarUpdate.field1212 > 0 && PcmPlayer.soundSystem == null) { // L: 67
+ PcmPlayer.soundSystem = new SoundSystem(); // L: 68
+ PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 69
+ PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 70
+ }
+
+ if (PcmPlayer.soundSystem != null) { // L: 72
+ if (PcmPlayer.soundSystem.players[var1] != null) { // L: 73
+ throw new IllegalArgumentException();
+ }
+
+ PcmPlayer.soundSystem.players[var1] = var3; // L: 74
+ }
+
+ return var3; // L: 76
+ } catch (Throwable var4) { // L: 78
+ return new PcmPlayer(); // L: 79
+ }
+ } else {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ @ObfuscatedName("jh")
+ @ObfuscatedSignature(
+ descriptor = "([Lkb;Lkb;ZI)V",
+ garbageValue = "1435342792"
+ )
+ @Export("revalidateWidgetScroll")
+ static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
+ int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1710798627 * 1791635595 : var1.width * 1623184389 * 2092161229; // L: 10653
+ int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -1042306339 * -1548911243 : var1.height * 514298127 * 236010991; // L: 10654
+ class118.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10655
+ if (var1.children != null) { // L: 10656
+ class118.resizeInterface(var1.children, var1.id, var3, var4, var2);
+ }
+
+ InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10657
+ if (var5 != null) { // L: 10658
+ int var6 = var5.group; // L: 10659
+ if (WorldMapSection2.loadInterface(var6)) { // L: 10661
+ class118.resizeInterface(SoundCache.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10662
+ }
+ }
+
+ if (var1.contentType == 1337) { // L: 10665
+ }
+
+ } // L: 10666
}
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index cbae31e008..1b79de67db 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("no")
+@ObfuscatedName("nc")
@Implements("BufferedSink")
public class BufferedSink implements Runnable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("thread")
Thread thread;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("outputStream")
OutputStream outputStream;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -424160887
+ intValue = -908139425
)
@Export("capacity")
int capacity;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("buffer")
byte[] buffer;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1137203181
+ intValue = -1613116679
)
@Export("position")
int position;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -649579149
+ intValue = -2132108273
)
@Export("limit")
int limit;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("exception")
IOException exception;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("closed")
boolean closed;
@@ -54,10 +54,10 @@ public class BufferedSink implements Runnable {
this.thread.start(); // L: 204
} // L: 205
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "2078615402"
+ garbageValue = "1872756001"
)
@Export("isClosed")
boolean isClosed() {
@@ -79,10 +79,10 @@ public class BufferedSink implements Runnable {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "([BIII)V",
- garbageValue = "1828248430"
+ garbageValue = "-1640336200"
)
@Export("write")
void write(byte[] var1, int var2, int var3) throws IOException {
@@ -98,8 +98,8 @@ public class BufferedSink implements Runnable {
var5 = this.position - this.limit - 1; // L: 273
}
- if (var5 < var3) { // L: 274
- throw new IOException("");
+ if (var5 < var3) {
+ throw new IOException(""); // L: 274
} else {
if (var3 + this.limit <= this.capacity) { // L: 275
System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276
@@ -119,10 +119,10 @@ public class BufferedSink implements Runnable {
}
} // L: 286
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1738399063"
+ descriptor = "(S)V",
+ garbageValue = "135"
)
@Export("close")
void close() {
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index fd465135b1..8bde462bff 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -7,46 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("np")
+@ObfuscatedName("nw")
@Implements("BufferedSource")
public class BufferedSource implements Runnable {
- @ObfuscatedName("uf")
- @ObfuscatedSignature(
- descriptor = "Lbd;"
- )
- @Export("friendSystem")
- public static FriendSystem friendSystem;
- @ObfuscatedName("j")
- @Export("userHomeDirectory")
- static String userHomeDirectory;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("thread")
Thread thread;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("inputStream")
InputStream inputStream;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1611590211
+ intValue = 647895995
)
@Export("capacity")
int capacity;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("buffer")
byte[] buffer;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1886855287
+ intValue = 2104008339
)
@Export("position")
int position;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 360959185
+ intValue = 678269677
)
@Export("limit")
int limit;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("exception")
IOException exception;
@@ -61,10 +52,10 @@ public class BufferedSource implements Runnable {
this.thread.start(); // L: 76
} // L: 77
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(II)Z",
- garbageValue = "-916314557"
+ garbageValue = "2131773931"
)
@Export("isAvailable")
boolean isAvailable(int var1) throws IOException {
@@ -95,10 +86,10 @@ public class BufferedSource implements Runnable {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "377483853"
+ descriptor = "(B)I",
+ garbageValue = "-31"
)
@Export("available")
int available() throws IOException {
@@ -119,10 +110,10 @@ public class BufferedSource implements Runnable {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-18"
+ descriptor = "(I)I",
+ garbageValue = "-1293599351"
)
@Export("readUnsignedByte")
int readUnsignedByte() throws IOException {
@@ -142,10 +133,10 @@ public class BufferedSource implements Runnable {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "([BIII)I",
- garbageValue = "-720858367"
+ descriptor = "([BIIB)I",
+ garbageValue = "-55"
)
@Export("read")
int read(byte[] var1, int var2, int var3) throws IOException {
@@ -183,10 +174,10 @@ public class BufferedSource implements Runnable {
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1309478376"
+ descriptor = "(B)V",
+ garbageValue = "-101"
)
@Export("close")
void close() {
@@ -252,39 +243,4 @@ public class BufferedSource implements Runnable {
} // L: 108
}
}
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(CI)Z",
- garbageValue = "-1918735565"
- )
- static final boolean method6702(char var0) {
- if (Character.isISOControl(var0)) { // L: 16
- return false;
- } else if (class78.isAlphaNumeric(var0)) { // L: 17
- return true;
- } else {
- char[] var1 = class424.field4621; // L: 19
-
- int var2;
- char var3;
- for (var2 = 0; var2 < var1.length; ++var2) { // L: 20
- var3 = var1[var2]; // L: 21
- if (var0 == var3) { // L: 22
- return true;
- }
- }
-
- var1 = class424.field4623; // L: 26
-
- for (var2 = 0; var2 < var1.length; ++var2) { // L: 27
- var3 = var1[var2]; // L: 28
- if (var0 == var3) { // L: 29
- return true;
- }
- }
-
- return false; // L: 32
- }
- }
}
diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java
index dbd0a3076f..d187a85fca 100644
--- a/runescape-client/src/main/java/ByteArrayNode.java
+++ b/runescape-client/src/main/java/ByteArrayNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("oc")
+@ObfuscatedName("ob")
@Implements("ByteArrayNode")
public class ByteArrayNode extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("byteArray")
public byte[] byteArray;
diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java
index 8b6ec000fa..1a31658d9a 100644
--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -6,185 +6,181 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mk")
+@ObfuscatedName("mm")
@Implements("ByteArrayPool")
public class ByteArrayPool {
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -88837057
+ intValue = -2132533809
)
@Export("ByteArrayPool_smallCount")
static int ByteArrayPool_smallCount;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1039424223
+ intValue = 1551258163
)
@Export("ByteArrayPool_mediumCount")
static int ByteArrayPool_mediumCount;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1336676741
+ intValue = 28601155
)
@Export("ByteArrayPool_largeCount")
static int ByteArrayPool_largeCount;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1169134273
+ intValue = -562517075
)
- static int field4217;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -957559945
- )
- static int field4210;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = 1701731071
- )
- static int field4219;
+ static int field4216;
@ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 1660116295
+ intValue = -30790003
)
- static int field4220;
- @ObfuscatedName("c")
+ static int field4207;
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1383703933
+ intValue = 677494483
)
- static int field4221;
- @ObfuscatedName("w")
+ static int field4208;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = -479475671
+ )
+ static int field4209;
+ @ObfuscatedName("t")
+ @ObfuscatedGetter(
+ intValue = 714035553
+ )
+ static int field4210;
+ @ObfuscatedName("z")
@Export("ByteArrayPool_small")
static byte[][] ByteArrayPool_small;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("ByteArrayPool_medium")
static byte[][] ByteArrayPool_medium;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("ByteArrayPool_large")
static byte[][] ByteArrayPool_large;
- @ObfuscatedName("g")
- static byte[][] field4225;
- @ObfuscatedName("h")
- static ArrayList field4212;
+ @ObfuscatedName("k")
+ static byte[][] field4214;
+ @ObfuscatedName("a")
+ public static ArrayList field4202;
static {
ByteArrayPool_smallCount = 0; // L: 13
ByteArrayPool_mediumCount = 0; // L: 14
ByteArrayPool_largeCount = 0; // L: 15
- field4217 = 0; // L: 16
- field4210 = 1000; // L: 17
- field4219 = 250; // L: 18
- field4220 = 100; // L: 19
- field4221 = 50; // L: 20
+ field4216 = 0; // L: 16
+ field4207 = 1000; // L: 17
+ field4208 = 250; // L: 18
+ field4209 = 100; // L: 19
+ field4210 = 50; // L: 20
ByteArrayPool_small = new byte[1000][]; // L: 21
ByteArrayPool_medium = new byte[250][]; // L: 22
ByteArrayPool_large = new byte[100][]; // L: 23
- field4225 = new byte[50][];
- field4212 = new ArrayList(); // L: 28
- LoginScreenAnimation.method2217(); // L: 31
+ field4214 = new byte[50][]; // L: 24
+ field4202 = new ArrayList(); // L: 28
+ class228.method4899(); // L: 31
new HashMap();
} // L: 36
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IB)F",
- garbageValue = "1"
- )
- public static float method6364(int var0) {
- var0 &= 16383; // L: 24
- return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); // L: 25
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(IZI)[B",
- garbageValue = "957663499"
+ descriptor = "(IZB)[B",
+ garbageValue = "-1"
)
@Export("ByteArrayPool_getArrayBool")
static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
byte[] var4;
- if (var0 != 100) { // L: 70
+ if (var0 != 100) { // L: 52
if (var0 < 100) {
}
} else if (ByteArrayPool_smallCount > 0) {
- var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 71
- ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 72
- return var4; // L: 73
+ var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 53
+ ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 54
+ return var4; // L: 55
}
- if (var0 != 5000) { // L: 75
+ if (var0 != 5000) { // L: 57
if (var0 < 5000) {
}
} else if (ByteArrayPool_mediumCount > 0) {
- var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 76
- ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 77
- return var4; // L: 78
+ var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 58
+ ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 59
+ return var4; // L: 60
}
- if (var0 != 10000) { // L: 80
+ if (var0 != 10000) { // L: 62
if (var0 < 10000) {
}
} else if (ByteArrayPool_largeCount > 0) {
- var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 81
- ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 82
- return var4; // L: 83
+ var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 63
+ ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 64
+ return var4; // L: 65
}
- if (var0 != 30000) { // L: 85
+ if (var0 != 30000) { // L: 67
if (var0 < 30000) {
}
- } else if (field4217 > 0) {
- var4 = field4225[--field4217]; // L: 86
- field4225[field4217] = null; // L: 87
- return var4; // L: 88
+ } else if (field4216 > 0) {
+ var4 = field4214[--field4216]; // L: 68
+ field4214[field4216] = null; // L: 69
+ return var4; // L: 70
}
- if (class131.ByteArrayPool_arrays != null) { // L: 90
- for (int var2 = 0; var2 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91
- if (FileSystem.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92
- if (var0 < FileSystem.ByteArrayPool_alternativeSizes[var2]) {
+ if (class464.ByteArrayPool_arrays != null) { // L: 72
+ for (int var2 = 0; var2 < Canvas.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 73
+ if (Canvas.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 74
+ if (var0 < Canvas.ByteArrayPool_alternativeSizes[var2]) {
}
- } else if (GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
- byte[] var3 = class131.ByteArrayPool_arrays[var2][--GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93
- class131.ByteArrayPool_arrays[var2][GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94
- return var3; // L: 95
+ } else if (class17.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
+ byte[] var3 = class464.ByteArrayPool_arrays[var2][--class17.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 75
+ class464.ByteArrayPool_arrays[var2][class17.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 76
+ return var3; // L: 77
}
}
}
- return new byte[var0]; // L: 108
+ return new byte[var0]; // L: 90
}
- @ObfuscatedName("r")
+ @ObfuscatedName("gh")
@ObfuscatedSignature(
- descriptor = "(I)Lqr;",
- garbageValue = "1594784812"
+ descriptor = "(Lci;ZI)V",
+ garbageValue = "1209232624"
)
- static SpritePixels method6365() {
- SpritePixels var0 = new SpritePixels(); // L: 149
- var0.width = class453.SpriteBuffer_spriteWidth; // L: 150
- var0.height = class453.SpriteBuffer_spriteHeight; // L: 151
- var0.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 152
- var0.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 153
- var0.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 154
- var0.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 155
- int var1 = var0.subHeight * var0.subWidth; // L: 156
- byte[] var2 = class127.SpriteBuffer_pixels[0]; // L: 157
- var0.pixels = new int[var1]; // L: 158
+ @Export("addPlayerToScene")
+ static void addPlayerToScene(Player var0, boolean var1) {
+ if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4802
+ var0.isUnanimated = false; // L: 4803
+ if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4804 4805
+ var0.isUnanimated = true;
+ }
- for (int var3 = 0; var3 < var1; ++var3) { // L: 159
- var0.pixels[var3] = Decimator.SpriteBuffer_spritePalette[var2[var3] & 255];
+ int var2 = var0.x >> 7; // L: 4807
+ int var3 = var0.y >> 7; // L: 4808
+ if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4809
+ long var4 = TaskHandler.calculateTag(0, 0, 0, false, var0.index); // L: 4810
+ if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4811
+ var0.isUnanimated = false; // L: 4812
+ var0.tileHeight = SceneTilePaint.getTileHeight(var0.x, var0.y, PacketWriter.Client_plane); // L: 4813
+ var0.playerCycle = Client.cycle; // L: 4814
+ class356.scene.addNullableObject(PacketWriter.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4815
+ } else {
+ if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4818
+ if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4819
+ return;
+ }
+
+ Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4820
+ }
+
+ var0.tileHeight = SceneTilePaint.getTileHeight(var0.x, var0.y, PacketWriter.Client_plane); // L: 4822
+ var0.playerCycle = Client.cycle; // L: 4823
+ class356.scene.drawEntity(PacketWriter.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4824
+ }
+ }
}
- VarcInt.method3325(); // L: 160
- return var0; // L: 161
- }
-
- @ObfuscatedName("hi")
- @ObfuscatedSignature(
- descriptor = "(Lcx;II)V",
- garbageValue = "-376973471"
- )
- static final void method6357(Actor var0, int var1) {
- AbstractWorldMapIcon.worldToScreen(var0.x, var0.y, var1); // L: 5456
- } // L: 5457
+ } // L: 4828
}
diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java
index 8d67bf46b5..05bb66d23e 100644
--- a/runescape-client/src/main/java/Calendar.java
+++ b/runescape-client/src/main/java/Calendar.java
@@ -3,186 +3,105 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("jz")
+@ObfuscatedName("jf")
@Implements("Calendar")
public class Calendar {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("MONTH_NAMES_ENGLISH_GERMAN")
- public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
- @ObfuscatedName("q")
+ static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
+ @ObfuscatedName("v")
@Export("DAYS_OF_THE_WEEK")
- public static final String[] DAYS_OF_THE_WEEK;
- @ObfuscatedName("l")
+ static final String[] DAYS_OF_THE_WEEK;
+ @ObfuscatedName("q")
@Export("Calendar_calendar")
- public static java.util.Calendar Calendar_calendar;
+ static java.util.Calendar Calendar_calendar;
static {
MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 8
DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 18
- java.util.Calendar.getInstance(); // L: 22
- Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23
- } // L: 24
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(II)Lfc;",
- garbageValue = "-1123951030"
- )
- @Export("getEnum")
- public static EnumComposition getEnum(int var0) {
- EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25
- if (var1 != null) { // L: 26
- return var1;
- } else {
- byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27
- var1 = new EnumComposition(); // L: 28
- if (var2 != null) { // L: 29
- var1.decode(new Buffer(var2));
- }
-
- EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30
- return var1; // L: 31
- }
+ java.util.Calendar.getInstance();
+ Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
}
- @ObfuscatedName("s")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "73"
+ descriptor = "(Llh;Llh;IZI)Lgh;",
+ garbageValue = "603221838"
)
- static int method5349(int var0, Script var1, boolean var2) {
- boolean var3 = true; // L: 858
- Widget var4;
- if (var0 >= 2000) { // L: 860
- var0 -= 1000; // L: 861
- var4 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 862
- var3 = false; // L: 863
- } else {
- var4 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 865
- }
+ public static Frames method5499(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
+ boolean var4 = true; // L: 11
+ int[] var5 = var0.getGroupFileIds(var2); // L: 12
- int var11;
- if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866
- var11 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] - 1; // L: 867
- if (var11 >= 0 && var11 <= 9) { // L: 868
- var4.setAction(var11, Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 872
- return 1; // L: 873
+ for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13
+ byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14
+ if (var7 == null) { // L: 15
+ var4 = false; // L: 16
} else {
- --class9.Interpreter_stringStackSize; // L: 869
- return 1; // L: 870
- }
- } else {
- int var6;
- if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875
- class12.Interpreter_intStackSize -= 2; // L: 876
- var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 877
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 878
- var4.parent = ApproximateRouteStrategy.getWidgetChild(var11, var6); // L: 879
- return 1; // L: 880
- } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882
- var4.isScrollBar = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 883
- return 1; // L: 884
- } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886
- var4.dragZoneSize = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 887
- return 1; // L: 888
- } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890
- var4.dragThreshold = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 891
- return 1; // L: 892
- } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894
- var4.dataText = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 895
- return 1; // L: 896
- } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898
- var4.spellActionName = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 899
- return 1; // L: 900
- } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902
- var4.actions = null; // L: 903
- return 1; // L: 904
- } else if (var0 == 1308) { // L: 906
- var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 907
- return 1; // L: 908
- } else if (var0 == 1309) { // L: 910
- --class12.Interpreter_intStackSize; // L: 911
- return 1; // L: 912
- } else {
- int var7;
- byte[] var8;
- if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914
- byte var5;
- if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944
- class12.Interpreter_intStackSize -= 2; // L: 945
- var5 = 10; // L: 946
- var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]}; // L: 947
- byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]}; // L: 948
- class363.Widget_setKey(var4, var5, var8, var9); // L: 949
- return 1; // L: 950
- } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952
- class12.Interpreter_intStackSize -= 3; // L: 953
- var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] - 1; // L: 954
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 955
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 956
- if (var11 >= 0 && var11 <= 9) { // L: 957
- class152.Widget_setKeyRate(var4, var11, var6, var7); // L: 960
- return 1; // L: 961
- } else {
- throw new RuntimeException(); // L: 958
- }
- } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963
- var5 = 10; // L: 964
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 965
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 966
- class152.Widget_setKeyRate(var4, var5, var6, var7); // L: 967
- return 1; // L: 968
- } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970
- --class12.Interpreter_intStackSize; // L: 971
- var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] - 1; // L: 972
- if (var11 >= 0 && var11 <= 9) { // L: 973
- Script.Widget_setKeyIgnoreHeld(var4, var11); // L: 976
- return 1; // L: 977
- } else {
- throw new RuntimeException(); // L: 974
- }
- } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979
- var5 = 10; // L: 980
- Script.Widget_setKeyIgnoreHeld(var4, var5); // L: 981
- return 1; // L: 982
- } else {
- return 2; // L: 984
- }
+ int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19
+ byte[] var9;
+ if (var3) {
+ var9 = var1.getFile(0, var8);
} else {
- byte[] var10 = null; // L: 915
- var8 = null; // L: 916
- if (var3) { // L: 917
- class12.Interpreter_intStackSize -= 10; // L: 918
+ var9 = var1.getFile(var8, 0);
+ }
- for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921
- }
-
- if (var7 > 0) { // L: 923
- var10 = new byte[var7 / 2]; // L: 924
- var8 = new byte[var7 / 2]; // L: 925
-
- for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926
- var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize]; // L: 927
- var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize + 1]; // L: 928
- }
- }
- } else {
- class12.Interpreter_intStackSize -= 2; // L: 933
- var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]}; // L: 934
- var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]}; // L: 935
- }
-
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] - 1; // L: 937
- if (var7 >= 0 && var7 <= 9) { // L: 938
- class363.Widget_setKey(var4, var7, var10, var8); // L: 941
- return 1; // L: 942
- } else {
- throw new RuntimeException(); // L: 939
- }
+ if (var9 == null) {
+ var4 = false;
}
}
}
+
+ if (!var4) {
+ return null;
+ } else {
+ try {
+ return new Frames(var0, var1, var2, var3);
+ } catch (Exception var11) { // L: 29
+ return null; // L: 30
+ }
+ }
}
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lfc;",
+ garbageValue = "71"
+ )
+ @Export("getInvDefinition")
+ public static InvDefinition getInvDefinition(int var0) {
+ InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21
+ if (var1 != null) { // L: 22
+ return var1;
+ } else {
+ byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23
+ var1 = new InvDefinition(); // L: 24
+ if (var2 != null) { // L: 25
+ var1.decode(new Buffer(var2));
+ }
+
+ InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26
+ return var1; // L: 27
+ }
+ }
+
+ @ObfuscatedName("al")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-197646586"
+ )
+ protected static final void method5504() {
+ class10.clock.mark(); // L: 408
+
+ int var0;
+ for (var0 = 0; var0 < 32; ++var0) { // L: 409
+ GameEngine.graphicsTickTimes[var0] = 0L;
+ }
+
+ for (var0 = 0; var0 < 32; ++var0) { // L: 410
+ GameEngine.clientTickTimes[var0] = 0L;
+ }
+
+ Messages.gameCyclesToDo = 0; // L: 411
+ } // L: 412
}
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index 8bdb7fc180..ac83d5b0eb 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -2,19 +2,23 @@ import java.awt.Component;
import java.awt.Graphics;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("u")
+@ObfuscatedName("d")
@Implements("Canvas")
public final class Canvas extends java.awt.Canvas {
- @ObfuscatedName("lf")
- @ObfuscatedSignature(
- descriptor = "Lki;"
+ @ObfuscatedName("h")
+ @Export("ByteArrayPool_alternativeSizes")
+ public static int[] ByteArrayPool_alternativeSizes;
+ @ObfuscatedName("n")
+ @ObfuscatedGetter(
+ intValue = -1814972075
)
- @Export("dragInventoryWidget")
- static Widget dragInventoryWidget;
- @ObfuscatedName("o")
+ @Export("loginBoxCenter")
+ static int loginBoxCenter;
+ @ObfuscatedName("c")
@Export("component")
Component component;
@@ -30,23 +34,382 @@ public final class Canvas extends java.awt.Canvas {
this.component.paint(var1); // L: 19
} // L: 20
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;II)I",
- garbageValue = "-989845700"
- )
- public static int method344(CharSequence var0, int var1) {
- return class202.method4016(var0, var1, true); // L: 72
+ @ObfuscatedName("q")
+ public static boolean method322(long var0) {
+ boolean var2 = var0 != 0L; // L: 52
+ if (var2) { // L: 53
+ boolean var3 = (int)(var0 >>> 16 & 1L) == 1; // L: 56
+ var2 = !var3; // L: 58
+ }
+
+ return var2; // L: 60
}
- @ObfuscatedName("lr")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "-35"
+ descriptor = "([BIIIIIII[Lgv;B)V",
+ garbageValue = "70"
)
- static void method347(int var0) {
- if (var0 != Client.loginState) { // L: 12714
- Client.loginState = var0; // L: 12715
+ static final void method315(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
+ int var10;
+ for (int var9 = 0; var9 < 8; ++var9) { // L: 111
+ for (var10 = 0; var10 < 8; ++var10) { // L: 112
+ if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) {
+ int[] var10000 = var8[var1].flags[var9 + var2]; // L: 113
+ var10000[var3 + var10] &= -16777217;
+ }
+ }
}
- } // L: 12716
+
+ Buffer var13 = new Buffer(var0); // L: 116
+
+ for (var10 = 0; var10 < 4; ++var10) { // L: 117
+ for (int var11 = 0; var11 < 64; ++var11) { // L: 118
+ for (int var12 = 0; var12 < 64; ++var12) { // L: 119
+ if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120
+ Players.loadTerrain(var13, var1, var2 + class122.method2763(var11 & 7, var12 & 7, var7), var3 + FloorOverlayDefinition.method3818(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 121
+ } else {
+ Players.loadTerrain(var13, 0, -1, -1, 0, 0, 0); // L: 123
+ }
+ }
+ }
+ }
+
+ } // L: 127
+
+ @ObfuscatedName("fv")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-113372020"
+ )
+ @Export("getLoginError")
+ static void getLoginError(int var0) {
+ int var1 = Login.loginIndex; // L: 2788
+ if (var0 == -3) { // L: 2791
+ class101.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
+ } else if (var0 == -2) { // L: 2792
+ class101.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
+ } else if (var0 == -1) { // L: 2793
+ class101.setLoginResponseString("No response from server.", "Please try using a different world.", "");
+ } else if (var0 == 3) { // L: 2794
+ WorldMapData_1.method4872(3); // L: 2795
+ Login.field902 = 1; // L: 2796
+ } else if (var0 == 4) { // L: 2798
+ WorldMapData_1.method4872(14); // L: 2800
+ Login.field897 = 0; // L: 2801
+ } else if (var0 == 5) { // L: 2804
+ Login.field902 = 2; // L: 2805
+ class101.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2806
+ } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2808
+ if (var0 == 7) { // L: 2811
+ class101.setLoginResponseString("This world is full.", "Please use a different world.", "");
+ } else if (var0 == 8) { // L: 2812
+ class101.setLoginResponseString("Unable to connect.", "Login server offline.", "");
+ } else if (var0 == 9) { // L: 2813
+ class101.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
+ } else if (var0 == 10) { // L: 2814
+ class101.setLoginResponseString("Unable to connect.", "Bad session id.", "");
+ } else if (var0 == 11) { // L: 2815
+ class101.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+ } else if (var0 == 12) { // L: 2816
+ class101.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
+ } else if (var0 == 13) { // L: 2817
+ class101.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
+ } else if (var0 == 14) { // L: 2818
+ class101.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
+ } else if (var0 == 16) { // L: 2819
+ class101.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
+ } else if (var0 == 17) { // L: 2820
+ class101.setLoginResponseString("To access this free world, log into a", "members world and move your character", "to a non-members area.");
+ } else if (var0 == 18) { // L: 2821
+ WorldMapData_1.method4872(14); // L: 2823
+ Login.field897 = 1; // L: 2824
+ } else if (var0 == 19) { // L: 2827
+ class101.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
+ } else if (var0 == 20) { // L: 2828
+ class101.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
+ } else if (var0 == 22) { // L: 2829
+ class101.setLoginResponseString("Malformed login packet.", "Please try again.", "");
+ } else if (var0 == 23) { // L: 2830
+ class101.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
+ } else if (var0 == 24) { // L: 2831
+ class101.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
+ } else if (var0 == 25) { // L: 2832
+ class101.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
+ } else if (var0 == 26) { // L: 2833
+ class101.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
+ } else if (var0 == 27) { // L: 2834
+ class101.setLoginResponseString("", "Service unavailable.", "");
+ } else if (var0 == 31) { // L: 2835
+ class101.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game.");
+ } else if (var0 == 32) { // L: 2836
+ class101.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system.");
+ } else if (var0 == 37) { // L: 2837
+ class101.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
+ } else if (var0 == 38) { // L: 2838
+ class101.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
+ } else if (var0 == 55) { // L: 2839
+ WorldMapData_1.method4872(8); // L: 2840
+ } else {
+ if (var0 == 56) { // L: 2842
+ class101.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2843
+ HealthBarUpdate.updateGameState(11); // L: 2844
+ return; // L: 2845
+ }
+
+ if (var0 == 57) { // L: 2847
+ class101.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2848
+ HealthBarUpdate.updateGameState(11); // L: 2849
+ return; // L: 2850
+ }
+
+ if (var0 == 61) { // L: 2852
+ class101.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2853
+ WorldMapData_1.method4872(7); // L: 2854
+ } else {
+ if (var0 == 62) { // L: 2856
+ HealthBarUpdate.updateGameState(10); // L: 2857
+ WorldMapData_1.method4872(9); // L: 2858
+ class101.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2859
+ return; // L: 2860
+ }
+
+ if (var0 == 63) { // L: 2862
+ HealthBarUpdate.updateGameState(10); // L: 2863
+ WorldMapData_1.method4872(9); // L: 2864
+ class101.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2865
+ return; // L: 2866
+ }
+
+ if (var0 == 65 || var0 == 67) { // L: 2868
+ HealthBarUpdate.updateGameState(10); // L: 2869
+ WorldMapData_1.method4872(9); // L: 2870
+ class101.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2871
+ return; // L: 2872
+ }
+
+ if (var0 == 71) { // L: 2874
+ HealthBarUpdate.updateGameState(10); // L: 2875
+ WorldMapData_1.method4872(7); // L: 2876
+ class101.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2877
+ } else if (var0 == 73) { // L: 2879
+ HealthBarUpdate.updateGameState(10); // L: 2880
+ WorldMapData_1.method4872(6); // L: 2881
+ class101.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); // L: 2882
+ } else if (var0 == 72) { // L: 2884
+ HealthBarUpdate.updateGameState(10); // L: 2885
+ WorldMapData_1.method4872(26); // L: 2886
+ } else {
+ class101.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2888
+ }
+ }
+ }
+ } else {
+ class101.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2809
+ }
+
+ HealthBarUpdate.updateGameState(10); // L: 2889
+ int var4 = Login.loginIndex; // L: 2893
+ boolean var5 = var4 != var1; // L: 2895
+ if (!var5 && Client.field516.method8008()) { // L: 2896
+ WorldMapData_1.method4872(9); // L: 2897
+ }
+
+ } // L: 2899
+
+ @ObfuscatedName("hf")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIIIIII)V",
+ garbageValue = "-525734760"
+ )
+ @Export("updatePendingSpawn")
+ static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+ PendingSpawn var9 = null; // L: 7757
+
+ for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7758 7759 7764
+ if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7760
+ var9 = var10; // L: 7761
+ break;
+ }
+ }
+
+ if (var9 == null) { // L: 7766
+ var9 = new PendingSpawn(); // L: 7767
+ var9.plane = var0; // L: 7768
+ var9.type = var3; // L: 7769
+ var9.x = var1; // L: 7770
+ var9.y = var2; // L: 7771
+ class151.method3146(var9); // L: 7772
+ Client.pendingSpawns.addFirst(var9); // L: 7773
+ }
+
+ var9.id = var4; // L: 7775
+ var9.field1125 = var5; // L: 7776
+ var9.orientation = var6; // L: 7777
+ var9.delay = var7; // L: 7778
+ var9.hitpoints = var8; // L: 7779
+ } // L: 7780
+
+ @ObfuscatedName("jg")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IB)I",
+ garbageValue = "9"
+ )
+ static final int method319(Widget var0, int var1) {
+ if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10788
+ try {
+ int[] var2 = var0.cs1Instructions[var1]; // L: 10790
+ int var3 = 0; // L: 10791
+ int var4 = 0; // L: 10792
+ byte var5 = 0; // L: 10793
+
+ while (true) {
+ int var6 = var2[var4++]; // L: 10795
+ int var7 = 0; // L: 10796
+ byte var8 = 0; // L: 10797
+ if (var6 == 0) { // L: 10798
+ return var3;
+ }
+
+ if (var6 == 1) { // L: 10799
+ var7 = Client.currentLevels[var2[var4++]];
+ }
+
+ if (var6 == 2) { // L: 10800
+ var7 = Client.levels[var2[var4++]];
+ }
+
+ if (var6 == 3) { // L: 10801
+ var7 = Client.experience[var2[var4++]];
+ }
+
+ int var9;
+ Widget var10;
+ int var11;
+ int var12;
+ if (var6 == 4) { // L: 10802
+ var9 = var2[var4++] << 16; // L: 10803
+ var9 += var2[var4++]; // L: 10804
+ var10 = class140.getWidget(var9); // L: 10805
+ var11 = var2[var4++]; // L: 10806
+ if (var11 != -1 && (!EnumComposition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10807
+ for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10808
+ if (var11 + 1 == var10.itemIds[var12]) { // L: 10809
+ var7 += var10.itemQuantities[var12];
+ }
+ }
+ }
+ }
+
+ if (var6 == 5) { // L: 10813
+ var7 = Varps.Varps_main[var2[var4++]];
+ }
+
+ if (var6 == 6) { // L: 10814
+ var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
+ }
+
+ if (var6 == 7) { // L: 10815
+ var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
+ }
+
+ if (var6 == 8) { // L: 10816
+ var7 = class101.localPlayer.combatLevel;
+ }
+
+ if (var6 == 9) { // L: 10817
+ for (var9 = 0; var9 < 25; ++var9) { // L: 10818
+ if (Skills.Skills_enabled[var9]) { // L: 10819
+ var7 += Client.levels[var9];
+ }
+ }
+ }
+
+ if (var6 == 10) { // L: 10822
+ var9 = var2[var4++] << 16; // L: 10823
+ var9 += var2[var4++]; // L: 10824
+ var10 = class140.getWidget(var9); // L: 10825
+ var11 = var2[var4++]; // L: 10826
+ if (var11 != -1 && (!EnumComposition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10827
+ for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10828
+ if (var11 + 1 == var10.itemIds[var12]) { // L: 10829
+ var7 = 999999999; // L: 10830
+ break; // L: 10831
+ }
+ }
+ }
+ }
+
+ if (var6 == 11) { // L: 10836
+ var7 = Client.runEnergy;
+ }
+
+ if (var6 == 12) { // L: 10837
+ var7 = Client.weight;
+ }
+
+ if (var6 == 13) { // L: 10838
+ var9 = Varps.Varps_main[var2[var4++]]; // L: 10839
+ int var13 = var2[var4++]; // L: 10840
+ var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10841
+ }
+
+ if (var6 == 14) { // L: 10843
+ var9 = var2[var4++]; // L: 10844
+ var7 = class388.getVarbit(var9); // L: 10845
+ }
+
+ if (var6 == 15) { // L: 10847
+ var8 = 1;
+ }
+
+ if (var6 == 16) { // L: 10848
+ var8 = 2;
+ }
+
+ if (var6 == 17) { // L: 10849
+ var8 = 3;
+ }
+
+ if (var6 == 18) { // L: 10850
+ var7 = (class101.localPlayer.x >> 7) + class28.baseX;
+ }
+
+ if (var6 == 19) { // L: 10851
+ var7 = (class101.localPlayer.y >> 7) + WorldMapLabelSize.baseY;
+ }
+
+ if (var6 == 20) { // L: 10852
+ var7 = var2[var4++];
+ }
+
+ if (var8 == 0) { // L: 10853
+ if (var5 == 0) { // L: 10854
+ var3 += var7;
+ }
+
+ if (var5 == 1) { // L: 10855
+ var3 -= var7;
+ }
+
+ if (var5 == 2 && var7 != 0) { // L: 10856
+ var3 /= var7;
+ }
+
+ if (var5 == 3) { // L: 10857
+ var3 *= var7;
+ }
+
+ var5 = 0; // L: 10858
+ } else {
+ var5 = var8; // L: 10860
+ }
+ }
+ } catch (Exception var14) { // L: 10863
+ return -1; // L: 10864
+ }
+ } else {
+ return -2;
+ }
+ }
}
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index d94ed19f39..10ad5d542b 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -3,175 +3,300 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("by")
+@ObfuscatedName("bx")
@Implements("ChatChannel")
public class ChatChannel {
- @ObfuscatedName("c")
- @ObfuscatedGetter(
- intValue = -2004549905
- )
- static int field973;
- @ObfuscatedName("ay")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lne;"
- )
- static Bounds field976;
- @ObfuscatedName("aa")
- @ObfuscatedSignature(
- descriptor = "Lne;"
- )
- static Bounds field977;
- @ObfuscatedName("hl")
- @ObfuscatedSignature(
- descriptor = "Lmx;"
- )
- @Export("fontBold12")
- static Font fontBold12;
- @ObfuscatedName("ii")
- @ObfuscatedSignature(
- descriptor = "[Lqr;"
- )
- @Export("headIconPrayerSprites")
- static SpritePixels[] headIconPrayerSprites;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "[Lbo;"
+ descriptor = "[Lbr;"
)
@Export("messages")
Message[] messages;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -247324107
+ intValue = 941516663
)
@Export("count")
int count;
ChatChannel() {
- this.messages = new Message[100]; // L: 72
- } // L: 75
+ this.messages = new Message[100]; // L: 79
+ } // L: 82
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbo;",
- garbageValue = "54"
+ descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbr;",
+ garbageValue = "-1607330830"
)
@Export("addMessage")
Message addMessage(int var1, String var2, String var3, String var4) {
- Message var5 = this.messages[99]; // L: 78
+ Message var5 = this.messages[99]; // L: 85
- for (int var6 = this.count; var6 > 0; --var6) { // L: 79
- if (var6 != 100) { // L: 80
- this.messages[var6] = this.messages[var6 - 1]; // L: 81
+ for (int var6 = this.count; var6 > 0; --var6) { // L: 86
+ if (var6 != 100) { // L: 87
+ this.messages[var6] = this.messages[var6 - 1]; // L: 88
}
}
- if (var5 == null) { // L: 83
+ if (var5 == null) { // L: 90
var5 = new Message(var1, var2, var4, var3);
} else {
- var5.remove(); // L: 85
- var5.removeDual(); // L: 86
- var5.set(var1, var2, var4, var3); // L: 87
+ var5.remove(); // L: 92
+ var5.removeDual(); // L: 93
+ var5.set(var1, var2, var4, var3); // L: 94
}
- this.messages[0] = var5; // L: 89
- if (this.count < 100) { // L: 90
+ this.messages[0] = var5; // L: 96
+ if (this.count < 100) { // L: 97
++this.count;
}
- return var5; // L: 91
+ return var5; // L: 98
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lbr;",
+ garbageValue = "-2069744784"
+ )
+ @Export("getMessage")
+ Message getMessage(int var1) {
+ return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 102 103
}
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)Lbo;",
- garbageValue = "-345084723"
- )
- @Export("getMessage")
- Message getMessage(int var1) {
- return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 95 96
- }
-
- @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-2082093822"
+ garbageValue = "164096866"
)
@Export("size")
int size() {
- return this.count; // L: 100
+ return this.count; // L: 107
}
- @ObfuscatedName("a")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "-17"
+ descriptor = "(ILbi;ZS)I",
+ garbageValue = "1700"
)
- public static boolean method1968(int var0) {
- return var0 >= WorldMapDecorationType.field3562.id && var0 <= WorldMapDecorationType.field3577.id; // L: 47
- }
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F",
- garbageValue = "-1029057430"
- )
- static float[] method1965(JSONObject var0, String var1) throws JSONException {
- float[] var2 = new float[4]; // L: 279
-
- try {
- JSONArray var3 = var0.getJSONArray(var1); // L: 281
- var2[0] = (float)var3.optDouble(0, 0.0D); // L: 282
- var2[1] = (float)var3.optDouble(1, 0.0D); // L: 283
- var2[2] = (float)var3.optDouble(2, 1.0D); // L: 284
- var2[3] = (float)var3.optDouble(3, 1.0D); // L: 285
- } catch (JSONException var4) { // L: 287
- var2[0] = 0.0F; // L: 288
- var2[1] = 0.0F; // L: 289
- var2[2] = 1.0F; // L: 290
- var2[3] = 1.0F; // L: 291
- }
-
- return var2; // L: 293
- }
-
- @ObfuscatedName("ju")
- @ObfuscatedSignature(
- descriptor = "(Lki;III)V",
- garbageValue = "-1619686813"
- )
- @Export("alignWidgetPosition")
- static void alignWidgetPosition(Widget var0, int var1, int var2) {
- if (var0.xAlignment == 0) { // L: 10816
- var0.x = var0.rawX;
- } else if (var0.xAlignment == 1) { // L: 10817
- var0.x = var0.rawX + (var1 - var0.width) / 2;
- } else if (var0.xAlignment == 2) { // L: 10818
- var0.x = var1 - var0.width - var0.rawX;
- } else if (var0.xAlignment == 3) { // L: 10819
- var0.x = var0.rawX * var1 >> 14;
- } else if (var0.xAlignment == 4) { // L: 10820
- var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2;
+ static int method2003(int var0, Script var1, boolean var2) {
+ boolean var3 = true; // L: 868
+ Widget var4;
+ if (var0 >= 2000) { // L: 870
+ var0 -= 1000; // L: 871
+ var4 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 872
+ var3 = false; // L: 873
} else {
- var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10821
+ var4 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 875
}
- if (var0.yAlignment == 0) { // L: 10822
- var0.y = var0.rawY;
- } else if (var0.yAlignment == 1) { // L: 10823
- var0.y = (var2 - var0.height) / 2 + var0.rawY;
- } else if (var0.yAlignment == 2) { // L: 10824
- var0.y = var2 - var0.height - var0.rawY;
- } else if (var0.yAlignment == 3) {
- var0.y = var2 * var0.rawY >> 14; // L: 10825
- } else if (var0.yAlignment == 4) { // L: 10826
- var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14);
+ int var11;
+ if (var0 == ScriptOpcodes.CC_SETOP) { // L: 876
+ var11 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] - 1; // L: 877
+ if (var11 >= 0 && var11 <= 9) { // L: 878
+ var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 882
+ return 1; // L: 883
+ } else {
+ --Interpreter.Interpreter_stringStackSize; // L: 879
+ return 1; // L: 880
+ }
} else {
- var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10827
+ int var6;
+ if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 885
+ class446.Interpreter_intStackSize -= 2; // L: 886
+ var11 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 887
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 888
+ var4.parent = ScriptFrame.getWidgetChild(var11, var6); // L: 889
+ return 1; // L: 890
+ } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 892
+ var4.isScrollBar = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 893
+ return 1; // L: 894
+ } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 896
+ var4.dragZoneSize = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 897
+ return 1; // L: 898
+ } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 900
+ var4.dragThreshold = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 901
+ return 1; // L: 902
+ } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 904
+ var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 905
+ return 1; // L: 906
+ } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 908
+ var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 909
+ return 1; // L: 910
+ } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 912
+ var4.actions = null; // L: 913
+ return 1; // L: 914
+ } else if (var0 == 1308) { // L: 916
+ var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 917
+ return 1; // L: 918
+ } else if (var0 == 1309) { // L: 920
+ --class446.Interpreter_intStackSize; // L: 921
+ return 1; // L: 922
+ } else {
+ int var7;
+ byte[] var8;
+ if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 924
+ byte var5;
+ if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 954
+ class446.Interpreter_intStackSize -= 2; // L: 955
+ var5 = 10; // L: 956
+ var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]}; // L: 957
+ byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]}; // L: 958
+ class340.Widget_setKey(var4, var5, var8, var9); // L: 959
+ return 1; // L: 960
+ } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 962
+ class446.Interpreter_intStackSize -= 3; // L: 963
+ var11 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] - 1; // L: 964
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 965
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 966
+ if (var11 >= 0 && var11 <= 9) { // L: 967
+ class346.Widget_setKeyRate(var4, var11, var6, var7); // L: 970
+ return 1; // L: 971
+ } else {
+ throw new RuntimeException(); // L: 968
+ }
+ } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 973
+ var5 = 10; // L: 974
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 975
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 976
+ class346.Widget_setKeyRate(var4, var5, var6, var7); // L: 977
+ return 1; // L: 978
+ } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 980
+ --class446.Interpreter_intStackSize; // L: 981
+ var11 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] - 1; // L: 982
+ if (var11 >= 0 && var11 <= 9) { // L: 983
+ class145.Widget_setKeyIgnoreHeld(var4, var11); // L: 986
+ return 1; // L: 987
+ } else {
+ throw new RuntimeException(); // L: 984
+ }
+ } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 989
+ var5 = 10; // L: 990
+ class145.Widget_setKeyIgnoreHeld(var4, var5); // L: 991
+ return 1; // L: 992
+ } else {
+ return 2; // L: 994
+ }
+ } else {
+ byte[] var10 = null; // L: 925
+ var8 = null; // L: 926
+ if (var3) { // L: 927
+ class446.Interpreter_intStackSize -= 10; // L: 928
+
+ for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class446.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 930 931
+ }
+
+ if (var7 > 0) { // L: 933
+ var10 = new byte[var7 / 2]; // L: 934
+ var8 = new byte[var7 / 2]; // L: 935
+
+ for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 936
+ var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class446.Interpreter_intStackSize]; // L: 937
+ var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class446.Interpreter_intStackSize + 1]; // L: 938
+ }
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 943
+ var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]}; // L: 944
+ var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]}; // L: 945
+ }
+
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] - 1; // L: 947
+ if (var7 >= 0 && var7 <= 9) { // L: 948
+ class340.Widget_setKey(var4, var7, var10, var8); // L: 951
+ return 1; // L: 952
+ } else {
+ throw new RuntimeException(); // L: 949
+ }
+ }
+ }
+ }
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "([BI)V",
+ garbageValue = "1956135788"
+ )
+ @Export("SpriteBuffer_decode")
+ static void SpriteBuffer_decode(byte[] var0) {
+ Buffer var1 = new Buffer(var0); // L: 190
+ var1.offset = var0.length - 2; // L: 191
+ class456.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 192
+ class426.SpriteBuffer_xOffsets = new int[class456.SpriteBuffer_spriteCount]; // L: 193
+ class142.SpriteBuffer_yOffsets = new int[class456.SpriteBuffer_spriteCount]; // L: 194
+ class359.SpriteBuffer_spriteWidths = new int[class456.SpriteBuffer_spriteCount]; // L: 195
+ class456.SpriteBuffer_spriteHeights = new int[class456.SpriteBuffer_spriteCount]; // L: 196
+ class421.SpriteBuffer_pixels = new byte[class456.SpriteBuffer_spriteCount][]; // L: 197
+ var1.offset = var0.length - 7 - class456.SpriteBuffer_spriteCount * 8; // L: 198
+ ModelData0.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 199
+ class456.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 200
+ int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 201
+
+ int var3;
+ for (var3 = 0; var3 < class456.SpriteBuffer_spriteCount; ++var3) { // L: 202
+ class426.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
}
- } // L: 10828
+ for (var3 = 0; var3 < class456.SpriteBuffer_spriteCount; ++var3) { // L: 203
+ class142.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+ }
+
+ for (var3 = 0; var3 < class456.SpriteBuffer_spriteCount; ++var3) { // L: 204
+ class359.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
+ }
+
+ for (var3 = 0; var3 < class456.SpriteBuffer_spriteCount; ++var3) { // L: 205
+ class456.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
+ }
+
+ var1.offset = var0.length - 7 - class456.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 206
+ class13.SpriteBuffer_spritePalette = new int[var2]; // L: 207
+
+ for (var3 = 1; var3 < var2; ++var3) { // L: 208
+ class13.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 209
+ if (class13.SpriteBuffer_spritePalette[var3] == 0) { // L: 210
+ class13.SpriteBuffer_spritePalette[var3] = 1;
+ }
+ }
+
+ var1.offset = 0; // L: 212
+
+ for (var3 = 0; var3 < class456.SpriteBuffer_spriteCount; ++var3) { // L: 213
+ int var4 = class359.SpriteBuffer_spriteWidths[var3]; // L: 214
+ int var5 = class456.SpriteBuffer_spriteHeights[var3]; // L: 215
+ int var6 = var4 * var5; // L: 216
+ byte[] var7 = new byte[var6]; // L: 217
+ class421.SpriteBuffer_pixels[var3] = var7; // L: 218
+ int var8 = var1.readUnsignedByte(); // L: 219
+ int var9;
+ if (var8 == 0) { // L: 220
+ for (var9 = 0; var9 < var6; ++var9) { // L: 221
+ var7[var9] = var1.readByte();
+ }
+ } else if (var8 == 1) { // L: 223
+ for (var9 = 0; var9 < var4; ++var9) { // L: 224
+ for (int var10 = 0; var10 < var5; ++var10) { // L: 225
+ var7[var9 + var4 * var10] = var1.readByte(); // L: 226
+ }
+ }
+ }
+ }
+
+ } // L: 231
+
+ @ObfuscatedName("kf")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I)V",
+ garbageValue = "-720762696"
+ )
+ @Export("invalidateWidget")
+ static void invalidateWidget(Widget var0) {
+ if (var0 != null && var0.cycle == Client.field702) { // L: 11733
+ Client.field703[var0.rootIndex] = true; // L: 11734
+ }
+
+ } // L: 11736
}
diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java
index 9950d5c07d..e62a84ab1a 100644
--- a/runescape-client/src/main/java/ClanChannel.java
+++ b/runescape-client/src/main/java/ClanChannel.java
@@ -7,49 +7,54 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("et")
+@ObfuscatedName("ex")
@Implements("ClanChannel")
public class ClanChannel extends Node {
- @ObfuscatedName("o")
- boolean field1712;
+ @ObfuscatedName("tj")
+ @ObfuscatedGetter(
+ intValue = 91794545
+ )
+ static int field1690;
+ @ObfuscatedName("c")
+ boolean field1689;
+ @ObfuscatedName("v")
+ boolean field1701;
@ObfuscatedName("q")
- boolean field1705;
- @ObfuscatedName("l")
@Export("members")
public List members;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("sortedMembers")
int[] sortedMembers;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- longValue = 1835319440432000381L
+ longValue = 1434435831047347565L
)
- long field1709;
- @ObfuscatedName("m")
+ long field1693;
+ @ObfuscatedName("e")
@Export("name")
public String name;
- @ObfuscatedName("p")
- public byte field1711;
- @ObfuscatedName("s")
- public byte field1706;
+ @ObfuscatedName("g")
+ public byte field1695;
+ @ObfuscatedName("w")
+ public byte field1696;
static {
new BitSet(65536); // L: 22
} // L: 23
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
public ClanChannel(Buffer var1) {
- this.field1705 = true; // L: 13
+ this.field1701 = true; // L: 13
this.name = null; // L: 17
- this.method3010(var1); // L: 26
+ this.method3121(var1); // L: 26
} // L: 27
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)[I",
- garbageValue = "57"
+ garbageValue = "-17"
)
@Export("getSortedMembers")
public int[] getSortedMembers() {
@@ -58,19 +63,19 @@ public class ClanChannel extends Node {
this.sortedMembers = new int[this.members.size()]; // L: 32
for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35
- var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8148(); // L: 34
+ var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8320(); // L: 34
}
- class113.method2625(var1, this.sortedMembers); // L: 37
+ class353.method6507(var1, this.sortedMembers); // L: 37
}
return this.sortedMembers; // L: 39
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lem;I)V",
- garbageValue = "42890757"
+ descriptor = "(Lew;I)V",
+ garbageValue = "-619896679"
)
@Export("addMember")
void addMember(ClanChannelMember var1) {
@@ -78,10 +83,10 @@ public class ClanChannel extends Node {
this.sortedMembers = null; // L: 44
} // L: 45
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "2089960192"
+ garbageValue = "911390350"
)
@Export("removeMember")
void removeMember(int var1) {
@@ -89,22 +94,22 @@ public class ClanChannel extends Node {
this.sortedMembers = null; // L: 49
} // L: 50
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "41"
+ descriptor = "(I)I",
+ garbageValue = "1458908732"
)
- public int method3005() {
+ public int method3113() {
return this.members.size(); // L: 53
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "1345436984"
+ descriptor = "(Ljava/lang/String;B)I",
+ garbageValue = "0"
)
- public int method3023(String var1) {
- if (!this.field1705) { // L: 57
+ public int method3102(String var1) {
+ if (!this.field1701) { // L: 57
throw new RuntimeException("Displaynames not available");
} else {
for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 58
@@ -117,19 +122,19 @@ public class ClanChannel extends Node {
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-423085826"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "1615348983"
)
- void method3010(Buffer var1) {
+ void method3121(Buffer var1) {
int var2 = var1.readUnsignedByte(); // L: 65
if ((var2 & 1) != 0) { // L: 66
- this.field1712 = true;
+ this.field1689 = true;
}
if ((var2 & 2) != 0) { // L: 67
- this.field1705 = true;
+ this.field1701 = true;
}
int var3 = 2; // L: 68
@@ -138,22 +143,22 @@ public class ClanChannel extends Node {
}
super.key = var1.readLong(); // L: 70
- this.field1709 = var1.readLong(); // L: 71
+ this.field1693 = var1.readLong(); // L: 71
this.name = var1.readStringCp1252NullTerminated(); // L: 72
var1.readBoolean(); // L: 73
- this.field1706 = var1.readByte(); // L: 74
- this.field1711 = var1.readByte(); // L: 75
+ this.field1696 = var1.readByte(); // L: 74
+ this.field1695 = var1.readByte(); // L: 75
int var4 = var1.readUnsignedShort(); // L: 76
if (var4 > 0) { // L: 77
this.members = new ArrayList(var4); // L: 78
for (int var5 = 0; var5 < var4; ++var5) { // L: 79
ClanChannelMember var6 = new ClanChannelMember(); // L: 80
- if (this.field1712) { // L: 81
+ if (this.field1689) { // L: 81
var1.readLong(); // L: 82
}
- if (this.field1705) { // L: 84
+ if (this.field1701) { // L: 84
var6.username = new Username(var1.readStringCp1252NullTerminated());
}
@@ -168,4 +173,51 @@ public class ClanChannel extends Node {
}
} // L: 94
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Llc;IIIBZB)V",
+ garbageValue = "126"
+ )
+ @Export("requestNetFile")
+ static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
+ long var6 = (long)((var1 << 16) + var2); // L: 101
+ NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 102
+ if (var8 == null) { // L: 103
+ var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 104
+ if (var8 == null) { // L: 105
+ var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 106
+ if (var8 != null) { // L: 107
+ if (var5) { // L: 108
+ var8.removeDual(); // L: 109
+ NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 110
+ --NetCache.NetCache_pendingWritesCount; // L: 111
+ ++NetCache.NetCache_pendingPriorityWritesCount; // L: 112
+ }
+
+ } else {
+ if (!var5) { // L: 116
+ var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 117
+ if (var8 != null) { // L: 118
+ return;
+ }
+ }
+
+ var8 = new NetFileRequest(); // L: 120
+ var8.archive = var0; // L: 121
+ var8.crc = var3; // L: 122
+ var8.padding = var4; // L: 123
+ if (var5) { // L: 124
+ NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 125
+ ++NetCache.NetCache_pendingPriorityWritesCount; // L: 126
+ } else {
+ NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 129
+ NetCache.NetCache_pendingWrites.put(var8, var6); // L: 130
+ ++NetCache.NetCache_pendingWritesCount; // L: 131
+ }
+
+ }
+ }
+ }
+ } // L: 114 133
}
diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java
index 69722c6dd2..5e7a44ef4d 100644
--- a/runescape-client/src/main/java/ClanChannelMember.java
+++ b/runescape-client/src/main/java/ClanChannelMember.java
@@ -4,27 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("em")
+@ObfuscatedName("ew")
@Implements("ClanChannelMember")
public class ClanChannelMember {
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("musicTrackArchive")
- public static AbstractArchive musicTrackArchive;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("rank")
public byte rank;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -594954787
+ intValue = 44459875
)
@Export("world")
public int world;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lqv;"
+ descriptor = "Lqa;"
)
@Export("username")
public Username username;
@@ -32,22 +26,52 @@ public class ClanChannelMember {
ClanChannelMember() {
} // L: 10
- @ObfuscatedName("m")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "98"
+ descriptor = "(Llh;III)[Lqu;",
+ garbageValue = "658098688"
)
- public static int method2819(int var0) {
- return ScriptEvent.method2085(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64
+ public static IndexedSprite[] method2867(AbstractArchive var0, int var1, int var2) {
+ if (!Ignored.method6774(var0, var1, var2)) { // L: 23
+ return null;
+ } else {
+ IndexedSprite[] var4 = new IndexedSprite[class456.SpriteBuffer_spriteCount]; // L: 26
+
+ for (int var5 = 0; var5 < class456.SpriteBuffer_spriteCount; ++var5) { // L: 27
+ IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28
+ var6.width = ModelData0.SpriteBuffer_spriteWidth; // L: 29
+ var6.height = class456.SpriteBuffer_spriteHeight; // L: 30
+ var6.xOffset = class426.SpriteBuffer_xOffsets[var5]; // L: 31
+ var6.yOffset = class142.SpriteBuffer_yOffsets[var5]; // L: 32
+ var6.subWidth = class359.SpriteBuffer_spriteWidths[var5]; // L: 33
+ var6.subHeight = class456.SpriteBuffer_spriteHeights[var5]; // L: 34
+ var6.palette = class13.SpriteBuffer_spritePalette; // L: 35
+ var6.pixels = class421.SpriteBuffer_pixels[var5]; // L: 36
+ }
+
+ class426.SpriteBuffer_xOffsets = null; // L: 39
+ class142.SpriteBuffer_yOffsets = null; // L: 40
+ class359.SpriteBuffer_spriteWidths = null; // L: 41
+ class456.SpriteBuffer_spriteHeights = null; // L: 42
+ class13.SpriteBuffer_spritePalette = null; // L: 43
+ class421.SpriteBuffer_pixels = null;
+ return var4;
+ }
}
- @ObfuscatedName("gc")
+ @ObfuscatedName("v")
+ static boolean method2865(long var0) {
+ return class7.method51(var0) == 2; // L: 48
+ }
+
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-113"
+ descriptor = "(II)I",
+ garbageValue = "88442168"
)
- @Export("getWindowedMode")
- static int getWindowedMode() {
- return Client.isResizable ? 2 : 1; // L: 4341
+ @Export("Messages_getHistorySize")
+ static int Messages_getHistorySize(int var0) {
+ ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44
+ return var1 == null ? 0 : var1.size(); // L: 45 46
}
}
diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java
index 26647c883e..ae6dcd573a 100644
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nm")
+@ObfuscatedName("nj")
@Implements("ClanMate")
public class ClanMate extends Buddy {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("friend")
TriBool friend;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("ignored")
TriBool ignored;
@@ -24,20 +24,20 @@ public class ClanMate extends Buddy {
this.ignored = TriBool.TriBool_unknown; // L: 7
} // L: 9
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-990800587"
+ garbageValue = "-2088884239"
)
@Export("clearIsFriend")
void clearIsFriend() {
this.friend = TriBool.TriBool_unknown; // L: 12
} // L: 13
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-107862662"
+ garbageValue = "-138013262"
)
@Export("isFriend")
public final boolean isFriend() {
@@ -48,30 +48,30 @@ public class ClanMate extends Buddy {
return this.friend == TriBool.TriBool_true; // L: 19
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1082249344"
+ descriptor = "(B)V",
+ garbageValue = "-43"
)
@Export("fillIsFriend")
void fillIsFriend() {
- this.friend = BufferedSource.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
+ this.friend = Player.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
} // L: 24
- @ObfuscatedName("v")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "25"
+ descriptor = "(I)V",
+ garbageValue = "-1504039009"
)
@Export("clearIsIgnored")
void clearIsIgnored() {
this.ignored = TriBool.TriBool_unknown; // L: 27
- } // L: 28
+ }
- @ObfuscatedName("y")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "2107172617"
+ descriptor = "(B)Z",
+ garbageValue = "-61"
)
@Export("isIgnored")
public final boolean isIgnored() {
@@ -82,13 +82,22 @@ public class ClanMate extends Buddy {
return this.ignored == TriBool.TriBool_true; // L: 34
}
- @ObfuscatedName("c")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-45"
+ descriptor = "(I)V",
+ garbageValue = "2033430026"
)
@Export("fillIsIgnored")
void fillIsIgnored() {
- this.ignored = BufferedSource.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
+ this.ignored = Player.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
} // L: 39
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IB)I",
+ garbageValue = "34"
+ )
+ public static int method6650(int var0) {
+ return class401.field4442[var0 & 16383]; // L: 28
+ }
}
diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java
index 5cbe6fae4f..5d76ec71a1 100644
--- a/runescape-client/src/main/java/ClanSettings.java
+++ b/runescape-client/src/main/java/ClanSettings.java
@@ -4,116 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ek")
+@ObfuscatedName("en")
@Implements("ClanSettings")
public class ClanSettings {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("useHashes")
boolean useHashes;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("useNames")
boolean useNames;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- longValue = -887635540627119073L
+ longValue = -6342819695359626435L
)
- long field1635;
- @ObfuscatedName("a")
+ long field1627;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 2108379547
+ intValue = 1887905615
)
- int field1636;
- @ObfuscatedName("m")
+ int field1628;
+ @ObfuscatedName("e")
@Export("name")
public String name;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -2134617101
+ intValue = -481546883
)
- int field1638;
- @ObfuscatedName("s")
+ int field1630;
+ @ObfuscatedName("w")
@Export("allowGuests")
public boolean allowGuests;
- @ObfuscatedName("r")
- public byte field1633;
- @ObfuscatedName("v")
- public byte field1641;
@ObfuscatedName("y")
- public byte field1642;
- @ObfuscatedName("c")
- public byte field1648;
- @ObfuscatedName("w")
+ public byte field1637;
+ @ObfuscatedName("i")
+ public byte field1633;
+ @ObfuscatedName("s")
+ public byte field1634;
+ @ObfuscatedName("t")
+ public byte field1645;
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = -224195769
+ intValue = 906149583
)
@Export("memberCount")
public int memberCount;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("memberHashes")
long[] memberHashes;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("memberRanks")
public byte[] memberRanks;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("sortedMembers")
int[] sortedMembers;
- @ObfuscatedName("x")
- int[] field1651;
- @ObfuscatedName("n")
- public int[] field1649;
- @ObfuscatedName("e")
- public boolean[] field1650;
@ObfuscatedName("h")
+ int[] field1640;
+ @ObfuscatedName("x")
+ public int[] field1649;
+ @ObfuscatedName("l")
+ public boolean[] field1642;
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = -2063830339
+ intValue = 819746427
)
@Export("currentOwner")
public int currentOwner;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = 2079411577
+ intValue = 14234283
)
- public int field1652;
- @ObfuscatedName("d")
+ public int field1644;
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 102858821
+ intValue = 1427901421
)
@Export("bannedMemberCount")
public int bannedMemberCount;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@Export("bannedMemberHashes")
long[] bannedMemberHashes;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("memberNames")
public String[] memberNames;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@Export("bannedMemberNames")
public String[] bannedMemberNames;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("parameters")
IterableNodeHashTable parameters;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
public ClanSettings(Buffer var1) {
- this.field1636 = 0; // L: 14
+ this.field1628 = 0; // L: 14
this.name = null; // L: 15
- this.field1638 = 0; // L: 16
+ this.field1630 = 0; // L: 16
this.currentOwner = -1; // L: 29
- this.field1652 = -1; // L: 30
- this.method2901(var1); // L: 43
+ this.field1644 = -1; // L: 30
+ this.method2969(var1); // L: 43
} // L: 44
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "1"
+ descriptor = "(II)V",
+ garbageValue = "1635442179"
)
- void method2882(int var1) {
+ void method2950(int var1) {
if (this.useHashes) { // L: 47
if (this.memberHashes != null) { // L: 48
System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount);
@@ -136,10 +136,10 @@ public class ClanSettings {
this.memberRanks = new byte[var1]; // L: 56
}
- if (this.field1651 != null) { // L: 57
- System.arraycopy(this.field1651, 0, this.field1651 = new int[var1], 0, this.memberCount);
+ if (this.field1640 != null) { // L: 57
+ System.arraycopy(this.field1640, 0, this.field1640 = new int[var1], 0, this.memberCount);
} else {
- this.field1651 = new int[var1]; // L: 58
+ this.field1640 = new int[var1]; // L: 58
}
if (this.field1649 != null) { // L: 59
@@ -148,20 +148,20 @@ public class ClanSettings {
this.field1649 = new int[var1]; // L: 60
}
- if (this.field1650 != null) { // L: 61
- System.arraycopy(this.field1650, 0, this.field1650 = new boolean[var1], 0, this.memberCount);
+ if (this.field1642 != null) { // L: 61
+ System.arraycopy(this.field1642, 0, this.field1642 = new boolean[var1], 0, this.memberCount);
} else {
- this.field1650 = new boolean[var1]; // L: 62
+ this.field1642 = new boolean[var1]; // L: 62
}
} // L: 63
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "1820150927"
+ garbageValue = "-1202056039"
)
- void method2883(int var1) {
+ void method2974(int var1) {
if (this.useHashes) { // L: 66
if (this.bannedMemberHashes != null) {
System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); // L: 67
@@ -171,148 +171,148 @@ public class ClanSettings {
}
if (this.useNames) { // L: 70
- if (this.bannedMemberNames != null) { // L: 71
+ if (this.bannedMemberNames != null) {
System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount);
} else {
- this.bannedMemberNames = new String[var1]; // L: 72
+ this.bannedMemberNames = new String[var1];
}
}
- } // L: 74
+ }
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "-2117273951"
+ garbageValue = "132002265"
)
- public int method2884(String var1) {
- if (var1 != null && var1.length() != 0) { // L: 77
- for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78
- if (this.memberNames[var2].equals(var1)) { // L: 79
+ public int method2991(String var1) {
+ if (var1 != null && var1.length() != 0) {
+ for (int var2 = 0; var2 < this.memberCount; ++var2) {
+ if (this.memberNames[var2].equals(var1)) {
return var2;
}
}
- return -1; // L: 81
+ return -1;
} else {
return -1;
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IIII)I",
- garbageValue = "-126239409"
+ descriptor = "(IIIS)I",
+ garbageValue = "29292"
)
- public int method2885(int var1, int var2, int var3) {
- int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85
- return (this.field1651[var1] & var4) >>> var2; // L: 86
+ public int method2972(int var1, int var2, int var3) {
+ int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1;
+ return (this.field1640[var1] & var4) >>> var2; // L: 86
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/Integer;",
- garbageValue = "-1977188561"
+ descriptor = "(IB)Ljava/lang/Integer;",
+ garbageValue = "1"
)
@Export("getTitleGroupValue")
public Integer getTitleGroupValue(int var1) {
- if (this.parameters == null) { // L: 90
+ if (this.parameters == null) {
return null;
} else {
- Node var2 = this.parameters.get((long)var1); // L: 91
- return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93
+ Node var2 = this.parameters.get((long)var1);
+ return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null;
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)[I",
- garbageValue = "-861135746"
+ descriptor = "(S)[I",
+ garbageValue = "267"
)
@Export("getSortedMembers")
public int[] getSortedMembers() {
- if (this.sortedMembers == null) { // L: 97
+ if (this.sortedMembers == null) {
String[] var1 = new String[this.memberCount]; // L: 98
this.sortedMembers = new int[this.memberCount]; // L: 99
- for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { // L: 100 103
+ for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) {
var1[var2] = this.memberNames[var2]; // L: 101
if (var1[var2] != null) { // L: 102
var1[var2] = var1[var2].toLowerCase();
}
}
- class113.method2625(var1, this.sortedMembers); // L: 105
+ class353.method6507(var1, this.sortedMembers);
}
- return this.sortedMembers; // L: 107
+ return this.sortedMembers;
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(JLjava/lang/String;II)V",
- garbageValue = "193395684"
+ descriptor = "(JLjava/lang/String;IB)V",
+ garbageValue = "-60"
)
- void method2888(long var1, String var3, int var4) {
- if (var3 != null && var3.length() == 0) { // L: 111
+ void method2956(long var1, String var3, int var4) {
+ if (var3 != null && var3.length() == 0) {
var3 = null;
}
- if (var1 > 0L != this.useHashes) { // L: 112
+ if (this.useHashes != var1 > 0L) {
throw new RuntimeException("");
- } else if (this.useNames != (var3 != null)) { // L: 113
+ } else if (var3 != null != this.useNames) {
throw new RuntimeException("");
} else {
if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 114
- this.method2882(this.memberCount + 5);
+ this.method2950(this.memberCount + 5);
}
if (this.memberHashes != null) { // L: 115
this.memberHashes[this.memberCount] = var1;
}
- if (this.memberNames != null) { // L: 116
+ if (this.memberNames != null) {
this.memberNames[this.memberCount] = var3;
}
- if (this.currentOwner == -1) { // L: 117
+ if (this.currentOwner == -1) {
this.currentOwner = this.memberCount; // L: 118
this.memberRanks[this.memberCount] = 126; // L: 119
} else {
- this.memberRanks[this.memberCount] = 0; // L: 122
+ this.memberRanks[this.memberCount] = 0;
}
- this.field1651[this.memberCount] = 0; // L: 124
- this.field1649[this.memberCount] = var4; // L: 125
- this.field1650[this.memberCount] = false; // L: 126
+ this.field1640[this.memberCount] = 0;
+ this.field1649[this.memberCount] = var4;
+ this.field1642[this.memberCount] = false; // L: 126
++this.memberCount; // L: 127
- this.sortedMembers = null; // L: 128
+ this.sortedMembers = null;
}
- } // L: 129
+ }
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "41"
+ descriptor = "(II)V",
+ garbageValue = "-721194378"
)
- void method2926(int var1) {
- if (var1 >= 0 && var1 < this.memberCount) { // L: 132
+ void method2957(int var1) {
+ if (var1 >= 0 && var1 < this.memberCount) {
--this.memberCount; // L: 133
this.sortedMembers = null; // L: 134
- if (this.memberCount == 0) { // L: 135
- this.memberHashes = null; // L: 136
- this.memberNames = null; // L: 137
+ if (this.memberCount == 0) {
+ this.memberHashes = null;
+ this.memberNames = null;
this.memberRanks = null; // L: 138
- this.field1651 = null; // L: 139
- this.field1649 = null; // L: 140
- this.field1650 = null; // L: 141
- this.currentOwner = -1; // L: 142
- this.field1652 = -1; // L: 143
+ this.field1640 = null;
+ this.field1649 = null;
+ this.field1642 = null;
+ this.currentOwner = -1;
+ this.field1644 = -1;
} else {
System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 146
- System.arraycopy(this.field1651, var1 + 1, this.field1651, var1, this.memberCount - var1); // L: 147
- System.arraycopy(this.field1649, var1 + 1, this.field1649, var1, this.memberCount - var1); // L: 148
- System.arraycopy(this.field1650, var1 + 1, this.field1650, var1, this.memberCount - var1); // L: 149
+ System.arraycopy(this.field1640, var1 + 1, this.field1640, var1, this.memberCount - var1); // L: 147
+ System.arraycopy(this.field1649, var1 + 1, this.field1649, var1, this.memberCount - var1);
+ System.arraycopy(this.field1642, var1 + 1, this.field1642, var1, this.memberCount - var1);
if (this.memberHashes != null) { // L: 150
System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1);
}
@@ -321,377 +321,377 @@ public class ClanSettings {
System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1);
}
- this.updateOwner(); // L: 152
+ this.updateOwner();
}
} else {
throw new RuntimeException("");
}
- } // L: 154
+ }
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1770256781"
+ descriptor = "(B)V",
+ garbageValue = "-87"
)
@Export("updateOwner")
void updateOwner() {
- if (this.memberCount == 0) { // L: 157
+ if (this.memberCount == 0) {
this.currentOwner = -1; // L: 158
- this.field1652 = -1; // L: 159
+ this.field1644 = -1; // L: 159
} else {
this.currentOwner = -1; // L: 162
- this.field1652 = -1; // L: 163
- int var1 = 0; // L: 164
+ this.field1644 = -1; // L: 163
+ int var1 = 0;
byte var2 = this.memberRanks[0]; // L: 165
for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 166
- if (this.memberRanks[var3] > var2) { // L: 167
- if (var2 == 125) { // L: 168
- this.field1652 = var1;
+ if (this.memberRanks[var3] > var2) {
+ if (var2 == 125) {
+ this.field1644 = var1;
}
- var1 = var3; // L: 169
+ var1 = var3;
var2 = this.memberRanks[var3]; // L: 170
- } else if (this.field1652 == -1 && this.memberRanks[var3] == 125) { // L: 172
- this.field1652 = var3; // L: 173
+ } else if (this.field1644 == -1 && this.memberRanks[var3] == 125) {
+ this.field1644 = var3;
}
}
- this.currentOwner = var1; // L: 176
- if (this.currentOwner != -1) { // L: 177
+ this.currentOwner = var1;
+ if (this.currentOwner != -1) {
this.memberRanks[this.currentOwner] = 126;
}
}
- } // L: 160 178
+ } // L: 178
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(JLjava/lang/String;B)V",
- garbageValue = "1"
+ descriptor = "(JLjava/lang/String;I)V",
+ garbageValue = "1888589183"
)
- void method2891(long var1, String var3) {
- if (var3 != null && var3.length() == 0) { // L: 181
+ void method2959(long var1, String var3) {
+ if (var3 != null && var3.length() == 0) {
var3 = null;
}
- if (var1 > 0L != this.useHashes) { // L: 182
+ if (this.useHashes != var1 > 0L) { // L: 182
throw new RuntimeException("");
- } else if (var3 != null != this.useNames) { // L: 183
+ } else if (this.useNames != (var3 != null)) {
throw new RuntimeException("");
} else {
- if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 184
- this.method2883(this.bannedMemberCount + 5);
+ if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) {
+ this.method2974(this.bannedMemberCount + 5);
}
- if (this.bannedMemberHashes != null) { // L: 185
+ if (this.bannedMemberHashes != null) {
this.bannedMemberHashes[this.bannedMemberCount] = var1;
}
- if (this.bannedMemberNames != null) { // L: 186
+ if (this.bannedMemberNames != null) {
this.bannedMemberNames[this.bannedMemberCount] = var3;
}
- ++this.bannedMemberCount; // L: 187
+ ++this.bannedMemberCount;
}
- } // L: 188
+ }
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-40246503"
+ descriptor = "(IB)V",
+ garbageValue = "0"
)
- void method2892(int var1) {
+ void method3019(int var1) {
--this.bannedMemberCount; // L: 191
- if (this.bannedMemberCount == 0) { // L: 192
- this.bannedMemberHashes = null; // L: 193
+ if (this.bannedMemberCount == 0) {
+ this.bannedMemberHashes = null;
this.bannedMemberNames = null; // L: 194
} else {
- if (this.bannedMemberHashes != null) { // L: 197
+ if (this.bannedMemberHashes != null) {
System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1);
}
if (this.bannedMemberNames != null) {
- System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 198
+ System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1);
}
}
- } // L: 200
+ }
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(IBI)I",
- garbageValue = "46712984"
+ garbageValue = "-585150872"
)
- int method2930(int var1, byte var2) {
- if (var2 != 126 && var2 != 127) { // L: 203
- if (this.currentOwner == var1 && (this.field1652 == -1 || this.memberRanks[this.field1652] < 125)) { // L: 204
+ int method2961(int var1, byte var2) {
+ if (var2 != 126 && var2 != 127) {
+ if (this.currentOwner == var1 && (this.field1644 == -1 || this.memberRanks[this.field1644] < 125)) {
return -1;
} else if (this.memberRanks[var1] == var2) {
- return -1; // L: 205
+ return -1;
} else {
- this.memberRanks[var1] = var2; // L: 206
- this.updateOwner(); // L: 207
- return var1; // L: 208
+ this.memberRanks[var1] = var2;
+ this.updateOwner();
+ return var1;
}
} else {
return -1;
}
}
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "-2047746975"
+ descriptor = "(IB)Z",
+ garbageValue = "1"
)
- boolean method2894(int var1) {
+ boolean method3016(int var1) {
if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 212
- this.memberRanks[this.currentOwner] = 125; // L: 213
- this.field1652 = this.currentOwner; // L: 214
- this.memberRanks[var1] = 126; // L: 215
- this.currentOwner = var1; // L: 216
- return true; // L: 217
+ this.memberRanks[this.currentOwner] = 125;
+ this.field1644 = this.currentOwner;
+ this.memberRanks[var1] = 126;
+ this.currentOwner = var1;
+ return true;
} else {
return false;
}
}
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
descriptor = "(IZI)I",
- garbageValue = "-1302763835"
+ garbageValue = "-1677088701"
)
- int method2895(int var1, boolean var2) {
- if (this.field1650[var1] == var2) { // L: 221
+ int method2963(int var1, boolean var2) {
+ if (this.field1642[var1] == var2) {
return -1;
} else {
- this.field1650[var1] = var2; // L: 222
- return var1; // L: 223
+ this.field1642[var1] = var2;
+ return var1;
}
}
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(IIIII)I",
- garbageValue = "1423184573"
+ descriptor = "(IIIIB)I",
+ garbageValue = "-37"
)
- int method2896(int var1, int var2, int var3, int var4) {
- int var5 = (1 << var3) - 1; // L: 227
- int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 228
- int var7 = var6 ^ var5; // L: 229
- var2 <<= var3; // L: 230
- var2 &= var7; // L: 231
- int var8 = this.field1651[var1]; // L: 232
+ int method2964(int var1, int var2, int var3, int var4) {
+ int var5 = (1 << var3) - 1;
+ int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1;
+ int var7 = var6 ^ var5;
+ var2 <<= var3;
+ var2 &= var7;
+ int var8 = this.field1640[var1];
if ((var8 & var7) == var2) {
- return -1; // L: 233
+ return -1;
} else {
- var8 &= ~var7; // L: 234
- this.field1651[var1] = var8 | var2; // L: 235
- return var1; // L: 236
+ var8 &= ~var7;
+ this.field1640[var1] = var8 | var2;
+ return var1;
}
}
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(III)Z",
- garbageValue = "1693351143"
+ descriptor = "(IIB)Z",
+ garbageValue = "62"
)
- boolean method2909(int var1, int var2) {
- if (this.parameters != null) { // L: 240
- Node var3 = this.parameters.get((long)var1); // L: 241
- if (var3 != null) { // L: 242
- if (var3 instanceof IntegerNode) { // L: 243
- IntegerNode var4 = (IntegerNode)var3; // L: 244
- if (var2 == var4.integer) { // L: 245
+ boolean method2965(int var1, int var2) {
+ if (this.parameters != null) {
+ Node var3 = this.parameters.get((long)var1);
+ if (var3 != null) {
+ if (var3 instanceof IntegerNode) {
+ IntegerNode var4 = (IntegerNode)var3;
+ if (var2 == var4.integer) {
return false;
}
- var4.integer = var2; // L: 246
- return true; // L: 247
+ var4.integer = var2;
+ return true;
}
- var3.remove(); // L: 249
+ var3.remove();
}
} else {
- this.parameters = new IterableNodeHashTable(4); // L: 252
+ this.parameters = new IterableNodeHashTable(4);
}
- this.parameters.put(new IntegerNode(var2), (long)var1); // L: 253
- return true; // L: 254
+ this.parameters.put(new IntegerNode(var2), (long)var1);
+ return true;
}
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "(IIIIB)Z",
- garbageValue = "55"
+ garbageValue = "71"
)
- boolean method2898(int var1, int var2, int var3, int var4) {
- int var5 = (1 << var3) - 1; // L: 258
- int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 259
- int var7 = var6 ^ var5; // L: 260
- var2 <<= var3; // L: 261
- var2 &= var7; // L: 262
- if (this.parameters != null) { // L: 263
- Node var8 = this.parameters.get((long)var1); // L: 264
- if (var8 != null) { // L: 265
- if (var8 instanceof IntegerNode) { // L: 266
- IntegerNode var9 = (IntegerNode)var8; // L: 267
- if ((var9.integer & var7) == var2) { // L: 268
+ boolean method3004(int var1, int var2, int var3, int var4) {
+ int var5 = (1 << var3) - 1;
+ int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1;
+ int var7 = var6 ^ var5;
+ var2 <<= var3;
+ var2 &= var7;
+ if (this.parameters != null) {
+ Node var8 = this.parameters.get((long)var1);
+ if (var8 != null) {
+ if (var8 instanceof IntegerNode) {
+ IntegerNode var9 = (IntegerNode)var8;
+ if ((var9.integer & var7) == var2) {
return false;
}
- var9.integer &= ~var7; // L: 269
- var9.integer |= var2; // L: 270
- return true; // L: 271
+ var9.integer &= ~var7;
+ var9.integer |= var2;
+ return true;
}
- var8.remove(); // L: 273
+ var8.remove();
}
} else {
- this.parameters = new IterableNodeHashTable(4); // L: 276
+ this.parameters = new IterableNodeHashTable(4);
}
- this.parameters.put(new IntegerNode(var2), (long)var1); // L: 277
+ this.parameters.put(new IntegerNode(var2), (long)var1);
return true; // L: 278
}
- @ObfuscatedName("n")
- boolean method2889(int var1, long var2) {
- if (this.parameters != null) { // L: 282
- Node var4 = this.parameters.get((long)var1); // L: 283
- if (var4 != null) { // L: 284
- if (var4 instanceof class408) { // L: 285
- class408 var5 = (class408)var4; // L: 286
- if (var2 == var5.field4463) { // L: 287
+ @ObfuscatedName("x")
+ boolean method2967(int var1, long var2) {
+ if (this.parameters != null) {
+ Node var4 = this.parameters.get((long)var1);
+ if (var4 != null) {
+ if (var4 instanceof class407) { // L: 285
+ class407 var5 = (class407)var4;
+ if (var5.field4459 == var2) { // L: 287
return false;
}
- var5.field4463 = var2; // L: 288
- return true; // L: 289
+ var5.field4459 = var2;
+ return true;
}
- var4.remove(); // L: 291
+ var4.remove();
}
} else {
this.parameters = new IterableNodeHashTable(4); // L: 294
}
- this.parameters.put(new class408(var2), (long)var1); // L: 295
- return true; // L: 296
+ this.parameters.put(new class407(var2), (long)var1);
+ return true;
}
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)Z",
- garbageValue = "-1953428658"
+ garbageValue = "-2147483648"
)
- boolean method2900(int var1, String var2) {
- if (var2 == null) { // L: 300
+ boolean method2968(int var1, String var2) {
+ if (var2 == null) {
var2 = "";
} else if (var2.length() > 80) { // L: 301
var2 = var2.substring(0, 80);
}
- if (this.parameters != null) { // L: 302
+ if (this.parameters != null) {
Node var3 = this.parameters.get((long)var1); // L: 303
- if (var3 != null) { // L: 304
- if (var3 instanceof ObjectNode) { // L: 305
- ObjectNode var4 = (ObjectNode)var3; // L: 306
- if (var4.obj instanceof String) { // L: 307
- if (var2.equals(var4.obj)) { // L: 308
+ if (var3 != null) {
+ if (var3 instanceof ObjectNode) {
+ ObjectNode var4 = (ObjectNode)var3;
+ if (var4.obj instanceof String) {
+ if (var2.equals(var4.obj)) {
return false;
}
var4.remove(); // L: 309
- this.parameters.put(new ObjectNode(var2), var4.key); // L: 310
- return true; // L: 311
+ this.parameters.put(new ObjectNode(var2), var4.key);
+ return true;
}
}
- var3.remove(); // L: 314
+ var3.remove();
}
} else {
this.parameters = new IterableNodeHashTable(4); // L: 317
}
- this.parameters.put(new ObjectNode(var2), (long)var1); // L: 318
- return true; // L: 319
+ this.parameters.put(new ObjectNode(var2), (long)var1);
+ return true;
}
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-122"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-37"
)
- void method2901(Buffer var1) {
+ void method2969(Buffer var1) {
int var2 = var1.readUnsignedByte(); // L: 323
- if (var2 >= 1 && var2 <= 6) { // L: 324
- int var3 = var1.readUnsignedByte(); // L: 325
- if ((var3 & 1) != 0) { // L: 326
+ if (var2 >= 1 && var2 <= 6) {
+ int var3 = var1.readUnsignedByte();
+ if ((var3 & 1) != 0) {
this.useHashes = true;
}
- if ((var3 & 2) != 0) { // L: 327
+ if ((var3 & 2) != 0) {
this.useNames = true;
}
if (!this.useHashes) { // L: 328
- this.memberHashes = null; // L: 329
- this.bannedMemberHashes = null; // L: 330
+ this.memberHashes = null;
+ this.bannedMemberHashes = null;
}
- if (!this.useNames) { // L: 332
- this.memberNames = null; // L: 333
- this.bannedMemberNames = null; // L: 334
+ if (!this.useNames) {
+ this.memberNames = null;
+ this.bannedMemberNames = null;
}
- this.field1636 = var1.readInt(); // L: 336
- this.field1638 = var1.readInt(); // L: 337
- if (var2 <= 3 && this.field1638 != 0) { // L: 338
- this.field1638 += 16912800;
+ this.field1628 = var1.readInt();
+ this.field1630 = var1.readInt();
+ if (var2 <= 3 && this.field1630 != 0) { // L: 338
+ this.field1630 += 16912800;
}
- this.memberCount = var1.readUnsignedShort(); // L: 339
- this.bannedMemberCount = var1.readUnsignedByte(); // L: 340
+ this.memberCount = var1.readUnsignedShort();
+ this.bannedMemberCount = var1.readUnsignedByte();
this.name = var1.readStringCp1252NullTerminated(); // L: 341
- if (var2 >= 4) { // L: 342
- var1.readInt(); // L: 343
+ if (var2 >= 4) {
+ var1.readInt();
}
this.allowGuests = var1.readUnsignedByte() == 1; // L: 345
- this.field1633 = var1.readByte(); // L: 346
- this.field1641 = var1.readByte(); // L: 347
- this.field1642 = var1.readByte(); // L: 348
- this.field1648 = var1.readByte(); // L: 349
+ this.field1637 = var1.readByte(); // L: 346
+ this.field1633 = var1.readByte();
+ this.field1634 = var1.readByte();
+ this.field1645 = var1.readByte();
int var4;
- if (this.memberCount > 0) { // L: 350
- if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 351
+ if (this.memberCount > 0) {
+ if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) {
this.memberHashes = new long[this.memberCount];
}
- if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 352
+ if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) {
this.memberNames = new String[this.memberCount];
}
- if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 353
+ if (this.memberRanks == null || this.memberRanks.length < this.memberCount) {
this.memberRanks = new byte[this.memberCount];
}
- if (this.field1651 == null || this.field1651.length < this.memberCount) { // L: 354
- this.field1651 = new int[this.memberCount];
+ if (this.field1640 == null || this.field1640.length < this.memberCount) {
+ this.field1640 = new int[this.memberCount];
}
- if (this.field1649 == null || this.field1649.length < this.memberCount) { // L: 355
+ if (this.field1649 == null || this.field1649.length < this.memberCount) {
this.field1649 = new int[this.memberCount];
}
- if (this.field1650 == null || this.field1650.length < this.memberCount) { // L: 356
- this.field1650 = new boolean[this.memberCount];
+ if (this.field1642 == null || this.field1642.length < this.memberCount) {
+ this.field1642 = new boolean[this.memberCount];
}
for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 357
- if (this.useHashes) { // L: 358
+ if (this.useHashes) {
this.memberHashes[var4] = var1.readLong();
}
@@ -701,62 +701,62 @@ public class ClanSettings {
this.memberRanks[var4] = var1.readByte(); // L: 360
if (var2 >= 2) { // L: 361
- this.field1651[var4] = var1.readInt();
+ this.field1640[var4] = var1.readInt();
}
- if (var2 >= 5) { // L: 362
+ if (var2 >= 5) {
this.field1649[var4] = var1.readUnsignedShort();
} else {
- this.field1649[var4] = 0; // L: 363
+ this.field1649[var4] = 0;
}
- if (var2 >= 6) { // L: 364
- this.field1650[var4] = var1.readUnsignedByte() == 1;
+ if (var2 >= 6) {
+ this.field1642[var4] = var1.readUnsignedByte() == 1;
} else {
- this.field1650[var4] = false; // L: 365
+ this.field1642[var4] = false; // L: 365
}
}
- this.updateOwner(); // L: 367
+ this.updateOwner();
}
- if (this.bannedMemberCount > 0) { // L: 369
- if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 370
+ if (this.bannedMemberCount > 0) {
+ if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) {
this.bannedMemberHashes = new long[this.bannedMemberCount];
}
- if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 371
+ if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) {
this.bannedMemberNames = new String[this.bannedMemberCount];
}
- for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 372
+ for (var4 = 0; var4 < this.bannedMemberCount; ++var4) {
if (this.useHashes) { // L: 373
this.bannedMemberHashes[var4] = var1.readLong();
}
- if (this.useNames) { // L: 374
+ if (this.useNames) {
this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull();
}
}
}
- if (var2 >= 3) { // L: 377
- var4 = var1.readUnsignedShort(); // L: 378
- if (var4 > 0) { // L: 379
- this.parameters = new IterableNodeHashTable(var4 < 16 ? FontName.method7228(var4) : 16); // L: 380
+ if (var2 >= 3) {
+ var4 = var1.readUnsignedShort();
+ if (var4 > 0) {
+ this.parameters = new IterableNodeHashTable(var4 < 16 ? class135.method2910(var4) : 16);
- while (var4-- > 0) { // L: 381
- int var5 = var1.readInt(); // L: 382
- int var6 = var5 & 1073741823; // L: 383
+ while (var4-- > 0) {
+ int var5 = var1.readInt();
+ int var6 = var5 & 1073741823;
int var7 = var5 >>> 30; // L: 384
- if (var7 == 0) { // L: 385
- int var12 = var1.readInt(); // L: 386
+ if (var7 == 0) {
+ int var12 = var1.readInt();
this.parameters.put(new IntegerNode(var12), (long)var6); // L: 387
- } else if (var7 == 1) { // L: 389
+ } else if (var7 == 1) {
long var10 = var1.readLong(); // L: 390
- this.parameters.put(new class408(var10), (long)var6); // L: 391
+ this.parameters.put(new class407(var10), (long)var6); // L: 391
} else if (var7 == 2) { // L: 393
- String var8 = var1.readStringCp1252NullTerminated(); // L: 394
+ String var8 = var1.readStringCp1252NullTerminated();
this.parameters.put(new ObjectNode(var8), (long)var6); // L: 395
}
}
@@ -768,580 +768,507 @@ public class ClanSettings {
}
} // L: 400
- @ObfuscatedName("fo")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "14"
+ descriptor = "(Llh;Llh;ZIS)V",
+ garbageValue = "6367"
)
- @Export("load")
- static void load() {
- int var19;
- if (Client.titleLoadingStage == 0) { // L: 1524
- class175.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1525
-
- for (var19 = 0; var19 < 4; ++var19) { // L: 1526
- Client.collisionMaps[var19] = new CollisionMap(104, 104);
+ static void method3020(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
+ if (Login.clearLoginScreen) { // L: 183
+ if (var3 == 4) {
+ WorldMapData_1.method4872(4); // L: 185
}
- InterfaceParent.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1527
- Login.Login_loadingText = "Starting game engine..."; // L: 1528
- Login.Login_loadingPercent = 5; // L: 1529
- Client.titleLoadingStage = 20; // L: 1530
- } else if (Client.titleLoadingStage == 20) { // L: 1533
- Login.Login_loadingText = "Prepared visibility map"; // L: 1534
- Login.Login_loadingPercent = 10; // L: 1535
- Client.titleLoadingStage = 30; // L: 1536
- } else if (Client.titleLoadingStage == 30) { // L: 1539
- NetSocket.archive0 = WorldMapRegion.newArchive(0, false, true, true); // L: 1540
- Clock.archive1 = WorldMapRegion.newArchive(1, false, true, true); // L: 1541
- class356.archive2 = WorldMapRegion.newArchive(2, true, false, true); // L: 1542
- class194.archive3 = WorldMapRegion.newArchive(3, false, true, true); // L: 1543
- MouseHandler.archive4 = WorldMapRegion.newArchive(4, false, true, true); // L: 1544
- Message.archive5 = WorldMapRegion.newArchive(5, true, true, true); // L: 1545
- AbstractUserComparator.archive6 = WorldMapRegion.newArchive(6, true, true, true); // L: 1546
- InterfaceParent.archive7 = WorldMapRegion.newArchive(7, false, true, true); // L: 1547
- class305.archive8 = WorldMapRegion.newArchive(8, false, true, true); // L: 1548
- TileItem.archive9 = WorldMapRegion.newArchive(9, false, true, true); // L: 1549
- ObjectSound.archive10 = WorldMapRegion.newArchive(10, false, true, true); // L: 1550
- UrlRequest.archive11 = WorldMapRegion.newArchive(11, false, true, true); // L: 1551
- class115.archive12 = WorldMapRegion.newArchive(12, false, true, true); // L: 1552
- class16.archive13 = WorldMapRegion.newArchive(13, true, false, true); // L: 1553
- class101.archive14 = WorldMapRegion.newArchive(14, false, true, true); // L: 1554
- Client.archive15 = WorldMapRegion.newArchive(15, false, true, true); // L: 1555
- class114.archive17 = WorldMapRegion.newArchive(17, true, true, true); // L: 1556
- class92.archive18 = WorldMapRegion.newArchive(18, false, true, true); // L: 1557
- VarpDefinition.archive19 = WorldMapRegion.newArchive(19, false, true, true); // L: 1558
- ItemContainer.archive20 = WorldMapRegion.newArchive(20, false, true, true); // L: 1559
- Login.Login_loadingText = "Connecting to update server"; // L: 1560
- Login.Login_loadingPercent = 20; // L: 1561
- Client.titleLoadingStage = 40; // L: 1562
- } else if (Client.titleLoadingStage == 40) { // L: 1565
- byte var33 = 0; // L: 1566
- var19 = var33 + NetSocket.archive0.percentage() * 4 / 100; // L: 1567
- var19 += Clock.archive1.percentage() * 4 / 100; // L: 1568
- var19 += class356.archive2.percentage() * 2 / 100; // L: 1569
- var19 += class194.archive3.percentage() * 2 / 100; // L: 1570
- var19 += MouseHandler.archive4.percentage() * 6 / 100; // L: 1571
- var19 += Message.archive5.percentage() * 4 / 100; // L: 1572
- var19 += AbstractUserComparator.archive6.percentage() * 2 / 100; // L: 1573
- var19 += InterfaceParent.archive7.percentage() * 56 / 100; // L: 1574
- var19 += class305.archive8.percentage() * 2 / 100; // L: 1575
- var19 += TileItem.archive9.percentage() * 2 / 100; // L: 1576
- var19 += ObjectSound.archive10.percentage() * 2 / 100; // L: 1577
- var19 += UrlRequest.archive11.percentage() * 2 / 100; // L: 1578
- var19 += class115.archive12.percentage() * 2 / 100; // L: 1579
- var19 += class16.archive13.percentage() * 2 / 100; // L: 1580
- var19 += class101.archive14.percentage() * 2 / 100; // L: 1581
- var19 += Client.archive15.percentage() * 2 / 100; // L: 1582
- var19 += VarpDefinition.archive19.percentage() / 100; // L: 1583
- var19 += class92.archive18.percentage() / 100; // L: 1584
- var19 += ItemContainer.archive20.percentage() / 100; // L: 1585
- var19 += class114.archive17.method5624() && class114.archive17.isFullyLoaded() ? 1 : 0; // L: 1586
- if (var19 != 100) { // L: 1587
- if (var19 != 0) { // L: 1588
- Login.Login_loadingText = "Checking for updates - " + var19 + "%";
- }
-
- Login.Login_loadingPercent = 30; // L: 1589
- } else {
- HealthBar.method2335(NetSocket.archive0, "Animations"); // L: 1592
- HealthBar.method2335(Clock.archive1, "Skeletons"); // L: 1593
- HealthBar.method2335(MouseHandler.archive4, "Sound FX"); // L: 1594
- HealthBar.method2335(Message.archive5, "Maps"); // L: 1595
- HealthBar.method2335(AbstractUserComparator.archive6, "Music Tracks"); // L: 1596
- HealthBar.method2335(InterfaceParent.archive7, "Models"); // L: 1597
- HealthBar.method2335(class305.archive8, "Sprites"); // L: 1598
- HealthBar.method2335(UrlRequest.archive11, "Music Jingles"); // L: 1599
- HealthBar.method2335(class101.archive14, "Music Samples"); // L: 1600
- HealthBar.method2335(Client.archive15, "Music Patches"); // L: 1601
- HealthBar.method2335(VarpDefinition.archive19, "World Map"); // L: 1602
- HealthBar.method2335(class92.archive18, "World Map Geography"); // L: 1603
- HealthBar.method2335(ItemContainer.archive20, "World Map Ground"); // L: 1604
- class28.spriteIds = new GraphicsDefaults(); // L: 1605
- class28.spriteIds.decode(class114.archive17); // L: 1606
- Login.Login_loadingText = "Loaded update list"; // L: 1607
- Login.Login_loadingPercent = 30; // L: 1608
- Client.titleLoadingStage = 45; // L: 1609
- }
} else {
- Archive var2;
- Archive var23;
- Archive var30;
- if (Client.titleLoadingStage == 45) { // L: 1612
- WorldMapSprite.method4809(22050, !Client.isLowDetail, 2); // L: 1613
- MidiPcmStream var29 = new MidiPcmStream(); // L: 1614
- var29.method5151(9, 128); // L: 1615
- SecureRandomCallable.pcmPlayer0 = class271.method5045(GameEngine.taskHandler, 0, 22050); // L: 1616
- SecureRandomCallable.pcmPlayer0.setStream(var29); // L: 1617
- var30 = Client.archive15; // L: 1618
- var2 = class101.archive14; // L: 1619
- var23 = MouseHandler.archive4; // L: 1620
- class273.musicPatchesArchive = var30; // L: 1622
- class462.musicSamplesArchive = var2; // L: 1623
- class273.soundEffectsArchive = var23; // L: 1624
- class273.midiPcmStream = var29; // L: 1625
- Fonts.pcmPlayer1 = class271.method5045(GameEngine.taskHandler, 1, 2048); // L: 1627
- class122.pcmStreamMixer = new PcmStreamMixer(); // L: 1628
- Fonts.pcmPlayer1.setStream(class122.pcmStreamMixer); // L: 1629
- class403.decimator = new Decimator(22050, PcmPlayer.field300); // L: 1630
- Login.Login_loadingText = "Prepared sound engine"; // L: 1631
- Login.Login_loadingPercent = 35; // L: 1632
- Client.titleLoadingStage = 50; // L: 1633
- MouseHandler.WorldMapElement_fonts = new Fonts(class305.archive8, class16.archive13); // L: 1634
- } else if (Client.titleLoadingStage == 50) { // L: 1637
- var19 = FontName.method7232().length; // L: 1638
- Client.fontsMap = MouseHandler.WorldMapElement_fonts.createMap(FontName.method7232()); // L: 1639
- if (Client.fontsMap.size() < var19) { // L: 1640
- Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var19 + "%"; // L: 1641
- Login.Login_loadingPercent = 40; // L: 1642
- } else {
- Varcs.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1645
- class149.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1646
- ChatChannel.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1647
- class135.platformInfo = Client.platformInfoProvider.get(); // L: 1648
- Login.Login_loadingText = "Loaded fonts"; // L: 1649
- Login.Login_loadingPercent = 40; // L: 1650
- Client.titleLoadingStage = 60; // L: 1651
- }
+ if (var3 == 0) {
+ class101.method2547(var2); // L: 190
} else {
- int var20;
- if (Client.titleLoadingStage == 60) { // L: 1654
- var19 = DevicePcmPlayerProvider.method338(ObjectSound.archive10, class305.archive8); // L: 1655
- var20 = Login.field911.length + Login.field910.length; // L: 1658
- if (var19 < var20) { // L: 1661
- Login.Login_loadingText = "Loading title screen - " + var19 * 100 / var20 + "%"; // L: 1662
- Login.Login_loadingPercent = 50; // L: 1663
- } else {
- Login.Login_loadingText = "Loaded title screen"; // L: 1666
- Login.Login_loadingPercent = 50; // L: 1667
- PendingSpawn.updateGameState(5); // L: 1668
- Client.titleLoadingStage = 70; // L: 1669
- }
- } else if (Client.titleLoadingStage == 70) { // L: 1672
- if (!class356.archive2.isFullyLoaded()) { // L: 1673
- Login.Login_loadingText = "Loading config - " + class356.archive2.loadPercent() + "%"; // L: 1674
- Login.Login_loadingPercent = 60; // L: 1675
- } else {
- WorldMapLabelSize.method4417(class356.archive2); // L: 1678
- Archive var28 = class356.archive2; // L: 1679
- FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var28; // L: 1681
- JagexCache.method3154(class356.archive2, InterfaceParent.archive7); // L: 1683
- class93.method2392(class356.archive2, InterfaceParent.archive7, Client.isLowDetail); // L: 1684
- var30 = class356.archive2; // L: 1685
- var2 = InterfaceParent.archive7; // L: 1686
- NPCComposition.NpcDefinition_archive = var30; // L: 1688
- class17.NpcDefinition_modelArchive = var2; // L: 1689
- World.method1662(class356.archive2); // L: 1691
- var23 = class356.archive2; // L: 1692
- Archive var4 = InterfaceParent.archive7; // L: 1693
- boolean var24 = Client.isMembersWorld; // L: 1694
- Font var25 = Varcs.fontPlain11; // L: 1695
- ItemComposition.ItemDefinition_archive = var23; // L: 1697
- ItemComposition.ItemDefinition_modelArchive = var4; // L: 1698
- class82.ItemDefinition_inMembersWorld = var24; // L: 1699
- ItemContainer.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 1700
- class146.ItemDefinition_fontPlain11 = var25; // L: 1701
- Archive var31 = class356.archive2; // L: 1703
- Archive var26 = NetSocket.archive0; // L: 1704
- Archive var32 = Clock.archive1; // L: 1705
- SequenceDefinition.SequenceDefinition_archive = var31; // L: 1707
- SequenceDefinition.SequenceDefinition_animationsArchive = var26; // L: 1708
- SequenceDefinition.SequenceDefinition_skeletonsArchive = var32; // L: 1709
- Archive var27 = class356.archive2; // L: 1711
- Archive var11 = InterfaceParent.archive7; // L: 1712
- SpotAnimationDefinition.SpotAnimationDefinition_archive = var27; // L: 1714
- class175.SpotAnimationDefinition_modelArchive = var11; // L: 1715
- Archive var12 = class356.archive2; // L: 1717
- VarbitComposition.VarbitDefinition_archive = var12; // L: 1719
- Archive var13 = class356.archive2; // L: 1721
- VarpDefinition.VarpDefinition_archive = var13; // L: 1723
- VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1724
- Timer.method6381(class194.archive3, InterfaceParent.archive7, class305.archive8, class16.archive13); // L: 1726
- Archive var14 = class356.archive2; // L: 1727
- InvDefinition.InvDefinition_archive = var14; // L: 1729
- Archive var15 = class356.archive2; // L: 1731
- EnumComposition.EnumDefinition_archive = var15; // L: 1733
- Archive var16 = class356.archive2; // L: 1735
- VarcInt.VarcInt_archive = var16; // L: 1737
- class16.method179(class356.archive2); // L: 1739
- class305.method5592(class356.archive2); // L: 1740
- Login.HitSplatDefinition_cachedSprites = new class428(ApproximateRouteStrategy.field473, 54, class263.clientLanguage, class356.archive2); // L: 1741
- class221.HitSplatDefinition_cached = new class428(ApproximateRouteStrategy.field473, 47, class263.clientLanguage, class356.archive2); // L: 1742
- class125.varcs = new Varcs(); // L: 1743
- GameEngine.method505(class356.archive2, class305.archive8, class16.archive13); // L: 1744
- Archive var17 = class356.archive2; // L: 1745
- Archive var18 = class305.archive8; // L: 1746
- World.HealthBarDefinition_archive = var17; // L: 1748
- HealthBarDefinition.field1911 = var18; // L: 1749
- class154.method3059(class356.archive2, class305.archive8); // L: 1751
- Login.Login_loadingText = "Loaded config"; // L: 1752
- Login.Login_loadingPercent = 60; // L: 1753
- Client.titleLoadingStage = 80; // L: 1754
- }
- } else if (Client.titleLoadingStage == 80) { // L: 1757
- var19 = 0; // L: 1758
- if (SoundSystem.compass == null) { // L: 1759
- SoundSystem.compass = StructComposition.SpriteBuffer_getSprite(class305.archive8, class28.spriteIds.compass, 0);
- } else {
- ++var19; // L: 1760
- }
+ WorldMapData_1.method4872(var3);
+ }
- if (class344.redHintArrowSprite == null) { // L: 1761
- class344.redHintArrowSprite = StructComposition.SpriteBuffer_getSprite(class305.archive8, class28.spriteIds.field4373, 0);
- } else {
- ++var19; // L: 1762
- }
+ Rasterizer2D.Rasterizer2D_clear(); // L: 195
+ byte[] var4 = var0.takeFileByNames("title.jpg", "");
+ class16.leftTitleSprite = ItemLayer.method3920(var4); // L: 197
+ Login.rightTitleSprite = class16.leftTitleSprite.mirrorHorizontally(); // L: 198
+ SoundSystem.method739(var1, Client.worldProperties);
+ class4.titleboxSprite = class421.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
+ class6.titlebuttonSprite = class421.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
+ Login.field914 = class421.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 202
+ IgnoreList.field4284 = class421.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", "");
+ class421.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", "");
+ int var6 = var1.getGroupId("runes");
+ int var7 = var1.getFileId(var6, "");
+ IndexedSprite[] var5 = ClanChannelMember.method2867(var1, var6, var7);
+ AbstractByteArrayCopier.runesSprite = var5; // L: 211
+ var7 = var1.getGroupId("title_mute");
+ int var8 = var1.getFileId(var7, "");
+ IndexedSprite[] var10 = ClanChannelMember.method2867(var1, var7, var8);
+ class145.title_muteSprite = var10; // L: 218
+ class345.options_buttons_0Sprite = class421.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
+ class113.field1427 = class421.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
+ class228.options_buttons_2Sprite = class421.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
+ DynamicObject.field979 = class421.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 222
+ ReflectionCheck.field247 = class345.options_buttons_0Sprite.subWidth;
+ MouseRecorder.field1064 = class345.options_buttons_0Sprite.subHeight;
+ Login.loginScreenRunesAnimation = new LoginScreenAnimation(AbstractByteArrayCopier.runesSprite);
+ if (var2) {
+ Login.Login_username = "";
+ Login.Login_password = "";
+ Login.field911 = new String[8];
+ Login.field910 = 0;
+ }
- if (class29.mapSceneSprites == null) { // L: 1763
- class29.mapSceneSprites = ItemContainer.method2062(class305.archive8, class28.spriteIds.mapScenes, 0);
- } else {
- ++var19; // L: 1764
- }
+ class240.field2846 = 0;
+ World.otp = ""; // L: 233
+ Login.field895 = true;
+ Login.worldSelectOpen = false;
+ if (!class19.clientPreferences.method2317()) {
+ Archive var11 = class121.archive6;
+ var8 = var11.getGroupId("scape main");
+ int var9 = var11.getFileId(var8, "");
+ class272.musicPlayerStatus = 1;
+ class272.musicTrackArchive = var11;
+ class272.musicTrackGroupId = var8;
+ class151.musicTrackFileId = var9; // L: 245
+ class272.musicTrackVolume = 255;
+ class11.musicTrackBoolean = false;
+ class272.pcmSampleLength = 2;
+ } else {
+ class272.musicPlayerStatus = 1; // L: 253
+ class272.musicTrackArchive = null;
+ class272.musicTrackGroupId = -1;
+ class151.musicTrackFileId = -1;
+ class272.musicTrackVolume = 0;
+ class11.musicTrackBoolean = false;
+ class272.pcmSampleLength = 2;
+ }
- SpritePixels[] var1;
- int var3;
- SpritePixels[] var5;
- int var6;
- SpritePixels var7;
- int var8;
- byte[] var9;
- int var10;
- if (UserComparator4.headIconPkSprites == null) { // L: 1765
- var2 = class305.archive8; // L: 1767
- var3 = class28.spriteIds.headIconsPk; // L: 1768
- if (!User.method6514(var2, var3, 0)) { // L: 1770
- var1 = null; // L: 1771
+ class115.method2693(false);
+ Login.clearLoginScreen = true;
+ Login.xPadding = (Script.canvasWidth - 765) / 2; // L: 263
+ Login.loginBoxX = Login.xPadding + 202;
+ Canvas.loginBoxCenter = Login.loginBoxX + 180;
+ class16.leftTitleSprite.drawAt(Login.xPadding, 0);
+ Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+ Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18);
+ }
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lpq;IB)V",
+ garbageValue = "118"
+ )
+ @Export("updatePlayers")
+ static final void updatePlayers(PacketBuffer var0, int var1) {
+ int var2 = var0.offset; // L: 71
+ Players.Players_pendingUpdateCount = 0; // L: 72
+ int var3 = 0; // L: 74
+ var0.importIndex(); // L: 75
+
+ int var4;
+ int var6;
+ int var8;
+ byte[] var10000;
+ int var17;
+ int var20;
+ for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76
+ var20 = Players.Players_indices[var4]; // L: 77
+ if ((Players.field1311[var20] & 1) == 0) { // L: 78
+ if (var3 > 0) { // L: 79
+ --var3; // L: 80
+ var10000 = Players.field1311; // L: 81
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else {
+ var6 = var0.readBits(1); // L: 84
+ if (var6 == 0) { // L: 85
+ var8 = var0.readBits(2); // L: 88
+ if (var8 == 0) { // L: 90
+ var17 = 0;
+ } else if (var8 == 1) { // L: 91
+ var17 = var0.readBits(5);
+ } else if (var8 == 2) { // L: 92
+ var17 = var0.readBits(8);
} else {
- var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1776
- var6 = 0;
-
- while (true) {
- if (var6 >= class453.SpriteBuffer_spriteCount) {
- VarcInt.method3325(); // L: 1790
- var1 = var5; // L: 1793
- break;
- }
-
- var7 = var5[var6] = new SpritePixels(); // L: 1778
- var7.width = class453.SpriteBuffer_spriteWidth; // L: 1779
- var7.height = class453.SpriteBuffer_spriteHeight; // L: 1780
- var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1781
- var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1782
- var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1783
- var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1784
- var8 = var7.subHeight * var7.subWidth; // L: 1785
- var9 = class127.SpriteBuffer_pixels[var6]; // L: 1786
- var7.pixels = new int[var8]; // L: 1787
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 1788
- var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255];
- }
-
- ++var6; // L: 1777
- }
+ var17 = var0.readBits(11); // L: 93
}
- UserComparator4.headIconPkSprites = var1; // L: 1795
+ var3 = var17; // L: 96
+ var10000 = Players.field1311; // L: 97
+ var10000[var20] = (byte)(var10000[var20] | 2);
} else {
- ++var19; // L: 1797
+ class14.readPlayerUpdate(var0, var20); // L: 100
}
-
- if (ChatChannel.headIconPrayerSprites == null) { // L: 1798
- var2 = class305.archive8; // L: 1800
- var3 = class28.spriteIds.field4376; // L: 1801
- if (!User.method6514(var2, var3, 0)) { // L: 1803
- var1 = null; // L: 1804
- } else {
- var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1809
- var6 = 0;
-
- while (true) {
- if (var6 >= class453.SpriteBuffer_spriteCount) {
- VarcInt.method3325(); // L: 1823
- var1 = var5; // L: 1826
- break;
- }
-
- var7 = var5[var6] = new SpritePixels(); // L: 1811
- var7.width = class453.SpriteBuffer_spriteWidth; // L: 1812
- var7.height = class453.SpriteBuffer_spriteHeight; // L: 1813
- var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1814
- var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1815
- var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1816
- var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1817
- var8 = var7.subWidth * var7.subHeight; // L: 1818
- var9 = class127.SpriteBuffer_pixels[var6]; // L: 1819
- var7.pixels = new int[var8]; // L: 1820
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 1821
- var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255];
- }
-
- ++var6; // L: 1810
- }
- }
-
- ChatChannel.headIconPrayerSprites = var1; // L: 1828
- } else {
- ++var19; // L: 1830
- }
-
- if (class21.headIconHintSprites == null) { // L: 1831
- var2 = class305.archive8; // L: 1833
- var3 = class28.spriteIds.field4377; // L: 1834
- if (!User.method6514(var2, var3, 0)) { // L: 1836
- var1 = null; // L: 1837
- } else {
- var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1842
- var6 = 0;
-
- while (true) {
- if (var6 >= class453.SpriteBuffer_spriteCount) {
- VarcInt.method3325(); // L: 1856
- var1 = var5; // L: 1859
- break;
- }
-
- var7 = var5[var6] = new SpritePixels(); // L: 1844
- var7.width = class453.SpriteBuffer_spriteWidth; // L: 1845
- var7.height = class453.SpriteBuffer_spriteHeight; // L: 1846
- var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1847
- var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1848
- var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1849
- var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1850
- var8 = var7.subWidth * var7.subHeight; // L: 1851
- var9 = class127.SpriteBuffer_pixels[var6]; // L: 1852
- var7.pixels = new int[var8]; // L: 1853
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 1854
- var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255];
- }
-
- ++var6; // L: 1843
- }
- }
-
- class21.headIconHintSprites = var1; // L: 1861
- } else {
- ++var19; // L: 1863
- }
-
- if (class146.mapMarkerSprites == null) { // L: 1864
- var2 = class305.archive8; // L: 1866
- var3 = class28.spriteIds.field4378; // L: 1867
- if (!User.method6514(var2, var3, 0)) { // L: 1869
- var1 = null; // L: 1870
- } else {
- var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1875
- var6 = 0;
-
- while (true) {
- if (var6 >= class453.SpriteBuffer_spriteCount) {
- VarcInt.method3325(); // L: 1889
- var1 = var5; // L: 1892
- break;
- }
-
- var7 = var5[var6] = new SpritePixels(); // L: 1877
- var7.width = class453.SpriteBuffer_spriteWidth; // L: 1878
- var7.height = class453.SpriteBuffer_spriteHeight; // L: 1879
- var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1880
- var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1881
- var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1882
- var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1883
- var8 = var7.subWidth * var7.subHeight; // L: 1884
- var9 = class127.SpriteBuffer_pixels[var6]; // L: 1885
- var7.pixels = new int[var8]; // L: 1886
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 1887
- var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255];
- }
-
- ++var6; // L: 1876
- }
- }
-
- class146.mapMarkerSprites = var1; // L: 1894
- } else {
- ++var19; // L: 1896
- }
-
- if (Projectile.crossSprites == null) { // L: 1897
- var2 = class305.archive8; // L: 1899
- var3 = class28.spriteIds.field4374; // L: 1900
- if (!User.method6514(var2, var3, 0)) { // L: 1902
- var1 = null; // L: 1903
- } else {
- var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1908
- var6 = 0;
-
- while (true) {
- if (var6 >= class453.SpriteBuffer_spriteCount) {
- VarcInt.method3325(); // L: 1922
- var1 = var5; // L: 1925
- break;
- }
-
- var7 = var5[var6] = new SpritePixels(); // L: 1910
- var7.width = class453.SpriteBuffer_spriteWidth; // L: 1911
- var7.height = class453.SpriteBuffer_spriteHeight; // L: 1912
- var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1913
- var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1914
- var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1915
- var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1916
- var8 = var7.subWidth * var7.subHeight; // L: 1917
- var9 = class127.SpriteBuffer_pixels[var6]; // L: 1918
- var7.pixels = new int[var8]; // L: 1919
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 1920
- var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255];
- }
-
- ++var6; // L: 1909
- }
- }
-
- Projectile.crossSprites = var1; // L: 1927
- } else {
- ++var19; // L: 1929
- }
-
- if (WallDecoration.mapDotSprites == null) { // L: 1930
- var2 = class305.archive8; // L: 1932
- var3 = class28.spriteIds.field4375; // L: 1933
- if (!User.method6514(var2, var3, 0)) { // L: 1935
- var1 = null; // L: 1936
- } else {
- var5 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 1941
- var6 = 0;
-
- while (true) {
- if (var6 >= class453.SpriteBuffer_spriteCount) {
- VarcInt.method3325(); // L: 1955
- var1 = var5; // L: 1958
- break;
- }
-
- var7 = var5[var6] = new SpritePixels(); // L: 1943
- var7.width = class453.SpriteBuffer_spriteWidth; // L: 1944
- var7.height = class453.SpriteBuffer_spriteHeight; // L: 1945
- var7.xOffset = class453.SpriteBuffer_xOffsets[var6]; // L: 1946
- var7.yOffset = class453.SpriteBuffer_yOffsets[var6]; // L: 1947
- var7.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var6]; // L: 1948
- var7.subHeight = class453.SpriteBuffer_spriteHeights[var6]; // L: 1949
- var8 = var7.subHeight * var7.subWidth; // L: 1950
- var9 = class127.SpriteBuffer_pixels[var6]; // L: 1951
- var7.pixels = new int[var8]; // L: 1952
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 1953
- var7.pixels[var10] = Decimator.SpriteBuffer_spritePalette[var9[var10] & 255];
- }
-
- ++var6; // L: 1942
- }
- }
-
- WallDecoration.mapDotSprites = var1; // L: 1960
- } else {
- ++var19; // L: 1962
- }
-
- if (class127.scrollBarSprites == null) { // L: 1963
- class127.scrollBarSprites = ItemContainer.method2062(class305.archive8, class28.spriteIds.field4381, 0);
- } else {
- ++var19; // L: 1964
- }
-
- if (ScriptEvent.modIconSprites == null) { // L: 1965
- ScriptEvent.modIconSprites = ItemContainer.method2062(class305.archive8, class28.spriteIds.field4372, 0);
- } else {
- ++var19; // L: 1966
- }
-
- if (var19 < 11) { // L: 1967
- Login.Login_loadingText = "Loading sprites - " + var19 * 100 / 12 + "%"; // L: 1968
- Login.Login_loadingPercent = 70; // L: 1969
- } else {
- AbstractFont.AbstractFont_modIconSprites = ScriptEvent.modIconSprites; // L: 1972
- class344.redHintArrowSprite.normalize(); // L: 1973
- var20 = (int)(Math.random() * 21.0D) - 10; // L: 1974
- int var21 = (int)(Math.random() * 21.0D) - 10; // L: 1975
- var3 = (int)(Math.random() * 21.0D) - 10; // L: 1976
- int var22 = (int)(Math.random() * 41.0D) - 20; // L: 1977
- class29.mapSceneSprites[0].shiftColors(var22 + var20, var21 + var22, var3 + var22); // L: 1978
- Login.Login_loadingText = "Loaded sprites"; // L: 1979
- Login.Login_loadingPercent = 70; // L: 1980
- Client.titleLoadingStage = 90; // L: 1981
- }
- } else if (Client.titleLoadingStage == 90) { // L: 1984
- if (!TileItem.archive9.isFullyLoaded()) { // L: 1985
- Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1986
- Login.Login_loadingPercent = 90; // L: 1987
- } else {
- PcmPlayer.textureProvider = new TextureProvider(TileItem.archive9, class305.archive8, 20, class12.clientPreferences.method2225(), Client.isLowDetail ? 64 : 128); // L: 1990
- Rasterizer3D.Rasterizer3D_setTextureLoader(PcmPlayer.textureProvider); // L: 1991
- Rasterizer3D.Rasterizer3D_setBrightness(class12.clientPreferences.method2225()); // L: 1992
- Client.titleLoadingStage = 100; // L: 1993
- }
- } else if (Client.titleLoadingStage == 100) { // L: 1996
- var19 = PcmPlayer.textureProvider.getLoadedPercentage(); // L: 1997
- if (var19 < 100) { // L: 1998
- Login.Login_loadingText = "Loading textures - " + var19 + "%"; // L: 1999
- Login.Login_loadingPercent = 90; // L: 2000
- } else {
- Login.Login_loadingText = "Loaded textures"; // L: 2003
- Login.Login_loadingPercent = 90; // L: 2004
- Client.titleLoadingStage = 110; // L: 2005
- }
- } else if (Client.titleLoadingStage == 110) { // L: 2008
- Varcs.mouseRecorder = new MouseRecorder(); // L: 2009
- GameEngine.taskHandler.newThreadTask(Varcs.mouseRecorder, 10); // L: 2010
- Login.Login_loadingText = "Loaded input handler"; // L: 2011
- Login.Login_loadingPercent = 92; // L: 2012
- Client.titleLoadingStage = 120; // L: 2013
- } else if (Client.titleLoadingStage == 120) { // L: 2016
- if (!ObjectSound.archive10.tryLoadFileByNames("huffman", "")) { // L: 2017
- Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2018
- Login.Login_loadingPercent = 94; // L: 2019
- } else {
- Huffman var0 = new Huffman(ObjectSound.archive10.takeFileByNames("huffman", "")); // L: 2022
- GraphicsObject.method1870(var0); // L: 2023
- Login.Login_loadingText = "Loaded wordpack"; // L: 2024
- Login.Login_loadingPercent = 94; // L: 2025
- Client.titleLoadingStage = 130; // L: 2026
- }
- } else if (Client.titleLoadingStage == 130) { // L: 2029
- if (!class194.archive3.isFullyLoaded()) { // L: 2030
- Login.Login_loadingText = "Loading interfaces - " + class194.archive3.loadPercent() * 4 / 5 + "%"; // L: 2031
- Login.Login_loadingPercent = 96; // L: 2032
- } else if (!class115.archive12.isFullyLoaded()) { // L: 2035
- Login.Login_loadingText = "Loading interfaces - " + (80 + class115.archive12.loadPercent() / 6) + "%"; // L: 2036
- Login.Login_loadingPercent = 96; // L: 2037
- } else if (!class16.archive13.isFullyLoaded()) { // L: 2040
- Login.Login_loadingText = "Loading interfaces - " + (96 + class16.archive13.loadPercent() / 50) + "%"; // L: 2041
- Login.Login_loadingPercent = 96; // L: 2042
- } else {
- Login.Login_loadingText = "Loaded interfaces"; // L: 2045
- Login.Login_loadingPercent = 98; // L: 2046
- Client.titleLoadingStage = 140; // L: 2047
- }
- } else if (Client.titleLoadingStage == 140) { // L: 2050
- Login.Login_loadingPercent = 100; // L: 2051
- if (!VarpDefinition.archive19.tryLoadGroupByName(WorldMapCacheName.field2910.name)) { // L: 2052
- Login.Login_loadingText = "Loading world map - " + VarpDefinition.archive19.groupLoadPercentByName(WorldMapCacheName.field2910.name) / 10 + "%"; // L: 2053
- } else {
- if (ServerPacket.worldMap == null) { // L: 2056
- ServerPacket.worldMap = new WorldMap(); // L: 2057
- ServerPacket.worldMap.init(VarpDefinition.archive19, class92.archive18, ItemContainer.archive20, ChatChannel.fontBold12, Client.fontsMap, class29.mapSceneSprites); // L: 2058
- }
-
- Login.Login_loadingText = "Loaded world map"; // L: 2060
- Client.titleLoadingStage = 150; // L: 2061
- }
- } else if (Client.titleLoadingStage == 150) { // L: 2064
- PendingSpawn.updateGameState(10); // L: 2065
}
}
}
- } // L: 1531 1537 1563 1590 1610 1635 1643 1652 1664 1670 1676 1755 1970 1982 1988 1994 2001 2006 2014 2020 2027 2033 2038 2043 2048 2054 2062 2066 2068
+
+ var0.exportIndex(); // L: 103
+ if (var3 != 0) { // L: 104
+ throw new RuntimeException(); // L: 105
+ } else {
+ var0.importIndex(); // L: 107
+
+ for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 108
+ var20 = Players.Players_indices[var4]; // L: 109
+ if ((Players.field1311[var20] & 1) != 0) { // L: 110
+ if (var3 > 0) { // L: 111
+ --var3; // L: 112
+ var10000 = Players.field1311; // L: 113
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else {
+ var6 = var0.readBits(1); // L: 116
+ if (var6 == 0) { // L: 117
+ var8 = var0.readBits(2); // L: 120
+ if (var8 == 0) { // L: 122
+ var17 = 0;
+ } else if (var8 == 1) { // L: 123
+ var17 = var0.readBits(5);
+ } else if (var8 == 2) { // L: 124
+ var17 = var0.readBits(8);
+ } else {
+ var17 = var0.readBits(11); // L: 125
+ }
+
+ var3 = var17; // L: 128
+ var10000 = Players.field1311; // L: 129
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else {
+ class14.readPlayerUpdate(var0, var20); // L: 132
+ }
+ }
+ }
+ }
+
+ var0.exportIndex(); // L: 135
+ if (var3 != 0) { // L: 136
+ throw new RuntimeException(); // L: 137
+ } else {
+ var0.importIndex(); // L: 139
+
+ for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 140
+ var20 = Players.Players_emptyIndices[var4]; // L: 141
+ if ((Players.field1311[var20] & 1) != 0) { // L: 142
+ if (var3 > 0) { // L: 143
+ --var3; // L: 144
+ var10000 = Players.field1311; // L: 145
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else {
+ var6 = var0.readBits(1); // L: 148
+ if (var6 == 0) { // L: 149
+ var8 = var0.readBits(2); // L: 152
+ if (var8 == 0) { // L: 154
+ var17 = 0;
+ } else if (var8 == 1) { // L: 155
+ var17 = var0.readBits(5);
+ } else if (var8 == 2) { // L: 156
+ var17 = var0.readBits(8);
+ } else {
+ var17 = var0.readBits(11); // L: 157
+ }
+
+ var3 = var17; // L: 160
+ var10000 = Players.field1311; // L: 161
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else if (ModelData0.updateExternalPlayer(var0, var20)) { // L: 164
+ var10000 = Players.field1311;
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ }
+ }
+ }
+ }
+
+ var0.exportIndex(); // L: 167
+ if (var3 != 0) { // L: 168
+ throw new RuntimeException(); // L: 169
+ } else {
+ var0.importIndex(); // L: 171
+
+ for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 172
+ var20 = Players.Players_emptyIndices[var4]; // L: 173
+ if ((Players.field1311[var20] & 1) == 0) { // L: 174
+ if (var3 > 0) { // L: 175
+ --var3; // L: 176
+ var10000 = Players.field1311; // L: 177
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else {
+ var6 = var0.readBits(1); // L: 180
+ if (var6 == 0) { // L: 181
+ var8 = var0.readBits(2); // L: 184
+ if (var8 == 0) { // L: 186
+ var17 = 0;
+ } else if (var8 == 1) { // L: 187
+ var17 = var0.readBits(5);
+ } else if (var8 == 2) { // L: 188
+ var17 = var0.readBits(8);
+ } else {
+ var17 = var0.readBits(11); // L: 189
+ }
+
+ var3 = var17; // L: 192
+ var10000 = Players.field1311; // L: 193
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ } else if (ModelData0.updateExternalPlayer(var0, var20)) { // L: 196
+ var10000 = Players.field1311;
+ var10000[var20] = (byte)(var10000[var20] | 2);
+ }
+ }
+ }
+ }
+
+ var0.exportIndex(); // L: 199
+ if (var3 != 0) { // L: 200
+ throw new RuntimeException(); // L: 201
+ } else {
+ Players.Players_count = 0; // L: 203
+ Players.Players_emptyIdxCount = 0; // L: 204
+
+ Player var5;
+ for (var4 = 1; var4 < 2048; ++var4) { // L: 205
+ var10000 = Players.field1311; // L: 206
+ var10000[var4] = (byte)(var10000[var4] >> 1);
+ var5 = Client.players[var4]; // L: 207
+ if (var5 != null) { // L: 208
+ Players.Players_indices[++Players.Players_count - 1] = var4;
+ } else {
+ Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 209
+ }
+ }
+
+ for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 213
+ var4 = Players.Players_pendingUpdateIndices[var3]; // L: 214
+ var5 = Client.players[var4]; // L: 215
+ var6 = var0.readUnsignedByte(); // L: 216
+ if ((var6 & 128) != 0) { // L: 217
+ var6 += var0.readUnsignedByte() << 8;
+ }
+
+ byte var7 = class192.field2208.field2210; // L: 219
+ if ((var6 & 2048) != 0) { // L: 220
+ for (var8 = 0; var8 < 3; ++var8) { // L: 221
+ var5.actions[var8] = var0.readStringCp1252NullTerminated();
+ }
+ }
+
+ int var11;
+ int var12;
+ int var15;
+ if ((var6 & 4) != 0) { // L: 223
+ var8 = var0.readUnsignedShort(); // L: 224
+ PlayerType var9 = (PlayerType)Actor.findEnumerated(SoundSystem.PlayerType_values(), var0.method7766()); // L: 225
+ boolean var10 = var0.method7766() == 1; // L: 226
+ var11 = var0.readUnsignedByte(); // L: 227
+ var12 = var0.offset; // L: 228
+ if (var5.username != null && var5.appearance != null) { // L: 229
+ boolean var13 = false; // L: 230
+ if (var9.isUser && Player.friendSystem.isIgnored(var5.username)) { // L: 231 232
+ var13 = true;
+ }
+
+ if (!var13 && Client.field607 == 0 && !var5.isHidden) { // L: 234
+ Players.field1317.offset = 0; // L: 235
+ var0.method7828(Players.field1317.array, 0, var11); // L: 236
+ Players.field1317.offset = 0; // L: 237
+ String var14 = AbstractFont.escapeBrackets(ArchiveDiskAction.method5777(class134.method2904(Players.field1317))); // L: 238
+ var5.overheadText = var14.trim(); // L: 239
+ var5.overheadTextColor = var8 >> 8; // L: 240
+ var5.overheadTextEffect = var8 & 255; // L: 241
+ var5.overheadTextCyclesRemaining = 150; // L: 242
+ var5.isAutoChatting = var10; // L: 243
+ var5.field1152 = var5 != class101.localPlayer && var9.isUser && "" != Client.field716 && var14.toLowerCase().indexOf(Client.field716) == -1; // L: 244
+ if (var9.isPrivileged) { // L: 246
+ var15 = var10 ? 91 : 1;
+ } else {
+ var15 = var10 ? 90 : 2; // L: 247
+ }
+
+ if (var9.modIcon != -1) { // L: 248
+ class290.addGameMessage(var15, SecureRandomCallable.method2066(var9.modIcon) + var5.username.getName(), var14);
+ } else {
+ class290.addGameMessage(var15, var5.username.getName(), var14); // L: 249
+ }
+ }
+ }
+
+ var0.offset = var12 + var11; // L: 252
+ }
+
+ if ((var6 & 8192) != 0) { // L: 254
+ var5.spotAnimation = var0.method7776(); // L: 255
+ var8 = var0.readInt(); // L: 256
+ var5.spotAnimationHeight = var8 >> 16; // L: 257
+ var5.field1178 = (var8 & 65535) + Client.cycle; // L: 258
+ var5.spotAnimationFrame = 0; // L: 259
+ var5.spotAnimationFrameCycle = 0; // L: 260
+ if (var5.field1178 > Client.cycle) { // L: 261
+ var5.spotAnimationFrame = -1;
+ }
+
+ if (var5.spotAnimation == 65535) { // L: 262
+ var5.spotAnimation = -1;
+ }
+ }
+
+ if ((var6 & 1024) != 0) { // L: 264
+ var5.field1140 = var0.method7952(); // L: 265
+ var5.field1182 = var0.readByte(); // L: 266
+ var5.field1181 = var0.method7952(); // L: 267
+ var5.field1183 = var0.method7768(); // L: 268
+ var5.field1184 = var0.method7774() + Client.cycle; // L: 269
+ var5.field1194 = var0.method7776() + Client.cycle; // L: 270
+ var5.field1186 = var0.readUnsignedShort(); // L: 271
+ if (var5.field1088) { // L: 272
+ var5.field1140 += var5.tileX; // L: 273
+ var5.field1182 += var5.tileY; // L: 274
+ var5.field1181 += var5.tileX; // L: 275
+ var5.field1183 += var5.tileY; // L: 276
+ var5.pathLength = 0; // L: 277
+ } else {
+ var5.field1140 += var5.pathX[0]; // L: 280
+ var5.field1182 += var5.pathY[0]; // L: 281
+ var5.field1181 += var5.pathX[0]; // L: 282
+ var5.field1183 += var5.pathY[0]; // L: 283
+ var5.pathLength = 1; // L: 284
+ }
+
+ var5.field1203 = 0; // L: 286
+ }
+
+ if ((var6 & 8) != 0) { // L: 288
+ var5.field1165 = var0.method7775(); // L: 289
+ if (var5.pathLength == 0) { // L: 290
+ var5.orientation = var5.field1165; // L: 291
+ var5.field1165 = -1; // L: 292
+ }
+ }
+
+ if ((var6 & 256) != 0) { // L: 295
+ class192[] var16 = Players.field1304; // L: 296
+ class192[] var18 = new class192[]{class192.field2212, class192.field2208, class192.field2209, class192.field2211}; // L: 300
+ var16[var4] = (class192)Actor.findEnumerated(var18, var0.method7952()); // L: 302
+ }
+
+ if ((var6 & 1) != 0) { // L: 304
+ var5.overheadText = var0.readStringCp1252NullTerminated(); // L: 305
+ if (var5.overheadText.charAt(0) == '~') { // L: 306
+ var5.overheadText = var5.overheadText.substring(1); // L: 307
+ class290.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 308
+ } else if (var5 == class101.localPlayer) { // L: 310
+ class290.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 311
+ }
+
+ var5.isAutoChatting = false; // L: 313
+ var5.overheadTextColor = 0; // L: 314
+ var5.overheadTextEffect = 0; // L: 315
+ var5.overheadTextCyclesRemaining = 150; // L: 316
+ }
+
+ if ((var6 & 2) != 0) { // L: 318
+ var8 = var0.readUnsignedShort(); // L: 319
+ if (var8 == 65535) { // L: 320
+ var8 = -1;
+ }
+
+ var17 = var0.method7766(); // L: 321
+ class65.performPlayerAnimation(var5, var8, var17); // L: 322
+ }
+
+ if ((var6 & 32) != 0) { // L: 324
+ var8 = var0.method7767(); // L: 325
+ int var19;
+ int var23;
+ int var24;
+ if (var8 > 0) { // L: 326
+ for (var17 = 0; var17 < var8; ++var17) { // L: 327
+ var11 = -1; // L: 329
+ var12 = -1; // L: 330
+ var24 = -1; // L: 331
+ var23 = var0.readUShortSmart(); // L: 332
+ if (var23 == 32767) { // L: 333
+ var23 = var0.readUShortSmart(); // L: 334
+ var12 = var0.readUShortSmart(); // L: 335
+ var11 = var0.readUShortSmart(); // L: 336
+ var24 = var0.readUShortSmart(); // L: 337
+ } else if (var23 != 32766) { // L: 339
+ var12 = var0.readUShortSmart(); // L: 340
+ } else {
+ var23 = -1; // L: 342
+ }
+
+ var19 = var0.readUShortSmart(); // L: 343
+ var5.addHitSplat(var23, var12, var11, var24, Client.cycle, var19); // L: 344
+ }
+ }
+
+ var17 = var0.method7767(); // L: 347
+ if (var17 > 0) { // L: 348
+ for (var23 = 0; var23 < var17; ++var23) { // L: 349
+ var11 = var0.readUShortSmart(); // L: 350
+ var12 = var0.readUShortSmart(); // L: 351
+ if (var12 != 32767) { // L: 352
+ var24 = var0.readUShortSmart(); // L: 353
+ var19 = var0.method7766(); // L: 354
+ var15 = var12 > 0 ? var0.method7766() : var19; // L: 355
+ var5.addHealthBar(var11, Client.cycle, var12, var24, var19, var15); // L: 356
+ } else {
+ var5.removeHealthBar(var11); // L: 358
+ }
+ }
+ }
+ }
+
+ if ((var6 & 64) != 0) { // L: 362
+ var5.targetIndex = var0.method7774(); // L: 363
+ if (var5.targetIndex == 65535) { // L: 364
+ var5.targetIndex = -1;
+ }
+ }
+
+ if ((var6 & 512) != 0) { // L: 366
+ var5.field1189 = Client.cycle + var0.method7774(); // L: 367
+ var5.field1135 = Client.cycle + var0.method7776(); // L: 368
+ var5.field1191 = var0.method7769(); // L: 369
+ var5.field1192 = var0.method7952(); // L: 370
+ var5.field1193 = var0.method7769(); // L: 371
+ var5.field1133 = (byte)var0.readUnsignedByte(); // L: 372
+ }
+
+ if ((var6 & 16384) != 0) { // L: 374
+ var7 = var0.method7952(); // L: 375
+ }
+
+ if ((var6 & 16) != 0) { // L: 377
+ var8 = var0.readUnsignedByte(); // L: 378
+ byte[] var21 = new byte[var8]; // L: 379
+ Buffer var26 = new Buffer(var21); // L: 380
+ var0.method7828(var21, 0, var8); // L: 381
+ Players.field1307[var4] = var26; // L: 382
+ var5.read(var26); // L: 383
+ }
+
+ if (var5.field1088) { // L: 385
+ if (var7 == 127) { // L: 386
+ var5.resetPath(var5.tileX, var5.tileY);
+ } else {
+ class192 var25;
+ if (var7 != class192.field2208.field2210) { // L: 389
+ class192[] var22 = new class192[]{class192.field2212, class192.field2208, class192.field2209, class192.field2211}; // L: 392
+ var25 = (class192)Actor.findEnumerated(var22, var7); // L: 394
+ } else {
+ var25 = Players.field1304[var4]; // L: 396
+ }
+
+ var5.method2139(var5.tileX, var5.tileY, var25); // L: 397
+ }
+ }
+ }
+
+ if (var0.offset - var2 != var1) { // L: 404
+ throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 405
+ }
+ }
+ }
+ }
+ }
+ } // L: 407
}
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 91b34f5fb0..ee48810bac 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -1,17 +1,18 @@
-import com.jagex.oldscape.pub.OAuthApi;
import com.jagex.oldscape.pub.OtlTokenRequester;
-import com.jagex.oldscape.pub.RefreshAccessTokenRequester;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.Socket;
import java.net.URL;
-import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.concurrent.Future;
+
+import com.jagex.oldscape.pub.OtlTokenResponse;
+import com.jagex.oldscape.pub.RefreshAccessTokenRequester;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
@@ -23,6540 +24,6450 @@ import netscape.javascript.JSObject;
@Implements("Client")
@ObfuscatedName("client")
public final class Client extends GameEngine implements Usernamed, OAuthApi {
- @ObfuscatedName("rk")
+ @ObfuscatedName("rh")
@ObfuscatedSignature(
- descriptor = "[Lek;"
+ descriptor = "[Len;"
)
@Export("currentClanSettings")
static ClanSettings[] currentClanSettings;
- @ObfuscatedName("un")
+ @ObfuscatedName("uv")
@ObfuscatedGetter(
- intValue = 127608033
+ intValue = 935610695
)
@Export("viewportOffsetX")
static int viewportOffsetX;
- @ObfuscatedName("up")
+ @ObfuscatedName("um")
@ObfuscatedGetter(
- intValue = 332427901
+ intValue = -1999216999
)
@Export("viewportOffsetY")
static int viewportOffsetY;
- @ObfuscatedName("uz")
+ @ObfuscatedName("ve")
@ObfuscatedGetter(
- intValue = 734962691
+ intValue = -1204982751
)
- public static int field767;
- @ObfuscatedName("si")
+ public static int field770;
+ @ObfuscatedName("sh")
@Export("playingJingle")
static boolean playingJingle;
- @ObfuscatedName("vu")
- @ObfuscatedSignature(
- descriptor = "Lbl;"
- )
- static final ApproximateRouteStrategy field771;
- @ObfuscatedName("vk")
- static int[] field772;
- @ObfuscatedName("vl")
- static int[] field773;
- @ObfuscatedName("rq")
+ @ObfuscatedName("rr")
@ObfuscatedGetter(
- intValue = -1537020861
+ intValue = 1324995943
)
@Export("destinationX")
static int destinationX;
- @ObfuscatedName("sq")
+ @ObfuscatedName("vz")
+ @ObfuscatedSignature(
+ descriptor = "Lbn;"
+ )
+ static final ApproximateRouteStrategy field774;
+ @ObfuscatedName("sc")
@ObfuscatedGetter(
- intValue = -512520213
+ intValue = -810716679
)
@Export("destinationY")
static int destinationY;
- @ObfuscatedName("uc")
+ @ObfuscatedName("sy")
+ @Export("isCameraLocked")
+ static boolean isCameraLocked;
+ @ObfuscatedName("ti")
+ static boolean[] field743;
+ @ObfuscatedName("vj")
+ static int[] field674;
+ @ObfuscatedName("vf")
+ static int[] field776;
+ @ObfuscatedName("sq")
@ObfuscatedGetter(
- intValue = 2034802331
- )
- static int field602;
- @ObfuscatedName("uv")
- @ObfuscatedSignature(
- descriptor = "Lkp;"
- )
- @Export("playerAppearance")
- static PlayerComposition playerAppearance;
- @ObfuscatedName("sf")
- @ObfuscatedGetter(
- intValue = 438457609
+ intValue = 1799589947
)
@Export("currentTrackGroupId")
static int currentTrackGroupId;
- @ObfuscatedName("ur")
+ @ObfuscatedName("ub")
@ObfuscatedGetter(
- intValue = -125837253
+ intValue = 1084011589
)
- static int field763;
- @ObfuscatedName("so")
- @Export("isCameraLocked")
- static boolean isCameraLocked;
- @ObfuscatedName("sv")
+ static int field535;
+ @ObfuscatedName("st")
@ObfuscatedGetter(
- intValue = -1463523237
- )
- @Export("minimapState")
- static int minimapState;
- @ObfuscatedName("th")
- static boolean[] field743;
- @ObfuscatedName("rw")
- @ObfuscatedGetter(
- intValue = 1443023427
- )
- static int field515;
- @ObfuscatedName("rc")
- @ObfuscatedSignature(
- descriptor = "[Let;"
- )
- @Export("currentClanChannels")
- static ClanChannel[] currentClanChannels;
- @ObfuscatedName("ti")
- static boolean field742;
- @ObfuscatedName("ri")
- @Export("crossWorldMessageIds")
- static long[] crossWorldMessageIds;
- @ObfuscatedName("rj")
- @ObfuscatedGetter(
- intValue = 1619055061
- )
- @Export("crossWorldMessageIdsIndex")
- static int crossWorldMessageIdsIndex;
- @ObfuscatedName("rm")
- @ObfuscatedGetter(
- longValue = -2855623584539877235L
- )
- static long field722;
- @ObfuscatedName("uh")
- @Export("archiveLoaders")
- static ArrayList archiveLoaders;
- @ObfuscatedName("vp")
- @ObfuscatedGetter(
- intValue = 430177943
- )
- @Export("archiveLoadersDone")
- static int archiveLoadersDone;
- @ObfuscatedName("sz")
- @ObfuscatedGetter(
- intValue = -2066946189
+ intValue = -1215099569
)
@Export("soundEffectCount")
static int soundEffectCount;
- @ObfuscatedName("sa")
- @Export("queuedSoundEffectDelays")
- static int[] queuedSoundEffectDelays;
- @ObfuscatedName("td")
- static short field748;
- @ObfuscatedName("ty")
- static short field749;
- @ObfuscatedName("se")
+ @ObfuscatedName("uf")
@ObfuscatedSignature(
- descriptor = "[Lau;"
+ descriptor = "Lkt;"
)
- @Export("soundEffects")
- static SoundEffect[] soundEffects;
- @ObfuscatedName("ug")
- static short field656;
+ @Export("playerAppearance")
+ static PlayerComposition playerAppearance;
@ObfuscatedName("sn")
@Export("soundEffectIds")
static int[] soundEffectIds;
- @ObfuscatedName("uj")
- @ObfuscatedSignature(
- descriptor = "Loi;"
+ @ObfuscatedName("ue")
+ @ObfuscatedGetter(
+ intValue = 1282769637
)
- @Export("platformInfoProvider")
- static PlatformInfoProvider platformInfoProvider;
- @ObfuscatedName("uk")
- static short field755;
- @ObfuscatedName("tt")
- static short field753;
- @ObfuscatedName("sy")
+ static int field763;
+ @ObfuscatedName("so")
@Export("queuedSoundEffectLoops")
static int[] queuedSoundEffectLoops;
- @ObfuscatedName("ry")
- @ObfuscatedGetter(
- intValue = 1318674061
- )
- @Export("mapIconCount")
- static int mapIconCount;
- @ObfuscatedName("st")
- @Export("soundLocations")
- static int[] soundLocations;
- @ObfuscatedName("ua")
- @ObfuscatedGetter(
- intValue = 1333373151
- )
- @Export("viewportZoom")
- static int viewportZoom;
- @ObfuscatedName("tz")
- static short field752;
- @ObfuscatedName("rf")
- @Export("mapIconXs")
- static int[] mapIconXs;
- @ObfuscatedName("uu")
- @ObfuscatedGetter(
- intValue = 731924017
- )
- @Export("viewportWidth")
- static int viewportWidth;
- @ObfuscatedName("us")
- @ObfuscatedGetter(
- intValue = -1035456419
- )
- @Export("viewportHeight")
- static int viewportHeight;
- @ObfuscatedName("rl")
- @Export("mapIconYs")
- static int[] mapIconYs;
- @ObfuscatedName("rs")
+ @ObfuscatedName("sd")
+ @Export("queuedSoundEffectDelays")
+ static int[] queuedSoundEffectDelays;
+ @ObfuscatedName("sj")
@ObfuscatedSignature(
- descriptor = "[Lqr;"
+ descriptor = "[Lan;"
)
- @Export("mapIcons")
- static SpritePixels[] mapIcons;
- @ObfuscatedName("tf")
- @Export("zoomHeight")
- static short zoomHeight;
- @ObfuscatedName("tw")
- @Export("zoomWidth")
- static short zoomWidth;
- @ObfuscatedName("rr")
- @ObfuscatedGetter(
- intValue = -509945839
- )
- static int field719;
- @ObfuscatedName("tx")
- static int[] field745;
- @ObfuscatedName("rp")
- static int[] field721;
- @ObfuscatedName("vc")
- @ObfuscatedGetter(
- intValue = 1709573475
- )
- static int field770;
- @ObfuscatedName("rn")
- static int[] field720;
- @ObfuscatedName("tg")
- static int[] field744;
- @ObfuscatedName("tp")
- static int[] field714;
- @ObfuscatedName("tv")
- static int[] field677;
- @ObfuscatedName("ux")
+ @Export("soundEffects")
+ static SoundEffect[] soundEffects;
+ @ObfuscatedName("ul")
@ObfuscatedSignature(
- descriptor = "[Lly;"
+ descriptor = "[Llu;"
)
@Export("grandExchangeOffers")
static GrandExchangeOffer[] grandExchangeOffers;
- @ObfuscatedName("rz")
- static int[] field769;
- @ObfuscatedName("ru")
+ @ObfuscatedName("sv")
+ @Export("soundLocations")
+ static int[] soundLocations;
+ @ObfuscatedName("su")
@ObfuscatedGetter(
- intValue = -1427601113
+ intValue = 2096040037
)
- @Export("publicChatMode")
- static int publicChatMode;
+ @Export("minimapState")
+ static int minimapState;
+ @ObfuscatedName("ut")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
+ )
+ @Export("Widget_cachedModels")
+ static EvictingDualNodeHashTable Widget_cachedModels;
+ @ObfuscatedName("ua")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
+ )
+ @Export("Widget_cachedFonts")
+ static EvictingDualNodeHashTable Widget_cachedFonts;
+ @ObfuscatedName("rj")
+ @Export("crossWorldMessageIds")
+ static long[] crossWorldMessageIds;
+ @ObfuscatedName("vq")
+ @Export("archiveLoaders")
+ static ArrayList archiveLoaders;
+ @ObfuscatedName("vl")
+ @ObfuscatedGetter(
+ intValue = 2097510307
+ )
+ @Export("archiveLoadersDone")
+ static int archiveLoadersDone;
+ @ObfuscatedName("rc")
+ @ObfuscatedGetter(
+ longValue = -8920117415948099427L
+ )
+ static long field728;
+ @ObfuscatedName("rq")
+ @ObfuscatedSignature(
+ descriptor = "[Lex;"
+ )
+ @Export("currentClanChannels")
+ static ClanChannel[] currentClanChannels;
+ @ObfuscatedName("uk")
+ @ObfuscatedGetter(
+ intValue = -190157901
+ )
+ @Export("viewportWidth")
+ static int viewportWidth;
+ @ObfuscatedName("rv")
+ @ObfuscatedGetter(
+ intValue = 1912439921
+ )
+ @Export("crossWorldMessageIdsIndex")
+ static int crossWorldMessageIdsIndex;
+ @ObfuscatedName("ra")
+ @ObfuscatedGetter(
+ intValue = -1001314581
+ )
+ static int field725;
+ @ObfuscatedName("un")
+ @ObfuscatedGetter(
+ intValue = -1741790015
+ )
+ @Export("viewportHeight")
+ static int viewportHeight;
+ @ObfuscatedName("uc")
+ @ObfuscatedSignature(
+ descriptor = "Lod;"
+ )
+ @Export("platformInfoProvider")
+ static PlatformInfoProvider platformInfoProvider;
+ @ObfuscatedName("rg")
+ @ObfuscatedGetter(
+ intValue = 1279667255
+ )
+ @Export("mapIconCount")
+ static int mapIconCount;
+ @ObfuscatedName("ry")
+ @Export("mapIconXs")
+ static int[] mapIconXs;
+ @ObfuscatedName("rs")
+ @Export("mapIconYs")
+ static int[] mapIconYs;
+ @ObfuscatedName("tc")
+ static short field748;
+ @ObfuscatedName("tw")
+ static short field749;
+ @ObfuscatedName("uh")
+ static short field754;
+ @ObfuscatedName("tt")
+ static boolean field667;
+ @ObfuscatedName("re")
+ @ObfuscatedSignature(
+ descriptor = "[Lqe;"
+ )
+ @Export("mapIcons")
+ static SpritePixels[] mapIcons;
+ @ObfuscatedName("ud")
+ static short field755;
+ @ObfuscatedName("tu")
+ static short field753;
+ @ObfuscatedName("ux")
+ @ObfuscatedGetter(
+ intValue = -1670932953
+ )
+ @Export("viewportZoom")
+ static int viewportZoom;
+ @ObfuscatedName("tb")
+ static short field752;
+ @ObfuscatedName("tg")
+ static int[] field762;
+ @ObfuscatedName("tz")
+ static int[] field745;
+ @ObfuscatedName("tp")
+ static int[] field537;
+ @ObfuscatedName("ts")
+ static int[] field747;
+ @ObfuscatedName("td")
+ @Export("zoomHeight")
+ static short zoomHeight;
+ @ObfuscatedName("tl")
+ @Export("zoomWidth")
+ static short zoomWidth;
+ @ObfuscatedName("vv")
+ @ObfuscatedGetter(
+ intValue = 1859330951
+ )
+ static int field626;
+ @ObfuscatedName("rk")
+ @ObfuscatedGetter(
+ intValue = -1407928571
+ )
+ static int field719;
+ @ObfuscatedName("ru")
+ static String field716;
+ @ObfuscatedName("rw")
+ static int[] field721;
+ @ObfuscatedName("rm")
+ static int[] field720;
@ObfuscatedName("rt")
@ObfuscatedGetter(
- intValue = -1897700155
+ intValue = 497802505
)
@Export("tradeChatMode")
static int tradeChatMode;
+ @ObfuscatedName("rn")
+ @ObfuscatedGetter(
+ intValue = 1719780425
+ )
+ @Export("publicChatMode")
+ static int publicChatMode;
@ObfuscatedName("rd")
- static String field549;
+ static int[] field773;
@ObfuscatedName("uy")
@ObfuscatedSignature(
- descriptor = "Lbs;"
+ descriptor = "Lbq;"
)
@Export("GrandExchangeEvents_worldComparator")
static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator;
+ @ObfuscatedName("uo")
+ @ObfuscatedGetter(
+ intValue = -1313039179
+ )
+ static int field588;
@ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "[Lgh;"
+ descriptor = "[Lgv;"
)
@Export("collisionMaps")
static CollisionMap[] collisionMaps;
- @ObfuscatedName("at")
- static boolean field659;
- @ObfuscatedName("br")
+ @ObfuscatedName("as")
+ static boolean field521;
+ @ObfuscatedName("be")
@ObfuscatedGetter(
- intValue = -1278418291
+ intValue = -1074570965
)
@Export("worldId")
public static int worldId;
- @ObfuscatedName("ba")
+ @ObfuscatedName("bz")
@ObfuscatedGetter(
- intValue = -1944187969
+ intValue = 946805513
)
@Export("worldProperties")
static int worldProperties;
- @ObfuscatedName("bi")
+ @ObfuscatedName("bf")
@ObfuscatedGetter(
- intValue = -792348705
+ intValue = -1890225389
)
@Export("gameBuild")
static int gameBuild;
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@Export("isMembersWorld")
public static boolean isMembersWorld;
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@Export("isLowDetail")
static boolean isLowDetail;
- @ObfuscatedName("bj")
- static String field662;
- @ObfuscatedName("bf")
+ @ObfuscatedName("bl")
+ static String field481;
+ @ObfuscatedName("bh")
@ObfuscatedGetter(
- intValue = -217293771
+ intValue = 1910731347
)
- static int field484;
- @ObfuscatedName("bz")
+ static int field482;
+ @ObfuscatedName("bs")
@ObfuscatedGetter(
- intValue = 499498919
+ intValue = -1905357045
)
@Export("clientType")
static int clientType;
- @ObfuscatedName("bv")
+ @ObfuscatedName("bk")
@ObfuscatedGetter(
- intValue = -965368167
+ intValue = -1350068019
)
- static int field486;
- @ObfuscatedName("bt")
+ static int field484;
+ @ObfuscatedName("bb")
@Export("onMobile")
static boolean onMobile;
- @ObfuscatedName("ck")
+ @ObfuscatedName("cq")
@ObfuscatedGetter(
- intValue = 1544003447
+ intValue = 1269137329
)
@Export("gameState")
static int gameState;
- @ObfuscatedName("cp")
+ @ObfuscatedName("ch")
@Export("isLoading")
static boolean isLoading;
- @ObfuscatedName("dc")
+ @ObfuscatedName("dm")
@ObfuscatedGetter(
- intValue = 469489167
+ intValue = 1368590037
)
@Export("cycle")
static int cycle;
- @ObfuscatedName("dp")
+ @ObfuscatedName("dd")
@ObfuscatedGetter(
- longValue = -7486676481103711511L
+ longValue = 7202440968788630607L
)
@Export("mouseLastLastPressedTimeMillis")
static long mouseLastLastPressedTimeMillis;
+ @ObfuscatedName("dr")
+ @ObfuscatedGetter(
+ intValue = 390292647
+ )
+ static int field605;
+ @ObfuscatedName("dv")
+ @ObfuscatedGetter(
+ intValue = 1325851119
+ )
+ static int field647;
@ObfuscatedName("dy")
@ObfuscatedGetter(
- intValue = -1940299159
+ longValue = -1804668360873736025L
)
- static int field492;
- @ObfuscatedName("dh")
- @ObfuscatedGetter(
- intValue = 1700797465
- )
- static int field681;
- @ObfuscatedName("dj")
- @ObfuscatedGetter(
- longValue = 4238643244622265373L
- )
- static long field494;
- @ObfuscatedName("dx")
+ static long field662;
+ @ObfuscatedName("ds")
@Export("hadFocus")
static boolean hadFocus;
- @ObfuscatedName("dd")
+ @ObfuscatedName("dg")
@ObfuscatedGetter(
- intValue = 2094140741
+ intValue = -171892083
)
@Export("rebootTimer")
static int rebootTimer;
- @ObfuscatedName("do")
+ @ObfuscatedName("dp")
@ObfuscatedGetter(
- intValue = 1533095709
+ intValue = 60579783
)
@Export("hintArrowType")
static int hintArrowType;
- @ObfuscatedName("di")
+ @ObfuscatedName("dx")
@ObfuscatedGetter(
- intValue = 327943909
+ intValue = 833909779
)
@Export("hintArrowNpcIndex")
static int hintArrowNpcIndex;
- @ObfuscatedName("de")
+ @ObfuscatedName("dl")
@ObfuscatedGetter(
- intValue = -1320763851
+ intValue = 1006702923
)
@Export("hintArrowPlayerIndex")
static int hintArrowPlayerIndex;
- @ObfuscatedName("db")
+ @ObfuscatedName("dc")
@ObfuscatedGetter(
- intValue = -48902629
+ intValue = 515437285
)
@Export("hintArrowX")
static int hintArrowX;
@ObfuscatedName("dn")
@ObfuscatedGetter(
- intValue = 618879367
+ intValue = -1291351367
)
@Export("hintArrowY")
static int hintArrowY;
- @ObfuscatedName("dz")
+ @ObfuscatedName("do")
@ObfuscatedGetter(
- intValue = -523368967
+ intValue = -1444359881
)
@Export("hintArrowHeight")
static int hintArrowHeight;
- @ObfuscatedName("dl")
+ @ObfuscatedName("dq")
@ObfuscatedGetter(
- intValue = 554007097
+ intValue = -1056241987
)
@Export("hintArrowSubX")
static int hintArrowSubX;
- @ObfuscatedName("da")
+ @ObfuscatedName("dt")
@ObfuscatedGetter(
- intValue = -741189791
+ intValue = -85823269
)
@Export("hintArrowSubY")
static int hintArrowSubY;
- @ObfuscatedName("dr")
+ @ObfuscatedName("di")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
@Export("playerAttackOption")
static AttackOption playerAttackOption;
- @ObfuscatedName("ds")
+ @ObfuscatedName("da")
@ObfuscatedSignature(
- descriptor = "Lcq;"
+ descriptor = "Lce;"
)
@Export("npcAttackOption")
static AttackOption npcAttackOption;
- @ObfuscatedName("dw")
+ @ObfuscatedName("db")
@ObfuscatedGetter(
- intValue = -1074005895
+ intValue = 1131242953
)
@Export("titleLoadingStage")
static int titleLoadingStage;
- @ObfuscatedName("em")
+ @ObfuscatedName("de")
+ @ObfuscatedSignature(
+ descriptor = "Lnl;"
+ )
+ @Export("js5Socket")
+ static AbstractSocket js5Socket;
+ @ObfuscatedName("ew")
@ObfuscatedGetter(
- intValue = -1048838289
+ intValue = 607109525
)
@Export("js5ConnectState")
static int js5ConnectState;
- @ObfuscatedName("eh")
+ @ObfuscatedName("ej")
@ObfuscatedGetter(
- intValue = -732279823
+ intValue = 986040805
)
- static int field625;
- @ObfuscatedName("et")
+ static int field621;
+ @ObfuscatedName("eb")
+ @ObfuscatedGetter(
+ longValue = -2878806795400476923L
+ )
+ static long field778;
+ @ObfuscatedName("eo")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Llc;"
)
- @Export("archive15")
- static Archive archive15;
- @ObfuscatedName("eu")
+ @Export("archive4")
+ static Archive archive4;
+ @ObfuscatedName("et")
@ObfuscatedGetter(
- intValue = 186266927
+ intValue = -1225597433
)
@Export("js5Errors")
static int js5Errors;
- @ObfuscatedName("eq")
+ @ObfuscatedName("fr")
@ObfuscatedGetter(
- intValue = -1220447691
+ intValue = 1982553661
)
@Export("loginState")
static int loginState;
- @ObfuscatedName("fs")
+ @ObfuscatedName("fz")
@ObfuscatedGetter(
- intValue = 2023084757
+ intValue = -2060549467
)
- static int field626;
- @ObfuscatedName("fp")
+ static int field512;
+ @ObfuscatedName("fh")
@ObfuscatedGetter(
- intValue = -70601535
+ intValue = 1277489
+ )
+ static int field609;
+ @ObfuscatedName("fw")
+ @ObfuscatedGetter(
+ intValue = -1316290873
)
static int field514;
- @ObfuscatedName("fy")
+ @ObfuscatedName("fb")
+ @ObfuscatedSignature(
+ descriptor = "Ldj;"
+ )
+ static class124 field515;
+ @ObfuscatedName("fn")
+ @ObfuscatedSignature(
+ descriptor = "Lqm;"
+ )
+ static class446 field516;
+ @ObfuscatedName("fo")
@ObfuscatedGetter(
- intValue = -30088535
+ intValue = 1290584285
)
- static int field654;
- @ObfuscatedName("fg")
- @ObfuscatedSignature(
- descriptor = "Ldf;"
- )
- static class124 field615;
- @ObfuscatedName("fd")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- static class443 field517;
- @ObfuscatedName("fk")
- static final String field526;
+ @Export("currentPort")
+ static int currentPort;
+ @ObfuscatedName("fq")
+ static final String field527;
@ObfuscatedName("gp")
@Export("Login_isUsernameRemembered")
static boolean Login_isUsernameRemembered;
- @ObfuscatedName("gk")
+ @ObfuscatedName("gc")
@ObfuscatedSignature(
- descriptor = "Lbh;"
+ descriptor = "Lbw;"
)
@Export("secureRandomFuture")
static SecureRandomFuture secureRandomFuture;
- @ObfuscatedName("gy")
- @Export("secureRandom")
- static SecureRandom secureRandom;
- @ObfuscatedName("gd")
+ @ObfuscatedName("gu")
+ static int[] field530;
+ @ObfuscatedName("gw")
@Export("randomDatData")
static byte[] randomDatData;
- @ObfuscatedName("ga")
+ @ObfuscatedName("gy")
@ObfuscatedSignature(
- descriptor = "[Lcd;"
+ descriptor = "[Lco;"
)
@Export("npcs")
static NPC[] npcs;
- @ObfuscatedName("go")
+ @ObfuscatedName("ga")
@ObfuscatedGetter(
- intValue = 1947856981
+ intValue = 1254072227
)
@Export("npcCount")
static int npcCount;
- @ObfuscatedName("gu")
+ @ObfuscatedName("gq")
@Export("npcIndices")
static int[] npcIndices;
- @ObfuscatedName("gn")
- @ObfuscatedGetter(
- intValue = 1608740447
- )
- static int field565;
- @ObfuscatedName("gr")
- static int[] field601;
@ObfuscatedName("gm")
+ @ObfuscatedGetter(
+ intValue = 1772801065
+ )
+ static int field538;
+ @ObfuscatedName("gg")
+ static int[] field539;
+ @ObfuscatedName("gh")
@ObfuscatedSignature(
- descriptor = "Lcz;"
+ descriptor = "Lcs;"
)
@Export("packetWriter")
public static final PacketWriter packetWriter;
- @ObfuscatedName("gg")
+ @ObfuscatedName("hk")
@ObfuscatedGetter(
- intValue = 1726076607
+ intValue = 1646872955
)
@Export("logoutTimer")
static int logoutTimer;
- @ObfuscatedName("gt")
+ @ObfuscatedName("hs")
@Export("hadNetworkError")
static boolean hadNetworkError;
@ObfuscatedName("hy")
- @Export("useBufferedSocket")
- static boolean useBufferedSocket;
- @ObfuscatedName("ht")
- static boolean field493;
- @ObfuscatedName("hu")
@ObfuscatedSignature(
- descriptor = "Lmn;"
+ descriptor = "Lms;"
)
@Export("timer")
static Timer timer;
- @ObfuscatedName("hc")
+ @ObfuscatedName("hl")
@Export("fontsMap")
static HashMap fontsMap;
- @ObfuscatedName("hb")
+ @ObfuscatedName("ht")
@ObfuscatedGetter(
- intValue = -1668545791
+ intValue = -202810841
)
- static int field545;
- @ObfuscatedName("ho")
+ static int field694;
+ @ObfuscatedName("hg")
@ObfuscatedGetter(
- intValue = 689366699
+ intValue = -225611453
)
static int field546;
+ @ObfuscatedName("hn")
+ @ObfuscatedGetter(
+ intValue = 1086571893
+ )
+ static int field547;
@ObfuscatedName("hm")
@ObfuscatedGetter(
- intValue = -262177223
- )
- static int field570;
- @ObfuscatedName("hd")
- @ObfuscatedGetter(
- intValue = 1267729281
+ intValue = 1979760859
)
static int field548;
- @ObfuscatedName("hp")
+ @ObfuscatedName("ho")
@ObfuscatedGetter(
- intValue = 1293908739
+ intValue = -1202603819
)
- static int field597;
- @ObfuscatedName("ig")
+ static int field549;
+ @ObfuscatedName("hf")
+ @Export("regions")
+ static int[] regions;
+ @ObfuscatedName("is")
@Export("isInInstance")
static boolean isInInstance;
- @ObfuscatedName("iy")
+ @ObfuscatedName("ie")
@Export("instanceChunkTemplates")
static int[][][] instanceChunkTemplates;
- @ObfuscatedName("ip")
- static final int[] field553;
- @ObfuscatedName("in")
+ @ObfuscatedName("il")
+ static final int[] field582;
+ @ObfuscatedName("im")
@ObfuscatedGetter(
- intValue = -1672744051
+ intValue = 1380070425
)
- static int field727;
+ static int field555;
+ @ObfuscatedName("ia")
+ @ObfuscatedGetter(
+ intValue = 11377727
+ )
+ static int field556;
+ @ObfuscatedName("ii")
+ @ObfuscatedGetter(
+ intValue = -994848647
+ )
+ static int field653;
+ @ObfuscatedName("ib")
+ @ObfuscatedGetter(
+ intValue = 1437024821
+ )
+ static int field558;
+ @ObfuscatedName("ip")
+ @ObfuscatedGetter(
+ intValue = -1267863299
+ )
+ static int field553;
@ObfuscatedName("it")
@Export("selectedItemName")
static String selectedItemName;
- @ObfuscatedName("ij")
+ @ObfuscatedName("id")
+ static boolean field560;
+ @ObfuscatedName("ja")
@ObfuscatedGetter(
- intValue = 1810344519
- )
- static int field555;
- @ObfuscatedName("ir")
- @ObfuscatedGetter(
- intValue = -780915989
- )
- static int field556;
- @ObfuscatedName("il")
- @ObfuscatedGetter(
- intValue = -1243173565
- )
- static int field640;
- @ObfuscatedName("im")
- @ObfuscatedGetter(
- intValue = -1989374159
- )
- static int field483;
- @ObfuscatedName("io")
- static boolean field559;
- @ObfuscatedName("jq")
- @ObfuscatedGetter(
- intValue = -684171709
+ intValue = 227812733
)
@Export("alternativeScrollbarWidth")
static int alternativeScrollbarWidth;
- @ObfuscatedName("ju")
+ @ObfuscatedName("jh")
@ObfuscatedGetter(
- intValue = 1197895497
+ intValue = -1074847463
)
@Export("camAngleX")
static int camAngleX;
- @ObfuscatedName("jf")
+ @ObfuscatedName("jz")
@ObfuscatedGetter(
- intValue = 1252457677
+ intValue = -816340287
)
@Export("camAngleY")
static int camAngleY;
- @ObfuscatedName("jr")
+ @ObfuscatedName("jq")
@ObfuscatedGetter(
- intValue = -1755070001
+ intValue = 374512009
)
@Export("camAngleDY")
static int camAngleDY;
- @ObfuscatedName("jo")
+ @ObfuscatedName("jv")
@ObfuscatedGetter(
- intValue = -1679026773
+ intValue = 1656721383
)
@Export("camAngleDX")
static int camAngleDX;
- @ObfuscatedName("jp")
+ @ObfuscatedName("jd")
@ObfuscatedGetter(
- intValue = -906562689
+ intValue = 566842587
)
@Export("mouseCamClickedX")
static int mouseCamClickedX;
- @ObfuscatedName("jk")
+ @ObfuscatedName("jp")
@ObfuscatedGetter(
- intValue = -1720159471
+ intValue = 1432786235
)
@Export("mouseCamClickedY")
static int mouseCamClickedY;
- @ObfuscatedName("jw")
+ @ObfuscatedName("je")
@ObfuscatedGetter(
- intValue = 335114329
+ intValue = -1325635219
)
@Export("oculusOrbState")
static int oculusOrbState;
- @ObfuscatedName("je")
+ @ObfuscatedName("jg")
@ObfuscatedGetter(
- intValue = -314035411
+ intValue = -1995181845
)
@Export("camFollowHeight")
static int camFollowHeight;
+ @ObfuscatedName("jk")
+ @ObfuscatedGetter(
+ intValue = 1032499049
+ )
+ static int field570;
@ObfuscatedName("ji")
@ObfuscatedGetter(
- intValue = 1232038605
- )
- static int field569;
- @ObfuscatedName("js")
- @ObfuscatedGetter(
- intValue = 1950209385
- )
- static int field567;
- @ObfuscatedName("jx")
- @ObfuscatedGetter(
- intValue = 1023354667
+ intValue = 1407304007
)
static int field571;
- @ObfuscatedName("jc")
+ @ObfuscatedName("jo")
@ObfuscatedGetter(
- intValue = 208832309
+ intValue = 148519397
+ )
+ static int field572;
+ @ObfuscatedName("jf")
+ @ObfuscatedGetter(
+ intValue = -149009651
)
@Export("oculusOrbNormalSpeed")
static int oculusOrbNormalSpeed;
- @ObfuscatedName("jz")
+ @ObfuscatedName("jr")
@ObfuscatedGetter(
- intValue = -175885413
+ intValue = 7759089
)
@Export("oculusOrbSlowedSpeed")
static int oculusOrbSlowedSpeed;
- @ObfuscatedName("jl")
+ @ObfuscatedName("js")
@ObfuscatedGetter(
- intValue = -1673751255
+ intValue = 1789144907
)
- static int field482;
- @ObfuscatedName("kf")
- static boolean field575;
- @ObfuscatedName("ka")
+ public static int field635;
+ @ObfuscatedName("kp")
+ static boolean field533;
+ @ObfuscatedName("kr")
@ObfuscatedGetter(
- intValue = -270296809
+ intValue = -68869867
)
- static int field576;
- @ObfuscatedName("kn")
- static boolean field557;
+ static int field493;
@ObfuscatedName("kd")
+ static boolean field578;
+ @ObfuscatedName("kf")
@ObfuscatedGetter(
- intValue = -2076113975
+ intValue = -1491072859
)
- static int field578;
- @ObfuscatedName("kh")
+ static int field681;
+ @ObfuscatedName("ki")
@ObfuscatedGetter(
- intValue = 483768037
+ intValue = -1075023379
)
@Export("overheadTextCount")
static int overheadTextCount;
- @ObfuscatedName("kk")
+ @ObfuscatedName("kt")
@ObfuscatedGetter(
- intValue = 1581123849
+ intValue = 114946289
)
@Export("overheadTextLimit")
static int overheadTextLimit;
- @ObfuscatedName("kp")
+ @ObfuscatedName("kk")
@Export("overheadTextXs")
static int[] overheadTextXs;
- @ObfuscatedName("kl")
+ @ObfuscatedName("kb")
@Export("overheadTextYs")
static int[] overheadTextYs;
- @ObfuscatedName("ki")
+ @ObfuscatedName("ke")
@Export("overheadTextAscents")
static int[] overheadTextAscents;
- @ObfuscatedName("kv")
+ @ObfuscatedName("kh")
@Export("overheadTextXOffsets")
static int[] overheadTextXOffsets;
- @ObfuscatedName("ks")
+ @ObfuscatedName("ku")
@Export("overheadTextColors")
static int[] overheadTextColors;
- @ObfuscatedName("kw")
+ @ObfuscatedName("kn")
@Export("overheadTextEffects")
static int[] overheadTextEffects;
- @ObfuscatedName("kj")
+ @ObfuscatedName("kw")
@Export("overheadTextCyclesRemaining")
static int[] overheadTextCyclesRemaining;
- @ObfuscatedName("kb")
+ @ObfuscatedName("kq")
@Export("overheadText")
static String[] overheadText;
@ObfuscatedName("kc")
@Export("tileLastDrawnActor")
static int[][] tileLastDrawnActor;
- @ObfuscatedName("kr")
+ @ObfuscatedName("kg")
@ObfuscatedGetter(
- intValue = 1351448589
+ intValue = -1223447233
)
@Export("viewportDrawCount")
static int viewportDrawCount;
- @ObfuscatedName("kx")
+ @ObfuscatedName("ka")
@ObfuscatedGetter(
- intValue = 1803325213
+ intValue = 1110096171
)
@Export("viewportTempX")
static int viewportTempX;
- @ObfuscatedName("kt")
+ @ObfuscatedName("kx")
@ObfuscatedGetter(
- intValue = 807038053
+ intValue = -1835185617
)
@Export("viewportTempY")
static int viewportTempY;
- @ObfuscatedName("ke")
+ @ObfuscatedName("ko")
@ObfuscatedGetter(
- intValue = 47728385
+ intValue = -1319931075
)
@Export("mouseCrossX")
static int mouseCrossX;
@ObfuscatedName("kz")
@ObfuscatedGetter(
- intValue = 2041470719
+ intValue = -1901549727
)
@Export("mouseCrossY")
static int mouseCrossY;
- @ObfuscatedName("ku")
+ @ObfuscatedName("kj")
@ObfuscatedGetter(
- intValue = -1687090233
+ intValue = 74657781
)
@Export("mouseCrossState")
static int mouseCrossState;
- @ObfuscatedName("ko")
+ @ObfuscatedName("kl")
@ObfuscatedGetter(
- intValue = 379603381
+ intValue = -1712964005
)
@Export("mouseCrossColor")
static int mouseCrossColor;
- @ObfuscatedName("kq")
+ @ObfuscatedName("km")
@Export("showMouseCross")
static boolean showMouseCross;
- @ObfuscatedName("kg")
+ @ObfuscatedName("kv")
@ObfuscatedGetter(
- intValue = -759271611
- )
- static int field598;
- @ObfuscatedName("ky")
- @ObfuscatedGetter(
- intValue = 1437033155
+ intValue = -1882771743
)
static int field599;
- @ObfuscatedName("li")
+ @ObfuscatedName("ks")
@ObfuscatedGetter(
- intValue = -294428911
+ intValue = -607516803
+ )
+ static int field600;
+ @ObfuscatedName("lh")
+ @ObfuscatedGetter(
+ intValue = 543552379
)
@Export("dragItemSlotSource")
static int dragItemSlotSource;
- @ObfuscatedName("lp")
+ @ObfuscatedName("lt")
@ObfuscatedGetter(
- intValue = -1303003277
+ intValue = 1208682555
)
@Export("draggedWidgetX")
static int draggedWidgetX;
- @ObfuscatedName("lc")
+ @ObfuscatedName("ls")
@ObfuscatedGetter(
- intValue = -813690107
+ intValue = -1970131045
)
@Export("draggedWidgetY")
static int draggedWidgetY;
- @ObfuscatedName("lb")
+ @ObfuscatedName("lv")
@ObfuscatedGetter(
- intValue = 637964015
+ intValue = -233015653
)
@Export("dragItemSlotDestination")
static int dragItemSlotDestination;
- @ObfuscatedName("ld")
- static boolean field604;
- @ObfuscatedName("la")
+ @ObfuscatedName("lw")
+ static boolean field705;
+ @ObfuscatedName("lq")
@ObfuscatedGetter(
- intValue = -1631862171
+ intValue = 882283935
)
@Export("itemDragDuration")
static int itemDragDuration;
- @ObfuscatedName("lw")
+ @ObfuscatedName("ln")
@ObfuscatedGetter(
- intValue = -1891907085
+ intValue = 1779631475
)
- static int field606;
+ static int field607;
@ObfuscatedName("lj")
@Export("showLoadingMessages")
static boolean showLoadingMessages;
@ObfuscatedName("ly")
@ObfuscatedSignature(
- descriptor = "[Lca;"
+ descriptor = "[Lci;"
)
@Export("players")
static Player[] players;
- @ObfuscatedName("lh")
+ @ObfuscatedName("lg")
@ObfuscatedGetter(
- intValue = -1171887655
+ intValue = 1199512807
)
@Export("localPlayerIndex")
static int localPlayerIndex;
- @ObfuscatedName("ls")
+ @ObfuscatedName("la")
@ObfuscatedGetter(
- intValue = 770928633
+ intValue = -1381361397
)
- static int field610;
- @ObfuscatedName("lk")
+ static int field601;
+ @ObfuscatedName("lp")
@ObfuscatedGetter(
- longValue = 3707872763962830187L
+ longValue = 1857087709666512391L
)
- static long field611;
- @ObfuscatedName("lq")
+ static long field612;
+ @ObfuscatedName("lz")
@Export("renderSelf")
static boolean renderSelf;
- @ObfuscatedName("ll")
+ @ObfuscatedName("lk")
@ObfuscatedGetter(
- intValue = -154688775
+ intValue = 2032870849
)
@Export("drawPlayerNames")
static int drawPlayerNames;
- @ObfuscatedName("lo")
+ @ObfuscatedName("li")
@ObfuscatedGetter(
- intValue = -1065459261
+ intValue = 499701621
)
- static int field621;
- @ObfuscatedName("lm")
+ static int field615;
+ @ObfuscatedName("ld")
static int[] field616;
- @ObfuscatedName("ma")
+ @ObfuscatedName("mx")
@Export("playerMenuOpcodes")
static final int[] playerMenuOpcodes;
- @ObfuscatedName("mi")
+ @ObfuscatedName("mb")
@Export("playerMenuActions")
static String[] playerMenuActions;
- @ObfuscatedName("ms")
+ @ObfuscatedName("ml")
@Export("playerOptionsPriorities")
static boolean[] playerOptionsPriorities;
- @ObfuscatedName("ml")
+ @ObfuscatedName("mr")
@Export("defaultRotations")
static int[] defaultRotations;
- @ObfuscatedName("mt")
+ @ObfuscatedName("mj")
@ObfuscatedGetter(
- intValue = -599570105
+ intValue = -573630111
)
@Export("combatTargetPlayerIndex")
static int combatTargetPlayerIndex;
- @ObfuscatedName("mv")
+ @ObfuscatedName("mk")
@ObfuscatedSignature(
- descriptor = "[[[Llv;"
+ descriptor = "[[[Llo;"
)
@Export("groundItems")
static NodeDeque[][][] groundItems;
- @ObfuscatedName("me")
+ @ObfuscatedName("mn")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("pendingSpawns")
static NodeDeque pendingSpawns;
- @ObfuscatedName("mf")
+ @ObfuscatedName("me")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("projectiles")
static NodeDeque projectiles;
- @ObfuscatedName("md")
+ @ObfuscatedName("mo")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("graphicsObjects")
static NodeDeque graphicsObjects;
- @ObfuscatedName("mr")
+ @ObfuscatedName("mt")
@Export("currentLevels")
static int[] currentLevels;
- @ObfuscatedName("mx")
+ @ObfuscatedName("mw")
@Export("levels")
static int[] levels;
- @ObfuscatedName("mo")
+ @ObfuscatedName("mq")
@Export("experience")
static int[] experience;
- @ObfuscatedName("mu")
+ @ObfuscatedName("ma")
@ObfuscatedGetter(
- intValue = 2040476069
+ intValue = 106403657
)
@Export("leftClickOpensMenu")
static int leftClickOpensMenu;
- @ObfuscatedName("mp")
+ @ObfuscatedName("mm")
@Export("isMenuOpen")
static boolean isMenuOpen;
- @ObfuscatedName("mq")
+ @ObfuscatedName("md")
@ObfuscatedGetter(
- intValue = 942781313
+ intValue = 522171969
)
@Export("menuOptionsCount")
static int menuOptionsCount;
- @ObfuscatedName("my")
+ @ObfuscatedName("mf")
@Export("menuArguments1")
static int[] menuArguments1;
- @ObfuscatedName("mc")
+ @ObfuscatedName("mg")
@Export("menuArguments2")
static int[] menuArguments2;
- @ObfuscatedName("mz")
+ @ObfuscatedName("my")
@Export("menuOpcodes")
static int[] menuOpcodes;
- @ObfuscatedName("mh")
+ @ObfuscatedName("mv")
@Export("menuIdentifiers")
static int[] menuIdentifiers;
- @ObfuscatedName("mw")
+ @ObfuscatedName("mi")
@Export("menuActions")
static String[] menuActions;
- @ObfuscatedName("nd")
+ @ObfuscatedName("nv")
@Export("menuTargets")
static String[] menuTargets;
- @ObfuscatedName("nj")
+ @ObfuscatedName("ng")
@Export("menuShiftClick")
static boolean[] menuShiftClick;
- @ObfuscatedName("na")
+ @ObfuscatedName("no")
@Export("followerOpsLowPriority")
static boolean followerOpsLowPriority;
- @ObfuscatedName("nn")
+ @ObfuscatedName("nh")
@Export("shiftClickDrop")
static boolean shiftClickDrop;
- @ObfuscatedName("nr")
+ @ObfuscatedName("nj")
@Export("tapToDrop")
static boolean tapToDrop;
- @ObfuscatedName("nm")
+ @ObfuscatedName("ne")
@Export("showMouseOverText")
static boolean showMouseOverText;
- @ObfuscatedName("nb")
+ @ObfuscatedName("nn")
@ObfuscatedGetter(
- intValue = -967949353
+ intValue = -1891205191
)
@Export("viewportX")
static int viewportX;
- @ObfuscatedName("ng")
+ @ObfuscatedName("nq")
@ObfuscatedGetter(
- intValue = 1936177467
+ intValue = 794951399
)
@Export("viewportY")
static int viewportY;
- @ObfuscatedName("nq")
+ @ObfuscatedName("nl")
@ObfuscatedGetter(
- intValue = -1234203737
+ intValue = -787071349
)
- static int field645;
- @ObfuscatedName("nf")
+ static int field638;
+ @ObfuscatedName("np")
@ObfuscatedGetter(
- intValue = -690580105
+ intValue = 1198468895
)
- static int field702;
- @ObfuscatedName("ni")
+ static int field646;
+ @ObfuscatedName("nw")
@ObfuscatedGetter(
- intValue = -1712799689
+ intValue = 583575935
)
@Export("isItemSelected")
static int isItemSelected;
- @ObfuscatedName("no")
+ @ObfuscatedName("nd")
@Export("isSpellSelected")
static boolean isSpellSelected;
- @ObfuscatedName("ny")
+ @ObfuscatedName("nz")
@ObfuscatedGetter(
- intValue = 1489754623
+ intValue = -627541487
)
@Export("selectedSpellChildIndex")
static int selectedSpellChildIndex;
- @ObfuscatedName("nu")
+ @ObfuscatedName("ns")
@ObfuscatedGetter(
- intValue = 1640085877
+ intValue = 834564635
)
@Export("selectedSpellItemId")
static int selectedSpellItemId;
- @ObfuscatedName("nk")
+ @ObfuscatedName("nx")
@Export("selectedSpellActionName")
static String selectedSpellActionName;
- @ObfuscatedName("nv")
+ @ObfuscatedName("ni")
@Export("selectedSpellName")
static String selectedSpellName;
- @ObfuscatedName("nh")
+ @ObfuscatedName("ny")
@ObfuscatedGetter(
- intValue = -628280401
+ intValue = -1662823287
)
@Export("rootInterface")
static int rootInterface;
- @ObfuscatedName("nw")
+ @ObfuscatedName("nu")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("interfaceParents")
static NodeHashTable interfaceParents;
- @ObfuscatedName("od")
+ @ObfuscatedName("or")
@ObfuscatedGetter(
- intValue = -381412093
+ intValue = 656001227
)
- static int field487;
- @ObfuscatedName("ow")
+ static int field656;
+ @ObfuscatedName("oj")
@ObfuscatedGetter(
- intValue = -1385659211
+ intValue = 209876339
)
static int field657;
- @ObfuscatedName("ou")
+ @ObfuscatedName("ol")
@ObfuscatedGetter(
- intValue = 1129390483
+ intValue = -659435717
)
@Export("chatEffects")
static int chatEffects;
- @ObfuscatedName("ol")
+ @ObfuscatedName("on")
@ObfuscatedGetter(
- intValue = -1268599939
+ intValue = -1601368233
)
- static int field480;
- @ObfuscatedName("ob")
+ static int field676;
+ @ObfuscatedName("ot")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("meslayerContinueWidget")
static Widget meslayerContinueWidget;
- @ObfuscatedName("oz")
+ @ObfuscatedName("oi")
@ObfuscatedGetter(
- intValue = 942376391
+ intValue = 416479
)
@Export("runEnergy")
static int runEnergy;
- @ObfuscatedName("ot")
+ @ObfuscatedName("om")
@ObfuscatedGetter(
- intValue = 93181997
+ intValue = 1324693451
)
@Export("weight")
static int weight;
- @ObfuscatedName("oh")
+ @ObfuscatedName("op")
@ObfuscatedGetter(
- intValue = 1679259971
+ intValue = 461459507
)
@Export("staffModLevel")
public static int staffModLevel;
@ObfuscatedName("ov")
@ObfuscatedGetter(
- intValue = 840097293
+ intValue = 2076010155
)
@Export("followerIndex")
static int followerIndex;
- @ObfuscatedName("or")
+ @ObfuscatedName("oc")
@Export("playerMod")
static boolean playerMod;
- @ObfuscatedName("ox")
+ @ObfuscatedName("ou")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("viewportWidget")
static Widget viewportWidget;
- @ObfuscatedName("og")
+ @ObfuscatedName("oo")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("clickedWidget")
- static Widget clickedWidget;
- @ObfuscatedName("oq")
+ public static Widget clickedWidget;
+ @ObfuscatedName("oa")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("clickedWidgetParent")
static Widget clickedWidgetParent;
- @ObfuscatedName("oj")
+ @ObfuscatedName("ob")
@ObfuscatedGetter(
- intValue = -251848545
+ intValue = -1712422655
)
@Export("widgetClickX")
static int widgetClickX;
- @ObfuscatedName("oc")
+ @ObfuscatedName("ow")
@ObfuscatedGetter(
- intValue = 701573001
+ intValue = -296722423
)
@Export("widgetClickY")
static int widgetClickY;
- @ObfuscatedName("on")
+ @ObfuscatedName("oq")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("draggedOnWidget")
static Widget draggedOnWidget;
- @ObfuscatedName("ok")
- static boolean field574;
+ @ObfuscatedName("oh")
+ static boolean field767;
+ @ObfuscatedName("og")
+ @ObfuscatedGetter(
+ intValue = -1791235815
+ )
+ static int field664;
@ObfuscatedName("os")
@ObfuscatedGetter(
- intValue = 1943275901
+ intValue = -839646525
)
- static int field747;
- @ObfuscatedName("of")
- @ObfuscatedGetter(
- intValue = 2047583569
- )
- static int field674;
- @ObfuscatedName("om")
+ static int field550;
+ @ObfuscatedName("od")
static boolean field675;
- @ObfuscatedName("oi")
+ @ObfuscatedName("ox")
@ObfuscatedGetter(
- intValue = 352021831
+ intValue = 1288881969
)
- static int field653;
+ static int field775;
+ @ObfuscatedName("oe")
+ @ObfuscatedGetter(
+ intValue = -380497981
+ )
+ static int field677;
@ObfuscatedName("oy")
- @ObfuscatedGetter(
- intValue = 1143795035
- )
- static int field612;
- @ObfuscatedName("op")
@Export("isDraggingWidget")
static boolean isDraggingWidget;
- @ObfuscatedName("pv")
+ @ObfuscatedName("pt")
@ObfuscatedGetter(
- intValue = 1746638637
+ intValue = 285293563
)
@Export("cycleCntr")
static int cycleCntr;
- @ObfuscatedName("pj")
+ @ObfuscatedName("pg")
@Export("changedVarps")
static int[] changedVarps;
- @ObfuscatedName("pe")
+ @ObfuscatedName("pn")
@ObfuscatedGetter(
- intValue = -1300368255
+ intValue = 1293312285
)
@Export("changedVarpCount")
static int changedVarpCount;
- @ObfuscatedName("pu")
+ @ObfuscatedName("pa")
@Export("changedItemContainers")
static int[] changedItemContainers;
- @ObfuscatedName("pz")
+ @ObfuscatedName("ph")
@ObfuscatedGetter(
- intValue = -386041557
+ intValue = -691611171
)
static int field683;
- @ObfuscatedName("pg")
+ @ObfuscatedName("pr")
@Export("changedSkills")
static int[] changedSkills;
- @ObfuscatedName("pd")
+ @ObfuscatedName("pf")
@ObfuscatedGetter(
- intValue = 1687044341
+ intValue = -967328363
)
@Export("changedSkillsCount")
static int changedSkillsCount;
- @ObfuscatedName("pb")
+ @ObfuscatedName("pz")
static int[] field686;
- @ObfuscatedName("pp")
+ @ObfuscatedName("pu")
@ObfuscatedGetter(
- intValue = -31940881
+ intValue = -435906803
)
static int field687;
- @ObfuscatedName("pa")
+ @ObfuscatedName("pj")
@ObfuscatedGetter(
- intValue = 743328381
+ intValue = -74544135
)
@Export("chatCycle")
static int chatCycle;
- @ObfuscatedName("pr")
+ @ObfuscatedName("pv")
@ObfuscatedGetter(
- intValue = 1498936325
+ intValue = -1145277929
)
static int field689;
- @ObfuscatedName("pm")
- @ObfuscatedGetter(
- intValue = -1311780869
- )
- static int field690;
- @ObfuscatedName("ps")
- @ObfuscatedGetter(
- intValue = -1047813865
- )
- static int field691;
- @ObfuscatedName("pq")
- @ObfuscatedGetter(
- intValue = -316236861
- )
- static int field692;
- @ObfuscatedName("pl")
- @ObfuscatedGetter(
- intValue = 330047093
- )
- static int field762;
- @ObfuscatedName("pf")
- @ObfuscatedGetter(
- intValue = 907254029
- )
- static int field512;
@ObfuscatedName("pc")
@ObfuscatedGetter(
- intValue = -1728010509
+ intValue = 928375515
+ )
+ static int field690;
+ @ObfuscatedName("py")
+ @ObfuscatedGetter(
+ intValue = 985499809
+ )
+ static int field525;
+ @ObfuscatedName("po")
+ @ObfuscatedGetter(
+ intValue = -1122398405
+ )
+ static int field692;
+ @ObfuscatedName("ps")
+ @ObfuscatedGetter(
+ intValue = -954040221
+ )
+ static int field480;
+ @ObfuscatedName("px")
+ @ObfuscatedGetter(
+ intValue = 814513413
+ )
+ static int field661;
+ @ObfuscatedName("pp")
+ @ObfuscatedGetter(
+ intValue = -218300167
)
static int field695;
- @ObfuscatedName("qp")
+ @ObfuscatedName("qo")
@ObfuscatedGetter(
- intValue = 189830111
+ intValue = 1033995651
)
@Export("mouseWheelRotation")
static int mouseWheelRotation;
- @ObfuscatedName("qn")
+ @ObfuscatedName("qf")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("scriptEvents")
static NodeDeque scriptEvents;
- @ObfuscatedName("qo")
+ @ObfuscatedName("qm")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
static NodeDeque field698;
- @ObfuscatedName("qx")
+ @ObfuscatedName("qi")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
- static NodeDeque field701;
- @ObfuscatedName("qc")
+ static NodeDeque field699;
+ @ObfuscatedName("qq")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("widgetFlags")
static NodeHashTable widgetFlags;
- @ObfuscatedName("qw")
+ @ObfuscatedName("qr")
@ObfuscatedGetter(
- intValue = 863306169
+ intValue = 1651725245
)
@Export("rootWidgetCount")
static int rootWidgetCount;
- @ObfuscatedName("qd")
- @ObfuscatedGetter(
- intValue = 300350499
- )
- static int field694;
- @ObfuscatedName("qr")
- static boolean[] field652;
- @ObfuscatedName("qk")
- static boolean[] field704;
- @ObfuscatedName("qa")
- static boolean[] field524;
@ObfuscatedName("qh")
+ @ObfuscatedGetter(
+ intValue = -1575231401
+ )
+ static int field702;
+ @ObfuscatedName("qn")
+ static boolean[] field703;
+ @ObfuscatedName("qy")
+ static boolean[] field704;
+ @ObfuscatedName("qu")
+ static boolean[] field751;
+ @ObfuscatedName("qe")
@Export("rootWidgetXs")
static int[] rootWidgetXs;
@ObfuscatedName("qb")
@Export("rootWidgetYs")
static int[] rootWidgetYs;
- @ObfuscatedName("qj")
+ @ObfuscatedName("qs")
@Export("rootWidgetWidths")
static int[] rootWidgetWidths;
- @ObfuscatedName("qz")
+ @ObfuscatedName("qv")
@Export("rootWidgetHeights")
static int[] rootWidgetHeights;
- @ObfuscatedName("qs")
+ @ObfuscatedName("qg")
@ObfuscatedGetter(
- intValue = -1165338739
+ intValue = 56462401
)
@Export("gameDrawingMode")
static int gameDrawingMode;
- @ObfuscatedName("qv")
+ @ObfuscatedName("qj")
@ObfuscatedGetter(
- longValue = 5765024780864769377L
+ longValue = 7845411661208525347L
)
static long field711;
- @ObfuscatedName("qq")
+ @ObfuscatedName("qz")
@Export("isResizable")
static boolean isResizable;
- @ObfuscatedName("fx")
+ @ObfuscatedName("fi")
String field518;
@ObfuscatedName("fe")
@ObfuscatedSignature(
- descriptor = "Lt;"
+ descriptor = "Lu;"
)
class14 field519;
- @ObfuscatedName("fb")
+ @ObfuscatedName("fu")
@ObfuscatedSignature(
- descriptor = "Lh;"
+ descriptor = "La;"
)
class19 field520;
- @ObfuscatedName("fr")
- OtlTokenRequester field478;
- @ObfuscatedName("fu")
- Future field550;
- @ObfuscatedName("fc")
- @ObfuscatedSignature(
- descriptor = "Lh;"
- )
- class19 field523;
+ @ObfuscatedName("fs")
+ OtlTokenRequester field733;
+ @ObfuscatedName("fk")
+ Future field611;
@ObfuscatedName("fj")
- RefreshAccessTokenRequester field577;
- @ObfuscatedName("fm")
- Future field581;
- @ObfuscatedName("gi")
+ boolean field523;
+ @ObfuscatedName("ft")
@ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "La;"
)
- Buffer field529;
- @ObfuscatedName("gq")
+ class19 field524;
+ @ObfuscatedName("fx")
@ObfuscatedSignature(
- descriptor = "Ls;"
+ descriptor = "Lcom/jagex/oldscape/pub/RefreshAccessTokenRequester;"
)
- class7 field592;
- @ObfuscatedName("gh")
+ RefreshAccessTokenRequester field673;
+ @ObfuscatedName("fd")
+ Future field526;
+ @ObfuscatedName("gn")
+ @ObfuscatedSignature(
+ descriptor = "Lqt;"
+ )
+ Buffer field531;
+ @ObfuscatedName("go")
+ @ObfuscatedSignature(
+ descriptor = "Lw;"
+ )
+ class7 field532;
+ @ObfuscatedName("gz")
@ObfuscatedGetter(
- longValue = 5000728514975258643L
+ longValue = 6747147557520930471L
)
- long field531;
+ long field707;
static {
- field659 = true; // L: 142
- worldId = 1; // L: 143
- worldProperties = 0; // L: 144
- gameBuild = 0; // L: 146
- isMembersWorld = false; // L: 149
- isLowDetail = false; // L: 150
- field484 = -1; // L: 155
- clientType = -1; // L: 156
- field486 = -1; // L: 157
- onMobile = false; // L: 158
- gameState = 0; // L: 170
- isLoading = true; // L: 194
- cycle = 0; // L: 195
- mouseLastLastPressedTimeMillis = -1L; // L: 196
- field492 = -1; // L: 198
- field681 = -1; // L: 199
- field494 = -1L; // L: 200
- hadFocus = true; // L: 201
- rebootTimer = 0; // L: 202
- hintArrowType = 0; // L: 203
- hintArrowNpcIndex = 0; // L: 204
- hintArrowPlayerIndex = 0; // L: 205
- hintArrowX = 0; // L: 206
- hintArrowY = 0; // L: 207
- hintArrowHeight = 0; // L: 208
- hintArrowSubX = 0; // L: 209
- hintArrowSubY = 0; // L: 210
- playerAttackOption = AttackOption.AttackOption_hidden; // L: 212
- npcAttackOption = AttackOption.AttackOption_hidden; // L: 213
- titleLoadingStage = 0; // L: 218
- js5ConnectState = 0; // L: 221
- field625 = 0; // L: 222
- js5Errors = 0; // L: 244
- loginState = 0; // L: 246
- field626 = 0; // L: 247
- field514 = 0; // L: 248
- field654 = 0; // L: 249
- field615 = class124.field1553; // L: 250
- field517 = class443.field4734; // L: 251
- field526 = class119.method2745(SecureRandomCallable.method2035("com_jagex_auth_desktop_osrs:public")); // L: 270
- Login_isUsernameRemembered = false; // L: 276
- secureRandomFuture = new SecureRandomFuture(); // L: 277
- randomDatData = null; // L: 284
- npcs = new NPC[32768]; // L: 288
- npcCount = 0; // L: 289
- npcIndices = new int[32768]; // L: 290
- field565 = 0; // L: 291
- field601 = new int[250]; // L: 292
- packetWriter = new PacketWriter(); // L: 295
- logoutTimer = 0; // L: 297
- hadNetworkError = false; // L: 298
- useBufferedSocket = true; // L: 299
- field493 = false; // L: 300
- timer = new Timer(); // L: 301
- fontsMap = new HashMap(); // L: 307
- field545 = 0; // L: 314
- field546 = 1; // L: 315
- field570 = 0; // L: 316
- field548 = 1; // L: 317
- field597 = 0; // L: 318
- collisionMaps = new CollisionMap[4]; // L: 326
- isInInstance = false; // L: 327
- instanceChunkTemplates = new int[4][13][13]; // L: 328
- field553 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 329
- field727 = 0; // L: 332
- field555 = 2301979; // L: 344
- field556 = 5063219; // L: 345
- field640 = 3353893; // L: 346
- field483 = 7759444; // L: 347
- field559 = false; // L: 348
- alternativeScrollbarWidth = 0; // L: 349
- camAngleX = 128; // L: 357
- camAngleY = 0; // L: 358
- camAngleDY = 0; // L: 359
- camAngleDX = 0; // L: 360
- mouseCamClickedX = 0; // L: 361
- mouseCamClickedY = 0; // L: 362
- oculusOrbState = 0; // L: 363
- camFollowHeight = 50; // L: 364
- field569 = 0; // L: 368
- field567 = 0; // L: 369
- field571 = 0; // L: 370
- oculusOrbNormalSpeed = 12; // L: 372
- oculusOrbSlowedSpeed = 6; // L: 373
- field482 = 0; // L: 374
- field575 = false; // L: 375
- field576 = 0; // L: 376
- field557 = false; // L: 377
- field578 = 0; // L: 378
- overheadTextCount = 0; // L: 379
- overheadTextLimit = 50; // L: 380
- overheadTextXs = new int[overheadTextLimit]; // L: 381
- overheadTextYs = new int[overheadTextLimit]; // L: 382
- overheadTextAscents = new int[overheadTextLimit]; // L: 383
- overheadTextXOffsets = new int[overheadTextLimit]; // L: 384
- overheadTextColors = new int[overheadTextLimit]; // L: 385
- overheadTextEffects = new int[overheadTextLimit]; // L: 386
- overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 387
- overheadText = new String[overheadTextLimit]; // L: 388
- tileLastDrawnActor = new int[104][104]; // L: 389
- viewportDrawCount = 0; // L: 390
- viewportTempX = -1; // L: 391
- viewportTempY = -1; // L: 392
- mouseCrossX = 0; // L: 393
- mouseCrossY = 0; // L: 394
- mouseCrossState = 0; // L: 395
- mouseCrossColor = 0; // L: 396
- showMouseCross = true; // L: 397
- field598 = 0; // L: 399
- field599 = 0; // L: 400
- dragItemSlotSource = 0; // L: 403
- draggedWidgetX = 0; // L: 404
- draggedWidgetY = 0; // L: 405
- dragItemSlotDestination = 0; // L: 406
- field604 = false; // L: 407
- itemDragDuration = 0; // L: 408
- field606 = 0; // L: 409
- showLoadingMessages = true; // L: 411
- players = new Player[2048]; // L: 413
- localPlayerIndex = -1; // L: 415
- field610 = 0; // L: 416
- field611 = -1L; // L: 417
- renderSelf = true; // L: 419
- drawPlayerNames = 0; // L: 424
- field621 = 0; // L: 425
- field616 = new int[1000]; // L: 426
- playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 428
- playerMenuActions = new String[8]; // L: 429
- playerOptionsPriorities = new boolean[8]; // L: 430
- defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 431
- combatTargetPlayerIndex = -1; // L: 432
- groundItems = new NodeDeque[4][104][104]; // L: 433
- pendingSpawns = new NodeDeque(); // L: 434
- projectiles = new NodeDeque(); // L: 435
- graphicsObjects = new NodeDeque(); // L: 436
- currentLevels = new int[25]; // L: 437
- levels = new int[25]; // L: 438
- experience = new int[25]; // L: 439
- leftClickOpensMenu = 0; // L: 440
- isMenuOpen = false; // L: 441
- menuOptionsCount = 0; // L: 447
- menuArguments1 = new int[500]; // L: 448
- menuArguments2 = new int[500]; // L: 449
- menuOpcodes = new int[500]; // L: 450
- menuIdentifiers = new int[500]; // L: 451
- menuActions = new String[500]; // L: 452
- menuTargets = new String[500]; // L: 453
- menuShiftClick = new boolean[500]; // L: 454
- followerOpsLowPriority = false; // L: 455
- shiftClickDrop = false; // L: 457
- tapToDrop = false; // L: 458
- showMouseOverText = true; // L: 459
- viewportX = -1; // L: 460
- viewportY = -1; // L: 461
- field645 = 0; // L: 465
- field702 = 50; // L: 466
- isItemSelected = 0; // L: 467
- selectedItemName = null; // L: 471
- isSpellSelected = false; // L: 472
- selectedSpellChildIndex = -1; // L: 474
- selectedSpellItemId = -1; // L: 475
- selectedSpellActionName = null; // L: 477
- selectedSpellName = null; // L: 478
- rootInterface = -1; // L: 479
- interfaceParents = new NodeHashTable(8); // L: 480
- field487 = 0; // L: 485
- field657 = -1; // L: 486
- chatEffects = 0; // L: 487
- field480 = 0; // L: 488
- meslayerContinueWidget = null; // L: 489
- runEnergy = 0; // L: 490
- weight = 0; // L: 491
- staffModLevel = 0; // L: 492
- followerIndex = -1; // L: 493
- playerMod = false; // L: 494
- viewportWidget = null; // L: 495
- clickedWidget = null; // L: 496
- clickedWidgetParent = null; // L: 497
- widgetClickX = 0; // L: 498
- widgetClickY = 0; // L: 499
- draggedOnWidget = null; // L: 500
- field574 = false; // L: 501
- field747 = -1; // L: 502
- field674 = -1; // L: 503
- field675 = false; // L: 504
- field653 = -1; // L: 505
- field612 = -1; // L: 506
- isDraggingWidget = false; // L: 507
- cycleCntr = 1; // L: 512
- changedVarps = new int[32]; // L: 515
- changedVarpCount = 0; // L: 516
- changedItemContainers = new int[32]; // L: 517
- field683 = 0; // L: 518
- changedSkills = new int[32]; // L: 519
- changedSkillsCount = 0; // L: 520
- field686 = new int[32]; // L: 521
- field687 = 0; // L: 522
- chatCycle = 0; // L: 523
- field689 = 0; // L: 524
- field690 = 0; // L: 525
- field691 = 0; // L: 526
- field692 = 0; // L: 527
- field762 = 0; // L: 528
- field512 = 0; // L: 529
- field695 = 0; // L: 530
- mouseWheelRotation = 0; // L: 536
- scriptEvents = new NodeDeque(); // L: 537
- field698 = new NodeDeque(); // L: 538
- field701 = new NodeDeque(); // L: 539
- widgetFlags = new NodeHashTable(512); // L: 540
- rootWidgetCount = 0; // L: 542
- field694 = -2; // L: 543
- field652 = new boolean[100]; // L: 544
- field704 = new boolean[100]; // L: 545
- field524 = new boolean[100]; // L: 546
- rootWidgetXs = new int[100]; // L: 547
- rootWidgetYs = new int[100]; // L: 548
- rootWidgetWidths = new int[100]; // L: 549
- rootWidgetHeights = new int[100]; // L: 550
- gameDrawingMode = 0; // L: 551
- field711 = 0L; // L: 552
- isResizable = true; // L: 553
- field769 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 560
- publicChatMode = 0; // L: 561
- tradeChatMode = 0; // L: 563
- field549 = ""; // L: 564
- crossWorldMessageIds = new long[100]; // L: 566
- crossWorldMessageIdsIndex = 0; // L: 567
- field719 = 0; // L: 569
- field720 = new int[128]; // L: 570
- field721 = new int[128]; // L: 571
- field722 = -1L; // L: 572
- currentClanSettings = new ClanSettings[4]; // L: 576
- currentClanChannels = new ClanChannel[4]; // L: 578
- field515 = -1; // L: 580
- mapIconCount = 0; // L: 581
- mapIconXs = new int[1000]; // L: 582
- mapIconYs = new int[1000]; // L: 583
- mapIcons = new SpritePixels[1000]; // L: 584
- destinationX = 0; // L: 585
- destinationY = 0; // L: 586
- minimapState = 0; // L: 593
- currentTrackGroupId = -1; // L: 594
- playingJingle = false; // L: 595
- soundEffectCount = 0; // L: 601
- soundEffectIds = new int[50]; // L: 602
- queuedSoundEffectLoops = new int[50]; // L: 603
- queuedSoundEffectDelays = new int[50]; // L: 604
- soundLocations = new int[50]; // L: 605
- soundEffects = new SoundEffect[50]; // L: 606
- isCameraLocked = false; // L: 608
- field742 = false; // L: 619
- field743 = new boolean[5]; // L: 627
- field744 = new int[5]; // L: 628
- field745 = new int[5]; // L: 629
- field714 = new int[5]; // L: 630
- field677 = new int[5]; // L: 631
- field748 = 256; // L: 632
- field749 = 205; // L: 633
- zoomHeight = 256; // L: 634
- zoomWidth = 320; // L: 635
- field752 = 1; // L: 636
- field753 = 32767; // L: 637
- field656 = 1; // L: 638
- field755 = 32767; // L: 639
- viewportOffsetX = 0; // L: 640
- viewportOffsetY = 0; // L: 641
- viewportWidth = 0; // L: 642
- viewportHeight = 0; // L: 643
- viewportZoom = 0; // L: 644
- playerAppearance = new PlayerComposition(); // L: 646
- field602 = -1; // L: 647
- field763 = -1; // L: 648
- platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 650
- grandExchangeOffers = new GrandExchangeOffer[8]; // L: 652
- GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 655
- field767 = -1; // L: 662
- archiveLoaders = new ArrayList(10); // L: 663
- archiveLoadersDone = 0; // L: 664
- field770 = 0; // L: 665
- field771 = new ApproximateRouteStrategy(); // L: 674
- field772 = new int[50]; // L: 675
- field773 = new int[50]; // L: 676
+ field521 = true; // L: 147
+ worldId = 1; // L: 148
+ worldProperties = 0; // L: 149
+ gameBuild = 0; // L: 151
+ isMembersWorld = false; // L: 154
+ isLowDetail = false; // L: 155
+ field482 = -1; // L: 160
+ clientType = -1; // L: 161
+ field484 = -1; // L: 162
+ onMobile = false; // L: 163
+ gameState = 0; // L: 175
+ isLoading = true; // L: 199
+ cycle = 0; // L: 200
+ mouseLastLastPressedTimeMillis = -1L; // L: 201
+ field605 = -1; // L: 203
+ field647 = -1; // L: 204
+ field662 = -1L; // L: 205
+ hadFocus = true; // L: 206
+ rebootTimer = 0; // L: 207
+ hintArrowType = 0; // L: 208
+ hintArrowNpcIndex = 0; // L: 209
+ hintArrowPlayerIndex = 0; // L: 210
+ hintArrowX = 0; // L: 211
+ hintArrowY = 0; // L: 212
+ hintArrowHeight = 0; // L: 213
+ hintArrowSubX = 0; // L: 214
+ hintArrowSubY = 0; // L: 215
+ playerAttackOption = AttackOption.AttackOption_hidden; // L: 217
+ npcAttackOption = AttackOption.AttackOption_hidden; // L: 218
+ titleLoadingStage = 0; // L: 223
+ js5ConnectState = 0; // L: 226
+ field621 = 0; // L: 227
+ js5Errors = 0; // L: 250
+ loginState = 0; // L: 252
+ field512 = 0; // L: 253
+ field609 = 0; // L: 254
+ field514 = 0; // L: 255
+ field515 = class124.field1543; // L: 256
+ field516 = class446.field4751; // L: 257
+ int var1 = "com_jagex_auth_desktop_osrs:public".length(); // L: 282
+ byte[] var2 = new byte[var1]; // L: 283
+
+ int var3;
+ for (var3 = 0; var3 < var1; ++var3) { // L: 284
+ char var10 = "com_jagex_auth_desktop_osrs:public".charAt(var3); // L: 285
+ if (var10 > 127) { // L: 286
+ var2[var3] = 63;
+ } else {
+ var2[var3] = (byte)var10; // L: 287
+ }
+ }
+
+ byte[] var0 = var2; // L: 289
+ var3 = var2.length; // L: 294
+ StringBuilder var4 = new StringBuilder(); // L: 296
+
+ for (int var5 = 0; var5 < var3 + 0; var5 += 3) { // L: 297
+ int var6 = var0[var5] & 255; // L: 298
+ var4.append(class341.field4146[var6 >>> 2]); // L: 299
+ if (var5 < var3 - 1) { // L: 300
+ int var7 = var0[var5 + 1] & 255; // L: 301
+ var4.append(class341.field4146[(var6 & 3) << 4 | var7 >>> 4]); // L: 302
+ if (var5 < var3 - 2) { // L: 303
+ int var8 = var0[var5 + 2] & 255; // L: 304
+ var4.append(class341.field4146[(var7 & 15) << 2 | var8 >>> 6]).append(class341.field4146[var8 & 63]); // L: 305
+ } else {
+ var4.append(class341.field4146[(var7 & 15) << 2]).append("="); // L: 307
+ }
+ } else {
+ var4.append(class341.field4146[(var6 & 3) << 4]).append("=="); // L: 309
+ }
+ }
+
+ String var11 = var4.toString(); // L: 311
+ field527 = var11; // L: 315
+ Login_isUsernameRemembered = false; // L: 324
+ secureRandomFuture = new SecureRandomFuture(); // L: 325
+ randomDatData = null; // L: 331
+ npcs = new NPC[32768]; // L: 335
+ npcCount = 0; // L: 336
+ npcIndices = new int[32768]; // L: 337
+ field538 = 0; // L: 338
+ field539 = new int[250]; // L: 339
+ packetWriter = new PacketWriter(); // L: 342
+ logoutTimer = 0; // L: 344
+ hadNetworkError = false; // L: 345
+ timer = new Timer(); // L: 346
+ fontsMap = new HashMap(); // L: 352
+ field694 = 0; // L: 359
+ field546 = 1; // L: 360
+ field547 = 0; // L: 361
+ field548 = 1; // L: 362
+ field549 = 0; // L: 363
+ collisionMaps = new CollisionMap[4]; // L: 371
+ isInInstance = false; // L: 372
+ instanceChunkTemplates = new int[4][13][13]; // L: 373
+ field582 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 374
+ field555 = 0; // L: 377
+ field556 = 2301979; // L: 389
+ field653 = 5063219; // L: 390
+ field558 = 3353893; // L: 391
+ field553 = 7759444; // L: 392
+ field560 = false; // L: 393
+ alternativeScrollbarWidth = 0; // L: 394
+ camAngleX = 128; // L: 402
+ camAngleY = 0; // L: 403
+ camAngleDY = 0; // L: 404
+ camAngleDX = 0; // L: 405
+ mouseCamClickedX = 0; // L: 406
+ mouseCamClickedY = 0; // L: 407
+ oculusOrbState = 0; // L: 408
+ camFollowHeight = 50; // L: 409
+ field570 = 0; // L: 413
+ field571 = 0; // L: 414
+ field572 = 0; // L: 415
+ oculusOrbNormalSpeed = 12; // L: 417
+ oculusOrbSlowedSpeed = 6; // L: 418
+ field635 = 0; // L: 419
+ field533 = false; // L: 420
+ field493 = 0; // L: 421
+ field578 = false; // L: 422
+ field681 = 0; // L: 423
+ overheadTextCount = 0; // L: 424
+ overheadTextLimit = 50; // L: 425
+ overheadTextXs = new int[overheadTextLimit]; // L: 426
+ overheadTextYs = new int[overheadTextLimit]; // L: 427
+ overheadTextAscents = new int[overheadTextLimit]; // L: 428
+ overheadTextXOffsets = new int[overheadTextLimit]; // L: 429
+ overheadTextColors = new int[overheadTextLimit]; // L: 430
+ overheadTextEffects = new int[overheadTextLimit]; // L: 431
+ overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 432
+ overheadText = new String[overheadTextLimit]; // L: 433
+ tileLastDrawnActor = new int[104][104]; // L: 434
+ viewportDrawCount = 0; // L: 435
+ viewportTempX = -1; // L: 436
+ viewportTempY = -1; // L: 437
+ mouseCrossX = 0; // L: 438
+ mouseCrossY = 0; // L: 439
+ mouseCrossState = 0; // L: 440
+ mouseCrossColor = 0; // L: 441
+ showMouseCross = true; // L: 442
+ field599 = 0; // L: 444
+ field600 = 0; // L: 445
+ dragItemSlotSource = 0; // L: 448
+ draggedWidgetX = 0; // L: 449
+ draggedWidgetY = 0; // L: 450
+ dragItemSlotDestination = 0; // L: 451
+ field705 = false; // L: 452
+ itemDragDuration = 0; // L: 453
+ field607 = 0; // L: 454
+ showLoadingMessages = true; // L: 456
+ players = new Player[2048]; // L: 458
+ localPlayerIndex = -1; // L: 460
+ field601 = 0; // L: 461
+ field612 = -1L; // L: 462
+ renderSelf = true; // L: 464
+ drawPlayerNames = 0; // L: 469
+ field615 = 0; // L: 470
+ field616 = new int[1000]; // L: 471
+ playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 473
+ playerMenuActions = new String[8]; // L: 474
+ playerOptionsPriorities = new boolean[8]; // L: 475
+ defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 476
+ combatTargetPlayerIndex = -1; // L: 477
+ groundItems = new NodeDeque[4][104][104]; // L: 478
+ pendingSpawns = new NodeDeque(); // L: 479
+ projectiles = new NodeDeque(); // L: 480
+ graphicsObjects = new NodeDeque(); // L: 481
+ currentLevels = new int[25]; // L: 482
+ levels = new int[25]; // L: 483
+ experience = new int[25]; // L: 484
+ leftClickOpensMenu = 0; // L: 485
+ isMenuOpen = false; // L: 486
+ menuOptionsCount = 0; // L: 492
+ menuArguments1 = new int[500]; // L: 493
+ menuArguments2 = new int[500]; // L: 494
+ menuOpcodes = new int[500]; // L: 495
+ menuIdentifiers = new int[500]; // L: 496
+ menuActions = new String[500]; // L: 497
+ menuTargets = new String[500]; // L: 498
+ menuShiftClick = new boolean[500]; // L: 499
+ followerOpsLowPriority = false; // L: 500
+ shiftClickDrop = false; // L: 502
+ tapToDrop = false; // L: 503
+ showMouseOverText = true; // L: 504
+ viewportX = -1; // L: 505
+ viewportY = -1; // L: 506
+ field638 = 0; // L: 510
+ field646 = 50; // L: 511
+ isItemSelected = 0; // L: 512
+ selectedItemName = null; // L: 516
+ isSpellSelected = false; // L: 517
+ selectedSpellChildIndex = -1; // L: 519
+ selectedSpellItemId = -1; // L: 520
+ selectedSpellActionName = null; // L: 522
+ selectedSpellName = null; // L: 523
+ rootInterface = -1; // L: 524
+ interfaceParents = new NodeHashTable(8); // L: 525
+ field656 = 0; // L: 530
+ field657 = -1; // L: 531
+ chatEffects = 0; // L: 532
+ field676 = 0; // L: 533
+ meslayerContinueWidget = null; // L: 534
+ runEnergy = 0; // L: 535
+ weight = 0; // L: 536
+ staffModLevel = 0; // L: 537
+ followerIndex = -1; // L: 538
+ playerMod = false; // L: 539
+ viewportWidget = null; // L: 540
+ clickedWidget = null; // L: 541
+ clickedWidgetParent = null; // L: 542
+ widgetClickX = 0; // L: 543
+ widgetClickY = 0; // L: 544
+ draggedOnWidget = null; // L: 545
+ field767 = false; // L: 546
+ field664 = -1; // L: 547
+ field550 = -1; // L: 548
+ field675 = false; // L: 549
+ field775 = -1; // L: 550
+ field677 = -1; // L: 551
+ isDraggingWidget = false; // L: 552
+ cycleCntr = 1; // L: 557
+ changedVarps = new int[32]; // L: 560
+ changedVarpCount = 0; // L: 561
+ changedItemContainers = new int[32]; // L: 562
+ field683 = 0; // L: 563
+ changedSkills = new int[32]; // L: 564
+ changedSkillsCount = 0; // L: 565
+ field686 = new int[32]; // L: 566
+ field687 = 0; // L: 567
+ chatCycle = 0; // L: 568
+ field689 = 0; // L: 569
+ field690 = 0; // L: 570
+ field525 = 0; // L: 571
+ field692 = 0; // L: 572
+ field480 = 0; // L: 573
+ field661 = 0; // L: 574
+ field695 = 0; // L: 575
+ mouseWheelRotation = 0; // L: 581
+ scriptEvents = new NodeDeque(); // L: 582
+ field698 = new NodeDeque(); // L: 583
+ field699 = new NodeDeque(); // L: 584
+ widgetFlags = new NodeHashTable(512); // L: 585
+ rootWidgetCount = 0; // L: 587
+ field702 = -2; // L: 588
+ field703 = new boolean[100]; // L: 589
+ field704 = new boolean[100]; // L: 590
+ field751 = new boolean[100]; // L: 591
+ rootWidgetXs = new int[100]; // L: 592
+ rootWidgetYs = new int[100]; // L: 593
+ rootWidgetWidths = new int[100]; // L: 594
+ rootWidgetHeights = new int[100]; // L: 595
+ gameDrawingMode = 0; // L: 596
+ field711 = 0L; // L: 597
+ isResizable = true; // L: 598
+ field773 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 605
+ publicChatMode = 0; // L: 606
+ tradeChatMode = 0; // L: 608
+ field716 = ""; // L: 609
+ crossWorldMessageIds = new long[100]; // L: 611
+ crossWorldMessageIdsIndex = 0; // L: 612
+ field719 = 0; // L: 614
+ field720 = new int[128]; // L: 615
+ field721 = new int[128]; // L: 616
+ field728 = -1L; // L: 617
+ currentClanSettings = new ClanSettings[4]; // L: 621
+ currentClanChannels = new ClanChannel[4]; // L: 623
+ field725 = -1; // L: 625
+ mapIconCount = 0; // L: 626
+ mapIconXs = new int[1000]; // L: 627
+ mapIconYs = new int[1000]; // L: 628
+ mapIcons = new SpritePixels[1000]; // L: 629
+ destinationX = 0; // L: 630
+ destinationY = 0; // L: 631
+ minimapState = 0; // L: 638
+ currentTrackGroupId = -1; // L: 639
+ playingJingle = false; // L: 640
+ soundEffectCount = 0; // L: 646
+ soundEffectIds = new int[50]; // L: 647
+ queuedSoundEffectLoops = new int[50]; // L: 648
+ queuedSoundEffectDelays = new int[50]; // L: 649
+ soundLocations = new int[50]; // L: 650
+ soundEffects = new SoundEffect[50]; // L: 651
+ isCameraLocked = false; // L: 653
+ field667 = false; // L: 664
+ field743 = new boolean[5]; // L: 672
+ field762 = new int[5]; // L: 673
+ field745 = new int[5]; // L: 674
+ field537 = new int[5]; // L: 675
+ field747 = new int[5]; // L: 676
+ field748 = 256; // L: 677
+ field749 = 205; // L: 678
+ zoomHeight = 256; // L: 679
+ zoomWidth = 320; // L: 680
+ field752 = 1; // L: 681
+ field753 = 32767; // L: 682
+ field754 = 1; // L: 683
+ field755 = 32767; // L: 684
+ viewportOffsetX = 0; // L: 685
+ viewportOffsetY = 0; // L: 686
+ viewportWidth = 0; // L: 687
+ viewportHeight = 0; // L: 688
+ viewportZoom = 0; // L: 689
+ playerAppearance = new PlayerComposition(); // L: 691
+ field535 = -1; // L: 692
+ field763 = -1; // L: 693
+ platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 695
+ grandExchangeOffers = new GrandExchangeOffer[8]; // L: 697
+ GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 700
+ Widget_cachedModels = new EvictingDualNodeHashTable(64); // L: 702
+ Widget_cachedFonts = new EvictingDualNodeHashTable(64); // L: 703
+ field588 = -1; // L: 706
+ field770 = -1; // L: 712
+ archiveLoaders = new ArrayList(10); // L: 713
+ archiveLoadersDone = 0; // L: 714
+ field626 = 0; // L: 715
+ field774 = new ApproximateRouteStrategy(); // L: 724
+ field674 = new int[50]; // L: 725
+ field776 = new int[50]; // L: 726
}
public Client() {
- this.field531 = -1L; // L: 282
- }
+ this.field523 = false; // L: 273
+ this.field707 = -1L;
+ } // L: 330
- @ObfuscatedName("b")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1437501286"
+ garbageValue = "1807518530"
)
@Export("resizeGame")
protected final void resizeGame() {
- field711 = class113.method2624() + 500L; // L: 4375
- this.resizeJS(); // L: 4376
- if (rootInterface != -1) { // L: 4377
+ field711 = class115.method2692() + 500L; // L: 4394
+ this.resizeJS(); // L: 4395
+ if (rootInterface != -1) { // L: 4396
this.resizeRoot(true);
}
- } // L: 4378
+ } // L: 4397
- @ObfuscatedName("u")
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-1311"
+ descriptor = "(I)V",
+ garbageValue = "-1208160772"
)
@Export("setUp")
protected final void setUp() {
- Interpreter.method1866(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 907
- Tiles.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 908
- GrandExchangeEvent.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 909
- WorldMapRegion.currentPort = Tiles.worldPort; // L: 910
- Coord.field3352 = class293.field3375; // L: 911
- DesktopPlatformInfoProvider.field4469 = class293.field3371; // L: 912
- class340.field4156 = class293.field3376; // L: 913
- PlayerComposition.field3366 = class293.field3374; // L: 914
- UserComparator7.urlRequester = new class101(); // L: 915
- this.setUpKeyboard(); // L: 916
- this.method415(); // L: 917
- Clock.mouseWheel = this.mouseWheel(); // L: 918
- class135.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 919
- AccessFile var2 = null; // L: 922
- ClientPreferences var3 = new ClientPreferences(); // L: 923
+ int[] var1 = new int[]{20, 260, 10000}; // L: 967
+ int[] var2 = new int[]{1000, 100, 500}; // L: 968
+ if (var1 != null && var2 != null) { // L: 970
+ Canvas.ByteArrayPool_alternativeSizes = var1; // L: 977
+ class17.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 978
+ class464.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 979
- try {
- var2 = UserComparator3.getPreferencesFile("", ApproximateRouteStrategy.field473.name, false); // L: 925
- byte[] var4 = new byte[(int)var2.length()]; // L: 926
-
- int var6;
- for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 927 928 931
- var6 = var2.read(var4, var5, var4.length - var5); // L: 929
- if (var6 == -1) { // L: 930
- throw new IOException();
- }
+ for (int var3 = 0; var3 < Canvas.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 980
+ class464.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 981
+ ByteArrayPool.field4202.add(var1[var3]); // L: 982
}
- var3 = new ClientPreferences(new Buffer(var4)); // L: 933
- } catch (Exception var8) { // L: 935
+ Collections.sort(ByteArrayPool.field4202); // L: 984
+ } else {
+ Canvas.ByteArrayPool_alternativeSizes = null; // L: 971
+ class17.ByteArrayPool_altSizeArrayCounts = null; // L: 972
+ class464.ByteArrayPool_arrays = null; // L: 973
+ class228.method4899(); // L: 974
}
- try {
- if (var2 != null) { // L: 937
- var2.close();
- }
- } catch (Exception var7) { // L: 939
+ FloorDecoration.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 986
+ class18.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 987
+ currentPort = FloorDecoration.worldPort; // L: 988
+ PlayerComposition.field3343 = class292.field3351; // L: 989
+ PlayerComposition.field3342 = class292.field3349; // L: 990
+ WorldMapSectionType.field2793 = class292.field3350; // L: 991
+ PlayerComposition.field3334 = class292.field3352; // L: 992
+ class138.urlRequester = new class101(this.field523, 206); // L: 993
+ this.setUpKeyboard(); // L: 994
+ this.method387(); // L: 995
+ JagexCache.mouseWheel = this.mouseWheel(); // L: 996
+ CollisionMap.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 997
+ class19.clientPreferences = class299.method5754(); // L: 998
+ this.setUpClipboard(); // L: 999
+ String var4 = TileItem.field1301; // L: 1001
+ class29.field172 = this; // L: 1003
+ if (var4 != null) { // L: 1004
+ class29.field169 = var4;
}
- class12.clientPreferences = var3; // L: 942
- this.setUpClipboard(); // L: 943
- Tiles.method1996(this, GameEngine.field206); // L: 944
- Widget.setWindowedMode(class12.clientPreferences.method2274()); // L: 945
- BufferedSource.friendSystem = new FriendSystem(class391.loginType); // L: 946
- this.field519 = new class14("tokenRequest", 1, 1); // L: 947
- } // L: 948
+ WorldMapLabelSize.setWindowedMode(class19.clientPreferences.method2268()); // L: 1006
+ Player.friendSystem = new FriendSystem(HealthBarDefinition.loginType); // L: 1007
+ this.field519 = new class14("tokenRequest", 1, 1); // L: 1008
+ } // L: 1009
- @ObfuscatedName("ag")
+ @ObfuscatedName("ab")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-772264838"
+ garbageValue = "-1160439504"
)
@Export("doCycle")
protected final void doCycle() {
- ++cycle; // L: 952
- this.doCycleJs5(); // L: 953
+ ++cycle; // L: 1013
+ this.doCycleJs5(); // L: 1014
while (true) {
ArchiveDiskAction var1;
- synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 957
- var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 958
- } // L: 959
+ synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 1018
+ var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 1019
+ } // L: 1020
- if (var1 == null) { // L: 960
- int var5;
+ if (var1 == null) { // L: 1021
+ int var6;
try {
- if (class273.musicPlayerStatus == 1) { // L: 966
- var5 = class273.midiPcmStream.method5080(); // L: 967
- if (var5 > 0 && class273.midiPcmStream.isReady()) { // L: 968
- var5 -= GrandExchangeEvent.pcmSampleLength; // L: 969
- if (var5 < 0) { // L: 970
- var5 = 0;
+ if (class272.musicPlayerStatus == 1) { // L: 1027
+ var6 = class272.midiPcmStream.method5254(); // L: 1028
+ if (var6 > 0 && class272.midiPcmStream.isReady()) { // L: 1029
+ var6 -= class272.pcmSampleLength; // L: 1030
+ if (var6 < 0) { // L: 1031
+ var6 = 0;
}
- class273.midiPcmStream.setPcmStreamVolume(var5); // L: 971
+ class272.midiPcmStream.setPcmStreamVolume(var6); // L: 1032
} else {
- class273.midiPcmStream.clear(); // L: 974
- class273.midiPcmStream.removeAll(); // L: 975
- if (ClanChannelMember.musicTrackArchive != null) { // L: 976
- class273.musicPlayerStatus = 2;
+ class272.midiPcmStream.clear(); // L: 1035
+ class272.midiPcmStream.removeAll(); // L: 1036
+ if (class272.musicTrackArchive != null) { // L: 1037
+ class272.musicPlayerStatus = 2;
} else {
- class273.musicPlayerStatus = 0; // L: 977
+ class272.musicPlayerStatus = 0; // L: 1038
}
- class273.musicTrack = null; // L: 978
- class152.soundCache = null; // L: 979
+ Tiles.musicTrack = null; // L: 1039
+ class181.soundCache = null; // L: 1040
}
}
- } catch (Exception var9) { // L: 982
- var9.printStackTrace(); // L: 983
- class273.midiPcmStream.clear(); // L: 984
- class273.musicPlayerStatus = 0; // L: 985
- class273.musicTrack = null; // L: 986
- class152.soundCache = null; // L: 987
- ClanChannelMember.musicTrackArchive = null; // L: 988
+ } catch (Exception var11) { // L: 1043
+ var11.printStackTrace(); // L: 1044
+ class272.midiPcmStream.clear(); // L: 1045
+ class272.musicPlayerStatus = 0; // L: 1046
+ Tiles.musicTrack = null; // L: 1047
+ class181.soundCache = null; // L: 1048
+ class272.musicTrackArchive = null; // L: 1049
}
- ArchiveLoader.playPcmPlayers(); // L: 991
- synchronized(KeyHandler.KeyHandler_instance) { // L: 993
- ++KeyHandler.KeyHandler_idleCycles; // L: 994
- KeyHandler.field142 = KeyHandler.field144; // L: 995
- KeyHandler.field139 = 0; // L: 996
- KeyHandler.field134 = 0; // L: 997
- Arrays.fill(KeyHandler.field120, false); // L: 998
- Arrays.fill(KeyHandler.field132, false); // L: 999
- if (KeyHandler.field135 < 0) { // L: 1000
- Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 1001
- KeyHandler.field135 = KeyHandler.field150; // L: 1002
+ Renderable.playPcmPlayers(); // L: 1052
+ synchronized(KeyHandler.KeyHandler_instance) { // L: 1054
+ ++KeyHandler.KeyHandler_idleCycles; // L: 1055
+ KeyHandler.field147 = KeyHandler.field127; // L: 1056
+ KeyHandler.field144 = 0; // L: 1057
+ KeyHandler.field146 = 0; // L: 1058
+ Arrays.fill(KeyHandler.field136, false); // L: 1059
+ Arrays.fill(KeyHandler.field141, false); // L: 1060
+ if (KeyHandler.field140 < 0) { // L: 1061
+ Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 1062
+ KeyHandler.field140 = KeyHandler.field139; // L: 1063
} else {
- while (KeyHandler.field135 != KeyHandler.field150) { // L: 1005
- int var6 = KeyHandler.field133[KeyHandler.field150]; // L: 1006
- KeyHandler.field150 = KeyHandler.field150 + 1 & 127; // L: 1007
- if (var6 < 0) { // L: 1008
- var6 = ~var6; // L: 1009
- if (KeyHandler.KeyHandler_pressedKeys[var6]) { // L: 1010
- KeyHandler.KeyHandler_pressedKeys[var6] = false; // L: 1011
- KeyHandler.field132[var6] = true; // L: 1012
- KeyHandler.field140[KeyHandler.field134] = var6; // L: 1013
- ++KeyHandler.field134; // L: 1014
+ while (KeyHandler.field140 != KeyHandler.field139) { // L: 1066
+ int var7 = KeyHandler.field138[KeyHandler.field139]; // L: 1067
+ KeyHandler.field139 = KeyHandler.field139 + 1 & 127; // L: 1068
+ if (var7 < 0) { // L: 1069
+ var7 = ~var7; // L: 1070
+ if (KeyHandler.KeyHandler_pressedKeys[var7]) { // L: 1071
+ KeyHandler.KeyHandler_pressedKeys[var7] = false; // L: 1072
+ KeyHandler.field141[var7] = true; // L: 1073
+ KeyHandler.field142[KeyHandler.field146] = var7; // L: 1074
+ ++KeyHandler.field146; // L: 1075
}
} else {
- if (!KeyHandler.KeyHandler_pressedKeys[var6] && KeyHandler.field139 < KeyHandler.field138.length - 1) { // L: 1018
- KeyHandler.field120[var6] = true; // L: 1019
- KeyHandler.field138[++KeyHandler.field139 - 1] = var6; // L: 1020
+ if (!KeyHandler.KeyHandler_pressedKeys[var7] && KeyHandler.field144 < KeyHandler.field134.length - 1) { // L: 1079
+ KeyHandler.field136[var7] = true; // L: 1080
+ KeyHandler.field134[++KeyHandler.field144 - 1] = var7; // L: 1081
}
- KeyHandler.KeyHandler_pressedKeys[var6] = true; // L: 1022
+ KeyHandler.KeyHandler_pressedKeys[var7] = true; // L: 1083
}
}
}
- if (KeyHandler.field139 > 0) { // L: 1026
+ if (KeyHandler.field144 > 0) { // L: 1087
KeyHandler.KeyHandler_idleCycles = 0;
}
- KeyHandler.field144 = KeyHandler.field143; // L: 1027
+ KeyHandler.field127 = KeyHandler.field143; // L: 1088
}
- WorldMapLabelSize.method4414(); // L: 1030
- if (Clock.mouseWheel != null) { // L: 1031
- var5 = Clock.mouseWheel.useRotation(); // L: 1032
- mouseWheelRotation = var5; // L: 1033
+ synchronized(MouseHandler.MouseHandler_instance) { // L: 1092
+ MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 1093
+ MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 1094
+ MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 1095
+ MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 1096
+ MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 1097
+ MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 1098
+ MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 1099
+ MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 1100
+ MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 1101
+ } // L: 1102
+
+ if (JagexCache.mouseWheel != null) { // L: 1104
+ var6 = JagexCache.mouseWheel.useRotation(); // L: 1105
+ mouseWheelRotation = var6; // L: 1106
}
- if (gameState == 0) { // L: 1035
- ClanSettings.load(); // L: 1036
- WorldMap.method7222(); // L: 1037
- } else if (gameState == 5) { // L: 1039
- class136.loginScreen(this, class149.fontPlain12); // L: 1040
- ClanSettings.load(); // L: 1041
- WorldMap.method7222(); // L: 1042
- } else if (gameState != 10 && gameState != 11) { // L: 1044
- if (gameState == 20) { // L: 1045
- class136.loginScreen(this, class149.fontPlain12); // L: 1046
- this.doCycleLoggedOut(); // L: 1047
- } else if (gameState == 50) { // L: 1049
- class136.loginScreen(this, class149.fontPlain12); // L: 1050
- this.doCycleLoggedOut(); // L: 1051
- } else if (gameState == 25) { // L: 1053
- class301.method5580();
+ if (gameState == 0) { // L: 1108
+ ViewportMouse.load(); // L: 1109
+ Calendar.method5504(); // L: 1110
+ } else if (gameState == 5) { // L: 1112
+ class16.loginScreen(this, DevicePcmPlayerProvider.fontPlain12); // L: 1113
+ ViewportMouse.load(); // L: 1114
+ Calendar.method5504(); // L: 1115
+ } else if (gameState != 10 && gameState != 11) { // L: 1117
+ if (gameState == 20) { // L: 1118
+ class16.loginScreen(this, DevicePcmPlayerProvider.fontPlain12); // L: 1119
+ this.doCycleLoggedOut(); // L: 1120
+ } else if (gameState == 50) { // L: 1122
+ class16.loginScreen(this, DevicePcmPlayerProvider.fontPlain12); // L: 1123
+ this.doCycleLoggedOut(); // L: 1124
+ } else if (gameState == 25) { // L: 1126
+ ArchiveDiskActionHandler.method5793();
}
} else {
- class136.loginScreen(this, class149.fontPlain12);
+ class16.loginScreen(this, DevicePcmPlayerProvider.fontPlain12);
}
- if (gameState == 30) { // L: 1054
+ if (gameState == 30) { // L: 1127
this.doCycleLoggedIn();
- } else if (gameState == 40 || gameState == 45) { // L: 1055
+ } else if (gameState == 40 || gameState == 45) { // L: 1128
this.doCycleLoggedOut();
}
- return; // L: 1056
+ return; // L: 1129
}
- var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 961
+ var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 1022
}
}
- @ObfuscatedName("ar")
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
descriptor = "(ZI)V",
- garbageValue = "-375798495"
+ garbageValue = "-2097579655"
)
@Export("draw")
protected final void draw(boolean var1) {
- boolean var2 = Players.method2427(); // L: 1060
- if (var2 && playingJingle && SecureRandomCallable.pcmPlayer0 != null) { // L: 1061 1062
- SecureRandomCallable.pcmPlayer0.tryDiscard();
+ boolean var2;
+ label174: {
+ try {
+ if (class272.musicPlayerStatus == 2) { // L: 1136
+ if (Tiles.musicTrack == null) { // L: 1137
+ Tiles.musicTrack = MusicTrack.readTrack(class272.musicTrackArchive, class272.musicTrackGroupId, class151.musicTrackFileId); // L: 1138
+ if (Tiles.musicTrack == null) { // L: 1139
+ var2 = false; // L: 1140
+ break label174;
+ }
+ }
+
+ if (class181.soundCache == null) { // L: 1144
+ class181.soundCache = new SoundCache(class28.soundEffectsArchive, class272.musicSamplesArchive);
+ }
+
+ if (class272.midiPcmStream.loadMusicTrack(Tiles.musicTrack, class272.musicPatchesArchive, class181.soundCache, 22050)) { // L: 1145
+ class272.midiPcmStream.clearAll(); // L: 1146
+ class272.midiPcmStream.setPcmStreamVolume(class272.musicTrackVolume); // L: 1147
+ class272.midiPcmStream.setMusicTrack(Tiles.musicTrack, class11.musicTrackBoolean); // L: 1148
+ class272.musicPlayerStatus = 0; // L: 1149
+ Tiles.musicTrack = null; // L: 1150
+ class181.soundCache = null; // L: 1151
+ class272.musicTrackArchive = null; // L: 1152
+ var2 = true; // L: 1153
+ break label174;
+ }
+ }
+ } catch (Exception var6) { // L: 1158
+ var6.printStackTrace(); // L: 1159
+ class272.midiPcmStream.clear(); // L: 1160
+ class272.musicPlayerStatus = 0; // L: 1161
+ Tiles.musicTrack = null; // L: 1162
+ class181.soundCache = null; // L: 1163
+ class272.musicTrackArchive = null; // L: 1164
+ }
+
+ var2 = false; // L: 1166
}
- if ((gameState == 10 || gameState == 20 || gameState == 30) && field711 != 0L && class113.method2624() > field711) { // L: 1064 1065
- Widget.setWindowedMode(ClanChannelMember.getWindowedMode()); // L: 1066
+ if (var2 && playingJingle && AttackOption.pcmPlayer0 != null) { // L: 1169 1170
+ AttackOption.pcmPlayer0.tryDiscard();
}
- int var3;
- if (var1) { // L: 1069
- for (var3 = 0; var3 < 100; ++var3) { // L: 1070
- field652[var3] = true;
+ if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field711 && class115.method2692() > field711) { // L: 1172 1173
+ WorldMapLabelSize.setWindowedMode(class9.getWindowedMode()); // L: 1174
+ }
+
+ int var4;
+ if (var1) { // L: 1177
+ for (var4 = 0; var4 < 100; ++var4) { // L: 1178
+ field703[var4] = true;
}
}
- if (gameState == 0) { // L: 1072
+ if (gameState == 0) { // L: 1180
this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
- } else if (gameState == 5) { // L: 1073
- SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12);
- } else if (gameState != 10 && gameState != 11) { // L: 1074
- if (gameState == 20) { // L: 1075
- SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12);
- } else if (gameState == 50) { // L: 1076
- SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12);
- } else if (gameState == 25) { // L: 1077
- if (field597 == 1) { // L: 1078
- if (field545 > field546) { // L: 1079
- field546 = field545;
+ } else if (gameState == 5) { // L: 1181
+ HitSplatDefinition.drawTitle(TileItem.fontBold12, MouseHandler.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+ } else if (gameState != 10 && gameState != 11) { // L: 1182
+ if (gameState == 20) { // L: 1183
+ HitSplatDefinition.drawTitle(TileItem.fontBold12, MouseHandler.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+ } else if (gameState == 50) { // L: 1184
+ HitSplatDefinition.drawTitle(TileItem.fontBold12, MouseHandler.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+ } else if (gameState == 25) { // L: 1185
+ if (field549 == 1) { // L: 1186
+ if (field694 > field546) { // L: 1187
+ field546 = field694;
}
- var3 = (field546 * 50 - field545 * 50) / field546; // L: 1080
- class259.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1081
- } else if (field597 == 2) { // L: 1083
- if (field570 > field548) { // L: 1084
- field548 = field570;
+ var4 = (field546 * 50 - field694 * 50) / field546; // L: 1188
+ SequenceDefinition.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1189
+ } else if (field549 == 2) { // L: 1191
+ if (field547 > field548) { // L: 1192
+ field548 = field547;
}
- var3 = (field548 * 50 - field570 * 50) / field548 + 50; // L: 1085
- class259.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1086
+ var4 = (field548 * 50 - field547 * 50) / field548 + 50; // L: 1193
+ SequenceDefinition.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1194
} else {
- class259.drawLoadingMessage("Loading - please wait.", false); // L: 1088
+ SequenceDefinition.drawLoadingMessage("Loading - please wait.", false); // L: 1196
}
- } else if (gameState == 30) { // L: 1090
+ } else if (gameState == 30) { // L: 1198
this.drawLoggedIn();
- } else if (gameState == 40) { // L: 1091
- class259.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false);
- } else if (gameState == 45) { // L: 1092
- class259.drawLoadingMessage("Please wait...", false);
+ } else if (gameState == 40) { // L: 1199
+ SequenceDefinition.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false);
+ } else if (gameState == 45) { // L: 1200
+ SequenceDefinition.drawLoadingMessage("Please wait...", false);
}
} else {
- SoundCache.drawTitle(ChatChannel.fontBold12, Varcs.fontPlain11, class149.fontPlain12); // L: 1082
+ HitSplatDefinition.drawTitle(TileItem.fontBold12, MouseHandler.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
}
- if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1093
- for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1094
- if (field704[var3]) { // L: 1095
- DevicePcmPlayerProvider.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1096
- field704[var3] = false; // L: 1097
+ if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1201
+ for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1202
+ if (field704[var4]) { // L: 1203
+ Message.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1204
+ field704[var4] = false; // L: 1205
}
}
- } else if (gameState > 0) { // L: 1101
- DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 1102
+ } else if (gameState > 0) { // L: 1209
+ Message.rasterProvider.drawFull(0, 0); // L: 1210
- for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1103
- field704[var3] = false;
+ for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1211
+ field704[var4] = false;
}
}
- } // L: 1105
+ } // L: 1213
@ObfuscatedName("am")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-31"
+ descriptor = "(I)V",
+ garbageValue = "853101705"
)
@Export("kill0")
protected final void kill0() {
- if (class125.varcs.hasUnwrittenChanges()) { // L: 1108
- class125.varcs.write();
+ if (class308.varcs.hasUnwrittenChanges()) { // L: 1216
+ class308.varcs.write();
}
- if (Varcs.mouseRecorder != null) { // L: 1109
- Varcs.mouseRecorder.isRunning = false;
+ if (ItemLayer.mouseRecorder != null) { // L: 1217
+ ItemLayer.mouseRecorder.isRunning = false;
}
- Varcs.mouseRecorder = null; // L: 1110
- packetWriter.close(); // L: 1111
- class162.method3209(); // L: 1112
- if (MouseHandler.MouseHandler_instance != null) { // L: 1114
- synchronized(MouseHandler.MouseHandler_instance) { // L: 1115
- MouseHandler.MouseHandler_instance = null; // L: 1116
- } // L: 1117
+ ItemLayer.mouseRecorder = null; // L: 1218
+ packetWriter.close(); // L: 1219
+ class83.method2118(); // L: 1220
+ NPC.method2365(); // L: 1221
+ JagexCache.mouseWheel = null; // L: 1222
+ if (AttackOption.pcmPlayer0 != null) { // L: 1223
+ AttackOption.pcmPlayer0.shutdown();
}
- Clock.mouseWheel = null; // L: 1120
- if (SecureRandomCallable.pcmPlayer0 != null) { // L: 1121
- SecureRandomCallable.pcmPlayer0.shutdown();
+ if (class238.pcmPlayer1 != null) { // L: 1224
+ class238.pcmPlayer1.shutdown();
}
- if (Fonts.pcmPlayer1 != null) { // L: 1122
- Fonts.pcmPlayer1.shutdown();
- }
-
- if (NetCache.NetCache_socket != null) { // L: 1124
+ if (NetCache.NetCache_socket != null) { // L: 1226
NetCache.NetCache_socket.close();
}
- Occluder.method4221(); // L: 1126
- if (UserComparator7.urlRequester != null) { // L: 1127
- UserComparator7.urlRequester.close(); // L: 1128
- UserComparator7.urlRequester = null; // L: 1129
- }
+ synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1229
+ if (ArchiveDiskActionHandler.field3971 != 0) { // L: 1230
+ ArchiveDiskActionHandler.field3971 = 1; // L: 1231
- try {
- JagexCache.JagexCache_dat2File.close(); // L: 1133
-
- for (int var3 = 0; var3 < UserComparator6.idxCount; ++var3) { // L: 1134
- JagexCache.JagexCache_idxFiles[var3].close();
+ try {
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1233
+ } catch (InterruptedException var4) { // L: 1235
+ }
}
-
- JagexCache.JagexCache_idx255File.close(); // L: 1135
- JagexCache.JagexCache_randomDat.close(); // L: 1136
- } catch (Exception var5) { // L: 1138
}
- this.field519.method161(); // L: 1140
- } // L: 1141
+ if (class138.urlRequester != null) { // L: 1239
+ class138.urlRequester.close(); // L: 1240
+ class138.urlRequester = null; // L: 1241
+ }
- @ObfuscatedName("au")
+ WorldMapLabel.method4999(); // L: 1243
+ this.field519.method151(); // L: 1244
+ } // L: 1245
+
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-9"
+ garbageValue = "2"
)
- protected final void vmethod1448() {
- } // L: 683
+ protected final void vmethod1099() {
+ } // L: 733
- @ObfuscatedName("ez")
+ @ObfuscatedName("ev")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1606202603"
+ garbageValue = "-920255859"
)
- boolean method1128() {
- return Decimator.field406 != null && !Decimator.field406.trim().isEmpty(); // L: 852
+ boolean method1102() {
+ return class21.field122 != null && !class21.field122.trim().isEmpty(); // L: 912
}
- @ObfuscatedName("eq")
+ @ObfuscatedName("ee")
@ObfuscatedSignature(
descriptor = "(B)Z",
- garbageValue = "-69"
+ garbageValue = "-74"
)
- boolean method1520() {
- return this.field478 != null; // L: 856
+ boolean method1103() {
+ return this.field733 != null; // L: 916
}
- @ObfuscatedName("fs")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "64"
- )
- void method1130(String var1) throws IOException {
- HashMap var2 = new HashMap(); // L: 860
- var2.put("grant_type", "refresh_token"); // L: 861
- var2.put("scope", "gamesso.token.create"); // L: 862
- var2.put("refresh_token", var1); // L: 863
- URL var3 = new URL(ApproximateRouteStrategy.field471 + "shield/oauth/token" + (new class401(var2)).method6961()); // L: 864
- HashMap var4 = new HashMap(); // L: 865
- var4.put("Authorization", "Basic " + field526); // L: 866
- var4.put("Host", (new URL(ApproximateRouteStrategy.field471)).getHost()); // L: 867
- var4.put("Accept", class398.field4432.method6940()); // L: 868
- class9 var5 = class9.field32; // L: 869
- RefreshAccessTokenRequester var6 = this.field577; // L: 870
- if (var6 != null) { // L: 871
- this.field581 = var6.request(var5.method67(), var3, var4, ""); // L: 872
- } else {
- class10 var7 = new class10(var3, var5); // L: 875
- Iterator var8 = var4.entrySet().iterator(); // L: 876
-
- while (var8.hasNext()) {
- Entry var9 = (Entry)var8.next(); // L: 877
- var7.method78((String)var9.getKey(), (String)var9.getValue()); // L: 879
- }
-
- this.field523 = this.field519.method160(var7); // L: 882
- }
- } // L: 873 883
-
- @ObfuscatedName("fp")
+ @ObfuscatedName("ef")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-1218305449"
+ garbageValue = "45169414"
)
- void method1229(String var1) throws MalformedURLException, IOException {
- URL var2 = new URL(ApproximateRouteStrategy.field471 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 886
- HashMap var3 = new HashMap(); // L: 887
- var3.put("Authorization", "Bearer " + var1); // L: 888
- class9 var4 = class9.field40; // L: 889
- OtlTokenRequester var5 = this.field478; // L: 890
- if (var5 != null) { // L: 891
- this.field550 = var5.request(var4.method67(), var2, var3, ""); // L: 892
+ void method1104(String var1) throws IOException {
+ HashMap var2 = new HashMap(); // L: 920
+ var2.put("grant_type", "refresh_token"); // L: 921
+ var2.put("scope", "gamesso.token.create"); // L: 922
+ var2.put("refresh_token", var1); // L: 923
+ URL var3 = new URL(UserComparator5.field1387 + "shield/oauth/token" + (new class400(var2)).method7122()); // L: 924
+ HashMap var4 = new HashMap(); // L: 925
+ var4.put("Authorization", "Basic " + field527); // L: 926
+ var4.put("Host", (new URL(UserComparator5.field1387)).getHost()); // L: 927
+ var4.put("Accept", class397.field4431.method7086()); // L: 928
+ class9 var5 = class9.field36; // L: 929
+ RefreshAccessTokenRequester var6 = this.field673; // L: 930
+ if (var6 != null) { // L: 931
+ this.field526 = var6.request(var5.method64(), var3, var4, ""); // L: 932
} else {
- class10 var6 = new class10(var2, var4); // L: 895
- Iterator var7 = var3.entrySet().iterator(); // L: 896
+ class10 var7 = new class10(var3, var5, this.field523); // L: 935
+ Iterator var8 = var4.entrySet().iterator(); // L: 936
- while (var7.hasNext()) {
- Entry var8 = (Entry)var7.next(); // L: 897
- var6.method78((String)var8.getKey(), (String)var8.getValue()); // L: 899
+ while (var8.hasNext()) {
+ Entry var9 = (Entry)var8.next(); // L: 937
+ var7.method79((String)var9.getKey(), (String)var9.getValue()); // L: 939
}
- this.field520 = this.field519.method160(var6); // L: 902
+ this.field524 = this.field519.method150(var7); // L: 942
}
- } // L: 893 903
+ } // L: 933 943
- @ObfuscatedName("fg")
+ @ObfuscatedName("er")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-568109507"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "1435757566"
+ )
+ void method1481(String var1) throws MalformedURLException, IOException {
+ URL var2 = new URL(UserComparator5.field1387 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"); // L: 946
+ HashMap var3 = new HashMap(); // L: 947
+ var3.put("Authorization", "Bearer " + var1); // L: 948
+ class9 var4 = class9.field30; // L: 949
+ OtlTokenRequester var5 = this.field733; // L: 950
+ if (var5 != null) { // L: 951
+ this.field611 = var5.request(var4.method64(), var2, var3, ""); // L: 952
+ } else {
+ class10 var6 = new class10(var2, var4, this.field523); // L: 955
+ Iterator var7 = var3.entrySet().iterator(); // L: 956
+
+ while (var7.hasNext()) {
+ Entry var8 = (Entry)var7.next(); // L: 957
+ var6.method79((String)var8.getKey(), (String)var8.getValue()); // L: 959
+ }
+
+ this.field520 = this.field519.method150(var6); // L: 962
+ }
+ } // L: 953 963
+
+ @ObfuscatedName("es")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "116"
)
@Export("doCycleJs5")
void doCycleJs5() {
- if (gameState != 1000) { // L: 1206
- long var2 = class113.method2624(); // L: 1209
- int var4 = (int)(var2 - NetCache.field4041); // L: 1210
- NetCache.field4041 = var2; // L: 1211
- if (var4 > 200) { // L: 1212
+ if (gameState != 1000) { // L: 1322
+ long var2 = class115.method2692(); // L: 1325
+ int var4 = (int)(var2 - NetCache.field4029); // L: 1326
+ NetCache.field4029 = var2; // L: 1327
+ if (var4 > 200) { // L: 1328
var4 = 200;
}
- NetCache.NetCache_loadTime += var4; // L: 1213
+ NetCache.NetCache_loadTime += var4; // L: 1329
boolean var1;
- if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1214
- var1 = true; // L: 1215
- } else if (NetCache.NetCache_socket == null) { // L: 1218
- var1 = false; // L: 1219
+ if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1330
+ var1 = true; // L: 1331
+ } else if (NetCache.NetCache_socket == null) { // L: 1334
+ var1 = false; // L: 1335
} else {
try {
- label243: {
- if (NetCache.NetCache_loadTime > 30000) { // L: 1223
+ label241: {
+ if (NetCache.NetCache_loadTime > 30000) { // L: 1339
throw new IOException();
}
NetFileRequest var5;
Buffer var6;
- while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1224
- var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1225
- var6 = new Buffer(4); // L: 1226
- var6.writeByte(1); // L: 1227
- var6.writeMedium((int)var5.key); // L: 1228
- NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1229
- NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1230
- --NetCache.NetCache_pendingPriorityWritesCount; // L: 1231
- ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1232
+ while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1340
+ var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1341
+ var6 = new Buffer(4); // L: 1342
+ var6.writeByte(1); // L: 1343
+ var6.writeMedium((int)var5.key); // L: 1344
+ NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1345
+ NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1346
+ --NetCache.NetCache_pendingPriorityWritesCount; // L: 1347
+ ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1348
}
- while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1234
- var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1235
- var6 = new Buffer(4); // L: 1236
- var6.writeByte(0); // L: 1237
- var6.writeMedium((int)var5.key); // L: 1238
- NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1239
- var5.removeDual(); // L: 1240
- NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1241
- --NetCache.NetCache_pendingWritesCount; // L: 1242
- ++NetCache.NetCache_pendingResponsesCount; // L: 1243
+ while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1350
+ var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1351
+ var6 = new Buffer(4); // L: 1352
+ var6.writeByte(0); // L: 1353
+ var6.writeMedium((int)var5.key); // L: 1354
+ NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1355
+ var5.removeDual(); // L: 1356
+ NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1357
+ --NetCache.NetCache_pendingWritesCount; // L: 1358
+ ++NetCache.NetCache_pendingResponsesCount; // L: 1359
}
- for (int var17 = 0; var17 < 100; ++var17) { // L: 1245
- int var18 = NetCache.NetCache_socket.available(); // L: 1246
- if (var18 < 0) { // L: 1247
+ for (int var17 = 0; var17 < 100; ++var17) { // L: 1361
+ int var18 = NetCache.NetCache_socket.available(); // L: 1362
+ if (var18 < 0) { // L: 1363
throw new IOException();
}
- if (var18 == 0) { // L: 1248
+ if (var18 == 0) { // L: 1364
break;
}
- NetCache.NetCache_loadTime = 0; // L: 1249
- byte var7 = 0; // L: 1250
- if (WorldMapIcon_0.NetCache_currentResponse == null) { // L: 1251
+ NetCache.NetCache_loadTime = 0; // L: 1365
+ byte var7 = 0; // L: 1366
+ if (Buddy.NetCache_currentResponse == null) { // L: 1367
var7 = 8;
- } else if (NetCache.field4052 == 0) { // L: 1252
+ } else if (NetCache.field4027 == 0) { // L: 1368
var7 = 1;
}
int var8;
int var9;
int var10;
- int var12;
byte[] var10000;
int var10001;
- Buffer var25;
- if (var7 > 0) { // L: 1253
- var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1254
- if (var8 > var18) { // L: 1255
+ Buffer var24;
+ if (var7 > 0) { // L: 1369
+ var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1370
+ if (var8 > var18) { // L: 1371
var8 = var18;
}
- NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1256
- if (NetCache.field4043 != 0) { // L: 1257
- for (var9 = 0; var9 < var8; ++var9) { // L: 1258
+ NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1372
+ if (NetCache.field4033 != 0) { // L: 1373
+ for (var9 = 0; var9 < var8; ++var9) { // L: 1374
var10000 = NetCache.NetCache_responseHeaderBuffer.array;
var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset;
- var10000[var10001] ^= NetCache.field4043;
+ var10000[var10001] ^= NetCache.field4033;
}
}
- var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1260
- var25.offset += var8;
- if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1261
+ var24 = NetCache.NetCache_responseHeaderBuffer; // L: 1376
+ var24.offset += var8;
+ if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1377
break;
}
- if (WorldMapIcon_0.NetCache_currentResponse == null) { // L: 1262
- NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1263
- var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1264
- var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1265
- int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1266
- var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1267
- long var13 = (long)(var10 + (var9 << 16)); // L: 1268
- NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1269
- class270.field3218 = true; // L: 1270
- if (var15 == null) { // L: 1271
- var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1272
- class270.field3218 = false; // L: 1273
+ if (Buddy.NetCache_currentResponse == null) { // L: 1378
+ NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1379
+ var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1380
+ var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1381
+ int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1382
+ int var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1383
+ long var13 = (long)(var10 + (var9 << 16)); // L: 1384
+ NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1385
+ class351.field4198 = true; // L: 1386
+ if (var15 == null) { // L: 1387
+ var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1388
+ class351.field4198 = false; // L: 1389
}
- if (var15 == null) { // L: 1275
- throw new IOException(); // L: 1276
+ if (var15 == null) { // L: 1391
+ throw new IOException(); // L: 1392
}
- int var16 = var11 == 0 ? 5 : 9; // L: 1278
- WorldMapIcon_0.NetCache_currentResponse = var15; // L: 1279
- class357.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + WorldMapIcon_0.NetCache_currentResponse.padding); // L: 1280
- class357.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1281
- class357.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1282
- NetCache.field4052 = 8; // L: 1283
- NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1284
- } else if (NetCache.field4052 == 0) { // L: 1287
- if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1288
- NetCache.field4052 = 1; // L: 1289
- NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1290
+ int var16 = var11 == 0 ? 5 : 9; // L: 1394
+ Buddy.NetCache_currentResponse = var15; // L: 1395
+ ObjectSound.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + Buddy.NetCache_currentResponse.padding); // L: 1396
+ ObjectSound.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1397
+ ObjectSound.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1398
+ NetCache.field4027 = 8; // L: 1399
+ NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1400
+ } else if (NetCache.field4027 == 0) { // L: 1403
+ if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1404
+ NetCache.field4027 = 1; // L: 1405
+ NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1406
} else {
- WorldMapIcon_0.NetCache_currentResponse = null; // L: 1294
+ Buddy.NetCache_currentResponse = null; // L: 1410
}
}
} else {
- var8 = class357.NetCache_responseArchiveBuffer.array.length - WorldMapIcon_0.NetCache_currentResponse.padding; // L: 1300
- var9 = 512 - NetCache.field4052; // L: 1301
- if (var9 > var8 - class357.NetCache_responseArchiveBuffer.offset) { // L: 1302
- var9 = var8 - class357.NetCache_responseArchiveBuffer.offset;
+ var8 = ObjectSound.NetCache_responseArchiveBuffer.array.length - Buddy.NetCache_currentResponse.padding; // L: 1416
+ var9 = 512 - NetCache.field4027; // L: 1417
+ if (var9 > var8 - ObjectSound.NetCache_responseArchiveBuffer.offset) { // L: 1418
+ var9 = var8 - ObjectSound.NetCache_responseArchiveBuffer.offset;
}
- if (var9 > var18) { // L: 1303
+ if (var9 > var18) { // L: 1419
var9 = var18;
}
- NetCache.NetCache_socket.read(class357.NetCache_responseArchiveBuffer.array, class357.NetCache_responseArchiveBuffer.offset, var9); // L: 1304
- if (NetCache.field4043 != 0) { // L: 1305
- for (var10 = 0; var10 < var9; ++var10) { // L: 1306
- var10000 = class357.NetCache_responseArchiveBuffer.array;
- var10001 = class357.NetCache_responseArchiveBuffer.offset + var10;
- var10000[var10001] ^= NetCache.field4043;
+ NetCache.NetCache_socket.read(ObjectSound.NetCache_responseArchiveBuffer.array, ObjectSound.NetCache_responseArchiveBuffer.offset, var9); // L: 1420
+ if (NetCache.field4033 != 0) { // L: 1421
+ for (var10 = 0; var10 < var9; ++var10) { // L: 1422
+ var10000 = ObjectSound.NetCache_responseArchiveBuffer.array;
+ var10001 = ObjectSound.NetCache_responseArchiveBuffer.offset + var10;
+ var10000[var10001] ^= NetCache.field4033;
}
}
- var25 = class357.NetCache_responseArchiveBuffer; // L: 1308
- var25.offset += var9;
- NetCache.field4052 += var9; // L: 1309
- if (var8 == class357.NetCache_responseArchiveBuffer.offset) { // L: 1310
- if (WorldMapIcon_0.NetCache_currentResponse.key == 16711935L) { // L: 1311
- class300.NetCache_reference = class357.NetCache_responseArchiveBuffer; // L: 1312
+ var24 = ObjectSound.NetCache_responseArchiveBuffer; // L: 1424
+ var24.offset += var9;
+ NetCache.field4027 += var9; // L: 1425
+ if (var8 == ObjectSound.NetCache_responseArchiveBuffer.offset) { // L: 1426
+ if (Buddy.NetCache_currentResponse.key == 16711935L) { // L: 1427
+ KitDefinition.field1862 = ObjectSound.NetCache_responseArchiveBuffer; // L: 1428
- for (var10 = 0; var10 < 256; ++var10) { // L: 1313
- Archive var19 = NetCache.NetCache_archives[var10]; // L: 1314
- if (var19 != null) { // L: 1315
- class300.NetCache_reference.offset = var10 * 8 + 5; // L: 1316
- var12 = class300.NetCache_reference.readInt(); // L: 1317
- int var20 = class300.NetCache_reference.readInt(); // L: 1318
- var19.loadIndex(var12, var20); // L: 1319
+ for (var10 = 0; var10 < 256; ++var10) { // L: 1429
+ Archive var19 = NetCache.NetCache_archives[var10]; // L: 1430
+ if (var19 != null) { // L: 1431
+ DirectByteArrayCopier.method5512(var19, var10); // L: 1432
}
}
} else {
- NetCache.NetCache_crc.reset(); // L: 1324
- NetCache.NetCache_crc.update(class357.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1325
- var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1326
- if (var10 != WorldMapIcon_0.NetCache_currentResponse.crc) { // L: 1327
+ NetCache.NetCache_crc.reset(); // L: 1437
+ NetCache.NetCache_crc.update(ObjectSound.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1438
+ var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1439
+ if (var10 != Buddy.NetCache_currentResponse.crc) { // L: 1440
try {
- NetCache.NetCache_socket.close(); // L: 1329
- } catch (Exception var23) { // L: 1331
+ NetCache.NetCache_socket.close(); // L: 1442
+ } catch (Exception var22) { // L: 1444
}
- ++NetCache.NetCache_crcMismatches; // L: 1332
- NetCache.NetCache_socket = null; // L: 1333
- NetCache.field4043 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1334
- var1 = false; // L: 1335
- break label243;
+ ++NetCache.NetCache_crcMismatches; // L: 1445
+ NetCache.NetCache_socket = null; // L: 1446
+ NetCache.field4033 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1447
+ var1 = false; // L: 1448
+ break label241;
}
- NetCache.NetCache_crcMismatches = 0; // L: 1338
- NetCache.NetCache_ioExceptions = 0; // L: 1339
- WorldMapIcon_0.NetCache_currentResponse.archive.write((int)(WorldMapIcon_0.NetCache_currentResponse.key & 65535L), class357.NetCache_responseArchiveBuffer.array, (WorldMapIcon_0.NetCache_currentResponse.key & 16711680L) == 16711680L, class270.field3218); // L: 1340
+ NetCache.NetCache_crcMismatches = 0; // L: 1451
+ NetCache.NetCache_ioExceptions = 0; // L: 1452
+ Buddy.NetCache_currentResponse.archive.write((int)(Buddy.NetCache_currentResponse.key & 65535L), ObjectSound.NetCache_responseArchiveBuffer.array, 16711680L == (Buddy.NetCache_currentResponse.key & 16711680L), class351.field4198); // L: 1453
}
- WorldMapIcon_0.NetCache_currentResponse.remove(); // L: 1342
- if (class270.field3218) { // L: 1343
+ Buddy.NetCache_currentResponse.remove(); // L: 1455
+ if (class351.field4198) { // L: 1456
--NetCache.NetCache_pendingPriorityResponsesCount;
} else {
- --NetCache.NetCache_pendingResponsesCount; // L: 1344
+ --NetCache.NetCache_pendingResponsesCount; // L: 1457
}
- NetCache.field4052 = 0; // L: 1345
- WorldMapIcon_0.NetCache_currentResponse = null; // L: 1346
- class357.NetCache_responseArchiveBuffer = null; // L: 1347
+ NetCache.field4027 = 0; // L: 1458
+ Buddy.NetCache_currentResponse = null; // L: 1459
+ ObjectSound.NetCache_responseArchiveBuffer = null; // L: 1460
} else {
- if (NetCache.field4052 != 512) { // L: 1349
+ if (NetCache.field4027 != 512) { // L: 1462
break;
}
- NetCache.field4052 = 0;
+ NetCache.field4027 = 0;
}
}
}
- var1 = true; // L: 1353
+ var1 = true; // L: 1466
}
- } catch (IOException var24) {
+ } catch (IOException var23) {
try {
- NetCache.NetCache_socket.close(); // L: 1357
- } catch (Exception var22) { // L: 1359
+ NetCache.NetCache_socket.close(); // L: 1470
+ } catch (Exception var21) { // L: 1472
}
- ++NetCache.NetCache_ioExceptions; // L: 1360
- NetCache.NetCache_socket = null; // L: 1361
- var1 = false; // L: 1362
+ ++NetCache.NetCache_ioExceptions; // L: 1473
+ NetCache.NetCache_socket = null; // L: 1474
+ var1 = false; // L: 1475
}
}
- if (!var1) { // L: 1366
+ if (!var1) { // L: 1479
this.doCycleJs5Connect();
}
}
- } // L: 1367
+ } // L: 1480
- @ObfuscatedName("fd")
+ @ObfuscatedName("fr")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "17214"
+ descriptor = "(I)V",
+ garbageValue = "2087398985"
)
@Export("doCycleJs5Connect")
void doCycleJs5Connect() {
- if (NetCache.NetCache_crcMismatches >= 4) { // L: 1370
- this.error("js5crc"); // L: 1371
- PendingSpawn.updateGameState(1000); // L: 1372
+ if (NetCache.NetCache_crcMismatches >= 4) { // L: 1483
+ this.error("js5crc"); // L: 1484
+ HealthBarUpdate.updateGameState(1000); // L: 1485
} else {
- if (NetCache.NetCache_ioExceptions >= 4) { // L: 1375
- if (gameState <= 5) { // L: 1376
- this.error("js5io"); // L: 1377
- PendingSpawn.updateGameState(1000); // L: 1378
- return; // L: 1379
+ if (NetCache.NetCache_ioExceptions >= 4) { // L: 1488
+ if (gameState <= 5) { // L: 1489
+ this.error("js5io"); // L: 1490
+ HealthBarUpdate.updateGameState(1000); // L: 1491
+ return; // L: 1492
}
- field625 = 3000; // L: 1382
- NetCache.NetCache_ioExceptions = 3; // L: 1383
+ field621 = 3000; // L: 1495
+ NetCache.NetCache_ioExceptions = 3; // L: 1496
}
- if (--field625 + 1 <= 0) { // L: 1386
+ if (--field621 + 1 <= 0) { // L: 1499
try {
- if (js5ConnectState == 0) { // L: 1388
- class259.js5SocketTask = GameEngine.taskHandler.newSocketTask(Timer.worldHost, WorldMapRegion.currentPort); // L: 1389
- ++js5ConnectState; // L: 1390
+ if (js5ConnectState == 0) { // L: 1501
+ FloorOverlayDefinition.js5SocketTask = GameEngine.taskHandler.newSocketTask(StructComposition.worldHost, currentPort); // L: 1502
+ ++js5ConnectState; // L: 1503
}
- if (js5ConnectState == 1) { // L: 1392
- if (class259.js5SocketTask.status == 2) { // L: 1393
- this.js5Error(-1); // L: 1394
- return; // L: 1395
+ if (js5ConnectState == 1) { // L: 1505
+ if (FloorOverlayDefinition.js5SocketTask.status == 2) { // L: 1506
+ this.js5Error(-1); // L: 1507
+ return; // L: 1508
}
- if (class259.js5SocketTask.status == 1) { // L: 1397
+ if (FloorOverlayDefinition.js5SocketTask.status == 1) { // L: 1510
++js5ConnectState;
}
}
- if (js5ConnectState == 2) { // L: 1399
- if (useBufferedSocket) { // L: 1400
- Socket var2 = (Socket)class259.js5SocketTask.result; // L: 1402
- BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1404
- Varcs.js5Socket = var1; // L: 1406
- } else {
- Varcs.js5Socket = new NetSocket((Socket)class259.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1409
- }
-
- Buffer var5 = new Buffer(5); // L: 1411
- var5.writeByte(15); // L: 1412
- var5.writeInt(205); // L: 1413
- Varcs.js5Socket.write(var5.array, 0, 5); // L: 1414
- ++js5ConnectState; // L: 1415
- class147.field1704 = class113.method2624(); // L: 1416
+ if (js5ConnectState == 2) { // L: 1512
+ js5Socket = class131.method2878((Socket)FloorOverlayDefinition.js5SocketTask.result, 40000, 5000); // L: 1513
+ Buffer var1 = new Buffer(5); // L: 1514
+ var1.writeByte(15); // L: 1515
+ var1.writeInt(206); // L: 1516
+ js5Socket.write(var1.array, 0, 5); // L: 1517
+ ++js5ConnectState; // L: 1518
+ field778 = class115.method2692(); // L: 1519
}
- if (js5ConnectState == 3) { // L: 1418
- if (Varcs.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1419
- int var3 = Varcs.js5Socket.readUnsignedByte(); // L: 1420
- if (var3 != 0) { // L: 1421
- this.js5Error(var3); // L: 1422
- return; // L: 1423
+ if (js5ConnectState == 3) { // L: 1521
+ if (js5Socket.available() > 0) { // L: 1522
+ int var5 = js5Socket.readUnsignedByte(); // L: 1523
+ if (var5 != 0) { // L: 1524
+ this.js5Error(var5); // L: 1525
+ return; // L: 1526
}
- ++js5ConnectState; // L: 1425
- } else if (class113.method2624() - class147.field1704 > 30000L) { // L: 1428
- this.js5Error(-2); // L: 1429
- return; // L: 1430
+ ++js5ConnectState; // L: 1528
+ } else if (class115.method2692() - field778 > 30000L) { // L: 1531
+ this.js5Error(-2); // L: 1532
+ return; // L: 1533
}
}
- if (js5ConnectState == 4) { // L: 1434
- Skeleton.method4024(Varcs.js5Socket, gameState > 20); // L: 1435
- class259.js5SocketTask = null; // L: 1436
- Varcs.js5Socket = null; // L: 1437
- js5ConnectState = 0; // L: 1438
- js5Errors = 0; // L: 1439
+ if (js5ConnectState == 4) { // L: 1537
+ AbstractSocket var10 = js5Socket; // L: 1538
+ boolean var2 = gameState > 20; // L: 1539
+ if (NetCache.NetCache_socket != null) { // L: 1541
+ try {
+ NetCache.NetCache_socket.close(); // L: 1543
+ } catch (Exception var8) { // L: 1545
+ }
+
+ NetCache.NetCache_socket = null; // L: 1546
+ }
+
+ NetCache.NetCache_socket = var10; // L: 1548
+ class115.method2693(var2); // L: 1549
+ NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1550
+ Buddy.NetCache_currentResponse = null; // L: 1551
+ ObjectSound.NetCache_responseArchiveBuffer = null; // L: 1552
+ NetCache.field4027 = 0; // L: 1553
+
+ while (true) {
+ NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1555
+ if (var3 == null) { // L: 1556
+ while (true) {
+ var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1562
+ if (var3 == null) { // L: 1563
+ if (NetCache.field4033 != 0) { // L: 1569
+ try {
+ Buffer var11 = new Buffer(4); // L: 1571
+ var11.writeByte(4); // L: 1572
+ var11.writeByte(NetCache.field4033); // L: 1573
+ var11.writeShort(0); // L: 1574
+ NetCache.NetCache_socket.write(var11.array, 0, 4); // L: 1575
+ } catch (IOException var7) {
+ try {
+ NetCache.NetCache_socket.close(); // L: 1579
+ } catch (Exception var6) { // L: 1581
+ }
+
+ ++NetCache.NetCache_ioExceptions; // L: 1582
+ NetCache.NetCache_socket = null; // L: 1583
+ }
+ }
+
+ NetCache.NetCache_loadTime = 0; // L: 1586
+ NetCache.field4029 = class115.method2692(); // L: 1587
+ FloorOverlayDefinition.js5SocketTask = null; // L: 1589
+ js5Socket = null; // L: 1590
+ js5ConnectState = 0; // L: 1591
+ js5Errors = 0; // L: 1592
+ return; // L: 1598
+ }
+
+ NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1564
+ NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1565
+ ++NetCache.NetCache_pendingWritesCount; // L: 1566
+ --NetCache.NetCache_pendingResponsesCount; // L: 1567
+ }
+ }
+
+ NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1557
+ ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1558
+ --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1559
+ }
}
- } catch (IOException var4) { // L: 1442
- this.js5Error(-3); // L: 1443
+ } catch (IOException var9) { // L: 1595
+ this.js5Error(-3); // L: 1596
}
}
}
- } // L: 1373 1445
+ } // L: 1486
- @ObfuscatedName("fh")
+ @ObfuscatedName("fz")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "1106896178"
+ garbageValue = "-2141455936"
)
@Export("js5Error")
void js5Error(int var1) {
- class259.js5SocketTask = null; // L: 1448
- Varcs.js5Socket = null; // L: 1449
- js5ConnectState = 0; // L: 1450
- if (Tiles.worldPort == WorldMapRegion.currentPort) { // L: 1451
- WorldMapRegion.currentPort = GrandExchangeEvent.js5Port;
+ FloorOverlayDefinition.js5SocketTask = null; // L: 1601
+ js5Socket = null; // L: 1602
+ js5ConnectState = 0; // L: 1603
+ if (FloorDecoration.worldPort == currentPort) { // L: 1604
+ currentPort = class18.js5Port;
} else {
- WorldMapRegion.currentPort = Tiles.worldPort; // L: 1452
+ currentPort = FloorDecoration.worldPort; // L: 1605
}
- ++js5Errors; // L: 1453
- if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1454
- if (js5Errors >= 2 && var1 == 6) { // L: 1461
- this.error("js5connect_outofdate"); // L: 1462
- PendingSpawn.updateGameState(1000); // L: 1463
- } else if (js5Errors >= 4) { // L: 1465
- if (gameState <= 5) { // L: 1466
- this.error("js5connect"); // L: 1467
- PendingSpawn.updateGameState(1000); // L: 1468
- } else {
- field625 = 3000; // L: 1470
- }
+ ++js5Errors; // L: 1606
+ if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1607
+ if (gameState <= 5) { // L: 1608
+ this.error("js5connect_full"); // L: 1609
+ HealthBarUpdate.updateGameState(1000); // L: 1610
+ } else {
+ field621 = 3000; // L: 1612
+ }
+ } else if (js5Errors >= 2 && var1 == 6) { // L: 1614
+ this.error("js5connect_outofdate"); // L: 1615
+ HealthBarUpdate.updateGameState(1000); // L: 1616
+ } else if (js5Errors >= 4) { // L: 1618
+ if (gameState <= 5) { // L: 1619
+ this.error("js5connect"); // L: 1620
+ HealthBarUpdate.updateGameState(1000); // L: 1621
+ } else {
+ field621 = 3000; // L: 1623
}
- } else if (gameState <= 5) { // L: 1455
- this.error("js5connect_full"); // L: 1456
- PendingSpawn.updateGameState(1000); // L: 1457
- } else {
- field625 = 3000; // L: 1459
}
- } // L: 1472
+ } // L: 1625
- @ObfuscatedName("ft")
+ @ObfuscatedName("fm")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "57"
+ descriptor = "(I)V",
+ garbageValue = "234739213"
)
@Export("doCycleLoggedOut")
final void doCycleLoggedOut() {
- Object var1 = packetWriter.getSocket(); // L: 2077
- PacketBuffer var2 = packetWriter.packetBuffer; // L: 2078
+ AbstractSocket var1 = packetWriter.getSocket(); // L: 2036
+ PacketBuffer var2 = packetWriter.packetBuffer; // L: 2037
try {
- if (loginState == 0) { // L: 2080
- if (secureRandom == null && (secureRandomFuture.isDone() || field626 > 250)) { // L: 2081
- secureRandom = secureRandomFuture.get(); // L: 2082
- secureRandomFuture.shutdown(); // L: 2083
- secureRandomFuture = null; // L: 2084
+ if (loginState == 0) { // L: 2039
+ if (class306.secureRandom == null && (secureRandomFuture.isDone() || field512 > 250)) { // L: 2040
+ class306.secureRandom = secureRandomFuture.get(); // L: 2041
+ secureRandomFuture.shutdown(); // L: 2042
+ secureRandomFuture = null; // L: 2043
}
- if (secureRandom != null) { // L: 2086
- if (var1 != null) { // L: 2087
- ((AbstractSocket)var1).close(); // L: 2088
- var1 = null; // L: 2089
+ if (class306.secureRandom != null) { // L: 2045
+ if (var1 != null) { // L: 2046
+ var1.close(); // L: 2047
+ var1 = null; // L: 2048
}
- WorldMapCacheName.socketTask = null; // L: 2091
- hadNetworkError = false; // L: 2092
- field626 = 0; // L: 2093
- if (field517.method7790()) { // L: 2094
+ class120.socketTask = null; // L: 2050
+ hadNetworkError = false; // L: 2051
+ field512 = 0; // L: 2052
+ if (field516.method8008()) { // L: 2053
try {
- this.method1130(ModelData0.field2661); // L: 2096
- Canvas.method347(21); // L: 2097
- } catch (Throwable var21) { // L: 2099
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var21); // L: 2100
- PcmPlayer.getLoginError(65); // L: 2101
- return; // L: 2102
+ this.method1104(VarcInt.field1851); // L: 2055
+ HitSplatDefinition.method3624(21); // L: 2056
+ } catch (Throwable var23) { // L: 2058
+ class249.RunException_sendStackTrace((String)null, var23); // L: 2059
+ Canvas.getLoginError(65); // L: 2060
+ return; // L: 2061
}
} else {
- Canvas.method347(1); // L: 2106
+ HitSplatDefinition.method3624(1); // L: 2065
}
}
}
- class21 var23;
- if (loginState == 21) { // L: 2110
- if (this.field581 != null) { // L: 2111
- if (!this.field581.isDone()) { // L: 2112
- return; // L: 2113
+ OtlTokenResponse var3;
+ class21 var25;
+ if (loginState == 21) { // L: 2069
+ if (this.field526 != null) { // L: 2070
+ if (!this.field526.isDone()) { // L: 2071
+ return; // L: 2072
}
- if (this.field581.isCancelled()) { // L: 2115
- PcmPlayer.getLoginError(65); // L: 2116
- this.field581 = null; // L: 2117
- return; // L: 2118
+ if (this.field526.isCancelled()) { // L: 2074
+ Canvas.getLoginError(65); // L: 2075
+ this.field526 = null; // L: 2076
+ return; // L: 2077
}
try {
- OtlTokenResponse var3 = (OtlTokenResponse)this.field581.get(); // L: 2121
- if (!var3.isSuccess()) { // L: 2122
- PcmPlayer.getLoginError(65); // L: 2123
- this.field581 = null; // L: 2124
- return; // L: 2125
+ var3 = (OtlTokenResponse)this.field526.get(); // L: 2080
+ if (!var3.isSuccess()) { // L: 2081
+ Canvas.getLoginError(65); // L: 2082
+ this.field526 = null; // L: 2083
+ return; // L: 2084
}
- Decimator.field406 = var3.getAccessToken(); // L: 2127
- ModelData0.field2661 = var3.getRefreshToken(); // L: 2128
- this.field581 = null; // L: 2129
- } catch (Exception var20) { // L: 2131
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var20); // L: 2132
- PcmPlayer.getLoginError(65); // L: 2133
- this.field581 = null; // L: 2134
- return; // L: 2135
+ class21.field122 = var3.getAccessToken(); // L: 2086
+ VarcInt.field1851 = var3.getRefreshToken(); // L: 2087
+ this.field526 = null; // L: 2088
+ } catch (Exception var22) { // L: 2090
+ class249.RunException_sendStackTrace((String)null, var22); // L: 2091
+ Canvas.getLoginError(65); // L: 2092
+ this.field526 = null; // L: 2093
+ return; // L: 2094
}
} else {
- if (this.field523 == null) { // L: 2138
- PcmPlayer.getLoginError(65); // L: 2168
- return; // L: 2169
+ if (this.field524 == null) { // L: 2097
+ Canvas.getLoginError(65); // L: 2127
+ return; // L: 2128
}
- if (!this.field523.method253()) { // L: 2139
- return; // L: 2140
+ if (!this.field524.method246()) { // L: 2098
+ return; // L: 2099
}
- if (this.field523.method250()) { // L: 2142
- ArchiveDiskActionHandler.RunException_sendStackTrace(this.field523.method251(), (Throwable)null); // L: 2143
- PcmPlayer.getLoginError(65); // L: 2144
- this.field523 = null; // L: 2145
- return; // L: 2146
+ if (this.field524.method251()) { // L: 2101
+ class249.RunException_sendStackTrace(this.field524.method244(), (Throwable)null); // L: 2102
+ Canvas.getLoginError(65); // L: 2103
+ this.field524 = null; // L: 2104
+ return; // L: 2105
}
- var23 = this.field523.method254(); // L: 2148
- if (var23.method271() != 200) { // L: 2149
- PcmPlayer.getLoginError(65); // L: 2150
- this.field523 = null; // L: 2151
- return; // L: 2152
+ var25 = this.field524.method249(); // L: 2107
+ if (var25.method258() != 200) { // L: 2108
+ Canvas.getLoginError(65); // L: 2109
+ this.field524 = null; // L: 2110
+ return; // L: 2111
}
- field626 = 0; // L: 2154
- class400 var4 = new class400(var23.method276()); // L: 2155
+ field512 = 0; // L: 2113
+ class399 var4 = new class399(var25.method262()); // L: 2114
try {
- Decimator.field406 = var4.method6947().getString("access_token"); // L: 2157
- ModelData0.field2661 = var4.method6947().getString("refresh_token"); // L: 2158
- } catch (Exception var19) { // L: 2160
- ArchiveDiskActionHandler.RunException_sendStackTrace("Error parsing tokens", var19); // L: 2161
- PcmPlayer.getLoginError(65); // L: 2162
- this.field523 = null; // L: 2163
- return; // L: 2164
+ class21.field122 = var4.method7100().getString("access_token"); // L: 2116
+ VarcInt.field1851 = var4.method7100().getString("refresh_token"); // L: 2117
+ } catch (Exception var21) { // L: 2119
+ class249.RunException_sendStackTrace("Error parsing tokens", var21); // L: 2120
+ Canvas.getLoginError(65); // L: 2121
+ this.field524 = null; // L: 2122
+ return; // L: 2123
}
}
- this.method1229(Decimator.field406); // L: 2171
- Canvas.method347(20); // L: 2172
+ this.method1481(class21.field122); // L: 2130
+ HitSplatDefinition.method3624(20); // L: 2131
}
- if (loginState == 20) { // L: 2174
- if (this.field550 != null) { // L: 2175
- if (!this.field550.isDone()) { // L: 2176
- return; // L: 2177
+ if (loginState == 20) { // L: 2133
+ if (this.field611 != null) { // L: 2134
+ if (!this.field611.isDone()) { // L: 2135
+ return; // L: 2136
}
- if (this.field550.isCancelled()) { // L: 2179
- PcmPlayer.getLoginError(65); // L: 2180
- this.field550 = null; // L: 2181
+ if (this.field611.isCancelled()) { // L: 2138
+ Canvas.getLoginError(65); // L: 2139
+ this.field611 = null; // L: 2140
+ return; // L: 2141
+ }
+
+ try {
+ var3 = (OtlTokenResponse)this.field611.get(); // L: 2144
+ if (!var3.isSuccess()) { // L: 2145
+ Canvas.getLoginError(65); // L: 2146
+ this.field611 = null; // L: 2147
+ return; // L: 2148
+ }
+
+ this.field518 = var3.getToken(); // L: 2150
+ this.field611 = null; // L: 2151
+ } catch (Exception var20) { // L: 2153
+ class249.RunException_sendStackTrace((String)null, var20); // L: 2154
+ Canvas.getLoginError(65); // L: 2155
+ this.field611 = null; // L: 2156
+ return; // L: 2157
+ }
+ } else {
+ if (this.field520 == null) { // L: 2160
+ Canvas.getLoginError(65); // L: 2181
return; // L: 2182
}
- try {
- com.jagex.oldscape.pub.OtlTokenResponse var24 = (com.jagex.oldscape.pub.OtlTokenResponse)this.field550.get(); // L: 2185
- if (!var24.isSuccess()) { // L: 2186
- PcmPlayer.getLoginError(65); // L: 2187
- this.field550 = null; // L: 2188
- return; // L: 2189
- }
-
- this.field518 = var24.getToken(); // L: 2191
- this.field550 = null; // L: 2192
- } catch (Exception var18) { // L: 2194
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var18); // L: 2195
- PcmPlayer.getLoginError(65); // L: 2196
- this.field550 = null; // L: 2197
- return; // L: 2198
- }
- } else {
- if (this.field520 == null) { // L: 2201
- PcmPlayer.getLoginError(65); // L: 2222
- return; // L: 2223
+ if (!this.field520.method246()) { // L: 2161
+ return; // L: 2162
}
- if (!this.field520.method253()) { // L: 2202
- return; // L: 2203
+ if (this.field520.method251()) { // L: 2164
+ class249.RunException_sendStackTrace(this.field520.method244(), (Throwable)null); // L: 2165
+ Canvas.getLoginError(65); // L: 2166
+ this.field520 = null; // L: 2167
+ return; // L: 2168
}
- if (this.field520.method250()) { // L: 2205
- ArchiveDiskActionHandler.RunException_sendStackTrace(this.field520.method251(), (Throwable)null); // L: 2206
- PcmPlayer.getLoginError(65); // L: 2207
- this.field520 = null; // L: 2208
- return; // L: 2209
+ var25 = this.field520.method249(); // L: 2170
+ if (var25.method258() != 200) { // L: 2171
+ class249.RunException_sendStackTrace("Response code: " + var25.method258() + "Response body: " + var25.method262(), (Throwable)null); // L: 2172
+ Canvas.getLoginError(65); // L: 2173
+ this.field520 = null; // L: 2174
+ return; // L: 2175
}
- var23 = this.field520.method254(); // L: 2211
- if (var23.method271() != 200) { // L: 2212
- ArchiveDiskActionHandler.RunException_sendStackTrace("Response code: " + var23.method271() + "Response body: " + var23.method276(), (Throwable)null); // L: 2213
- PcmPlayer.getLoginError(65); // L: 2214
- this.field520 = null; // L: 2215
- return; // L: 2216
- }
-
- this.field518 = var23.method276(); // L: 2218
- this.field520 = null; // L: 2219
+ this.field518 = var25.method262(); // L: 2177
+ this.field520 = null; // L: 2178
}
- field626 = 0; // L: 2225
- Canvas.method347(1); // L: 2226
+ field512 = 0; // L: 2184
+ HitSplatDefinition.method3624(1); // L: 2185
}
- if (loginState == 1) { // L: 2228
- if (WorldMapCacheName.socketTask == null) { // L: 2229
- WorldMapCacheName.socketTask = GameEngine.taskHandler.newSocketTask(Timer.worldHost, WorldMapRegion.currentPort); // L: 2230
+ if (loginState == 1) { // L: 2187
+ if (class120.socketTask == null) { // L: 2188
+ class120.socketTask = GameEngine.taskHandler.newSocketTask(StructComposition.worldHost, currentPort); // L: 2189
}
- if (WorldMapCacheName.socketTask.status == 2) { // L: 2232
+ if (class120.socketTask.status == 2) { // L: 2191
throw new IOException();
}
- if (WorldMapCacheName.socketTask.status == 1) { // L: 2233
- if (useBufferedSocket) { // L: 2234
- Socket var25 = (Socket)WorldMapCacheName.socketTask.result; // L: 2236
- BufferedNetSocket var26 = new BufferedNetSocket(var25, 40000, 5000); // L: 2238
- var1 = var26; // L: 2240
- } else {
- var1 = new NetSocket((Socket)WorldMapCacheName.socketTask.result, GameEngine.taskHandler, 5000); // L: 2243
- }
-
- packetWriter.setSocket((AbstractSocket)var1); // L: 2245
- WorldMapCacheName.socketTask = null; // L: 2246
- Canvas.method347(2); // L: 2247
+ if (class120.socketTask.status == 1) { // L: 2192
+ var1 = class131.method2878((Socket)class120.socketTask.result, 40000, 5000); // L: 2193
+ packetWriter.setSocket(var1); // L: 2194
+ class120.socketTask = null; // L: 2195
+ HitSplatDefinition.method3624(2); // L: 2196
}
}
- PacketBufferNode var27;
- if (loginState == 2) { // L: 2250
- packetWriter.clearBuffer(); // L: 2251
- var27 = class162.method3208(); // L: 2252
- var27.packetBuffer.writeByte(LoginPacket.field3192.id); // L: 2253
- packetWriter.addNode(var27); // L: 2254
- packetWriter.flush(); // L: 2255
- var2.offset = 0; // L: 2256
- Canvas.method347(3); // L: 2257
+ PacketBufferNode var26;
+ if (loginState == 2) { // L: 2199
+ packetWriter.clearBuffer(); // L: 2200
+ var26 = MusicPatchNode.method5473(); // L: 2201
+ var26.packetBuffer.writeByte(LoginPacket.field3152.id); // L: 2202
+ packetWriter.addNode(var26); // L: 2203
+ packetWriter.flush(); // L: 2204
+ var2.offset = 0; // L: 2205
+ HitSplatDefinition.method3624(3); // L: 2206
}
- boolean var11;
- int var12;
- if (loginState == 3) { // L: 2259
- if (SecureRandomCallable.pcmPlayer0 != null) { // L: 2260
- SecureRandomCallable.pcmPlayer0.method739();
+ int var13;
+ if (loginState == 3) { // L: 2208
+ if (AttackOption.pcmPlayer0 != null) { // L: 2209
+ AttackOption.pcmPlayer0.method715();
}
- if (Fonts.pcmPlayer1 != null) { // L: 2261
- Fonts.pcmPlayer1.method739();
+ if (class238.pcmPlayer1 != null) { // L: 2210
+ class238.pcmPlayer1.method715();
}
- var11 = true; // L: 2262
- if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2263 2264
- var11 = false;
- }
-
- if (var11) { // L: 2266
- var12 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2267
- if (SecureRandomCallable.pcmPlayer0 != null) { // L: 2268
- SecureRandomCallable.pcmPlayer0.method739();
+ if (var1.isAvailable(1)) { // L: 2211
+ var13 = var1.readUnsignedByte(); // L: 2212
+ if (AttackOption.pcmPlayer0 != null) { // L: 2213
+ AttackOption.pcmPlayer0.method715();
}
- if (Fonts.pcmPlayer1 != null) { // L: 2269
- Fonts.pcmPlayer1.method739();
+ if (class238.pcmPlayer1 != null) { // L: 2214
+ class238.pcmPlayer1.method715();
}
- if (var12 != 0) { // L: 2270
- PcmPlayer.getLoginError(var12); // L: 2271
- return; // L: 2272
+ if (var13 != 0) { // L: 2215
+ Canvas.getLoginError(var13); // L: 2216
+ return; // L: 2217
}
- var2.offset = 0; // L: 2274
- Canvas.method347(4); // L: 2275
+ var2.offset = 0; // L: 2219
+ HitSplatDefinition.method3624(4); // L: 2220
}
}
- int var40;
- if (loginState == 4) { // L: 2278
- if (var2.offset < 8) { // L: 2279
- var40 = ((AbstractSocket)var1).available(); // L: 2280
- if (var40 > 8 - var2.offset) { // L: 2281
- var40 = 8 - var2.offset;
+ if (loginState == 4) { // L: 2223
+ if (var2.offset < 8) { // L: 2224
+ var13 = var1.available(); // L: 2225
+ if (var13 > 8 - var2.offset) { // L: 2226
+ var13 = 8 - var2.offset;
}
- if (var40 > 0) { // L: 2282
- ((AbstractSocket)var1).read(var2.array, var2.offset, var40); // L: 2283
- var2.offset += var40; // L: 2284
+ if (var13 > 0) { // L: 2227
+ var1.read(var2.array, var2.offset, var13); // L: 2228
+ var2.offset += var13; // L: 2229
}
}
- if (var2.offset == 8) { // L: 2287
- var2.offset = 0; // L: 2288
- ModelData0.field2658 = var2.readLong(); // L: 2289
- Canvas.method347(5); // L: 2290
+ if (var2.offset == 8) { // L: 2232
+ var2.offset = 0; // L: 2233
+ UserList.field4320 = var2.readLong(); // L: 2234
+ HitSplatDefinition.method3624(5); // L: 2235
}
}
- int var6;
- if (loginState == 5) { // L: 2293
- packetWriter.packetBuffer.offset = 0; // L: 2294
- packetWriter.clearBuffer(); // L: 2295
- PacketBuffer var29 = new PacketBuffer(500); // L: 2296
- int[] var28 = new int[]{secureRandom.nextInt(), secureRandom.nextInt(), secureRandom.nextInt(), secureRandom.nextInt()}; // L: 2297 2298 2299 2300 2301
- var29.offset = 0; // L: 2302
- var29.writeByte(1); // L: 2303
- var29.writeInt(var28[0]); // L: 2304
- var29.writeInt(var28[1]); // L: 2305
- var29.writeInt(var28[2]); // L: 2306
- var29.writeInt(var28[3]); // L: 2307
- var29.writeLong(ModelData0.field2658); // L: 2308
- if (gameState == 40) { // L: 2309
- var29.writeInt(LoginType.field4619[0]); // L: 2310
- var29.writeInt(LoginType.field4619[1]); // L: 2311
- var29.writeInt(LoginType.field4619[2]); // L: 2312
- var29.writeInt(LoginType.field4619[3]); // L: 2313
+ if (loginState == 5) { // L: 2238
+ packetWriter.packetBuffer.offset = 0; // L: 2239
+ packetWriter.clearBuffer(); // L: 2240
+ PacketBuffer var28 = new PacketBuffer(500); // L: 2241
+ int[] var27 = new int[]{class306.secureRandom.nextInt(), class306.secureRandom.nextInt(), class306.secureRandom.nextInt(), class306.secureRandom.nextInt()}; // L: 2242 2243 2244 2245 2246
+ var28.offset = 0; // L: 2247
+ var28.writeByte(1); // L: 2248
+ var28.writeInt(var27[0]); // L: 2249
+ var28.writeInt(var27[1]); // L: 2250
+ var28.writeInt(var27[2]); // L: 2251
+ var28.writeInt(var27[3]); // L: 2252
+ var28.writeLong(UserList.field4320); // L: 2253
+ if (gameState == 40) { // L: 2254
+ var28.writeInt(field530[0]); // L: 2255
+ var28.writeInt(field530[1]); // L: 2256
+ var28.writeInt(field530[2]); // L: 2257
+ var28.writeInt(field530[3]); // L: 2258
} else {
- if (gameState == 50) { // L: 2316
- var29.writeByte(class124.field1555.rsOrdinal()); // L: 2317
- var29.writeInt(class7.field26); // L: 2318
+ if (gameState == 50) { // L: 2261
+ var28.writeByte(class124.field1547.rsOrdinal()); // L: 2262
+ var28.writeInt(class174.field1891); // L: 2263
} else {
- var29.writeByte(field615.rsOrdinal()); // L: 2321
- switch(field615.field1552) { // L: 2322
+ var28.writeByte(field515.rsOrdinal()); // L: 2266
+ switch(field515.field1548) { // L: 2267
case 0:
- case 1:
- var29.writeMedium(WorldMapCacheName.field2912); // L: 2336
- ++var29.offset; // L: 2337
+ var28.writeInt((Integer)class19.clientPreferences.parameters.get(Projectile.method1950(Login.Login_username))); // L: 2282
break;
+ case 1:
+ var28.offset += 4; // L: 2270
+ break; // L: 2271
case 2:
- var29.offset += 4; // L: 2325
- break; // L: 2326
+ case 4:
+ var28.writeMedium(class240.field2846); // L: 2276
+ ++var28.offset; // L: 2277
case 3:
- var29.writeInt((Integer)class12.clientPreferences.parameters.get(class239.method4810(Login.Login_username))); // L: 2330
}
}
- if (field517.method7790()) { // L: 2342
- var29.writeByte(class443.field4730.rsOrdinal()); // L: 2343
- var29.writeStringCp1252NullTerminated(this.field518); // L: 2344
+ if (field516.method8008()) { // L: 2287
+ var28.writeByte(class446.field4750.rsOrdinal()); // L: 2288
+ var28.writeStringCp1252NullTerminated(this.field518); // L: 2289
} else {
- var29.writeByte(class443.field4734.rsOrdinal()); // L: 2347
- var29.writeStringCp1252NullTerminated(Login.Login_password); // L: 2348
+ var28.writeByte(class446.field4751.rsOrdinal()); // L: 2292
+ var28.writeStringCp1252NullTerminated(Login.Login_password); // L: 2293
}
}
- var29.encryptRsa(class67.field875, class67.field871); // L: 2351
- LoginType.field4619 = var28; // L: 2352
- PacketBufferNode var5 = class162.method3208(); // L: 2353
- var5.packetBuffer.offset = 0; // L: 2354
- if (gameState == 40) { // L: 2355
- var5.packetBuffer.writeByte(LoginPacket.field3194.id); // L: 2356
+ var28.encryptRsa(class67.field886, class67.field885); // L: 2296
+ field530 = var27; // L: 2297
+ PacketBufferNode var6;
+ if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2302
+ var6 = new PacketBufferNode(); // L: 2303
} else {
- var5.packetBuffer.writeByte(LoginPacket.field3193.id); // L: 2359
+ var6 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2306
}
- var5.packetBuffer.writeShort(0); // L: 2361
- var6 = var5.packetBuffer.offset; // L: 2362
- var5.packetBuffer.writeInt(205); // L: 2363
- var5.packetBuffer.writeInt(1); // L: 2364
- var5.packetBuffer.writeByte(clientType); // L: 2365
- var5.packetBuffer.writeByte(field486); // L: 2366
- var5.packetBuffer.writeBytes(var29.array, 0, var29.offset); // L: 2367
- int var7 = var5.packetBuffer.offset; // L: 2368
- var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2369
- var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2370
- var5.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 2371
- var5.packetBuffer.writeShort(class433.canvasHeight); // L: 2372
- IntHashTable.method8124(var5.packetBuffer); // L: 2373
- if (!field662.endsWith(";A")) { // L: 2374
- field662 = field662 + ";A"; // L: 2375
+ var6.clientPacket = null; // L: 2309
+ var6.clientPacketLength = 0; // L: 2310
+ var6.packetBuffer = new PacketBuffer(5000); // L: 2311
+ var6.packetBuffer.offset = 0; // L: 2315
+ if (gameState == 40) { // L: 2316
+ var6.packetBuffer.writeByte(LoginPacket.field3146.id); // L: 2317
+ } else {
+ var6.packetBuffer.writeByte(LoginPacket.field3145.id); // L: 2320
}
- var5.packetBuffer.writeStringCp1252NullTerminated(field662); // L: 2377
- var5.packetBuffer.writeInt(class230.field2807); // L: 2378
- Buffer var8 = new Buffer(class135.platformInfo.size()); // L: 2379
- class135.platformInfo.write(var8); // L: 2380
- var5.packetBuffer.writeBytes(var8.array, 0, var8.array.length); // L: 2381
- var5.packetBuffer.writeByte(clientType); // L: 2382
- var5.packetBuffer.writeInt(0); // L: 2383
- var5.packetBuffer.method7563(AbstractUserComparator.archive6.hash); // L: 2384
- var5.packetBuffer.writeInt(ItemContainer.archive20.hash); // L: 2385
- var5.packetBuffer.method7565(class305.archive8.hash); // L: 2386
- var5.packetBuffer.method7565(0); // L: 2387
- var5.packetBuffer.writeInt(class356.archive2.hash); // L: 2388
- var5.packetBuffer.method7563(VarpDefinition.archive19.hash); // L: 2389
- var5.packetBuffer.method7565(InterfaceParent.archive7.hash); // L: 2390
- var5.packetBuffer.method7565(class101.archive14.hash); // L: 2391
- var5.packetBuffer.writeIntME(UrlRequest.archive11.hash); // L: 2392
- var5.packetBuffer.writeInt(Clock.archive1.hash); // L: 2393
- var5.packetBuffer.method7563(Message.archive5.hash); // L: 2394
- var5.packetBuffer.writeInt(class16.archive13.hash); // L: 2395
- var5.packetBuffer.method7565(class114.archive17.hash); // L: 2396
- var5.packetBuffer.method7565(class92.archive18.hash); // L: 2397
- var5.packetBuffer.writeInt(ObjectSound.archive10.hash); // L: 2398
- var5.packetBuffer.writeInt(class194.archive3.hash); // L: 2399
- var5.packetBuffer.writeIntME(archive15.hash); // L: 2400
- var5.packetBuffer.writeInt(MouseHandler.archive4.hash); // L: 2401
- var5.packetBuffer.method7565(class115.archive12.hash); // L: 2402
- var5.packetBuffer.method7563(TileItem.archive9.hash); // L: 2403
- var5.packetBuffer.method7563(NetSocket.archive0.hash); // L: 2404
- var5.packetBuffer.xteaEncrypt(var28, var7, var5.packetBuffer.offset); // L: 2405
- var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); // L: 2406
- packetWriter.addNode(var5); // L: 2407
- packetWriter.flush(); // L: 2408
- packetWriter.isaacCipher = new IsaacCipher(var28); // L: 2409
- int[] var9 = new int[4]; // L: 2410
-
- for (int var10 = 0; var10 < 4; ++var10) { // L: 2411
- var9[var10] = var28[var10] + 50;
+ var6.packetBuffer.writeShort(0); // L: 2322
+ int var14 = var6.packetBuffer.offset; // L: 2323
+ var6.packetBuffer.writeInt(206); // L: 2324
+ var6.packetBuffer.writeInt(1); // L: 2325
+ var6.packetBuffer.writeByte(clientType); // L: 2326
+ var6.packetBuffer.writeByte(field484); // L: 2327
+ var6.packetBuffer.writeBytes(var28.array, 0, var28.offset); // L: 2328
+ int var8 = var6.packetBuffer.offset; // L: 2329
+ var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2330
+ var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2331
+ var6.packetBuffer.writeShort(Script.canvasWidth); // L: 2332
+ var6.packetBuffer.writeShort(class78.canvasHeight); // L: 2333
+ PacketBuffer var9 = var6.packetBuffer; // L: 2334
+ if (randomDatData != null) { // L: 2336
+ var9.writeBytes(randomDatData, 0, randomDatData.length); // L: 2337
+ } else {
+ byte[] var10 = ModeWhere.method6082(); // L: 2340
+ var9.writeBytes(var10, 0, var10.length); // L: 2341
}
- var2.newIsaacCipher(var9); // L: 2412
- Canvas.method347(6); // L: 2413
+ var6.packetBuffer.writeStringCp1252NullTerminated(GrandExchangeOfferTotalQuantityComparator.field4045); // L: 2343
+ var6.packetBuffer.writeInt(class17.field99); // L: 2344
+ Buffer var38 = new Buffer(Occluder.platformInfo.size()); // L: 2345
+ Occluder.platformInfo.write(var38); // L: 2346
+ var6.packetBuffer.writeBytes(var38.array, 0, var38.array.length); // L: 2347
+ var6.packetBuffer.writeByte(clientType); // L: 2348
+ var6.packetBuffer.writeInt(0); // L: 2349
+ var6.packetBuffer.method7760(Language.field4098.hash); // L: 2350
+ var6.packetBuffer.method7784(WorldMapSectionType.archive9.hash); // L: 2351
+ var6.packetBuffer.method7760(class121.archive6.hash); // L: 2352
+ var6.packetBuffer.method7760(ApproximateRouteStrategy.archive10.hash); // L: 2353
+ var6.packetBuffer.writeInt(Varcs.archive5.hash); // L: 2354
+ var6.packetBuffer.method7760(AbstractUserComparator.archive18.hash); // L: 2355
+ var6.packetBuffer.method7760(WorldMapEvent.field2882.hash); // L: 2356
+ var6.packetBuffer.method7784(class341.archive7.hash); // L: 2357
+ var6.packetBuffer.method7783(class140.archive2.hash); // L: 2358
+ var6.packetBuffer.method7784(MouseHandler.archive19.hash); // L: 2359
+ var6.packetBuffer.method7784(class304.archive8.hash); // L: 2360
+ var6.packetBuffer.method7760(class10.archive11.hash); // L: 2361
+ var6.packetBuffer.writeInt(0); // L: 2362
+ var6.packetBuffer.method7760(WorldMapSprite.archive14.hash); // L: 2363
+ var6.packetBuffer.method7783(UserComparator7.field1383.hash); // L: 2364
+ var6.packetBuffer.method7783(archive4.hash); // L: 2365
+ var6.packetBuffer.method7784(class67.archive15.hash); // L: 2366
+ var6.packetBuffer.writeInt(AbstractByteArrayCopier.archive13.hash); // L: 2367
+ var6.packetBuffer.method7760(class4.archive20.hash); // L: 2368
+ var6.packetBuffer.method7760(class6.archive17.hash); // L: 2369
+ var6.packetBuffer.method7783(class267.archive12.hash); // L: 2370
+ var6.packetBuffer.xteaEncrypt(var27, var8, var6.packetBuffer.offset); // L: 2371
+ var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var14); // L: 2372
+ packetWriter.addNode(var6); // L: 2373
+ packetWriter.flush(); // L: 2374
+ packetWriter.isaacCipher = new IsaacCipher(var27); // L: 2375
+ int[] var11 = new int[4]; // L: 2376
+
+ for (int var12 = 0; var12 < 4; ++var12) { // L: 2377
+ var11[var12] = var27[var12] + 50;
+ }
+
+ var2.newIsaacCipher(var11); // L: 2378
+ HitSplatDefinition.method3624(6); // L: 2379
}
- if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2415 2416
- var40 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2417
- if (var40 == 61) { // L: 2418
- var12 = ((AbstractSocket)var1).available(); // L: 2419
- class92.field1273 = var12 == 1 && ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2420
- Canvas.method347(5); // L: 2421
+ int var15;
+ if (loginState == 6 && var1.available() > 0) { // L: 2381 2382
+ var13 = var1.readUnsignedByte(); // L: 2383
+ if (var13 == 61) { // L: 2384
+ var15 = var1.available(); // L: 2385
+ VarpDefinition.field1821 = var15 == 1 && var1.readUnsignedByte() == 1; // L: 2386
+ HitSplatDefinition.method3624(5); // L: 2387
}
- if (var40 == 21 && gameState == 20) { // L: 2423
- Canvas.method347(12); // L: 2424
- } else if (var40 == 2) { // L: 2426
- Canvas.method347(14); // L: 2427
- } else if (var40 == 15 && gameState == 40) { // L: 2429
- packetWriter.serverPacketLength = -1; // L: 2430
- Canvas.method347(19); // L: 2431
- } else if (var40 == 64) { // L: 2433
- Canvas.method347(10); // L: 2434
- } else if (var40 == 23 && field514 < 1) { // L: 2436
- ++field514; // L: 2437
- Canvas.method347(0); // L: 2438
- } else if (var40 == 29) { // L: 2440
- Canvas.method347(17); // L: 2441
+ if (var13 == 21 && gameState == 20) { // L: 2389
+ HitSplatDefinition.method3624(12); // L: 2390
+ } else if (var13 == 2) { // L: 2392
+ HitSplatDefinition.method3624(14); // L: 2393
+ } else if (var13 == 15 && gameState == 40) { // L: 2395
+ packetWriter.serverPacketLength = -1; // L: 2396
+ HitSplatDefinition.method3624(19); // L: 2397
+ } else if (var13 == 64) { // L: 2399
+ HitSplatDefinition.method3624(10); // L: 2400
+ } else if (var13 == 23 && field609 < 1) { // L: 2402
+ ++field609; // L: 2403
+ HitSplatDefinition.method3624(0); // L: 2404
+ } else if (var13 == 29) { // L: 2406
+ HitSplatDefinition.method3624(17); // L: 2407
} else {
- if (var40 != 69) { // L: 2443
- PcmPlayer.getLoginError(var40); // L: 2447
- return; // L: 2448
+ if (var13 != 69) { // L: 2409
+ Canvas.getLoginError(var13); // L: 2413
+ return; // L: 2414
}
- Canvas.method347(7); // L: 2444
+ HitSplatDefinition.method3624(7); // L: 2410
}
}
- if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2452 2453
- ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2454
- var2.offset = 0; // L: 2455
- AttackOption.field1290 = var2.readUnsignedShort(); // L: 2456
- Canvas.method347(8); // L: 2457
+ if (loginState == 7 && var1.available() >= 2) { // L: 2418 2419
+ var1.read(var2.array, 0, 2); // L: 2420
+ var2.offset = 0; // L: 2421
+ HealthBarDefinition.field1888 = var2.readUnsignedShort(); // L: 2422
+ HitSplatDefinition.method3624(8); // L: 2423
}
- if (loginState == 8 && ((AbstractSocket)var1).available() >= AttackOption.field1290) { // L: 2460 2461
- var2.offset = 0; // L: 2462
- ((AbstractSocket)var1).read(var2.array, var2.offset, AttackOption.field1290); // L: 2463
- class6[] var31 = new class6[]{class6.field16}; // L: 2466
- class6 var30 = var31[var2.readUnsignedByte()]; // L: 2468
+ if (loginState == 8 && var1.available() >= HealthBarDefinition.field1888) { // L: 2426 2427
+ var2.offset = 0; // L: 2428
+ var1.read(var2.array, var2.offset, HealthBarDefinition.field1888); // L: 2429
+ class6[] var30 = new class6[]{class6.field17}; // L: 2432
+ class6 var29 = var30[var2.readUnsignedByte()]; // L: 2434
try {
- switch(var30.field11) { // L: 2472
+ switch(var29.field16) { // L: 2438
case 0:
- class0 var32 = new class0(); // L: 2479
- this.field592 = new class7(var2, var32); // L: 2485
- Canvas.method347(9); // L: 2486
+ class0 var5 = new class0(); // L: 2441
+ this.field532 = new class7(var2, var5); // L: 2451
+ HitSplatDefinition.method3624(9); // L: 2452
break;
default:
- throw new IllegalArgumentException(); // L: 2475
+ throw new IllegalArgumentException(); // L: 2446
}
- } catch (Exception var17) { // L: 2488
- PcmPlayer.getLoginError(22); // L: 2489
- return; // L: 2490
+ } catch (Exception var19) { // L: 2454
+ Canvas.getLoginError(22); // L: 2455
+ return; // L: 2456
}
}
- if (loginState == 9 && this.field592.method49()) { // L: 2494 2495
- this.field529 = this.field592.method51(); // L: 2496
- this.field592.method50(); // L: 2497
- this.field592 = null; // L: 2498
- if (this.field529 == null) { // L: 2499
- PcmPlayer.getLoginError(22); // L: 2500
- return; // L: 2501
+ if (loginState == 9 && this.field532.method46()) { // L: 2460 2461
+ this.field531 = this.field532.method42(); // L: 2462
+ this.field532.method41(); // L: 2463
+ this.field532 = null; // L: 2464
+ if (this.field531 == null) { // L: 2465
+ Canvas.getLoginError(22); // L: 2466
+ return; // L: 2467
}
- packetWriter.clearBuffer(); // L: 2503
- var27 = class162.method3208(); // L: 2504
- var27.packetBuffer.writeByte(LoginPacket.field3195.id); // L: 2505
- var27.packetBuffer.writeShort(this.field529.offset); // L: 2506
- var27.packetBuffer.method7530(this.field529); // L: 2507
- packetWriter.addNode(var27); // L: 2508
- packetWriter.flush(); // L: 2509
- this.field529 = null; // L: 2510
- Canvas.method347(6); // L: 2511
+ packetWriter.clearBuffer(); // L: 2469
+ var26 = MusicPatchNode.method5473(); // L: 2470
+ var26.packetBuffer.writeByte(LoginPacket.field3147.id); // L: 2471
+ var26.packetBuffer.writeShort(this.field531.offset); // L: 2472
+ var26.packetBuffer.method7727(this.field531); // L: 2473
+ packetWriter.addNode(var26); // L: 2474
+ packetWriter.flush(); // L: 2475
+ this.field531 = null; // L: 2476
+ HitSplatDefinition.method3624(6); // L: 2477
}
- if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2514 2515
- class263.field3070 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2516
- Canvas.method347(11); // L: 2517
+ if (loginState == 10 && var1.available() > 0) { // L: 2480 2481
+ DirectByteArrayCopier.field3306 = var1.readUnsignedByte(); // L: 2482
+ HitSplatDefinition.method3624(11); // L: 2483
}
- if (loginState == 11 && ((AbstractSocket)var1).available() >= class263.field3070) { // L: 2520 2521
- ((AbstractSocket)var1).read(var2.array, 0, class263.field3070); // L: 2522
- var2.offset = 0; // L: 2523
- Canvas.method347(6); // L: 2524
+ if (loginState == 11 && var1.available() >= DirectByteArrayCopier.field3306) { // L: 2486 2487
+ var1.read(var2.array, 0, DirectByteArrayCopier.field3306); // L: 2488
+ var2.offset = 0; // L: 2489
+ HitSplatDefinition.method3624(6); // L: 2490
}
- if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2527 2528
- field654 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2529
- Canvas.method347(13); // L: 2530
+ if (loginState == 12 && var1.available() > 0) { // L: 2493 2494
+ field514 = (var1.readUnsignedByte() + 3) * 60; // L: 2495
+ HitSplatDefinition.method3624(13); // L: 2496
}
- if (loginState == 13) { // L: 2533
- field626 = 0; // L: 2534
- class345.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field654 / 60 + " seconds."); // L: 2535
- if (--field654 <= 0) { // L: 2536
- Canvas.method347(0);
+ if (loginState == 13) { // L: 2499
+ field512 = 0; // L: 2500
+ class101.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field514 / 60 + " seconds."); // L: 2501
+ if (--field514 <= 0) { // L: 2502
+ HitSplatDefinition.method3624(0);
}
} else {
- if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2539 2540
- Varcs.field1329 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2541
- Canvas.method347(15); // L: 2542
+ if (loginState == 14 && var1.available() >= 1) { // L: 2505 2506
+ HealthBarUpdate.field1206 = var1.readUnsignedByte(); // L: 2507
+ HitSplatDefinition.method3624(15); // L: 2508
}
- int var14;
- boolean var41;
- if (loginState == 15 && ((AbstractSocket)var1).available() >= Varcs.field1329) { // L: 2545 2546
- var11 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2547
- ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2548
- var2.offset = 0; // L: 2549
- var41 = false; // L: 2550
- if (var11) { // L: 2551
- var12 = var2.readByteIsaac() << 24; // L: 2552
- var12 |= var2.readByteIsaac() << 16; // L: 2553
- var12 |= var2.readByteIsaac() << 8; // L: 2554
- var12 |= var2.readByteIsaac(); // L: 2555
- var14 = class239.method4810(Login.Login_username); // L: 2556
- if (class12.clientPreferences.parameters.size() >= 10 && !class12.clientPreferences.parameters.containsKey(var14)) { // L: 2557 2558
- Iterator var13 = class12.clientPreferences.parameters.entrySet().iterator(); // L: 2559
- var13.next(); // L: 2560
- var13.remove(); // L: 2561
+ int var16;
+ boolean var40;
+ if (loginState == 15 && var1.available() >= HealthBarUpdate.field1206) { // L: 2511 2512
+ boolean var39 = var1.readUnsignedByte() == 1; // L: 2513
+ var1.read(var2.array, 0, 4); // L: 2514
+ var2.offset = 0; // L: 2515
+ var40 = false; // L: 2516
+ if (var39) { // L: 2517
+ var15 = var2.readByteIsaac() << 24; // L: 2518
+ var15 |= var2.readByteIsaac() << 16; // L: 2519
+ var15 |= var2.readByteIsaac() << 8; // L: 2520
+ var15 |= var2.readByteIsaac(); // L: 2521
+ var16 = Projectile.method1950(Login.Login_username); // L: 2522
+ if (class19.clientPreferences.parameters.size() >= 10 && !class19.clientPreferences.parameters.containsKey(var16)) { // L: 2523 2524
+ Iterator var37 = class19.clientPreferences.parameters.entrySet().iterator(); // L: 2525
+ var37.next(); // L: 2526
+ var37.remove(); // L: 2527
}
- class12.clientPreferences.parameters.put(var14, var12); // L: 2564
+ class19.clientPreferences.parameters.put(var16, var15); // L: 2530
}
- if (Login_isUsernameRemembered) { // L: 2566
- class12.clientPreferences.method2297(Login.Login_username); // L: 2567
+ if (Login_isUsernameRemembered) { // L: 2532
+ class19.clientPreferences.method2260(Login.Login_username); // L: 2533
} else {
- class12.clientPreferences.method2297((String)null); // L: 2570
+ class19.clientPreferences.method2260((String)null); // L: 2536
}
- class270.savePreferences(); // L: 2572
- staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2573
- playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2574
- localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2575
- localPlayerIndex <<= 8; // L: 2576
- localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2577
- field610 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2578
- ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2579
- var2.offset = 0; // L: 2580
- this.field531 = var2.readLong(); // L: 2581
- if (Varcs.field1329 >= 29) { // L: 2582
- ((AbstractSocket)var1).read(var2.array, 0, 8); // L: 2583
- var2.offset = 0; // L: 2584
- field611 = var2.readLong(); // L: 2585
+ class220.savePreferences(); // L: 2538
+ staffModLevel = var1.readUnsignedByte(); // L: 2539
+ playerMod = var1.readUnsignedByte() == 1; // L: 2540
+ localPlayerIndex = var1.readUnsignedByte(); // L: 2541
+ localPlayerIndex <<= 8; // L: 2542
+ localPlayerIndex += var1.readUnsignedByte(); // L: 2543
+ field601 = var1.readUnsignedByte(); // L: 2544
+ var1.read(var2.array, 0, 8); // L: 2545
+ var2.offset = 0; // L: 2546
+ this.field707 = var2.readLong(); // L: 2547
+ if (HealthBarUpdate.field1206 >= 29) { // L: 2548
+ var1.read(var2.array, 0, 8); // L: 2549
+ var2.offset = 0; // L: 2550
+ field612 = var2.readLong(); // L: 2551
}
- ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2587
- var2.offset = 0; // L: 2588
- ServerPacket[] var34 = BuddyRankComparator.ServerPacket_values(); // L: 2589
- var6 = var2.readSmartByteShortIsaac(); // L: 2590
- if (var6 < 0 || var6 >= var34.length) { // L: 2591
- throw new IOException(var6 + " " + var2.offset);
+ var1.read(var2.array, 0, 1); // L: 2553
+ var2.offset = 0; // L: 2554
+ ServerPacket[] var33 = FloorUnderlayDefinition.ServerPacket_values(); // L: 2555
+ int var17 = var2.readSmartByteShortIsaac(); // L: 2556
+ if (var17 < 0 || var17 >= var33.length) { // L: 2557
+ throw new IOException(var17 + " " + var2.offset);
}
- packetWriter.serverPacket = var34[var6]; // L: 2592
- packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2593
- ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2594
- var2.offset = 0; // L: 2595
- packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2596
+ packetWriter.serverPacket = var33[var17]; // L: 2558
+ packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2559
+ var1.read(var2.array, 0, 2); // L: 2560
+ var2.offset = 0; // L: 2561
+ packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2562
try {
- class27.method370(class82.client, "zap"); // L: 2598
- } catch (Throwable var16) { // L: 2600
+ class27.method346(class353.client, "zap"); // L: 2564
+ } catch (Throwable var18) { // L: 2566
}
- Canvas.method347(16); // L: 2601
+ HitSplatDefinition.method3624(16); // L: 2567
}
- if (loginState == 16) { // L: 2604
- if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2605
- var2.offset = 0; // L: 2606
- ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2607
- timer.method6370(); // L: 2608
- mouseLastLastPressedTimeMillis = -1L; // L: 2611
- Varcs.mouseRecorder.index = 0; // L: 2612
- WorldMapArea.hasFocus = true; // L: 2613
- hadFocus = true; // L: 2614
- field722 = -1L; // L: 2615
- class33.reflectionChecks = new IterableNodeDeque(); // L: 2617
- packetWriter.clearBuffer(); // L: 2619
- packetWriter.packetBuffer.offset = 0; // L: 2620
- packetWriter.serverPacket = null; // L: 2621
- packetWriter.field1351 = null; // L: 2622
- packetWriter.field1340 = null; // L: 2623
- packetWriter.field1345 = null; // L: 2624
- packetWriter.serverPacketLength = 0; // L: 2625
- packetWriter.field1349 = 0; // L: 2626
- rebootTimer = 0; // L: 2627
- logoutTimer = 0; // L: 2628
- hintArrowType = 0; // L: 2629
- menuOptionsCount = 0; // L: 2631
- isMenuOpen = false; // L: 2632
- MouseHandler.MouseHandler_idleCycles = 0; // L: 2635
- class152.method3044(); // L: 2637
- isItemSelected = 0; // L: 2638
- isSpellSelected = false; // L: 2639
- soundEffectCount = 0; // L: 2640
- camAngleY = 0; // L: 2641
- oculusOrbState = 0; // L: 2642
- class127.field1570 = null; // L: 2643
- minimapState = 0; // L: 2644
- field515 = -1; // L: 2645
- destinationX = 0; // L: 2646
- destinationY = 0; // L: 2647
- playerAttackOption = AttackOption.AttackOption_hidden; // L: 2648
- npcAttackOption = AttackOption.AttackOption_hidden; // L: 2649
- npcCount = 0; // L: 2650
- Players.Players_count = 0; // L: 2652
-
- for (var40 = 0; var40 < 2048; ++var40) { // L: 2653
- Players.field1307[var40] = null; // L: 2654
- Players.field1302[var40] = class193.field2251; // L: 2655
- }
-
- for (var40 = 0; var40 < 2048; ++var40) { // L: 2658
- players[var40] = null;
- }
-
- for (var40 = 0; var40 < 32768; ++var40) { // L: 2659
- npcs[var40] = null;
- }
-
- combatTargetPlayerIndex = -1; // L: 2660
- projectiles.clear(); // L: 2661
- graphicsObjects.clear(); // L: 2662
-
- for (var40 = 0; var40 < 4; ++var40) { // L: 2663
- for (var12 = 0; var12 < 104; ++var12) { // L: 2664
- for (var14 = 0; var14 < 104; ++var14) { // L: 2665
- groundItems[var40][var12][var14] = null; // L: 2666
- }
- }
- }
-
- pendingSpawns = new NodeDeque(); // L: 2670
- BufferedSource.friendSystem.clear(); // L: 2671
-
- for (var40 = 0; var40 < VarpDefinition.VarpDefinition_fileCount; ++var40) { // L: 2672
- VarpDefinition var35 = class21.VarpDefinition_get(var40); // L: 2673
- if (var35 != null) { // L: 2674
- Varps.Varps_temp[var40] = 0; // L: 2675
- Varps.Varps_main[var40] = 0; // L: 2676
- }
- }
-
- class125.varcs.clearTransient(); // L: 2679
- followerIndex = -1; // L: 2680
- if (rootInterface != -1) { // L: 2681
- var40 = rootInterface; // L: 2682
- if (var40 != -1 && class120.Widget_loadedInterfaces[var40]) { // L: 2684 2685
- class134.Widget_archive.clearFilesGroup(var40); // L: 2686
- if (NetSocket.Widget_interfaceComponents[var40] != null) { // L: 2687
- var41 = true; // L: 2688
-
- for (var14 = 0; var14 < NetSocket.Widget_interfaceComponents[var40].length; ++var14) { // L: 2689
- if (NetSocket.Widget_interfaceComponents[var40][var14] != null) { // L: 2690
- if (NetSocket.Widget_interfaceComponents[var40][var14].type != 2) { // L: 2691
- NetSocket.Widget_interfaceComponents[var40][var14] = null;
- } else {
- var41 = false; // L: 2692
- }
- }
- }
-
- if (var41) { // L: 2695
- NetSocket.Widget_interfaceComponents[var40] = null;
- }
-
- class120.Widget_loadedInterfaces[var40] = false; // L: 2696
- }
- }
- }
-
- for (InterfaceParent var39 = (InterfaceParent)interfaceParents.first(); var39 != null; var39 = (InterfaceParent)interfaceParents.next()) { // L: 2699
- NetSocket.closeInterface(var39, true); // L: 2700
- }
-
- rootInterface = -1; // L: 2702
- interfaceParents = new NodeHashTable(8); // L: 2703
- meslayerContinueWidget = null; // L: 2704
- menuOptionsCount = 0; // L: 2706
- isMenuOpen = false; // L: 2707
- playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2709
-
- for (var40 = 0; var40 < 8; ++var40) { // L: 2710
- playerMenuActions[var40] = null; // L: 2711
- playerOptionsPriorities[var40] = false; // L: 2712
- }
-
- ItemContainer.itemContainers = new NodeHashTable(32); // L: 2715
- isLoading = true; // L: 2717
-
- for (var40 = 0; var40 < 100; ++var40) { // L: 2718
- field652[var40] = true;
- }
-
- var27 = WallDecoration.getPacketBufferNode(ClientPacket.field3054, packetWriter.isaacCipher); // L: 2721
- var27.packetBuffer.writeByte(ClanChannelMember.getWindowedMode()); // L: 2722
- var27.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 2723
- var27.packetBuffer.writeShort(class433.canvasHeight); // L: 2724
- packetWriter.addNode(var27); // L: 2725
- PcmPlayer.friendsChat = null; // L: 2727
- class358.guestClanSettings = null; // L: 2728
- Arrays.fill(currentClanSettings, (Object)null); // L: 2729
- UserComparator10.guestClanChannel = null; // L: 2730
- Arrays.fill(currentClanChannels, (Object)null); // L: 2731
-
- for (var40 = 0; var40 < 8; ++var40) { // L: 2732
- grandExchangeOffers[var40] = new GrandExchangeOffer();
- }
-
- class120.grandExchangeEvents = null; // L: 2733
- Player.updatePlayer(var2); // L: 2735
- WorldMapSectionType.field2828 = -1; // L: 2736
- class144.loadRegions(false, var2); // L: 2737
- packetWriter.serverPacket = null; // L: 2738
+ if (loginState != 16) { // L: 2570
+ if (loginState == 17 && var1.available() >= 2) { // L: 2688 2689
+ var2.offset = 0; // L: 2690
+ var1.read(var2.array, 0, 2); // L: 2691
+ var2.offset = 0; // L: 2692
+ class432.field4663 = var2.readUnsignedShort(); // L: 2693
+ HitSplatDefinition.method3624(18); // L: 2694
}
- } else {
- if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2742 2743
- var2.offset = 0; // L: 2744
- ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2745
- var2.offset = 0; // L: 2746
- User.field4323 = var2.readUnsignedShort(); // L: 2747
- Canvas.method347(18); // L: 2748
- }
-
- if (loginState == 18 && ((AbstractSocket)var1).available() >= User.field4323) { // L: 2751 2752
- var2.offset = 0; // L: 2753
- ((AbstractSocket)var1).read(var2.array, 0, User.field4323); // L: 2754
- var2.offset = 0; // L: 2755
- String var36 = var2.readStringCp1252NullTerminated(); // L: 2756
- String var33 = var2.readStringCp1252NullTerminated(); // L: 2757
- String var37 = var2.readStringCp1252NullTerminated(); // L: 2758
- class345.setLoginResponseString(var36, var33, var37); // L: 2759
- PendingSpawn.updateGameState(10); // L: 2760
- if (field517.method7790()) { // L: 2761
- class126.method2799(9); // L: 2762
+ if (loginState == 18 && var1.available() >= class432.field4663) { // L: 2697 2698
+ var2.offset = 0; // L: 2699
+ var1.read(var2.array, 0, class432.field4663); // L: 2700
+ var2.offset = 0; // L: 2701
+ String var36 = var2.readStringCp1252NullTerminated(); // L: 2702
+ String var32 = var2.readStringCp1252NullTerminated(); // L: 2703
+ String var34 = var2.readStringCp1252NullTerminated(); // L: 2704
+ class101.setLoginResponseString(var36, var32, var34); // L: 2705
+ HealthBarUpdate.updateGameState(10); // L: 2706
+ if (field516.method8008()) { // L: 2707
+ WorldMapData_1.method4872(9); // L: 2708
}
}
- if (loginState != 19) { // L: 2766
- ++field626; // L: 2813
- if (field626 > 2000) { // L: 2814
- if (field514 < 1) { // L: 2815
- if (Tiles.worldPort == WorldMapRegion.currentPort) { // L: 2816
- WorldMapRegion.currentPort = GrandExchangeEvent.js5Port;
- } else {
- WorldMapRegion.currentPort = Tiles.worldPort; // L: 2817
- }
-
- ++field514; // L: 2818
- Canvas.method347(0); // L: 2819
- } else {
- PcmPlayer.getLoginError(-3); // L: 2822
- }
- }
- } else {
- if (packetWriter.serverPacketLength == -1) { // L: 2767
- if (((AbstractSocket)var1).available() < 2) { // L: 2768
+ if (loginState == 19) { // L: 2712
+ if (packetWriter.serverPacketLength == -1) { // L: 2713
+ if (var1.available() < 2) { // L: 2714
return;
}
- ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2769
- var2.offset = 0; // L: 2770
- packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2771
+ var1.read(var2.array, 0, 2); // L: 2715
+ var2.offset = 0; // L: 2716
+ packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2717
}
- if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2773
- ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2774
- var2.offset = 0; // L: 2775
- var40 = packetWriter.serverPacketLength; // L: 2776
- timer.method6372(); // L: 2777
- packetWriter.clearBuffer(); // L: 2779
- packetWriter.packetBuffer.offset = 0; // L: 2780
- packetWriter.serverPacket = null; // L: 2781
- packetWriter.field1351 = null; // L: 2782
- packetWriter.field1340 = null; // L: 2783
- packetWriter.field1345 = null; // L: 2784
- packetWriter.serverPacketLength = 0; // L: 2785
- packetWriter.field1349 = 0; // L: 2786
- rebootTimer = 0; // L: 2787
- HealthBar.method2336(); // L: 2788
- minimapState = 0; // L: 2789
- destinationX = 0; // L: 2790
-
- for (var12 = 0; var12 < 2048; ++var12) { // L: 2791
- players[var12] = null;
+ if (var1.available() >= packetWriter.serverPacketLength) { // L: 2719
+ var1.read(var2.array, 0, packetWriter.serverPacketLength);
+ var2.offset = 0;
+ var13 = packetWriter.serverPacketLength;
+ timer.method6514();
+ SoundSystem.method736(); // L: 2724
+ AbstractUserComparator.updatePlayer(var2);
+ if (var13 != var2.offset) {
+ throw new RuntimeException(); // L: 2727
}
-
- ModelData0.localPlayer = null; // L: 2792
-
- for (var12 = 0; var12 < npcs.length; ++var12) { // L: 2793
- NPC var38 = npcs[var12]; // L: 2794
- if (var38 != null) { // L: 2795
- var38.targetIndex = -1; // L: 2796
- var38.false0 = false; // L: 2797
+ }
+ } else {
+ ++field512;
+ if (field512 > 2000) {
+ if (field609 < 1) { // L: 2733
+ if (FloorDecoration.worldPort == currentPort) {
+ currentPort = class18.js5Port;
+ } else {
+ currentPort = FloorDecoration.worldPort;
}
- }
- ItemContainer.itemContainers = new NodeHashTable(32); // L: 2801
- PendingSpawn.updateGameState(30); // L: 2803
-
- for (var12 = 0; var12 < 100; ++var12) { // L: 2804
- field652[var12] = true;
- }
-
- class140.method2951(); // L: 2805
- Player.updatePlayer(var2); // L: 2807
- if (var40 != var2.offset) { // L: 2808
- throw new RuntimeException(); // L: 2809
+ ++field609; // L: 2736
+ HitSplatDefinition.method3624(0);
+ } else {
+ Canvas.getLoginError(-3); // L: 2740
}
}
}
+ } else {
+ if (var1.available() >= packetWriter.serverPacketLength) { // L: 2571
+ var2.offset = 0; // L: 2572
+ var1.read(var2.array, 0, packetWriter.serverPacketLength); // L: 2573
+ timer.method6511(); // L: 2574
+ mouseLastLastPressedTimeMillis = -1L; // L: 2577
+ ItemLayer.mouseRecorder.index = 0; // L: 2578
+ ModelData0.hasFocus = true; // L: 2579
+ hadFocus = true; // L: 2580
+ field728 = -1L; // L: 2581
+ PacketBufferNode.method5202(); // L: 2582
+ packetWriter.clearBuffer(); // L: 2583
+ packetWriter.packetBuffer.offset = 0; // L: 2584
+ packetWriter.serverPacket = null; // L: 2585
+ packetWriter.field1350 = null; // L: 2586
+ packetWriter.field1347 = null; // L: 2587
+ packetWriter.field1352 = null; // L: 2588
+ packetWriter.serverPacketLength = 0; // L: 2589
+ packetWriter.field1342 = 0; // L: 2590
+ rebootTimer = 0; // L: 2591
+ logoutTimer = 0; // L: 2592
+ hintArrowType = 0; // L: 2593
+ class125.method2824(); // L: 2594
+ class328.method6056(0); // L: 2595
+ Messages.Messages_channels.clear(); // L: 2597
+ Messages.Messages_hashTable.clear(); // L: 2598
+ Messages.Messages_queue.clear(); // L: 2599
+ Messages.Messages_count = 0; // L: 2600
+ isItemSelected = 0; // L: 2602
+ isSpellSelected = false; // L: 2603
+ soundEffectCount = 0; // L: 2604
+ camAngleY = 0; // L: 2605
+ oculusOrbState = 0; // L: 2606
+ UrlRequester.field1362 = null; // L: 2607
+ minimapState = 0; // L: 2608
+ field725 = -1; // L: 2609
+ destinationX = 0; // L: 2610
+ destinationY = 0; // L: 2611
+ playerAttackOption = AttackOption.AttackOption_hidden; // L: 2612
+ npcAttackOption = AttackOption.AttackOption_hidden; // L: 2613
+ npcCount = 0; // L: 2614
+ AbstractWorldMapData.method4958(); // L: 2615
+
+ for (var13 = 0; var13 < 2048; ++var13) { // L: 2616
+ players[var13] = null;
+ }
+
+ for (var13 = 0; var13 < 32768; ++var13) { // L: 2617
+ npcs[var13] = null;
+ }
+
+ combatTargetPlayerIndex = -1; // L: 2618
+ projectiles.clear(); // L: 2619
+ graphicsObjects.clear(); // L: 2620
+
+ for (var13 = 0; var13 < 4; ++var13) { // L: 2621
+ for (var15 = 0; var15 < 104; ++var15) { // L: 2622
+ for (var16 = 0; var16 < 104; ++var16) { // L: 2623
+ groundItems[var13][var15][var16] = null; // L: 2624
+ }
+ }
+ }
+
+ pendingSpawns = new NodeDeque(); // L: 2628
+ Player.friendSystem.clear(); // L: 2629
+
+ for (var13 = 0; var13 < VarpDefinition.field1822; ++var13) { // L: 2630
+ VarpDefinition var31 = FloorUnderlayDefinition.VarpDefinition_get(var13); // L: 2631
+ if (var31 != null) { // L: 2632
+ Varps.Varps_temp[var13] = 0; // L: 2633
+ Varps.Varps_main[var13] = 0; // L: 2634
+ }
+ }
+
+ class308.varcs.clearTransient(); // L: 2637
+ followerIndex = -1; // L: 2638
+ if (rootInterface != -1) { // L: 2639
+ var13 = rootInterface; // L: 2640
+ if (var13 != -1 && class228.Widget_loadedInterfaces[var13]) { // L: 2642 2643
+ MusicPatchPcmStream.Widget_archive.clearFilesGroup(var13); // L: 2644
+ if (SoundCache.Widget_interfaceComponents[var13] != null) { // L: 2645
+ var40 = true; // L: 2646
+
+ for (var16 = 0; var16 < SoundCache.Widget_interfaceComponents[var13].length; ++var16) { // L: 2647
+ if (SoundCache.Widget_interfaceComponents[var13][var16] != null) { // L: 2648
+ if (SoundCache.Widget_interfaceComponents[var13][var16].type != 2) { // L: 2649
+ SoundCache.Widget_interfaceComponents[var13][var16] = null;
+ } else {
+ var40 = false; // L: 2650
+ }
+ }
+ }
+
+ if (var40) { // L: 2653
+ SoundCache.Widget_interfaceComponents[var13] = null;
+ }
+
+ class228.Widget_loadedInterfaces[var13] = false; // L: 2654
+ }
+ }
+ }
+
+ for (InterfaceParent var35 = (InterfaceParent)interfaceParents.first(); var35 != null; var35 = (InterfaceParent)interfaceParents.next()) { // L: 2657
+ MusicPatchPcmStream.closeInterface(var35, true); // L: 2658
+ }
+
+ rootInterface = -1; // L: 2660
+ interfaceParents = new NodeHashTable(8); // L: 2661
+ meslayerContinueWidget = null; // L: 2662
+ class125.method2824(); // L: 2663
+ playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2664
+
+ for (var13 = 0; var13 < 8; ++var13) { // L: 2665
+ playerMenuActions[var13] = null; // L: 2666
+ playerOptionsPriorities[var13] = false; // L: 2667
+ }
+
+ class125.method2830(); // L: 2669
+ isLoading = true; // L: 2670
+
+ for (var13 = 0; var13 < 100; ++var13) { // L: 2671
+ field703[var13] = true;
+ }
+
+ SpriteMask.method5522(); // L: 2672
+ Huffman.friendsChat = null; // L: 2673
+ HealthBar.guestClanSettings = null; // L: 2674
+ Arrays.fill(currentClanSettings, (Object)null); // L: 2675
+ class150.guestClanChannel = null; // L: 2676
+ Arrays.fill(currentClanChannels, (Object)null); // L: 2677
+
+ for (var13 = 0; var13 < 8; ++var13) { // L: 2678
+ grandExchangeOffers[var13] = new GrandExchangeOffer();
+ }
+
+ class143.grandExchangeEvents = null; // L: 2679
+ AbstractUserComparator.updatePlayer(var2); // L: 2681
+ GrandExchangeOffer.field4070 = -1; // L: 2682
+ class294.loadRegions(false, var2); // L: 2683
+ packetWriter.serverPacket = null; // L: 2684
+ }
+
}
}
- } catch (IOException var22) { // L: 2826
- if (field514 < 1) { // L: 2827
- if (Tiles.worldPort == WorldMapRegion.currentPort) { // L: 2828
- WorldMapRegion.currentPort = GrandExchangeEvent.js5Port;
+ } catch (IOException var24) { // L: 2744
+ if (field609 < 1) {
+ if (FloorDecoration.worldPort == currentPort) {
+ currentPort = class18.js5Port;
} else {
- WorldMapRegion.currentPort = Tiles.worldPort; // L: 2829
+ currentPort = FloorDecoration.worldPort;
}
- ++field514; // L: 2830
- Canvas.method347(0); // L: 2831
+ ++field609; // L: 2748
+ HitSplatDefinition.method3624(0);
} else {
- PcmPlayer.getLoginError(-2); // L: 2834
+ Canvas.getLoginError(-2); // L: 2752
}
}
- } // L: 2537 2740 2811 2820 2823 2832 2835 2837
+ } // L: 2503 2686
- @ObfuscatedName("fc")
+ @ObfuscatedName("fe")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "2"
+ descriptor = "(I)V",
+ garbageValue = "2106360630"
)
@Export("doCycleLoggedIn")
final void doCycleLoggedIn() {
- if (rebootTimer > 1) { // L: 3073
+ if (rebootTimer > 1) { // L: 3029
--rebootTimer;
}
- if (logoutTimer > 0) { // L: 3074
+ if (logoutTimer > 0) { // L: 3030
--logoutTimer;
}
- if (hadNetworkError) { // L: 3075
- hadNetworkError = false; // L: 3076
- class129.method2812(); // L: 3077
+ if (hadNetworkError) { // L: 3031
+ hadNetworkError = false; // L: 3032
+ class131.method2877(); // L: 3033
} else {
- if (!isMenuOpen) { // L: 3080
- class20.addCancelMenuEntry();
+ if (!isMenuOpen) { // L: 3036
+ InterfaceParent.addCancelMenuEntry();
}
int var1;
- for (var1 = 0; var1 < 100 && this.method1254(packetWriter); ++var1) { // L: 3081 3082
+ for (var1 = 0; var1 < 100 && this.method1120(packetWriter); ++var1) { // L: 3037 3038
}
- if (gameState == 30) { // L: 3084
- while (true) {
- ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 3088
- boolean var30;
- if (var2 == null) { // L: 3089
- var30 = false; // L: 3090
- } else {
- var30 = true; // L: 3093
+ if (gameState == 30) { // L: 3040
+ int var2;
+ PacketBufferNode var14;
+ while (class6.method37()) { // L: 3041
+ var14 = EnumComposition.getPacketBufferNode(ClientPacket.field3001, packetWriter.isaacCipher); // L: 3042
+ var14.packetBuffer.writeByte(0); // L: 3043
+ var2 = var14.packetBuffer.offset; // L: 3044
+ ArchiveDiskAction.performReflectionCheck(var14.packetBuffer); // L: 3045
+ var14.packetBuffer.method7935(var14.packetBuffer.offset - var2); // L: 3046
+ packetWriter.addNode(var14); // L: 3047
+ }
+
+ if (timer.field4223) { // L: 3049
+ var14 = EnumComposition.getPacketBufferNode(ClientPacket.field2918, packetWriter.isaacCipher); // L: 3051
+ var14.packetBuffer.writeByte(0); // L: 3052
+ var2 = var14.packetBuffer.offset; // L: 3053
+ timer.write(var14.packetBuffer); // L: 3054
+ var14.packetBuffer.method7935(var14.packetBuffer.offset - var2); // L: 3055
+ packetWriter.addNode(var14); // L: 3056
+ timer.method6513(); // L: 3057
+ }
+
+ int var3;
+ int var4;
+ int var5;
+ int var6;
+ int var7;
+ int var8;
+ int var9;
+ int var10;
+ int var11;
+ int var12;
+ synchronized(ItemLayer.mouseRecorder.lock) { // L: 3060
+ if (!field521) { // L: 3061
+ ItemLayer.mouseRecorder.index = 0; // L: 3147
+ } else if (MouseHandler.MouseHandler_lastButton != 0 || ItemLayer.mouseRecorder.index >= 40) { // L: 3062
+ PacketBufferNode var15 = null; // L: 3064
+ var3 = 0; // L: 3065
+ var4 = 0; // L: 3066
+ var5 = 0; // L: 3067
+ var6 = 0; // L: 3068
+
+ for (var7 = 0; var7 < ItemLayer.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 3069 3070
+ var4 = var7; // L: 3071
+ var8 = ItemLayer.mouseRecorder.ys[var7]; // L: 3072
+ if (var8 < -1) { // L: 3073
+ var8 = -1;
+ } else if (var8 > 65534) { // L: 3074
+ var8 = 65534;
+ }
+
+ var9 = ItemLayer.mouseRecorder.xs[var7]; // L: 3075
+ if (var9 < -1) { // L: 3076
+ var9 = -1;
+ } else if (var9 > 65534) { // L: 3077
+ var9 = 65534;
+ }
+
+ if (var9 != field605 || var8 != field647) { // L: 3078
+ if (var15 == null) { // L: 3081
+ var15 = EnumComposition.getPacketBufferNode(ClientPacket.field2931, packetWriter.isaacCipher); // L: 3082
+ var15.packetBuffer.writeByte(0); // L: 3083
+ var3 = var15.packetBuffer.offset; // L: 3084
+ PacketBuffer var10000 = var15.packetBuffer; // L: 3085
+ var10000.offset += 2;
+ var5 = 0; // L: 3086
+ var6 = 0; // L: 3087
+ }
+
+ if (field662 != -1L) { // L: 3092
+ var10 = var9 - field605; // L: 3093
+ var11 = var8 - field647; // L: 3094
+ var12 = (int)((ItemLayer.mouseRecorder.millis[var7] - field662) / 20L); // L: 3095
+ var5 = (int)((long)var5 + (ItemLayer.mouseRecorder.millis[var7] - field662) % 20L); // L: 3096
+ } else {
+ var10 = var9; // L: 3099
+ var11 = var8; // L: 3100
+ var12 = Integer.MAX_VALUE; // L: 3101
+ }
+
+ field605 = var9; // L: 3103
+ field647 = var8; // L: 3104
+ if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3105
+ var10 += 32; // L: 3106
+ var11 += 32; // L: 3107
+ var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3108
+ } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3110
+ var10 += 128; // L: 3111
+ var11 += 128; // L: 3112
+ var15.packetBuffer.writeByte(var12 + 128); // L: 3113
+ var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3114
+ } else if (var12 < 32) { // L: 3116
+ var15.packetBuffer.writeByte(var12 + 192); // L: 3117
+ if (var9 != -1 && var8 != -1) { // L: 3118
+ var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3119
+ } else {
+ var15.packetBuffer.writeInt(Integer.MIN_VALUE);
+ }
+ } else {
+ var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3122
+ if (var9 != -1 && var8 != -1) { // L: 3123
+ var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3124
+ } else {
+ var15.packetBuffer.writeInt(Integer.MIN_VALUE);
+ }
+ }
+
+ ++var6; // L: 3126
+ field662 = ItemLayer.mouseRecorder.millis[var7]; // L: 3127
+ }
+ }
+
+ if (var15 != null) { // L: 3129
+ var15.packetBuffer.method7935(var15.packetBuffer.offset - var3); // L: 3130
+ var7 = var15.packetBuffer.offset; // L: 3131
+ var15.packetBuffer.offset = var3; // L: 3132
+ var15.packetBuffer.writeByte(var5 / var6); // L: 3133
+ var15.packetBuffer.writeByte(var5 % var6); // L: 3134
+ var15.packetBuffer.offset = var7; // L: 3135
+ packetWriter.addNode(var15); // L: 3136
+ }
+
+ if (var4 >= ItemLayer.mouseRecorder.index) { // L: 3138
+ ItemLayer.mouseRecorder.index = 0;
+ } else {
+ MouseRecorder var42 = ItemLayer.mouseRecorder; // L: 3140
+ var42.index -= var4;
+ System.arraycopy(ItemLayer.mouseRecorder.xs, var4, ItemLayer.mouseRecorder.xs, 0, ItemLayer.mouseRecorder.index); // L: 3141
+ System.arraycopy(ItemLayer.mouseRecorder.ys, var4, ItemLayer.mouseRecorder.ys, 0, ItemLayer.mouseRecorder.index); // L: 3142
+ System.arraycopy(ItemLayer.mouseRecorder.millis, var4, ItemLayer.mouseRecorder.millis, 0, ItemLayer.mouseRecorder.index); // L: 3143
+ }
+ }
+ }
+
+ PacketBufferNode var18;
+ if (MouseHandler.MouseHandler_lastButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3149
+ long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3150
+ if (var16 > 32767L) { // L: 3151
+ var16 = 32767L;
}
- int var3;
- PacketBufferNode var31;
- if (!var30) { // L: 3095
- PacketBufferNode var14;
- int var15;
- if (timer.field4235) { // L: 3103
- var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3009, packetWriter.isaacCipher); // L: 3105
- var14.packetBuffer.writeByte(0); // L: 3106
- var15 = var14.packetBuffer.offset; // L: 3107
- timer.write(var14.packetBuffer); // L: 3108
- var14.packetBuffer.method7740(var14.packetBuffer.offset - var15); // L: 3109
- packetWriter.addNode(var14); // L: 3110
- timer.method6371(); // L: 3111
+ mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3152
+ var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3153
+ if (var3 < 0) { // L: 3154
+ var3 = 0;
+ } else if (var3 > class78.canvasHeight) { // L: 3155
+ var3 = class78.canvasHeight;
+ }
+
+ var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3156
+ if (var4 < 0) { // L: 3157
+ var4 = 0;
+ } else if (var4 > Script.canvasWidth) { // L: 3158
+ var4 = Script.canvasWidth;
+ }
+
+ var5 = (int)var16; // L: 3159
+ var18 = EnumComposition.getPacketBufferNode(ClientPacket.field2957, packetWriter.isaacCipher); // L: 3160
+ var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3161
+ var18.packetBuffer.writeShort(var4); // L: 3162
+ var18.packetBuffer.writeShort(var3); // L: 3163
+ packetWriter.addNode(var18); // L: 3164
+ }
+
+ if (KeyHandler.field144 > 0) { // L: 3166
+ var14 = EnumComposition.getPacketBufferNode(ClientPacket.field2917, packetWriter.isaacCipher); // L: 3167
+ var14.packetBuffer.writeShort(0); // L: 3168
+ var2 = var14.packetBuffer.offset; // L: 3169
+ long var19 = class115.method2692(); // L: 3170
+
+ for (var5 = 0; var5 < KeyHandler.field144; ++var5) { // L: 3171
+ long var21 = var19 - field728; // L: 3172
+ if (var21 > 16777215L) { // L: 3173
+ var21 = 16777215L;
}
- int var4;
- int var5;
- int var6;
- int var7;
- int var8;
- int var9;
- int var10;
- int var11;
- int var12;
- PacketBuffer var10000;
- synchronized(Varcs.mouseRecorder.lock) { // L: 3114
- if (!field659) { // L: 3115
- Varcs.mouseRecorder.index = 0; // L: 3201
- } else if (MouseHandler.MouseHandler_lastButton != 0 || Varcs.mouseRecorder.index >= 40) { // L: 3116
- var31 = null; // L: 3118
- var3 = 0; // L: 3119
- var4 = 0; // L: 3120
- var5 = 0; // L: 3121
- var6 = 0; // L: 3122
+ field728 = var19; // L: 3174
+ var14.packetBuffer.method7762(KeyHandler.field134[var5]); // L: 3175
+ var14.packetBuffer.writeMedium((int)var21); // L: 3176
+ }
- for (var7 = 0; var7 < Varcs.mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { // L: 3123 3124
- var4 = var7; // L: 3125
- var8 = Varcs.mouseRecorder.ys[var7]; // L: 3126
- if (var8 < -1) { // L: 3127
- var8 = -1;
- } else if (var8 > 65534) { // L: 3128
- var8 = 65534;
- }
+ var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3178
+ packetWriter.addNode(var14); // L: 3179
+ }
- var9 = Varcs.mouseRecorder.xs[var7]; // L: 3129
- if (var9 < -1) { // L: 3130
- var9 = -1;
- } else if (var9 > 65534) { // L: 3131
- var9 = 65534;
- }
+ if (field493 > 0) { // L: 3181
+ --field493;
+ }
- if (var9 != field492 || var8 != field681) { // L: 3132
- if (var31 == null) { // L: 3135
- var31 = WallDecoration.getPacketBufferNode(ClientPacket.field2952, packetWriter.isaacCipher); // L: 3136
- var31.packetBuffer.writeByte(0); // L: 3137
- var3 = var31.packetBuffer.offset; // L: 3138
- var10000 = var31.packetBuffer; // L: 3139
- var10000.offset += 2;
- var5 = 0; // L: 3140
- var6 = 0; // L: 3141
- }
+ if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3182
+ field578 = true;
+ }
- if (-1L != field494) { // L: 3146
- var10 = var9 - field492; // L: 3147
- var11 = var8 - field681; // L: 3148
- var12 = (int)((Varcs.mouseRecorder.millis[var7] - field494) / 20L); // L: 3149
- var5 = (int)((long)var5 + (Varcs.mouseRecorder.millis[var7] - field494) % 20L); // L: 3150
- } else {
- var10 = var9; // L: 3153
- var11 = var8; // L: 3154
- var12 = Integer.MAX_VALUE; // L: 3155
- }
+ if (field578 && field493 <= 0) { // L: 3183
+ field493 = 20; // L: 3184
+ field578 = false; // L: 3185
+ var14 = EnumComposition.getPacketBufferNode(ClientPacket.field3006, packetWriter.isaacCipher); // L: 3187
+ var14.packetBuffer.writeIntME(camAngleY); // L: 3188
+ var14.packetBuffer.method7929(camAngleX); // L: 3189
+ packetWriter.addNode(var14); // L: 3190
+ }
- field492 = var9; // L: 3157
- field681 = var8; // L: 3158
- if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3159
- var10 += 32; // L: 3160
- var11 += 32; // L: 3161
- var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3162
- } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3164
- var10 += 128; // L: 3165
- var11 += 128; // L: 3166
- var31.packetBuffer.writeByte(var12 + 128); // L: 3167
- var31.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3168
- } else if (var12 < 32) { // L: 3170
- var31.packetBuffer.writeByte(var12 + 192); // L: 3171
- if (var9 != -1 && var8 != -1) { // L: 3172
- var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3173
- } else {
- var31.packetBuffer.writeInt(Integer.MIN_VALUE);
- }
- } else {
- var31.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3176
- if (var9 != -1 && var8 != -1) { // L: 3177
- var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3178
- } else {
- var31.packetBuffer.writeInt(Integer.MIN_VALUE);
- }
- }
+ if (ModelData0.hasFocus && !hadFocus) { // L: 3192
+ hadFocus = true; // L: 3193
+ var14 = EnumComposition.getPacketBufferNode(ClientPacket.field3002, packetWriter.isaacCipher); // L: 3195
+ var14.packetBuffer.writeByte(1); // L: 3196
+ packetWriter.addNode(var14); // L: 3197
+ }
- ++var6; // L: 3180
- field494 = Varcs.mouseRecorder.millis[var7]; // L: 3181
- }
- }
+ if (!ModelData0.hasFocus && hadFocus) { // L: 3199
+ hadFocus = false; // L: 3200
+ var14 = EnumComposition.getPacketBufferNode(ClientPacket.field3002, packetWriter.isaacCipher); // L: 3202
+ var14.packetBuffer.writeByte(0); // L: 3203
+ packetWriter.addNode(var14); // L: 3204
+ }
- if (var31 != null) { // L: 3183
- var31.packetBuffer.method7740(var31.packetBuffer.offset - var3); // L: 3184
- var7 = var31.packetBuffer.offset; // L: 3185
- var31.packetBuffer.offset = var3; // L: 3186
- var31.packetBuffer.writeByte(var5 / var6); // L: 3187
- var31.packetBuffer.writeByte(var5 % var6); // L: 3188
- var31.packetBuffer.offset = var7; // L: 3189
- packetWriter.addNode(var31); // L: 3190
- }
+ if (class121.worldMap != null) { // L: 3207
+ class121.worldMap.method7182();
+ }
- if (var4 >= Varcs.mouseRecorder.index) { // L: 3192
- Varcs.mouseRecorder.index = 0;
- } else {
- MouseRecorder var54 = Varcs.mouseRecorder; // L: 3194
- var54.index -= var4;
- System.arraycopy(Varcs.mouseRecorder.xs, var4, Varcs.mouseRecorder.xs, 0, Varcs.mouseRecorder.index); // L: 3195
- System.arraycopy(Varcs.mouseRecorder.ys, var4, Varcs.mouseRecorder.ys, 0, Varcs.mouseRecorder.index); // L: 3196
- System.arraycopy(Varcs.mouseRecorder.millis, var4, Varcs.mouseRecorder.millis, 0, Varcs.mouseRecorder.index); // L: 3197
+ SoundSystem.method743(); // L: 3208
+ AbstractWorldMapData.method4985(); // L: 3209
+ Messages.method2494(); // L: 3210
+ if (gameState == 30) { // L: 3211
+ for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { // L: 3213 3214 3233
+ if (var36.hitpoints > 0) { // L: 3215
+ --var36.hitpoints;
+ }
+
+ if (var36.hitpoints == 0) { // L: 3216
+ if (var36.objectId < 0 || class298.method5753(var36.objectId, var36.field1122)) { // L: 3217
+ class285.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field1121, var36.field1122); // L: 3218
+ var36.remove(); // L: 3219
+ }
+ } else {
+ if (var36.delay > 0) { // L: 3223
+ --var36.delay;
+ }
+
+ if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102 && (var36.id < 0 || class298.method5753(var36.id, var36.field1125))) { // L: 3224 3225
+ class285.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field1125); // L: 3226
+ var36.delay = -1; // L: 3227
+ if (var36.objectId == var36.id && var36.objectId == -1) { // L: 3228
+ var36.remove();
+ } else if (var36.id == var36.objectId && var36.field1121 == var36.orientation && var36.field1125 == var36.field1122) { // L: 3229
+ var36.remove();
}
}
}
+ }
- PacketBufferNode var18;
- if (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3203
- long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3204
- if (var16 > 32767L) { // L: 3205
- var16 = 32767L;
- }
+ ModelData0.method4532(); // L: 3236
+ ++packetWriter.field1342; // L: 3237
+ if (packetWriter.field1342 > 750) { // L: 3238
+ class131.method2877(); // L: 3239
+ } else {
+ PacketBuffer.method7714(); // L: 3242
- mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3206
- var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3207
- if (var3 < 0) { // L: 3208
- var3 = 0;
- } else if (var3 > class433.canvasHeight) { // L: 3209
- var3 = class433.canvasHeight;
- }
-
- var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3210
- if (var4 < 0) { // L: 3211
- var4 = 0;
- } else if (var4 > GraphicsObject.canvasWidth) { // L: 3212
- var4 = GraphicsObject.canvasWidth;
- }
-
- var5 = (int)var16; // L: 3213
- var18 = WallDecoration.getPacketBufferNode(ClientPacket.field3051, packetWriter.isaacCipher); // L: 3214
- var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3215
- var18.packetBuffer.writeShort(var4); // L: 3216
- var18.packetBuffer.writeShort(var3); // L: 3217
- packetWriter.addNode(var18); // L: 3218
- }
-
- if (KeyHandler.field139 > 0) { // L: 3220
- var14 = WallDecoration.getPacketBufferNode(ClientPacket.field2949, packetWriter.isaacCipher); // L: 3221
- var14.packetBuffer.writeShort(0); // L: 3222
- var15 = var14.packetBuffer.offset; // L: 3223
- long var19 = class113.method2624(); // L: 3224
-
- for (var5 = 0; var5 < KeyHandler.field139; ++var5) { // L: 3225
- long var21 = var19 - field722; // L: 3226
- if (var21 > 16777215L) { // L: 3227
- var21 = 16777215L;
- }
-
- field722 = var19; // L: 3228
- var14.packetBuffer.method7559((int)var21); // L: 3229
- var14.packetBuffer.writeByte(KeyHandler.field138[var5]); // L: 3230
- }
-
- var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 3232
- packetWriter.addNode(var14); // L: 3233
- }
-
- if (field576 > 0) { // L: 3235
- --field576;
- }
-
- if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3236
- field557 = true;
- }
-
- if (field557 && field576 <= 0) { // L: 3237
- field576 = 20; // L: 3238
- field557 = false; // L: 3239
- var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3035, packetWriter.isaacCipher); // L: 3241
- var14.packetBuffer.writeShort(camAngleY); // L: 3242
- var14.packetBuffer.writeShort(camAngleX); // L: 3243
- packetWriter.addNode(var14); // L: 3244
- }
-
- if (WorldMapArea.hasFocus && !hadFocus) { // L: 3246
- hadFocus = true; // L: 3247
- var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3038, packetWriter.isaacCipher); // L: 3249
- var14.packetBuffer.writeByte(1); // L: 3250
- packetWriter.addNode(var14); // L: 3251
- }
-
- if (!WorldMapArea.hasFocus && hadFocus) { // L: 3253
- hadFocus = false; // L: 3254
- var14 = WallDecoration.getPacketBufferNode(ClientPacket.field3038, packetWriter.isaacCipher); // L: 3256
- var14.packetBuffer.writeByte(0); // L: 3257
- packetWriter.addNode(var14); // L: 3258
- }
-
- if (ServerPacket.worldMap != null) { // L: 3261
- ServerPacket.worldMap.method7023();
- }
-
- WorldMapSection1.method4839(); // L: 3262
- HealthBar.method2334(); // L: 3263
- if (field515 != class128.Client_plane) { // L: 3265
- field515 = class128.Client_plane; // L: 3266
- GraphicsDefaults.method6732(class128.Client_plane); // L: 3267
- }
-
- if (gameState != 30) { // L: 3270
- return;
- }
-
- Tiles.method2031(); // L: 3271
-
- int var10002;
- for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3273
- var10002 = queuedSoundEffectDelays[var1]--; // L: 3274
- if (queuedSoundEffectDelays[var1] >= -10) { // L: 3275
- SoundEffect var32 = soundEffects[var1]; // L: 3287
- if (var32 == null) { // L: 3288
- var10000 = null; // L: 3289
- var32 = SoundEffect.readSoundEffect(MouseHandler.archive4, soundEffectIds[var1], 0);
- if (var32 == null) { // L: 3290
- continue;
- }
-
- int[] var55 = queuedSoundEffectDelays; // L: 3291
- var55[var1] += var32.calculateDelay();
- soundEffects[var1] = var32; // L: 3292
- }
-
- if (queuedSoundEffectDelays[var1] < 0) { // L: 3298
- if (soundLocations[var1] != 0) { // L: 3300
- var4 = (soundLocations[var1] & 255) * 128; // L: 3301
- var5 = soundLocations[var1] >> 16 & 255; // L: 3302
- var6 = var5 * 128 + 64 - ModelData0.localPlayer.x; // L: 3303
- if (var6 < 0) { // L: 3304
- var6 = -var6;
- }
-
- var7 = soundLocations[var1] >> 8 & 255; // L: 3305
- var8 = var7 * 128 + 64 - ModelData0.localPlayer.y; // L: 3306
- if (var8 < 0) { // L: 3307
- var8 = -var8;
- }
-
- var9 = var6 + var8 - 128; // L: 3308
- if (var9 > var4) { // L: 3309
- queuedSoundEffectDelays[var1] = -100; // L: 3310
- continue; // L: 3311
- }
-
- if (var9 < 0) { // L: 3313
- var9 = 0;
- }
-
- var3 = (var4 - var9) * class12.clientPreferences.method2239() / var4; // L: 3314
- } else {
- var3 = class12.clientPreferences.method2244(); // L: 3316
- }
-
- if (var3 > 0) { // L: 3317
- RawSound var23 = var32.toRawSound().resample(class403.decimator); // L: 3318
- RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 3319
- var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3320
- class122.pcmStreamMixer.addSubStream(var24); // L: 3321
- }
-
- queuedSoundEffectDelays[var1] = -100; // L: 3323
- }
- } else {
- --soundEffectCount; // L: 3276
-
- for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 3277
- soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 3278
- soundEffects[var15] = soundEffects[var15 + 1]; // L: 3279
- queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 3280
- queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 3281
- soundLocations[var15] = soundLocations[var15 + 1]; // L: 3282
- }
-
- --var1; // L: 3284
+ for (var1 = 0; var1 < npcCount; ++var1) { // L: 3244
+ var2 = npcIndices[var1]; // L: 3245
+ NPC var23 = npcs[var2]; // L: 3246
+ if (var23 != null) { // L: 3247
+ class285.updateActorSequence(var23, var23.definition.size); // L: 3248
}
}
- if (playingJingle && !Coord.method5370()) { // L: 3326
- if (class12.clientPreferences.method2248() != 0 && currentTrackGroupId != -1) { // L: 3327
- UserComparator8.method2574(AbstractUserComparator.archive6, currentTrackGroupId, 0, class12.clientPreferences.method2248(), false);
- }
-
- playingJingle = false; // L: 3328
- }
-
- ++packetWriter.field1349; // L: 3331
- if (packetWriter.field1349 > 750) { // L: 3332
- class129.method2812(); // L: 3333
- return; // L: 3334
- }
-
- var1 = Players.Players_count; // L: 3337
- int[] var33 = Players.Players_indices; // L: 3338
-
- for (var3 = 0; var3 < var1; ++var3) { // L: 3339
- Player var45 = players[var33[var3]]; // L: 3340
- if (var45 != null) { // L: 3341
- class301.updateActorSequence(var45, 1); // L: 3342
- }
- }
-
- for (var1 = 0; var1 < npcCount; ++var1) { // L: 3347
- var15 = npcIndices[var1]; // L: 3348
- NPC var25 = npcs[var15]; // L: 3349
- if (var25 != null) { // L: 3350
- class301.updateActorSequence(var25, var25.definition.size); // L: 3351
- }
- }
-
- int[] var40 = Players.Players_indices; // L: 3356
-
- for (var15 = 0; var15 < Players.Players_count; ++var15) { // L: 3357
- Player var51 = players[var40[var15]]; // L: 3358
- if (var51 != null && var51.overheadTextCyclesRemaining > 0) { // L: 3359
- --var51.overheadTextCyclesRemaining; // L: 3360
- if (var51.overheadTextCyclesRemaining == 0) { // L: 3361
- var51.overheadText = null;
- }
- }
- }
-
- for (var15 = 0; var15 < npcCount; ++var15) { // L: 3364
- var3 = npcIndices[var15]; // L: 3365
- NPC var46 = npcs[var3]; // L: 3366
- if (var46 != null && var46.overheadTextCyclesRemaining > 0) { // L: 3367
- --var46.overheadTextCyclesRemaining; // L: 3368
- if (var46.overheadTextCyclesRemaining == 0) { // L: 3369
- var46.overheadText = null;
- }
- }
- }
-
- ++field727; // L: 3373
- if (mouseCrossColor != 0) { // L: 3374
- mouseCrossState += 20; // L: 3375
- if (mouseCrossState >= 400) { // L: 3376
+ UrlRequester.method2536(); // L: 3252
+ ++field555; // L: 3253
+ if (mouseCrossColor != 0) { // L: 3254
+ mouseCrossState += 20; // L: 3255
+ if (mouseCrossState >= 400) { // L: 3256
mouseCrossColor = 0;
}
}
- if (NPCComposition.field1991 != null) { // L: 3378
- ++field598; // L: 3379
- if (field598 >= 15) { // L: 3380
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(NPCComposition.field1991); // L: 3381
- NPCComposition.field1991 = null; // L: 3382
+ if (class1.field4 != null) { // L: 3258
+ ++field599; // L: 3259
+ if (field599 >= 15) { // L: 3260
+ ChatChannel.invalidateWidget(class1.field4); // L: 3261
+ class1.field4 = null; // L: 3262
}
}
- Widget var41 = class144.mousedOverWidgetIf1; // L: 3385
- Widget var34 = class113.field1422; // L: 3386
- class144.mousedOverWidgetIf1 = null; // L: 3387
- class113.field1422 = null; // L: 3388
- draggedOnWidget = null; // L: 3389
- field675 = false; // L: 3390
- field574 = false; // L: 3391
- field719 = 0; // L: 3392
+ Widget var37 = Language.mousedOverWidgetIf1; // L: 3265
+ Widget var38 = SoundSystem.field313; // L: 3266
+ Language.mousedOverWidgetIf1 = null; // L: 3267
+ SoundSystem.field313 = null; // L: 3268
+ draggedOnWidget = null; // L: 3269
+ field675 = false; // L: 3270
+ field767 = false; // L: 3271
+ field719 = 0; // L: 3272
- while (TaskHandler.isKeyDown() && field719 < 128) { // L: 3393
- if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class12.field61 == 66) { // L: 3394
- StringBuilder var47 = new StringBuilder(); // L: 3397
-
- Message var42;
- for (Iterator var48 = Messages.Messages_hashTable.iterator(); var48.hasNext(); var47.append(var42.text).append('\n')) { // L: 3398 3404
- var42 = (Message)var48.next(); // L: 3399
- if (var42.sender != null && !var42.sender.isEmpty()) { // L: 3401
- var47.append(var42.sender).append(':'); // L: 3402
- }
- }
-
- String var53 = var47.toString(); // L: 3407
- class82.client.method429(var53); // L: 3410
- } else if (oculusOrbState != 1 || InvDefinition.field1850 <= 0) { // L: 3413
- field721[field719] = class12.field61; // L: 3416
- field720[field719] = InvDefinition.field1850; // L: 3417
- ++field719; // L: 3418
+ while (class18.isKeyDown() && field719 < 128) { // L: 3273
+ if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class272.field3196 == 66) { // L: 3274
+ String var40 = FloorOverlayDefinition.method3815(); // L: 3275
+ class353.client.method385(var40); // L: 3276
+ } else if (oculusOrbState != 1 || HealthBar.field1258 <= 0) { // L: 3279
+ field721[field719] = class272.field3196; // L: 3282
+ field720[field719] = HealthBar.field1258; // L: 3283
+ ++field719; // L: 3284
}
}
- boolean var35 = staffModLevel >= 2; // L: 3422
- if (var35 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3424
- var4 = ModelData0.localPlayer.plane - mouseWheelRotation; // L: 3425
- if (var4 < 0) { // L: 3426
+ boolean var31 = staffModLevel >= 2; // L: 3288
+ if (var31 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3290
+ var4 = class101.localPlayer.plane - mouseWheelRotation; // L: 3291
+ if (var4 < 0) { // L: 3292
var4 = 0;
- } else if (var4 > 3) { // L: 3427
+ } else if (var4 > 3) { // L: 3293
var4 = 3;
}
- if (var4 != ModelData0.localPlayer.plane) { // L: 3428
- class123.method2781(ModelData0.localPlayer.pathX[0] + SecureRandomCallable.baseX, ModelData0.localPlayer.pathY[0] + GrandExchangeOfferOwnWorldComparator.baseY, var4, false); // L: 3429
+ if (var4 != class101.localPlayer.plane) { // L: 3294
+ var5 = class101.localPlayer.pathX[0] + class28.baseX; // L: 3295
+ var6 = class101.localPlayer.pathY[0] + WorldMapLabelSize.baseY; // L: 3296
+ PacketBufferNode var24 = EnumComposition.getPacketBufferNode(ClientPacket.field2966, packetWriter.isaacCipher); // L: 3299
+ var24.packetBuffer.method7763(var4); // L: 3300
+ var24.packetBuffer.writeIntME(var6); // L: 3301
+ var24.packetBuffer.method7760(0); // L: 3302
+ var24.packetBuffer.writeIntME(var5); // L: 3303
+ packetWriter.addNode(var24); // L: 3304
}
- mouseWheelRotation = 0; // L: 3431
+ mouseWheelRotation = 0; // L: 3307
}
- if (rootInterface != -1) { // L: 3433
- class4.updateRootInterface(rootInterface, 0, 0, GraphicsObject.canvasWidth, class433.canvasHeight, 0, 0);
+ if (rootInterface != -1) { // L: 3309
+ class16.updateRootInterface(rootInterface, 0, 0, Script.canvasWidth, class78.canvasHeight, 0, 0);
}
- ++cycleCntr; // L: 3434
+ ++cycleCntr; // L: 3310
while (true) {
- Widget var43;
- ScriptEvent var49;
- Widget var50;
+ ScriptEvent var25;
+ Widget var26;
+ Widget var39;
do {
- var49 = (ScriptEvent)field698.removeLast(); // L: 3436
- if (var49 == null) { // L: 3437
+ var25 = (ScriptEvent)field698.removeLast(); // L: 3312
+ if (var25 == null) { // L: 3313
while (true) {
do {
- var49 = (ScriptEvent)field701.removeLast(); // L: 3448
- if (var49 == null) { // L: 3449
+ var25 = (ScriptEvent)field699.removeLast(); // L: 3324
+ if (var25 == null) { // L: 3325
while (true) {
do {
- var49 = (ScriptEvent)scriptEvents.removeLast(); // L: 3460
- if (var49 == null) { // L: 3461
- this.menu(); // L: 3471
- if (ServerPacket.worldMap != null) { // L: 3473
- ServerPacket.worldMap.method7033(class128.Client_plane, (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX, (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY, false); // L: 3474
- ServerPacket.worldMap.loadCache(); // L: 3475
+ var25 = (ScriptEvent)scriptEvents.removeLast(); // L: 3336
+ if (var25 == null) { // L: 3337
+ this.menu(); // L: 3347
+ class132.method2887(); // L: 3348
+ if (clickedWidget != null) { // L: 3349
+ this.method1511();
}
- if (clickedWidget != null) { // L: 3478
- this.method1150();
- }
-
- if (Canvas.dragInventoryWidget != null) { // L: 3479
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Canvas.dragInventoryWidget); // L: 3480
- ++itemDragDuration; // L: 3481
- if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3482
- if (field604) { // L: 3483
- if (Canvas.dragInventoryWidget == class155.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3484
- Widget var52 = Canvas.dragInventoryWidget; // L: 3485
- byte var36 = 0; // L: 3486
- if (field480 == 1 && var52.contentType == 206) { // L: 3487
- var36 = 1;
+ PacketBufferNode var27;
+ if (Interpreter.dragInventoryWidget != null) { // L: 3350
+ ChatChannel.invalidateWidget(Interpreter.dragInventoryWidget); // L: 3351
+ ++itemDragDuration; // L: 3352
+ if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3353
+ if (field705) { // L: 3354
+ if (class161.hoveredItemContainer == Interpreter.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { // L: 3355
+ Widget var41 = Interpreter.dragInventoryWidget; // L: 3356
+ byte var32 = 0; // L: 3357
+ if (field676 == 1 && var41.contentType == 206) { // L: 3358
+ var32 = 1;
}
- if (var52.itemIds[dragItemSlotDestination] <= 0) { // L: 3488
- var36 = 0;
+ if (var41.itemIds[dragItemSlotDestination] <= 0) { // L: 3359
+ var32 = 0;
}
- var7 = UrlRequester.getWidgetFlags(var52); // L: 3490
- boolean var37 = (var7 >> 29 & 1) != 0; // L: 3492
- if (var37) { // L: 3494
- var8 = dragItemSlotSource; // L: 3495
- var9 = dragItemSlotDestination; // L: 3496
- var52.itemIds[var9] = var52.itemIds[var8]; // L: 3497
- var52.itemQuantities[var9] = var52.itemQuantities[var8]; // L: 3498
- var52.itemIds[var8] = -1; // L: 3499
- var52.itemQuantities[var8] = 0; // L: 3500
- } else if (var36 == 1) { // L: 3502
- var8 = dragItemSlotSource; // L: 3503
- var9 = dragItemSlotDestination; // L: 3504
+ var7 = class124.getWidgetFlags(var41); // L: 3361
+ boolean var33 = (var7 >> 29 & 1) != 0; // L: 3363
+ if (var33) { // L: 3365
+ var8 = dragItemSlotSource; // L: 3366
+ var9 = dragItemSlotDestination; // L: 3367
+ var41.itemIds[var9] = var41.itemIds[var8]; // L: 3368
+ var41.itemQuantities[var9] = var41.itemQuantities[var8]; // L: 3369
+ var41.itemIds[var8] = -1; // L: 3370
+ var41.itemQuantities[var8] = 0; // L: 3371
+ } else if (var32 == 1) { // L: 3373
+ var8 = dragItemSlotSource; // L: 3374
+ var9 = dragItemSlotDestination; // L: 3375
- while (var8 != var9) { // L: 3505
- if (var8 > var9) { // L: 3506
- var52.swapItems(var8 - 1, var8); // L: 3507
- --var8; // L: 3508
- } else if (var8 < var9) { // L: 3510
- var52.swapItems(var8 + 1, var8); // L: 3511
- ++var8; // L: 3512
+ while (var8 != var9) { // L: 3376
+ if (var8 > var9) { // L: 3377
+ var41.swapItems(var8 - 1, var8); // L: 3378
+ --var8; // L: 3379
+ } else if (var8 < var9) { // L: 3381
+ var41.swapItems(var8 + 1, var8); // L: 3382
+ ++var8; // L: 3383
}
}
} else {
- var52.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3517
+ var41.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3388
}
- PacketBufferNode var26 = WallDecoration.getPacketBufferNode(ClientPacket.field3042, packetWriter.isaacCipher); // L: 3520
- var26.packetBuffer.writeShort(dragItemSlotSource); // L: 3521
- var26.packetBuffer.writeShort(dragItemSlotDestination); // L: 3522
- var26.packetBuffer.writeByte(var36); // L: 3523
- var26.packetBuffer.writeInt(Canvas.dragInventoryWidget.id); // L: 3524
- packetWriter.addNode(var26); // L: 3525
+ var27 = EnumComposition.getPacketBufferNode(ClientPacket.field2972, packetWriter.isaacCipher); // L: 3391
+ var27.packetBuffer.method7929(dragItemSlotSource); // L: 3392
+ var27.packetBuffer.method7783(Interpreter.dragInventoryWidget.id); // L: 3393
+ var27.packetBuffer.method7762(var32); // L: 3394
+ var27.packetBuffer.method7929(dragItemSlotDestination); // L: 3395
+ packetWriter.addNode(var27); // L: 3396
}
- } else if (this.shouldLeftClickOpenMenu()) { // L: 3529
- this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3530
- } else if (menuOptionsCount > 0) { // L: 3532
- var4 = draggedWidgetX; // L: 3533
- var5 = draggedWidgetY; // L: 3534
- MenuAction var44 = class116.tempMenuAction; // L: 3536
- if (var44 != null) { // L: 3538
- ModeWhere.menuAction(var44.param0, var44.param1, var44.opcode, var44.identifier, var44.action, var44.action, var4, var5); // L: 3539
- }
-
- class116.tempMenuAction = null; // L: 3542
+ } else if (this.shouldLeftClickOpenMenu()) { // L: 3400
+ this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3401
+ } else if (menuOptionsCount > 0) { // L: 3403
+ CollisionMap.method3906(draggedWidgetX, draggedWidgetY); // L: 3404
}
- field598 = 10; // L: 3546
- MouseHandler.MouseHandler_lastButton = 0; // L: 3547
- Canvas.dragInventoryWidget = null; // L: 3548
- } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3551 3552
- field604 = true; // L: 3553
+ field599 = 10; // L: 3407
+ MouseHandler.MouseHandler_lastButton = 0; // L: 3408
+ Interpreter.dragInventoryWidget = null; // L: 3409
+ } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3412 3413
+ field705 = true; // L: 3414
}
}
- if (Scene.shouldSendWalk()) { // L: 3558
- var4 = Scene.Scene_selectedX; // L: 3559
- var5 = Scene.Scene_selectedY; // L: 3560
- var18 = WallDecoration.getPacketBufferNode(ClientPacket.field2957, packetWriter.isaacCipher); // L: 3562
- var18.packetBuffer.writeByte(5); // L: 3563
- var18.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3564
- var18.packetBuffer.method7641(var5 + GrandExchangeOfferOwnWorldComparator.baseY); // L: 3565
- var18.packetBuffer.writeShort(var4 + SecureRandomCallable.baseX); // L: 3566
- packetWriter.addNode(var18); // L: 3567
- Scene.method4066(); // L: 3568
- mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3569
- mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3570
- mouseCrossColor = 1; // L: 3571
- mouseCrossState = 0; // L: 3572
- destinationX = var4; // L: 3573
- destinationY = var5; // L: 3574
+ if (Scene.shouldSendWalk()) { // L: 3419
+ var4 = Scene.Scene_selectedX; // L: 3420
+ var5 = Scene.Scene_selectedY; // L: 3421
+ var18 = EnumComposition.getPacketBufferNode(ClientPacket.field2962, packetWriter.isaacCipher); // L: 3423
+ var18.packetBuffer.writeByte(5); // L: 3424
+ var18.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3425
+ var18.packetBuffer.writeShort(var4 + class28.baseX); // L: 3426
+ var18.packetBuffer.writeIntME(var5 + WorldMapLabelSize.baseY); // L: 3427
+ packetWriter.addNode(var18); // L: 3428
+ Scene.method4195(); // L: 3429
+ mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3430
+ mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3431
+ mouseCrossColor = 1; // L: 3432
+ mouseCrossState = 0; // L: 3433
+ destinationX = var4; // L: 3434
+ destinationY = var5; // L: 3435
}
- if (var41 != class144.mousedOverWidgetIf1) { // L: 3576
- if (var41 != null) { // L: 3577
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var41);
+ if (var37 != Language.mousedOverWidgetIf1) { // L: 3437
+ if (var37 != null) { // L: 3438
+ ChatChannel.invalidateWidget(var37);
}
- if (class144.mousedOverWidgetIf1 != null) { // L: 3578
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class144.mousedOverWidgetIf1);
+ if (Language.mousedOverWidgetIf1 != null) { // L: 3439
+ ChatChannel.invalidateWidget(Language.mousedOverWidgetIf1);
}
}
- if (var34 != class113.field1422 && field645 == field702) { // L: 3580
- if (var34 != null) { // L: 3581
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var34);
+ if (var38 != SoundSystem.field313 && field638 == field646) { // L: 3441
+ if (var38 != null) { // L: 3442
+ ChatChannel.invalidateWidget(var38);
}
- if (class113.field1422 != null) { // L: 3582
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class113.field1422);
+ if (SoundSystem.field313 != null) { // L: 3443
+ ChatChannel.invalidateWidget(SoundSystem.field313);
}
}
- if (class113.field1422 != null) { // L: 3584
- if (field645 < field702) { // L: 3585
- ++field645; // L: 3586
- if (field645 == field702) { // L: 3587
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class113.field1422);
+ if (SoundSystem.field313 != null) { // L: 3445
+ if (field638 < field646) { // L: 3446
+ ++field638; // L: 3447
+ if (field638 == field646) { // L: 3448
+ ChatChannel.invalidateWidget(SoundSystem.field313);
}
}
- } else if (field645 > 0) { // L: 3590
- --field645;
+ } else if (field638 > 0) { // L: 3451
+ --field638;
}
- if (oculusOrbState == 0) { // L: 3592
- var4 = ModelData0.localPlayer.x; // L: 3593
- var5 = ModelData0.localPlayer.y; // L: 3594
- if (HorizontalAlignment.oculusOrbFocalPointX - var4 < -500 || HorizontalAlignment.oculusOrbFocalPointX - var4 > 500 || class28.oculusOrbFocalPointY - var5 < -500 || class28.oculusOrbFocalPointY - var5 > 500) { // L: 3595
- HorizontalAlignment.oculusOrbFocalPointX = var4; // L: 3596
- class28.oculusOrbFocalPointY = var5; // L: 3597
+ if (oculusOrbState == 0) { // L: 3453
+ var4 = class101.localPlayer.x; // L: 3454
+ var5 = class101.localPlayer.y; // L: 3455
+ if (InterfaceParent.oculusOrbFocalPointX - var4 < -500 || InterfaceParent.oculusOrbFocalPointX - var4 > 500 || class141.oculusOrbFocalPointY - var5 < -500 || class141.oculusOrbFocalPointY - var5 > 500) { // L: 3456
+ InterfaceParent.oculusOrbFocalPointX = var4; // L: 3457
+ class141.oculusOrbFocalPointY = var5; // L: 3458
}
- if (var4 != HorizontalAlignment.oculusOrbFocalPointX) { // L: 3599
- HorizontalAlignment.oculusOrbFocalPointX += (var4 - HorizontalAlignment.oculusOrbFocalPointX) / 16;
+ if (var4 != InterfaceParent.oculusOrbFocalPointX) { // L: 3460
+ InterfaceParent.oculusOrbFocalPointX += (var4 - InterfaceParent.oculusOrbFocalPointX) / 16;
}
- if (var5 != class28.oculusOrbFocalPointY) { // L: 3600
- class28.oculusOrbFocalPointY += (var5 - class28.oculusOrbFocalPointY) / 16;
+ if (var5 != class141.oculusOrbFocalPointY) { // L: 3461
+ class141.oculusOrbFocalPointY += (var5 - class141.oculusOrbFocalPointY) / 16;
}
- var6 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 3601
- var7 = class28.oculusOrbFocalPointY >> 7; // L: 3602
- var8 = class202.getTileHeight(HorizontalAlignment.oculusOrbFocalPointX, class28.oculusOrbFocalPointY, class128.Client_plane); // L: 3603
- var9 = 0; // L: 3604
- if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3605
- for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3606
- for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3607
- var12 = class128.Client_plane; // L: 3608
- if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3609
+ var6 = InterfaceParent.oculusOrbFocalPointX >> 7; // L: 3462
+ var7 = class141.oculusOrbFocalPointY >> 7; // L: 3463
+ var8 = SceneTilePaint.getTileHeight(InterfaceParent.oculusOrbFocalPointX, class141.oculusOrbFocalPointY, PacketWriter.Client_plane); // L: 3464
+ var9 = 0; // L: 3465
+ if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3466
+ for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3467
+ for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3468
+ var12 = PacketWriter.Client_plane; // L: 3469
+ if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3470
++var12;
}
- int var27 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3610
- if (var27 > var9) { // L: 3611
- var9 = var27;
+ int var28 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3471
+ if (var28 > var9) { // L: 3472
+ var9 = var28;
}
}
}
}
- var10 = var9 * 192; // L: 3615
- if (var10 > 98048) { // L: 3616
+ var10 = var9 * 192; // L: 3476
+ if (var10 > 98048) { // L: 3477
var10 = 98048;
}
- if (var10 < 32768) { // L: 3617
+ if (var10 < 32768) { // L: 3478
var10 = 32768;
}
- if (var10 > field578) { // L: 3618
- field578 += (var10 - field578) / 24;
- } else if (var10 < field578) { // L: 3619
- field578 += (var10 - field578) / 80;
+ if (var10 > field681) { // L: 3479
+ field681 += (var10 - field681) / 24;
+ } else if (var10 < field681) { // L: 3480
+ field681 += (var10 - field681) / 80;
}
- class140.field1666 = class202.getTileHeight(ModelData0.localPlayer.x, ModelData0.localPlayer.y, class128.Client_plane) - camFollowHeight; // L: 3620
- } else if (oculusOrbState == 1) { // L: 3622
- if (field575 && ModelData0.localPlayer != null) { // L: 3624
- var4 = ModelData0.localPlayer.pathX[0]; // L: 3625
- var5 = ModelData0.localPlayer.pathY[0]; // L: 3626
- if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 3627
- HorizontalAlignment.oculusOrbFocalPointX = ModelData0.localPlayer.x; // L: 3628
- var6 = class202.getTileHeight(ModelData0.localPlayer.x, ModelData0.localPlayer.y, class128.Client_plane) - camFollowHeight; // L: 3629
- if (var6 < class140.field1666) { // L: 3630
- class140.field1666 = var6;
- }
-
- class28.oculusOrbFocalPointY = ModelData0.localPlayer.y; // L: 3631
- field575 = false; // L: 3632
- }
+ class181.field1992 = SceneTilePaint.getTileHeight(class101.localPlayer.x, class101.localPlayer.y, PacketWriter.Client_plane) - camFollowHeight; // L: 3481
+ } else if (oculusOrbState == 1) { // L: 3483
+ ScriptEvent.method2101(); // L: 3484
+ short var34 = -1; // L: 3485
+ if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3486
+ var34 = 0;
+ } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3487
+ var34 = 1024;
}
- short var38 = -1; // L: 3635
- if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3636
- var38 = 0;
- } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3637
- var38 = 1024;
- }
-
- if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3638
- if (var38 == 0) { // L: 3639
- var38 = 1792;
- } else if (var38 == 1024) { // L: 3640
- var38 = 1280;
+ if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3488
+ if (var34 == 0) { // L: 3489
+ var34 = 1792;
+ } else if (var34 == 1024) { // L: 3490
+ var34 = 1280;
} else {
- var38 = 1536; // L: 3641
+ var34 = 1536; // L: 3491
}
- } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3643
- if (var38 == 0) { // L: 3644
- var38 = 256;
- } else if (var38 == 1024) { // L: 3645
- var38 = 768;
+ } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3493
+ if (var34 == 0) { // L: 3494
+ var34 = 256;
+ } else if (var34 == 1024) { // L: 3495
+ var34 = 768;
} else {
- var38 = 512; // L: 3646
+ var34 = 512; // L: 3496
}
}
- byte var39 = 0; // L: 3648
- if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3649
- var39 = -1;
- } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3650
- var39 = 1;
+ byte var35 = 0; // L: 3498
+ if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3499
+ var35 = -1;
+ } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3500
+ var35 = 1;
}
- var6 = 0; // L: 3651
- if (var38 >= 0 || var39 != 0) { // L: 3652
- var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -175885413 * -1650197869 : oculusOrbNormalSpeed * 208832309 * 1073664797; // L: 3653
- var6 *= 16; // L: 3654
- field567 = var38; // L: 3655
- field571 = var39; // L: 3656
+ var6 = 0; // L: 3501
+ if (var34 >= 0 || var35 != 0) { // L: 3502
+ var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 31984657 * 7759089 : oculusOrbNormalSpeed * -149009651 * 2045082565; // L: 3503
+ var6 *= 16; // L: 3504
+ field571 = var34; // L: 3505
+ field572 = var35; // L: 3506
}
- if (field569 < var6) { // L: 3658
- field569 += var6 / 8; // L: 3659
- if (field569 > var6) { // L: 3660
- field569 = var6;
+ if (field570 < var6) { // L: 3508
+ field570 += var6 / 8; // L: 3509
+ if (field570 > var6) { // L: 3510
+ field570 = var6;
}
- } else if (field569 > var6) { // L: 3662
- field569 = field569 * 9 / 10;
+ } else if (field570 > var6) { // L: 3512
+ field570 = field570 * 9 / 10;
}
- if (field569 > 0) { // L: 3663
- var7 = field569 / 16; // L: 3664
- if (field567 >= 0) { // L: 3665
- var4 = field567 - StudioGame.cameraYaw & 2047; // L: 3666
- var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3667
- var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3668
- HorizontalAlignment.oculusOrbFocalPointX += var8 * var7 / 65536; // L: 3669
- class28.oculusOrbFocalPointY += var9 * var7 / 65536; // L: 3670
+ if (field570 > 0) { // L: 3513
+ var7 = field570 / 16; // L: 3514
+ if (field571 >= 0) { // L: 3515
+ var4 = field571 - SoundCache.cameraYaw & 2047; // L: 3516
+ var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3517
+ var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3518
+ InterfaceParent.oculusOrbFocalPointX += var7 * var8 / 65536; // L: 3519
+ class141.oculusOrbFocalPointY += var9 * var7 / 65536; // L: 3520
}
- if (field571 != 0) { // L: 3672
- class140.field1666 += var7 * field571; // L: 3673
- if (class140.field1666 > 0) { // L: 3674
- class140.field1666 = 0;
+ if (field572 != 0) { // L: 3522
+ class181.field1992 += var7 * field572; // L: 3523
+ if (class181.field1992 > 0) { // L: 3524
+ class181.field1992 = 0;
}
}
} else {
- field567 = -1; // L: 3678
- field571 = -1; // L: 3679
+ field571 = -1; // L: 3528
+ field572 = -1; // L: 3529
}
- if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3681
- class4.method22(); // L: 3682
+ if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3531
+ HealthBarUpdate.method2205(); // L: 3532
}
}
- if (MouseHandler.MouseHandler_currentButton == 4 && Login.mouseCam) { // L: 3685
- var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3686
- camAngleDX = var4 * 2; // L: 3687
- mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -1263316171 * -1077369059; // L: 3688
- var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3689
- camAngleDY = var5 * 2; // L: 3690
- mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 1681939429 * -130913811; // L: 3691
+ if (MouseHandler.MouseHandler_currentButton == 4 && class122.mouseCam) { // L: 3535
+ var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3536
+ camAngleDX = var4 * 2; // L: 3537
+ mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -1019536109 * 673527067; // L: 3538
+ var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3539
+ camAngleDY = var5 * 2; // L: 3540
+ mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 1882994615 * -1418373625; // L: 3541
} else {
- if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3694
+ if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3544
camAngleDY += (-24 - camAngleDY) / 2;
- } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3695
+ } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3545
camAngleDY += (24 - camAngleDY) / 2;
} else {
- camAngleDY /= 2; // L: 3696
+ camAngleDY /= 2; // L: 3546
}
- if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3697
+ if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3547
camAngleDX += (12 - camAngleDX) / 2;
- } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3698
+ } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3548
camAngleDX += (-12 - camAngleDX) / 2;
} else {
- camAngleDX /= 2; // L: 3699
+ camAngleDX /= 2; // L: 3549
}
- mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3700
- mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3701
+ mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3550
+ mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3551
}
- camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 3703
- camAngleX += camAngleDX / 2; // L: 3704
- if (camAngleX < 128) { // L: 3705
+ camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 3553
+ camAngleX += camAngleDX / 2; // L: 3554
+ if (camAngleX < 128) { // L: 3555
camAngleX = 128;
}
- if (camAngleX > 383) { // L: 3706
+ if (camAngleX > 383) { // L: 3556
camAngleX = 383;
}
- if (field742) { // L: 3708
- class422.method7303(class271.field3221, Message.field469, NPC.field1262); // L: 3709
- class241.method4813(Interpreter.field838, Timer.field4239); // L: 3710
- if (class271.field3221 == class343.cameraX && class295.cameraY == Message.field469 && FaceNormal.cameraZ == NPC.field1262 && Interpreter.field838 == GameEngine.cameraPitch && StudioGame.cameraYaw == Timer.field4239) { // L: 3711
- field742 = false; // L: 3712
- isCameraLocked = false; // L: 3713
- class267.field3206 = 0; // L: 3714
- AbstractWorldMapData.field2851 = 0; // L: 3715
- ScriptFrame.field457 = 0; // L: 3716
- class17.field88 = 0; // L: 3717
- PacketBufferNode.field3083 = 0; // L: 3718
- HitSplatDefinition.field2077 = 0; // L: 3719
- class229.field2805 = 0; // L: 3720
- Players.field1317 = 0; // L: 3721
- TileItem.field1292 = 0; // L: 3722
- WorldMapSection1.field2898 = 0; // L: 3723
+ if (field667) { // L: 3558
+ InvDefinition.method3358(Interpreter.field846, WorldMapManager.field2743, BoundaryObject.field2622); // L: 3559
+ KeyHandler.method300(Decimator.field402, class390.field4423); // L: 3560
+ if (class18.cameraX == Interpreter.field846 && class16.cameraY == WorldMapManager.field2743 && BoundaryObject.field2622 == class228.cameraZ && ViewportMouse.cameraPitch == Decimator.field402 && class390.field4423 == SoundCache.cameraYaw) { // L: 3561
+ field667 = false; // L: 3562
+ isCameraLocked = false; // L: 3563
+ class165.field1809 = 0; // L: 3564
+ class434.field4664 = 0; // L: 3565
+ ClanChannel.field1690 = 0; // L: 3566
+ GameBuild.field3588 = 0; // L: 3567
+ MidiPcmStream.field3231 = 0; // L: 3568
+ UserComparator3.field1391 = 0; // L: 3569
+ PlayerComposition.field3346 = 0; // L: 3570
+ class12.field65 = 0; // L: 3571
+ class146.field1682 = 0; // L: 3572
+ InterfaceParent.field1043 = 0; // L: 3573
}
- } else if (isCameraLocked) { // L: 3727
- class1.method11();
+ } else if (isCameraLocked) { // L: 3577
+ var4 = class12.field65 * 128 + 64; // L: 3578
+ var5 = class146.field1682 * 128 + 64; // L: 3579
+ var6 = SceneTilePaint.getTileHeight(var4, var5, PacketWriter.Client_plane) - InterfaceParent.field1043; // L: 3580
+ InvDefinition.method3358(var4, var6, var5); // L: 3581
+ var4 = class165.field1809 * 128 + 64; // L: 3582
+ var5 = class434.field4664 * 128 + 64; // L: 3583
+ var6 = SceneTilePaint.getTileHeight(var4, var5, PacketWriter.Client_plane) - ClanChannel.field1690; // L: 3584
+ var7 = var4 - class18.cameraX; // L: 3585
+ var8 = var6 - class16.cameraY; // L: 3586
+ var9 = var5 - class228.cameraZ; // L: 3587
+ var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); // L: 3588
+ var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; // L: 3589
+ var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 3590
+ KeyHandler.method300(var11, var12); // L: 3591
}
- for (var4 = 0; var4 < 5; ++var4) { // L: 3728
- var10002 = field677[var4]++;
+ for (var4 = 0; var4 < 5; ++var4) { // L: 3593
+ int var10002 = field747[var4]++;
}
- class125.varcs.tryWrite(); // L: 3729
- var4 = class293.method5429(); // L: 3730
- var5 = ObjectSound.method1734(); // L: 3731
- if (var4 > 15000 && var5 > 15000) { // L: 3732
- logoutTimer = 250; // L: 3733
- MouseHandler.MouseHandler_idleCycles = 14500; // L: 3735
- var18 = WallDecoration.getPacketBufferNode(ClientPacket.field3027, packetWriter.isaacCipher); // L: 3738
- packetWriter.addNode(var18); // L: 3739
+ class308.varcs.tryWrite(); // L: 3594
+ var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3597
+ var6 = KeyHandler.KeyHandler_idleCycles; // L: 3602
+ if (var4 > 15000 && var6 > 15000) { // L: 3605
+ logoutTimer = 250; // L: 3606
+ class328.method6056(14500); // L: 3607
+ var27 = EnumComposition.getPacketBufferNode(ClientPacket.field2956, packetWriter.isaacCipher); // L: 3609
+ packetWriter.addNode(var27); // L: 3610
}
- BufferedSource.friendSystem.processFriendUpdates(); // L: 3741
- ++packetWriter.pendingWrites; // L: 3742
- if (packetWriter.pendingWrites > 50) { // L: 3743
- var18 = WallDecoration.getPacketBufferNode(ClientPacket.field2982, packetWriter.isaacCipher); // L: 3745
- packetWriter.addNode(var18); // L: 3746
+ Player.friendSystem.processFriendUpdates(); // L: 3612
+ ++packetWriter.pendingWrites; // L: 3613
+ if (packetWriter.pendingWrites > 50) { // L: 3614
+ var27 = EnumComposition.getPacketBufferNode(ClientPacket.field2969, packetWriter.isaacCipher); // L: 3616
+ packetWriter.addNode(var27); // L: 3617
}
try {
- packetWriter.flush(); // L: 3749
- } catch (IOException var28) { // L: 3751
- class129.method2812(); // L: 3752
+ packetWriter.flush(); // L: 3620
+ } catch (IOException var29) { // L: 3622
+ class131.method2877(); // L: 3623
}
- return; // L: 3754
+ return; // L: 3625
}
- var50 = var49.widget; // L: 3462
- if (var50.childIndex < 0) { // L: 3463
+ var26 = var25.widget; // L: 3338
+ if (var26.childIndex < 0) { // L: 3339
break;
}
- var43 = class92.getWidget(var50.parentId); // L: 3464
- } while(var43 == null || var43.children == null || var50.childIndex >= var43.children.length || var50 != var43.children[var50.childIndex]); // L: 3465
+ var39 = class140.getWidget(var26.parentId); // L: 3340
+ } while(var39 == null || var39.children == null || var26.childIndex >= var39.children.length || var26 != var39.children[var26.childIndex]); // L: 3341
- class144.runScriptEvent(var49); // L: 3469
+ BoundaryObject.runScriptEvent(var25); // L: 3345
}
}
- var50 = var49.widget; // L: 3450
- if (var50.childIndex < 0) { // L: 3451
+ var26 = var25.widget; // L: 3326
+ if (var26.childIndex < 0) { // L: 3327
break;
}
- var43 = class92.getWidget(var50.parentId); // L: 3452
- } while(var43 == null || var43.children == null || var50.childIndex >= var43.children.length || var50 != var43.children[var50.childIndex]); // L: 3453
+ var39 = class140.getWidget(var26.parentId); // L: 3328
+ } while(var39 == null || var39.children == null || var26.childIndex >= var39.children.length || var26 != var39.children[var26.childIndex]); // L: 3329
- class144.runScriptEvent(var49); // L: 3457
+ BoundaryObject.runScriptEvent(var25); // L: 3333
}
}
- var50 = var49.widget; // L: 3438
- if (var50.childIndex < 0) { // L: 3439
+ var26 = var25.widget; // L: 3314
+ if (var26.childIndex < 0) { // L: 3315
break;
}
- var43 = class92.getWidget(var50.parentId); // L: 3440
- } while(var43 == null || var43.children == null || var50.childIndex >= var43.children.length || var50 != var43.children[var50.childIndex]); // L: 3441
+ var39 = class140.getWidget(var26.parentId); // L: 3316
+ } while(var39 == null || var39.children == null || var26.childIndex >= var39.children.length || var26 != var39.children[var26.childIndex]); // L: 3317
- class144.runScriptEvent(var49); // L: 3445
+ BoundaryObject.runScriptEvent(var25); // L: 3321
}
}
-
- var31 = WallDecoration.getPacketBufferNode(ClientPacket.field3047, packetWriter.isaacCipher); // L: 3096
- var31.packetBuffer.writeByte(0); // L: 3097
- var3 = var31.packetBuffer.offset; // L: 3098
- UserComparator3.performReflectionCheck(var31.packetBuffer); // L: 3099
- var31.packetBuffer.method7740(var31.packetBuffer.offset - var3); // L: 3100
- packetWriter.addNode(var31); // L: 3101
}
}
}
- } // L: 3078
+ } // L: 3034 3240
- @ObfuscatedName("ga")
+ @ObfuscatedName("gy")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1836577440"
+ garbageValue = "-933968807"
)
@Export("resizeJS")
void resizeJS() {
- int var1 = GraphicsObject.canvasWidth; // L: 4381
- int var2 = class433.canvasHeight; // L: 4382
- if (super.contentWidth < var1) { // L: 4383
+ int var1 = Script.canvasWidth; // L: 4400
+ int var2 = class78.canvasHeight; // L: 4401
+ if (super.contentWidth < var1) { // L: 4402
var1 = super.contentWidth;
}
if (super.contentHeight < var2) {
- var2 = super.contentHeight; // L: 4384
+ var2 = super.contentHeight; // L: 4403
}
- if (class12.clientPreferences != null) { // L: 4385
+ if (class19.clientPreferences != null) { // L: 4404
try {
- Client var3 = class82.client; // L: 4387
- Object[] var4 = new Object[]{ClanChannelMember.getWindowedMode()}; // L: 4388
- JSObject.getWindow(var3).call("resize", var4); // L: 4391
- } catch (Throwable var5) { // L: 4394
+ Client var3 = class353.client; // L: 4406
+ Object[] var4 = new Object[]{class9.getWindowedMode()}; // L: 4407
+ JSObject.getWindow(var3).call("resize", var4); // L: 4410
+ } catch (Throwable var5) { // L: 4413
}
}
- } // L: 4396
+ } // L: 4415
- @ObfuscatedName("go")
+ @ObfuscatedName("ga")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "296030878"
+ garbageValue = "-798444922"
)
@Export("drawLoggedIn")
final void drawLoggedIn() {
int var1;
- if (rootInterface != -1) { // L: 4399
- var1 = rootInterface; // L: 4400
- if (WorldMapDecoration.loadInterface(var1)) { // L: 4402
- class342.drawModelComponents(NetSocket.Widget_interfaceComponents[var1], -1); // L: 4403
+ if (rootInterface != -1) { // L: 4418
+ var1 = rootInterface; // L: 4419
+ if (WorldMapSection2.loadInterface(var1)) { // L: 4421
+ Archive.drawModelComponents(SoundCache.Widget_interfaceComponents[var1], -1); // L: 4422
}
}
- for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4406
- if (field652[var1]) { // L: 4407
+ for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4425
+ if (field703[var1]) { // L: 4426
field704[var1] = true;
}
- field524[var1] = field652[var1]; // L: 4408
- field652[var1] = false; // L: 4409
+ field751[var1] = field703[var1]; // L: 4427
+ field703[var1] = false; // L: 4428
}
- field694 = cycle; // L: 4411
- viewportX = -1; // L: 4412
- viewportY = -1; // L: 4413
- class155.hoveredItemContainer = null; // L: 4414
- if (rootInterface != -1) { // L: 4415
- rootWidgetCount = 0; // L: 4416
- class175.drawWidgets(rootInterface, 0, 0, GraphicsObject.canvasWidth, class433.canvasHeight, 0, 0, -1); // L: 4417
+ field702 = cycle; // L: 4430
+ viewportX = -1; // L: 4431
+ viewportY = -1; // L: 4432
+ class161.hoveredItemContainer = null; // L: 4433
+ if (rootInterface != -1) { // L: 4434
+ rootWidgetCount = 0; // L: 4435
+ class193.drawWidgets(rootInterface, 0, 0, Script.canvasWidth, class78.canvasHeight, 0, 0, -1); // L: 4436
}
- Rasterizer2D.Rasterizer2D_resetClip(); // L: 4419
- if (showMouseCross) { // L: 4420
- if (mouseCrossColor == 1) { // L: 4421
- Projectile.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4422
+ Rasterizer2D.Rasterizer2D_resetClip(); // L: 4438
+ if (showMouseCross) { // L: 4439
+ if (mouseCrossColor == 1) { // L: 4440
+ BuddyRankComparator.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4441
}
- if (mouseCrossColor == 2) { // L: 4424
- Projectile.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4425
+ if (mouseCrossColor == 2) { // L: 4443
+ BuddyRankComparator.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4444
}
}
- int var2;
- int var3;
- int var4;
- int var6;
- int var7;
- int var8;
- if (!isMenuOpen) { // L: 4428
- if (viewportX != -1) { // L: 4429
- var1 = viewportX; // L: 4430
- var2 = viewportY; // L: 4431
- if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 4433 4434
- var3 = menuOptionsCount - 1; // L: 4437
- String var13;
- if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 4441
- var13 = "Use" + " " + selectedItemName + " " + "->";
- } else if (isSpellSelected && menuOptionsCount < 2) { // L: 4442
- var13 = selectedSpellActionName + " " + selectedSpellName + " " + "->";
- } else {
- String var14;
- if (var3 < 0) { // L: 4446
- var14 = ""; // L: 4447
- } else if (menuTargets[var3].length() > 0) { // L: 4450
- var14 = menuActions[var3] + " " + menuTargets[var3];
- } else {
- var14 = menuActions[var3]; // L: 4451
- }
-
- var13 = var14; // L: 4453
- }
-
- if (menuOptionsCount > 2) { // L: 4455
- var13 = var13 + class166.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options";
- }
-
- ChatChannel.fontBold12.drawRandomAlphaAndSpacing(var13, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 4456
- }
+ if (!isMenuOpen) { // L: 4447
+ if (viewportX != -1) { // L: 4448
+ class150.method3135(viewportX, viewportY);
}
} else {
- var1 = BuddyRankComparator.menuX; // L: 4461
- var2 = FontName.menuY; // L: 4462
- var3 = KeyHandler.menuWidth; // L: 4463
- var4 = class7.menuHeight; // L: 4464
- int var5 = 6116423; // L: 4465
- Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4466
- Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4467
- Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4468
- ChatChannel.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4469
- var6 = MouseHandler.MouseHandler_x; // L: 4470
- var7 = MouseHandler.MouseHandler_y; // L: 4471
-
- for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4472
- int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 4473
- int var10 = 16777215; // L: 4474
- if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4475
- var10 = 16776960;
- }
-
- Font var11 = ChatChannel.fontBold12; // L: 4476
- String var12;
- if (var8 < 0) { // L: 4479
- var12 = ""; // L: 4480
- } else if (menuTargets[var8].length() > 0) { // L: 4483
- var12 = menuActions[var8] + " " + menuTargets[var8];
- } else {
- var12 = menuActions[var8]; // L: 4484
- }
-
- var11.draw(var12, var1 + 3, var9, var10, 0); // L: 4486
- }
-
- ItemContainer.method2061(BuddyRankComparator.menuX, FontName.menuY, KeyHandler.menuWidth, class7.menuHeight); // L: 4488
+ ArchiveDiskActionHandler.method5779(); // L: 4450
}
- if (gameDrawingMode == 3) { // L: 4490
- for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4491
- if (field524[var1]) { // L: 4492
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4493
- } else if (field704[var1]) { // L: 4495
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4496
+ if (gameDrawingMode == 3) { // L: 4451
+ for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4452
+ if (field751[var1]) { // L: 4453
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4454
+ } else if (field704[var1]) { // L: 4456
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4457
}
}
}
- var1 = class128.Client_plane; // L: 4500
- var2 = ModelData0.localPlayer.x; // L: 4501
- var3 = ModelData0.localPlayer.y; // L: 4502
- var4 = field727; // L: 4503
+ BoundaryObject.method4534(PacketWriter.Client_plane, class101.localPlayer.x, class101.localPlayer.y, field555); // L: 4461
+ field555 = 0; // L: 4462
+ } // L: 4463
- for (ObjectSound var19 = (ObjectSound)ObjectSound.objectSounds.last(); var19 != null; var19 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4505
- if (var19.soundEffectId != -1 || var19.soundEffectIds != null) { // L: 4506
- var6 = 0; // L: 4507
- if (var2 > var19.maxX) { // L: 4508
- var6 += var2 - var19.maxX;
- } else if (var2 < var19.x) { // L: 4509
- var6 += var19.x - var2;
- }
-
- if (var3 > var19.maxY) {
- var6 += var3 - var19.maxY; // L: 4510
- } else if (var3 < var19.y) { // L: 4511
- var6 += var19.y - var3;
- }
-
- if (var6 - 64 <= var19.field817 && class12.clientPreferences.method2239() != 0 && var1 == var19.plane) { // L: 4512
- var6 -= 64; // L: 4523
- if (var6 < 0) { // L: 4524
- var6 = 0;
- }
-
- var7 = (var19.field817 - var6) * class12.clientPreferences.method2239() / var19.field817; // L: 4525
- Object var10000;
- if (var19.stream1 == null) { // L: 4526
- if (var19.soundEffectId >= 0) { // L: 4527
- var10000 = null; // L: 4528
- SoundEffect var15 = SoundEffect.readSoundEffect(MouseHandler.archive4, var19.soundEffectId, 0);
- if (var15 != null) { // L: 4529
- RawSound var16 = var15.toRawSound().resample(class403.decimator); // L: 4530
- RawPcmStream var17 = RawPcmStream.createRawPcmStream(var16, 100, var7); // L: 4531
- var17.setNumLoops(-1); // L: 4532
- class122.pcmStreamMixer.addSubStream(var17); // L: 4533
- var19.stream1 = var17; // L: 4534
- }
- }
- } else {
- var19.stream1.method802(var7); // L: 4538
- }
-
- if (var19.stream2 == null) { // L: 4539
- if (var19.soundEffectIds != null && (var19.field810 -= var4) <= 0) { // L: 4540
- var8 = (int)(Math.random() * (double)var19.soundEffectIds.length); // L: 4541
- var10000 = null; // L: 4542
- SoundEffect var20 = SoundEffect.readSoundEffect(MouseHandler.archive4, var19.soundEffectIds[var8], 0);
- if (var20 != null) { // L: 4543
- RawSound var21 = var20.toRawSound().resample(class403.decimator); // L: 4544
- RawPcmStream var18 = RawPcmStream.createRawPcmStream(var21, 100, var7); // L: 4545
- var18.setNumLoops(0); // L: 4546
- class122.pcmStreamMixer.addSubStream(var18); // L: 4547
- var19.stream2 = var18; // L: 4548
- var19.field810 = var19.field813 + (int)(Math.random() * (double)(var19.field808 - var19.field813)); // L: 4549
- }
- }
- } else {
- var19.stream2.method802(var7); // L: 4554
- if (!var19.stream2.hasNext()) { // L: 4555
- var19.stream2 = null; // L: 4556
- }
- }
- } else {
- if (var19.stream1 != null) { // L: 4513
- class122.pcmStreamMixer.removeSubStream(var19.stream1); // L: 4514
- var19.stream1 = null; // L: 4515
- }
-
- if (var19.stream2 != null) { // L: 4517
- class122.pcmStreamMixer.removeSubStream(var19.stream2); // L: 4518
- var19.stream2 = null; // L: 4519
- }
- }
- }
- }
-
- field727 = 0; // L: 4561
- } // L: 4562
-
- @ObfuscatedName("hw")
+ @ObfuscatedName("hg")
@ObfuscatedSignature(
- descriptor = "(Lcz;I)Z",
- garbageValue = "1953749853"
+ descriptor = "(Lcs;II)Z",
+ garbageValue = "812716451"
)
- final boolean method1254(PacketWriter var1) {
- AbstractSocket var2 = var1.getSocket(); // L: 6121
- PacketBuffer var3 = var1.packetBuffer; // L: 6122
- if (var2 == null) { // L: 6123
+ boolean method1118(PacketWriter var1, int var2) {
+ if (var1.serverPacketLength == 0) { // L: 6051
+ Huffman.friendsChat = null; // L: 6052
+ } else {
+ if (Huffman.friendsChat == null) { // L: 6055
+ Huffman.friendsChat = new FriendsChat(HealthBarDefinition.loginType, class353.client); // L: 6056
+ }
+
+ Huffman.friendsChat.method6592(var1.packetBuffer, var2); // L: 6058
+ }
+
+ class259.method5189(); // L: 6060
+ var1.serverPacket = null; // L: 6061
+ return true; // L: 6062
+ }
+
+ @ObfuscatedName("hn")
+ @ObfuscatedSignature(
+ descriptor = "(Lcs;I)Z",
+ garbageValue = "1747425058"
+ )
+ boolean method1379(PacketWriter var1) {
+ if (Huffman.friendsChat != null) { // L: 6066
+ Huffman.friendsChat.method6612(var1.packetBuffer); // L: 6067
+ }
+
+ class259.method5189(); // L: 6069
+ var1.serverPacket = null; // L: 6070
+ return true; // L: 6071
+ }
+
+ @ObfuscatedName("hm")
+ @ObfuscatedSignature(
+ descriptor = "(Lcs;B)Z",
+ garbageValue = "42"
+ )
+ final boolean method1120(PacketWriter var1) {
+ AbstractSocket var2 = var1.getSocket(); // L: 6076
+ PacketBuffer var3 = var1.packetBuffer; // L: 6077
+ if (var2 == null) { // L: 6078
return false;
} else {
int var6;
- String var21;
+ String var34;
try {
int var5;
- if (var1.serverPacket == null) { // L: 6125
- if (var1.field1348) { // L: 6126
- if (!var2.isAvailable(1)) { // L: 6127
+ if (var1.serverPacket == null) { // L: 6080
+ if (var1.field1341) { // L: 6081
+ if (!var2.isAvailable(1)) { // L: 6082
return false;
}
- var2.read(var1.packetBuffer.array, 0, 1); // L: 6128
- var1.field1349 = 0; // L: 6129
- var1.field1348 = false; // L: 6130
+ var2.read(var1.packetBuffer.array, 0, 1); // L: 6083
+ var1.field1342 = 0; // L: 6084
+ var1.field1341 = false; // L: 6085
}
- var3.offset = 0; // L: 6132
- if (var3.method7495()) { // L: 6133
- if (!var2.isAvailable(1)) { // L: 6134
+ var3.offset = 0; // L: 6087
+ if (var3.method7674()) { // L: 6088
+ if (!var2.isAvailable(1)) { // L: 6089
return false;
}
- var2.read(var1.packetBuffer.array, 1, 1); // L: 6135
- var1.field1349 = 0; // L: 6136
+ var2.read(var1.packetBuffer.array, 1, 1); // L: 6090
+ var1.field1342 = 0; // L: 6091
}
- var1.field1348 = true; // L: 6138
- ServerPacket[] var4 = BuddyRankComparator.ServerPacket_values(); // L: 6139
- var5 = var3.readSmartByteShortIsaac(); // L: 6140
- if (var5 < 0 || var5 >= var4.length) { // L: 6141
+ var1.field1341 = true; // L: 6093
+ ServerPacket[] var4 = FloorUnderlayDefinition.ServerPacket_values(); // L: 6094
+ var5 = var3.readSmartByteShortIsaac(); // L: 6095
+ if (var5 < 0 || var5 >= var4.length) { // L: 6096
throw new IOException(var5 + " " + var3.offset);
}
- var1.serverPacket = var4[var5]; // L: 6142
- var1.serverPacketLength = var1.serverPacket.length; // L: 6143
+ var1.serverPacket = var4[var5]; // L: 6097
+ var1.serverPacketLength = var1.serverPacket.length; // L: 6098
}
- if (var1.serverPacketLength == -1) { // L: 6145
- if (!var2.isAvailable(1)) { // L: 6146
+ if (var1.serverPacketLength == -1) { // L: 6100
+ if (!var2.isAvailable(1)) { // L: 6101
return false;
}
- var1.getSocket().read(var3.array, 0, 1); // L: 6147
- var1.serverPacketLength = var3.array[0] & 255; // L: 6148
+ var1.getSocket().read(var3.array, 0, 1); // L: 6102
+ var1.serverPacketLength = var3.array[0] & 255; // L: 6103
}
- if (var1.serverPacketLength == -2) { // L: 6150
- if (!var2.isAvailable(2)) { // L: 6151
+ if (var1.serverPacketLength == -2) { // L: 6105
+ if (!var2.isAvailable(2)) { // L: 6106
return false;
}
- var1.getSocket().read(var3.array, 0, 2); // L: 6152
- var3.offset = 0; // L: 6153
- var1.serverPacketLength = var3.readUnsignedShort(); // L: 6154
+ var1.getSocket().read(var3.array, 0, 2); // L: 6107
+ var3.offset = 0; // L: 6108
+ var1.serverPacketLength = var3.readUnsignedShort(); // L: 6109
}
- if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6156
+ if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6111
return false;
}
- var3.offset = 0; // L: 6157
- var2.read(var3.array, 0, var1.serverPacketLength); // L: 6158
- var1.field1349 = 0; // L: 6159
- timer.method6374(); // L: 6160
- var1.field1345 = var1.field1340; // L: 6161
- var1.field1340 = var1.field1351; // L: 6162
- var1.field1351 = var1.serverPacket; // L: 6163
- if (ServerPacket.field3141 == var1.serverPacket) { // L: 6164
- UserComparator8.field1378 = new class392(class221.HitSplatDefinition_cached); // L: 6165
- var1.serverPacket = null; // L: 6166
- return true; // L: 6167
- }
-
- int var67;
- if (ServerPacket.field3131 == var1.serverPacket) { // L: 6169
- var67 = var3.readInt(); // L: 6170
- if (var67 != field482) { // L: 6171
- field482 = var67; // L: 6172
- class134.method2850(); // L: 6173
- }
-
- var1.serverPacket = null; // L: 6175
- return true; // L: 6176
- }
-
- if (ServerPacket.field3099 == var1.serverPacket) { // L: 6178
- class119.method2737(); // L: 6179
- runEnergy = var3.readUnsignedByte(); // L: 6180
- field695 = cycleCntr; // L: 6181
- var1.serverPacket = null; // L: 6182
- return true; // L: 6183
- }
-
- if (ServerPacket.field3113 == var1.serverPacket) { // L: 6185
- var67 = var3.readUnsignedByte(); // L: 6186
- var21 = var3.readStringCp1252NullTerminated(); // L: 6187
- var6 = var3.method7593(); // L: 6188
- if (var6 >= 1 && var6 <= 8) { // L: 6189
- if (var21.equalsIgnoreCase("null")) { // L: 6190
- var21 = null;
- }
-
- playerMenuActions[var6 - 1] = var21; // L: 6191
- playerOptionsPriorities[var6 - 1] = var67 == 0; // L: 6192
- }
-
- var1.serverPacket = null; // L: 6194
- return true; // L: 6195
- }
-
- Widget var22;
- if (ServerPacket.field3148 == var1.serverPacket) { // L: 6197
- var67 = var3.method7568(); // L: 6198
- var5 = var3.method7576(); // L: 6199
- var22 = class92.getWidget(var67); // L: 6200
- if (var22.modelType != 1 || var5 != var22.modelId) { // L: 6201
- var22.modelType = 1; // L: 6202
- var22.modelId = var5; // L: 6203
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6204
- }
-
- var1.serverPacket = null; // L: 6206
- return true; // L: 6207
- }
-
- if (ServerPacket.field3092 == var1.serverPacket) { // L: 6209
- BufferedSource.friendSystem.method1667(); // L: 6210
- field689 = cycleCntr; // L: 6211
- var1.serverPacket = null; // L: 6212
- return true; // L: 6213
- }
-
- GameObject var14;
- int var15;
- int var16;
- byte var20;
- String var25;
- if (ServerPacket.field3103 == var1.serverPacket) { // L: 6215
- var20 = var3.readByte(); // L: 6216
- var21 = var3.readStringCp1252NullTerminated(); // L: 6217
- long var23 = (long)var3.readUnsignedShort(); // L: 6218
- long var8 = (long)var3.readMedium(); // L: 6219
- PlayerType var59 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var3.readUnsignedByte()); // L: 6220
- long var11 = var8 + (var23 << 32); // L: 6221
- boolean var64 = false; // L: 6222
- var14 = null; // L: 6223
- ClanChannel var66 = var20 >= 0 ? currentClanChannels[var20] : UserComparator10.guestClanChannel; // L: 6225
- if (var66 == null) { // L: 6226
- var64 = true; // L: 6227
- } else {
- var15 = 0;
-
- while (true) {
- if (var15 >= 100) {
- if (var59.isUser && BufferedSource.friendSystem.isIgnored(new Username(var21, class391.loginType))) { // L: 6236 6237
- var64 = true;
- }
- break;
- }
-
- if (crossWorldMessageIds[var15] == var11) { // L: 6231
- var64 = true; // L: 6232
- break; // L: 6233
- }
-
- ++var15; // L: 6230
- }
- }
-
- if (!var64) { // L: 6240
- crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; // L: 6241
- crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6242
- var25 = AbstractFont.escapeBrackets(LoginPacket.method5025(var3)); // L: 6243
- var16 = var20 >= 0 ? 41 : 44; // L: 6244
- if (var59.modIcon != -1) { // L: 6245
- UserComparator7.addChatMessage(var16, StudioGame.method5590(var59.modIcon) + var21, var25, var66.name);
- } else {
- UserComparator7.addChatMessage(var16, var21, var25, var66.name); // L: 6246
- }
- }
-
- var1.serverPacket = null; // L: 6248
- return true; // L: 6249
- }
-
- if (ServerPacket.field3155 == var1.serverPacket) { // L: 6251
- var67 = var3.readUnsignedByte(); // L: 6252
- class193.method3800(var67); // L: 6253
- var1.serverPacket = null; // L: 6254
- return true; // L: 6255
- }
-
- if (ServerPacket.field3122 == var1.serverPacket) { // L: 6257
- UserComparator8.field1378 = null; // L: 6258
- var1.serverPacket = null; // L: 6259
- return true; // L: 6260
- }
-
- Widget var55;
- if (ServerPacket.field3174 == var1.serverPacket) { // L: 6262
- var67 = var3.method7576(); // L: 6263
- if (var67 == 65535) { // L: 6264
- var67 = -1;
- }
-
- var5 = var3.method7701(); // L: 6265
- var6 = var3.method7701(); // L: 6266
- var55 = class92.getWidget(var6); // L: 6267
- ItemComposition var81;
- if (!var55.isIf3) { // L: 6268
- if (var67 == -1) { // L: 6269
- var55.modelType = 0; // L: 6270
- var1.serverPacket = null; // L: 6271
- return true; // L: 6272
- }
-
- var81 = FileSystem.ItemDefinition_get(var67); // L: 6274
- var55.modelType = 4; // L: 6275
- var55.modelId = var67; // L: 6276
- var55.modelAngleX = var81.xan2d; // L: 6277
- var55.modelAngleY = var81.yan2d; // L: 6278
- var55.modelZoom = var81.zoom2d * 100 / var5; // L: 6279
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var55); // L: 6280
- } else {
- var55.itemId = var67; // L: 6283
- var55.itemQuantity = var5; // L: 6284
- var81 = FileSystem.ItemDefinition_get(var67); // L: 6285
- var55.modelAngleX = var81.xan2d; // L: 6286
- var55.modelAngleY = var81.yan2d; // L: 6287
- var55.modelAngleZ = var81.zan2d; // L: 6288
- var55.modelOffsetX = var81.offsetX2d; // L: 6289
- var55.modelOffsetY = var81.offsetY2d; // L: 6290
- var55.modelZoom = var81.zoom2d; // L: 6291
- if (var81.isStackable == 1) { // L: 6292
- var55.itemQuantityMode = 1;
- } else {
- var55.itemQuantityMode = 2; // L: 6293
- }
-
- if (var55.field3406 > 0) { // L: 6294
- var55.modelZoom = var55.modelZoom * 32 / var55.field3406;
- } else if (var55.rawWidth > 0) { // L: 6295
- var55.modelZoom = var55.modelZoom * 32 / var55.rawWidth;
- }
-
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var55); // L: 6296
- }
-
- var1.serverPacket = null; // L: 6298
- return true; // L: 6299
- }
-
- if (ServerPacket.field3091 == var1.serverPacket) { // L: 6301
- class145.field1690 = var3.method7546(); // L: 6302
- class321.field4076 = var3.readUnsignedByte(); // L: 6303
-
- while (var3.offset < var1.serverPacketLength) { // L: 6304
- var67 = var3.readUnsignedByte(); // L: 6305
- class263 var78 = class194.method3807()[var67]; // L: 6306
- Occluder.method4222(var78); // L: 6307
- }
-
- var1.serverPacket = null; // L: 6309
- return true; // L: 6310
- }
-
- if (ServerPacket.field3095 == var1.serverPacket) { // L: 6312
- PendingSpawn.readReflectionCheck(var3, var1.serverPacketLength); // L: 6313
- var1.serverPacket = null; // L: 6314
- return true; // L: 6315
+ var3.offset = 0; // L: 6112
+ var2.read(var3.array, 0, var1.serverPacketLength); // L: 6113
+ var1.field1342 = 0; // L: 6114
+ timer.method6509(); // L: 6115
+ var1.field1352 = var1.field1347; // L: 6116
+ var1.field1347 = var1.field1350; // L: 6117
+ var1.field1350 = var1.serverPacket; // L: 6118
+ if (ServerPacket.field3051 == var1.serverPacket) { // L: 6119
+ WorldMapSprite.method4998(class262.field3023); // L: 6120
+ var1.serverPacket = null; // L: 6121
+ return true; // L: 6122
}
+ int var7;
+ int var8;
int var9;
- int var27;
- int var28;
- int var29;
- int var86;
- if (ServerPacket.field3158 == var1.serverPacket) { // L: 6317
- var6 = var3.readMedium(); // L: 6326
- var67 = var6 >> 16; // L: 6327
- var5 = var6 >> 8 & 255; // L: 6328
- var27 = var67 + (var6 >> 4 & 7); // L: 6329
- var28 = var5 + (var6 & 7); // L: 6330
- var9 = var3.readUnsignedShort(); // L: 6331
- var29 = var3.method7593(); // L: 6332
- var86 = var3.method7716(); // L: 6333
- if (var27 >= 0 && var28 >= 0 && var27 < 104 && var28 < 104) { // L: 6334
- var27 = var27 * 128 + 64; // L: 6335
- var28 = var28 * 128 + 64; // L: 6336
- GraphicsObject var60 = new GraphicsObject(var9, class128.Client_plane, var27, var28, class202.getTileHeight(var27, var28, class128.Client_plane) - var29, var86, cycle); // L: 6337
- graphicsObjects.addFirst(var60); // L: 6338
+ int var10;
+ int var11;
+ int var20;
+ if (ServerPacket.field3123 == var1.serverPacket) { // L: 6124
+ var10 = var3.method7766(); // L: 6133
+ var11 = var3.method7776(); // L: 6134
+ var9 = var3.method7776(); // L: 6135
+ var6 = var3.method7848(); // L: 6136
+ var20 = var6 >> 16; // L: 6137
+ var5 = var6 >> 8 & 255; // L: 6138
+ var7 = var20 + (var6 >> 4 & 7); // L: 6139
+ var8 = var5 + (var6 & 7); // L: 6140
+ if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6141
+ var7 = var7 * 128 + 64; // L: 6142
+ var8 = var8 * 128 + 64; // L: 6143
+ GraphicsObject var60 = new GraphicsObject(var9, PacketWriter.Client_plane, var7, var8, SceneTilePaint.getTileHeight(var7, var8, PacketWriter.Client_plane) - var10, var11, cycle); // L: 6144
+ graphicsObjects.addFirst(var60); // L: 6145
}
- var1.serverPacket = null; // L: 6340
- return true; // L: 6341
+ var1.serverPacket = null; // L: 6147
+ return true; // L: 6148
}
- if (ServerPacket.field3182 == var1.serverPacket) { // L: 6343
- var67 = var3.readInt(); // L: 6344
- InterfaceParent var77 = (InterfaceParent)interfaceParents.get((long)var67); // L: 6345
- if (var77 != null) { // L: 6346
- NetSocket.closeInterface(var77, true);
- }
-
- if (meslayerContinueWidget != null) { // L: 6347
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(meslayerContinueWidget); // L: 6348
- meslayerContinueWidget = null; // L: 6349
- }
-
- var1.serverPacket = null; // L: 6351
- return true; // L: 6352
+ if (ServerPacket.field3075 == var1.serverPacket) { // L: 6150
+ var20 = var3.readUnsignedByte(); // L: 6151
+ DefaultsGroup.forceDisconnect(var20); // L: 6152
+ var1.serverPacket = null; // L: 6153
+ return false; // L: 6154
}
- if (ServerPacket.field3098 == var1.serverPacket) { // L: 6354
- var20 = var3.readByte(); // L: 6355
- var5 = var3.method7576(); // L: 6356
- Varps.Varps_temp[var5] = var20; // L: 6357
- if (Varps.Varps_main[var5] != var20) { // L: 6358
- Varps.Varps_main[var5] = var20; // L: 6359
+ if (ServerPacket.field3124 == var1.serverPacket) { // L: 6156
+ if (FontName.field4584 == null) { // L: 6157
+ FontName.field4584 = new class391(ModeWhere.HitSplatDefinition_cached);
}
- class321.changeGameOptions(var5); // L: 6361
- changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6362
- var1.serverPacket = null; // L: 6363
- return true; // L: 6364
+ class450 var56 = ModeWhere.HitSplatDefinition_cached.method7060(var3); // L: 6158
+ FontName.field4584.field4424.vmethod7441(var56.field4765, var56.field4766); // L: 6159
+ field686[++field687 - 1 & 31] = var56.field4765; // L: 6160
+ var1.serverPacket = null; // L: 6161
+ return true; // L: 6162
}
- if (ServerPacket.field3165 == var1.serverPacket) { // L: 6366
- var67 = var3.method7554(); // L: 6367
- if (var67 == 65535) { // L: 6368
- var67 = -1;
+ InterfaceParent var70;
+ if (ServerPacket.field3085 == var1.serverPacket) { // L: 6164
+ var20 = var3.readInt(); // L: 6165
+ var5 = var3.readUnsignedByte(); // L: 6166
+ var6 = var3.readUnsignedShort(); // L: 6167
+ var70 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6168
+ if (var70 != null) { // L: 6169
+ MusicPatchPcmStream.closeInterface(var70, var6 != var70.group);
}
- WorldMapIcon_0.playSong(var67); // L: 6369
- var1.serverPacket = null; // L: 6370
- return true; // L: 6371
+ Language.method6063(var20, var6, var5); // L: 6170
+ var1.serverPacket = null; // L: 6171
+ return true; // L: 6172
}
- if (ServerPacket.field3096 == var1.serverPacket) { // L: 6373
- var67 = var3.readUnsignedShort(); // L: 6374
- if (var67 == 65535) { // L: 6375
- var67 = -1;
- }
+ int var15;
+ long var22;
+ long var24;
+ long var26;
+ long var29;
+ String var31;
+ String var51;
+ if (ServerPacket.field3045 == var1.serverPacket) { // L: 6174
+ var51 = var3.readStringCp1252NullTerminated(); // L: 6175
+ var22 = var3.readLong(); // L: 6176
+ var24 = (long)var3.readUnsignedShort(); // L: 6177
+ var26 = (long)var3.readMedium(); // L: 6178
+ PlayerType var71 = (PlayerType)Actor.findEnumerated(SoundSystem.PlayerType_values(), var3.readUnsignedByte()); // L: 6179
+ var29 = var26 + (var24 << 32); // L: 6180
+ boolean var63 = false; // L: 6181
- var5 = var3.method7503(); // L: 6376
- class306.method5593(var67, var5); // L: 6377
- var1.serverPacket = null; // L: 6378
- return true; // L: 6379
- }
-
- if (ServerPacket.field3112 == var1.serverPacket) { // L: 6381
- class119.method2737(); // L: 6382
- var67 = var3.method7701(); // L: 6383
- var5 = var3.method7545(); // L: 6384
- var6 = var3.method7545(); // L: 6385
- experience[var5] = var67; // L: 6386
- currentLevels[var5] = var6; // L: 6387
- levels[var5] = 1; // L: 6388
-
- for (var27 = 0; var27 < 98; ++var27) { // L: 6389
- if (var67 >= Skills.Skills_experienceTable[var27]) {
- levels[var5] = var27 + 2;
+ for (var15 = 0; var15 < 100; ++var15) { // L: 6182
+ if (crossWorldMessageIds[var15] == var29) { // L: 6183
+ var63 = true; // L: 6184
+ break; // L: 6185
}
}
- changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6390
- var1.serverPacket = null; // L: 6391
- return true; // L: 6392
+ if (var71.isUser && Player.friendSystem.isIgnored(new Username(var51, HealthBarDefinition.loginType))) { // L: 6188 6189
+ var63 = true;
+ }
+
+ if (!var63 && field607 == 0) { // L: 6191
+ crossWorldMessageIds[crossWorldMessageIdsIndex] = var29; // L: 6192
+ crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6193
+ var31 = AbstractFont.escapeBrackets(ArchiveDiskAction.method5777(class134.method2904(var3))); // L: 6194
+ if (var71.modIcon != -1) { // L: 6195
+ SecureRandomFuture.addChatMessage(9, SecureRandomCallable.method2066(var71.modIcon) + var51, var31, class229.base37DecodeLong(var22));
+ } else {
+ SecureRandomFuture.addChatMessage(9, var51, var31, class229.base37DecodeLong(var22)); // L: 6196
+ }
+ }
+
+ var1.serverPacket = null; // L: 6198
+ return true; // L: 6199
}
- boolean var84;
- if (ServerPacket.field3140 == var1.serverPacket) { // L: 6394
- var84 = var3.readBoolean(); // L: 6395
- if (var84) { // L: 6396
- if (class127.field1570 == null) { // L: 6397
- class127.field1570 = new class326();
+ if (ServerPacket.field3134 == var1.serverPacket) { // L: 6201
+ var20 = var3.offset + var1.serverPacketLength; // L: 6202
+ var5 = var3.readUnsignedShort(); // L: 6203
+ var6 = var3.readUnsignedShort(); // L: 6204
+ if (var5 != rootInterface) { // L: 6205
+ rootInterface = var5; // L: 6206
+ this.resizeRoot(false); // L: 6207
+ class17.Widget_resetModelFrames(rootInterface); // L: 6208
+ WorldMapLabelSize.runWidgetOnLoadListener(rootInterface); // L: 6209
+
+ for (var7 = 0; var7 < 100; ++var7) { // L: 6210
+ field703[var7] = true;
}
+ }
+
+ InterfaceParent var73;
+ for (; var6-- > 0; var73.field1040 = true) { // L: 6212 6222
+ var7 = var3.readInt(); // L: 6213
+ var8 = var3.readUnsignedShort(); // L: 6214
+ var9 = var3.readUnsignedByte(); // L: 6215
+ var73 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6216
+ if (var73 != null && var8 != var73.group) { // L: 6217
+ MusicPatchPcmStream.closeInterface(var73, true); // L: 6218
+ var73 = null; // L: 6219
+ }
+
+ if (var73 == null) { // L: 6221
+ var73 = Language.method6063(var7, var8, var9);
+ }
+ }
+
+ for (var70 = (InterfaceParent)interfaceParents.first(); var70 != null; var70 = (InterfaceParent)interfaceParents.next()) { // L: 6224
+ if (var70.field1040) { // L: 6225
+ var70.field1040 = false;
+ } else {
+ MusicPatchPcmStream.closeInterface(var70, true); // L: 6227
+ }
+ }
+
+ widgetFlags = new NodeHashTable(512); // L: 6230
+
+ while (var3.offset < var20) { // L: 6231
+ var7 = var3.readInt(); // L: 6232
+ var8 = var3.readUnsignedShort(); // L: 6233
+ var9 = var3.readUnsignedShort(); // L: 6234
+ var10 = var3.readInt(); // L: 6235
+
+ for (var11 = var8; var11 <= var9; ++var11) { // L: 6236
+ var29 = ((long)var7 << 32) + (long)var11; // L: 6237
+ widgetFlags.put(new IntegerNode(var10), var29); // L: 6238
+ }
+ }
+
+ var1.serverPacket = null; // L: 6241
+ return true; // L: 6242
+ }
+
+ if (ServerPacket.field3044 == var1.serverPacket) { // L: 6244
+ for (var20 = 0; var20 < players.length; ++var20) { // L: 6245
+ if (players[var20] != null) { // L: 6246
+ players[var20].sequence = -1;
+ }
+ }
+
+ for (var20 = 0; var20 < npcs.length; ++var20) { // L: 6248
+ if (npcs[var20] != null) { // L: 6249
+ npcs[var20].sequence = -1;
+ }
+ }
+
+ var1.serverPacket = null; // L: 6251
+ return true; // L: 6252
+ }
+
+ if (ServerPacket.field3068 == var1.serverPacket) { // L: 6254
+ isCameraLocked = false; // L: 6255
+
+ for (var20 = 0; var20 < 5; ++var20) { // L: 6256
+ field743[var20] = false;
+ }
+
+ var1.serverPacket = null; // L: 6257
+ return true; // L: 6258
+ }
+
+ if (ServerPacket.field3090 == var1.serverPacket) { // L: 6260
+ ClanSettings.updatePlayers(var3, var1.serverPacketLength); // L: 6261
+ ScriptEvent.method2106(); // L: 6262
+ var1.serverPacket = null; // L: 6263
+ return true; // L: 6264
+ }
+
+ if (ServerPacket.field3050 == var1.serverPacket) { // L: 6266
+ WorldMapSprite.method4998(class262.field3024); // L: 6267
+ var1.serverPacket = null; // L: 6268
+ return true; // L: 6269
+ }
+
+ if (ServerPacket.field3054 == var1.serverPacket) { // L: 6271
+ WorldMapSprite.method4998(class262.field3017); // L: 6272
+ var1.serverPacket = null; // L: 6273
+ return true; // L: 6274
+ }
+
+ if (ServerPacket.field3103 == var1.serverPacket) { // L: 6276
+ hintArrowType = var3.readUnsignedByte(); // L: 6277
+ if (hintArrowType == 1) { // L: 6278
+ hintArrowNpcIndex = var3.readUnsignedShort();
+ }
+
+ if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6279
+ if (hintArrowType == 2) { // L: 6280
+ hintArrowSubX = 64; // L: 6281
+ hintArrowSubY = 64; // L: 6282
+ }
+
+ if (hintArrowType == 3) { // L: 6284
+ hintArrowSubX = 0; // L: 6285
+ hintArrowSubY = 64; // L: 6286
+ }
+
+ if (hintArrowType == 4) { // L: 6288
+ hintArrowSubX = 128; // L: 6289
+ hintArrowSubY = 64; // L: 6290
+ }
+
+ if (hintArrowType == 5) { // L: 6292
+ hintArrowSubX = 64; // L: 6293
+ hintArrowSubY = 0; // L: 6294
+ }
+
+ if (hintArrowType == 6) { // L: 6296
+ hintArrowSubX = 64; // L: 6297
+ hintArrowSubY = 128; // L: 6298
+ }
+
+ hintArrowType = 2; // L: 6300
+ hintArrowX = var3.readUnsignedShort(); // L: 6301
+ hintArrowY = var3.readUnsignedShort(); // L: 6302
+ hintArrowHeight = var3.readUnsignedByte(); // L: 6303
+ }
+
+ if (hintArrowType == 10) { // L: 6305
+ hintArrowPlayerIndex = var3.readUnsignedShort();
+ }
+
+ var1.serverPacket = null; // L: 6306
+ return true; // L: 6307
+ }
+
+ if (ServerPacket.field3135 == var1.serverPacket) { // L: 6309
+ class298.field3558 = var3.method7765(); // L: 6310
+ class10.field53 = var3.method7766(); // L: 6311
+ var1.serverPacket = null; // L: 6312
+ return true; // L: 6313
+ }
+
+ boolean var68;
+ Widget var74;
+ if (ServerPacket.field3095 == var1.serverPacket) { // L: 6315
+ var68 = var3.readUnsignedByte() == 1; // L: 6316
+ var5 = var3.method7785(); // L: 6317
+ var74 = class140.getWidget(var5); // L: 6318
+ if (var68 != var74.isHidden) { // L: 6319
+ var74.isHidden = var68; // L: 6320
+ ChatChannel.invalidateWidget(var74); // L: 6321
+ }
+
+ var1.serverPacket = null; // L: 6323
+ return true; // L: 6324
+ }
+
+ Widget var83;
+ if (ServerPacket.field3129 == var1.serverPacket) { // L: 6326
+ var20 = var3.readInt(); // L: 6327
+ var83 = class140.getWidget(var20); // L: 6328
+ var83.modelType = 3; // L: 6329
+ var83.modelId = class101.localPlayer.appearance.getChatHeadId(); // L: 6330
+ ChatChannel.invalidateWidget(var83); // L: 6331
+ var1.serverPacket = null; // L: 6332
+ return true; // L: 6333
+ }
+
+ if (ServerPacket.field3043 == var1.serverPacket) { // L: 6335
+ var20 = var3.method7775(); // L: 6336
+ var5 = var3.method7787(); // L: 6337
+ var74 = class140.getWidget(var5); // L: 6338
+ if (var74 != null && var74.type == 0) { // L: 6339
+ if (var20 > var74.scrollHeight - var74.height) { // L: 6340
+ var20 = var74.scrollHeight - var74.height;
+ }
+
+ if (var20 < 0) { // L: 6341
+ var20 = 0;
+ }
+
+ if (var20 != var74.scrollY) { // L: 6342
+ var74.scrollY = var20; // L: 6343
+ ChatChannel.invalidateWidget(var74); // L: 6344
+ }
+ }
+
+ var1.serverPacket = null; // L: 6347
+ return true; // L: 6348
+ }
+
+ if (ServerPacket.field3106 == var1.serverPacket) { // L: 6350
+ class101.field1366 = true; // L: 6351
+ UserComparator4.updateNpcs(false, var3); // L: 6352
+ var1.serverPacket = null; // L: 6353
+ return true; // L: 6354
+ }
+
+ if (ServerPacket.field3079 == var1.serverPacket) { // L: 6356
+ rebootTimer = var3.method7774() * 30; // L: 6357
+ field695 = cycleCntr; // L: 6358
+ var1.serverPacket = null; // L: 6359
+ return true; // L: 6360
+ }
+
+ if (ServerPacket.field3077 == var1.serverPacket) { // L: 6362
+ var20 = var3.readInt(); // L: 6363
+ if (var20 != field635) { // L: 6364
+ field635 = var20; // L: 6365
+ MilliClock.method3304(); // L: 6366
+ }
+
+ var1.serverPacket = null; // L: 6368
+ return true; // L: 6369
+ }
+
+ if (ServerPacket.field3094 == var1.serverPacket) { // L: 6371
+ var20 = var3.readUnsignedByte(); // L: 6372
+ if (var3.readUnsignedByte() == 0) { // L: 6373
+ grandExchangeOffers[var20] = new GrandExchangeOffer(); // L: 6374
+ var3.offset += 18; // L: 6375
} else {
- class127.field1570 = null; // L: 6399
+ --var3.offset; // L: 6378
+ grandExchangeOffers[var20] = new GrandExchangeOffer(var3, false); // L: 6379
}
- var1.serverPacket = null; // L: 6400
- return true; // L: 6401
+ field480 = cycleCntr; // L: 6381
+ var1.serverPacket = null; // L: 6382
+ return true; // L: 6383
}
- String var48;
- if (ServerPacket.field3163 == var1.serverPacket) { // L: 6403
- var48 = var3.readStringCp1252NullTerminated(); // L: 6404
- var21 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(var3))); // L: 6405
- WorldMapEvent.addGameMessage(6, var48, var21); // L: 6406
- var1.serverPacket = null; // L: 6407
- return true; // L: 6408
+ if (ServerPacket.field3097 == var1.serverPacket) { // L: 6385
+ UserComparator4.updateNpcs(true, var3); // L: 6386
+ var1.serverPacket = null; // L: 6387
+ return true; // L: 6388
}
- if (ServerPacket.field3166 == var1.serverPacket) { // L: 6410
- class144.loadRegions(false, var1.packetBuffer); // L: 6411
- var1.serverPacket = null; // L: 6412
- return true; // L: 6413
+ if (ServerPacket.field3089 == var1.serverPacket) { // L: 6390
+ Player.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6391
+ field689 = cycleCntr; // L: 6392
+ var1.serverPacket = null; // L: 6393
+ return true; // L: 6394
}
- if (ServerPacket.field3162 == var1.serverPacket) { // L: 6415
- Occluder.method4222(class263.field3058); // L: 6416
- var1.serverPacket = null; // L: 6417
- return true; // L: 6418
+ if (ServerPacket.field3073 == var1.serverPacket) { // L: 6396
+ minimapState = var3.readUnsignedByte(); // L: 6397
+ var1.serverPacket = null; // L: 6398
+ return true; // L: 6399
}
- if (ServerPacket.field3147 == var1.serverPacket) { // L: 6420
- isCameraLocked = false; // L: 6421
+ if (ServerPacket.field3071 == var1.serverPacket) { // L: 6401
+ var20 = var3.readUnsignedByte(); // L: 6402
+ WorldMapDecoration.method4991(var20); // L: 6403
+ var1.serverPacket = null; // L: 6404
+ return true; // L: 6405
+ }
- for (var67 = 0; var67 < 5; ++var67) { // L: 6422
- field743[var67] = false;
+ if (ServerPacket.field3056 == var1.serverPacket) { // L: 6407
+ class101.field1366 = true; // L: 6408
+ UserComparator4.updateNpcs(true, var3); // L: 6409
+ var1.serverPacket = null; // L: 6410
+ return true; // L: 6411
+ }
+
+ NPC var69;
+ if (ServerPacket.field3102 == var1.serverPacket) { // L: 6413
+ var5 = var3.method7787(); // L: 6418
+ var6 = var3.method7775(); // L: 6419
+ var20 = var3.method7774(); // L: 6420
+ var69 = npcs[var20]; // L: 6421
+ if (var69 != null) { // L: 6422
+ var69.spotAnimation = var6; // L: 6423
+ var69.spotAnimationHeight = var5 >> 16; // L: 6424
+ var69.field1178 = (var5 & 65535) + cycle; // L: 6425
+ var69.spotAnimationFrame = 0; // L: 6426
+ var69.spotAnimationFrameCycle = 0; // L: 6427
+ if (var69.field1178 > cycle) { // L: 6428
+ var69.spotAnimationFrame = -1; // L: 6429
+ }
+
+ if (var69.spotAnimation == 65535) { // L: 6431
+ var69.spotAnimation = -1; // L: 6432
+ }
}
- var1.serverPacket = null; // L: 6423
- return true; // L: 6424
+ var1.serverPacket = null; // L: 6435
+ return true; // L: 6436
}
- if (ServerPacket.field3186 == var1.serverPacket) { // L: 6426
- var67 = var3.readInt(); // L: 6427
- var5 = var3.readInt(); // L: 6428
- var6 = class17.getGcDuration(); // L: 6429
- PacketBufferNode var58 = WallDecoration.getPacketBufferNode(ClientPacket.field3053, packetWriter.isaacCipher); // L: 6431
- var58.packetBuffer.method7565(var67); // L: 6432
- var58.packetBuffer.method7565(var5); // L: 6433
- var58.packetBuffer.method7596(GameEngine.fps); // L: 6434
- var58.packetBuffer.method7596(var6); // L: 6435
- packetWriter.addNode(var58); // L: 6436
- var1.serverPacket = null; // L: 6437
- return true; // L: 6438
- }
+ if (ServerPacket.field3084 == var1.serverPacket) { // L: 6438
+ var20 = var3.method7776(); // L: 6439
+ rootInterface = var20; // L: 6440
+ this.resizeRoot(false); // L: 6441
+ class17.Widget_resetModelFrames(var20); // L: 6442
+ WorldMapLabelSize.runWidgetOnLoadListener(rootInterface); // L: 6443
- if (ServerPacket.field3169 == var1.serverPacket) { // L: 6440
- Occluder.method4222(class263.field3059); // L: 6441
- var1.serverPacket = null; // L: 6442
- return true; // L: 6443
- }
-
- if (ServerPacket.field3177 == var1.serverPacket) { // L: 6445
- Occluder.method4222(class263.field3067); // L: 6446
- var1.serverPacket = null; // L: 6447
- return true; // L: 6448
- }
-
- if (ServerPacket.field3134 == var1.serverPacket) { // L: 6450
- var84 = var3.method7593() == 1; // L: 6451
- var5 = var3.method7567(); // L: 6452
- var22 = class92.getWidget(var5); // L: 6453
- if (var84 != var22.isHidden) { // L: 6454
- var22.isHidden = var84; // L: 6455
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6456
+ for (var5 = 0; var5 < 100; ++var5) { // L: 6444
+ field703[var5] = true;
}
+ var1.serverPacket = null; // L: 6445
+ return true; // L: 6446
+ }
+
+ if (ServerPacket.field3127 == var1.serverPacket) { // L: 6448
+ for (var20 = 0; var20 < VarpDefinition.field1822; ++var20) { // L: 6449
+ VarpDefinition var87 = FloorUnderlayDefinition.VarpDefinition_get(var20); // L: 6450
+ if (var87 != null) { // L: 6451
+ Varps.Varps_temp[var20] = 0; // L: 6452
+ Varps.Varps_main[var20] = 0; // L: 6453
+ }
+ }
+
+ GraphicsObject.method1870(); // L: 6456
+ changedVarpCount += 32; // L: 6457
var1.serverPacket = null; // L: 6458
return true; // L: 6459
}
- if (ServerPacket.field3132 == var1.serverPacket && isCameraLocked) { // L: 6461 6462
- field742 = true; // L: 6463
- class229.field2805 = var3.readUnsignedByte(); // L: 6464
- HitSplatDefinition.field2077 = var3.readUnsignedByte(); // L: 6465
- class17.field88 = var3.readUnsignedByte(); // L: 6466
- PacketBufferNode.field3083 = var3.readUnsignedByte(); // L: 6467
-
- for (var67 = 0; var67 < 5; ++var67) { // L: 6468
- field743[var67] = false;
+ byte var65;
+ if (ServerPacket.field3115 == var1.serverPacket) { // L: 6461
+ UserComparator5.method2586(); // L: 6462
+ var65 = var3.readByte(); // L: 6463
+ class131 var86 = new class131(var3); // L: 6464
+ ClanSettings var89;
+ if (var65 >= 0) { // L: 6466
+ var89 = currentClanSettings[var65];
+ } else {
+ var89 = HealthBar.guestClanSettings; // L: 6467
}
+ var86.method2869(var89); // L: 6468
var1.serverPacket = null; // L: 6469
return true; // L: 6470
}
- String var76;
- if (ServerPacket.field3184 == var1.serverPacket) { // L: 6473
- byte[] var52 = new byte[var1.serverPacketLength]; // L: 6474
- var3.method7460(var52, 0, var52.length); // L: 6475
- Buffer var75 = new Buffer(var52); // L: 6476
- var76 = var75.readStringCp1252NullTerminated(); // L: 6477
- ScriptEvent.openURL(var76, true, false); // L: 6478
- var1.serverPacket = null; // L: 6479
- return true; // L: 6480
- }
-
- if (ServerPacket.field3084 == var1.serverPacket) { // L: 6482
- if (PcmPlayer.friendsChat != null) { // L: 6483
- PcmPlayer.friendsChat.method6463(var3); // L: 6484
+ Widget var21;
+ if (ServerPacket.field3060 == var1.serverPacket) { // L: 6472
+ var20 = var3.method7775(); // L: 6473
+ if (var20 == 65535) { // L: 6474
+ var20 = -1;
}
- class194.method3804(); // L: 6486
- var1.serverPacket = null; // L: 6487
- return true; // L: 6488
- }
-
- if (ServerPacket.field3187 == var1.serverPacket) { // L: 6490
- class393.field4428 = true; // L: 6491
- HorizontalAlignment.updateNpcs(false, var3); // L: 6492
- var1.serverPacket = null; // L: 6493
- return true; // L: 6494
- }
-
- if (ServerPacket.field3152 == var1.serverPacket) { // L: 6496
- for (var67 = 0; var67 < players.length; ++var67) { // L: 6497
- if (players[var67] != null) { // L: 6498
- players[var67].sequence = -1;
- }
- }
-
- for (var67 = 0; var67 < npcs.length; ++var67) { // L: 6500
- if (npcs[var67] != null) { // L: 6501
- npcs[var67].sequence = -1;
- }
- }
-
- var1.serverPacket = null; // L: 6503
- return true; // L: 6504
- }
-
- if (ServerPacket.field3157 == var1.serverPacket) { // L: 6506
- var67 = var3.method7554(); // L: 6507
- var5 = var3.readInt(); // L: 6508
- var6 = var3.method7716(); // L: 6509
- var55 = class92.getWidget(var5); // L: 6510
- var55.field3451 = var6 + (var67 << 16); // L: 6511
- var1.serverPacket = null; // L: 6512
- return true; // L: 6513
- }
-
- if (ServerPacket.field3097 == var1.serverPacket) { // L: 6515
- var67 = var3.method7568(); // L: 6516
- var5 = var3.method7716(); // L: 6517
- var22 = class92.getWidget(var67); // L: 6518
- if (var22 != null && var22.type == 0) { // L: 6519
- if (var5 > var22.scrollHeight - var22.height) { // L: 6520
- var5 = var22.scrollHeight - var22.height;
+ var5 = var3.readInt(); // L: 6475
+ var6 = var3.method7787(); // L: 6476
+ var21 = class140.getWidget(var5); // L: 6477
+ ItemComposition var82;
+ if (!var21.isIf3) { // L: 6478
+ if (var20 == -1) { // L: 6479
+ var21.modelType = 0; // L: 6480
+ var1.serverPacket = null; // L: 6481
+ return true; // L: 6482
}
- if (var5 < 0) { // L: 6521
- var5 = 0;
- }
-
- if (var5 != var22.scrollY) { // L: 6522
- var22.scrollY = var5; // L: 6523
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6524
- }
- }
-
- var1.serverPacket = null; // L: 6527
- return true; // L: 6528
- }
-
- if (ServerPacket.field3116 == var1.serverPacket) { // L: 6530
- if (UserComparator8.field1378 == null) { // L: 6531
- UserComparator8.field1378 = new class392(class221.HitSplatDefinition_cached);
- }
-
- class447 var51 = class221.HitSplatDefinition_cached.method6920(var3); // L: 6532
- UserComparator8.field1378.field4427.vmethod7295(var51.field4741, var51.field4742); // L: 6533
- field686[++field687 - 1 & 31] = var51.field4741; // L: 6534
- var1.serverPacket = null; // L: 6535
- return true; // L: 6536
- }
-
- if (ServerPacket.field3089 == var1.serverPacket) { // L: 6538
- var48 = var3.readStringCp1252NullTerminated(); // L: 6539
- Object[] var74 = new Object[var48.length() + 1]; // L: 6540
-
- for (var6 = var48.length() - 1; var6 >= 0; --var6) { // L: 6541
- if (var48.charAt(var6) == 's') { // L: 6542
- var74[var6 + 1] = var3.readStringCp1252NullTerminated();
- } else {
- var74[var6 + 1] = new Integer(var3.readInt()); // L: 6543
- }
- }
-
- var74[0] = new Integer(var3.readInt()); // L: 6545
- ScriptEvent var83 = new ScriptEvent(); // L: 6546
- var83.args = var74; // L: 6547
- class144.runScriptEvent(var83); // L: 6548
- var1.serverPacket = null; // L: 6549
- return true; // L: 6550
- }
-
- if (ServerPacket.field3090 == var1.serverPacket) { // L: 6552
- class119.method2737(); // L: 6553
- weight = var3.readShort(); // L: 6554
- field695 = cycleCntr; // L: 6555
- var1.serverPacket = null; // L: 6556
- return true; // L: 6557
- }
-
- if (ServerPacket.field3175 == var1.serverPacket) { // L: 6559
- Occluder.method4222(class263.field3066); // L: 6560
- var1.serverPacket = null; // L: 6561
- return true; // L: 6562
- }
-
- if (ServerPacket.field3150 == var1.serverPacket) { // L: 6564
- Occluder.method4222(class263.field3071); // L: 6565
- var1.serverPacket = null; // L: 6566
- return true; // L: 6567
- }
-
- if (ServerPacket.field3115 == var1.serverPacket) { // L: 6569
- field692 = cycleCntr; // L: 6570
- var20 = var3.readByte(); // L: 6571
- if (var1.serverPacketLength == 1) { // L: 6572
- if (var20 >= 0) { // L: 6573
- currentClanChannels[var20] = null;
- } else {
- UserComparator10.guestClanChannel = null; // L: 6574
- }
-
- var1.serverPacket = null; // L: 6575
- return true; // L: 6576
- }
-
- if (var20 >= 0) { // L: 6578
- currentClanChannels[var20] = new ClanChannel(var3); // L: 6579
+ var82 = EnumComposition.ItemDefinition_get(var20); // L: 6484
+ var21.modelType = 4; // L: 6485
+ var21.modelId = var20; // L: 6486
+ var21.modelAngleX = var82.xan2d; // L: 6487
+ var21.modelAngleY = var82.yan2d; // L: 6488
+ var21.modelZoom = var82.zoom2d * 100 / var6; // L: 6489
+ ChatChannel.invalidateWidget(var21); // L: 6490
} else {
- UserComparator10.guestClanChannel = new ClanChannel(var3); // L: 6582
+ var21.itemId = var20; // L: 6493
+ var21.itemQuantity = var6; // L: 6494
+ var82 = EnumComposition.ItemDefinition_get(var20); // L: 6495
+ var21.modelAngleX = var82.xan2d; // L: 6496
+ var21.modelAngleY = var82.yan2d; // L: 6497
+ var21.modelAngleZ = var82.zan2d; // L: 6498
+ var21.modelOffsetX = var82.offsetX2d; // L: 6499
+ var21.modelOffsetY = var82.offsetY2d; // L: 6500
+ var21.modelZoom = var82.zoom2d; // L: 6501
+ if (var82.isStackable == 1) { // L: 6502
+ var21.itemQuantityMode = 1;
+ } else {
+ var21.itemQuantityMode = 2; // L: 6503
+ }
+
+ if (var21.field3424 > 0) { // L: 6504
+ var21.modelZoom = var21.modelZoom * 32 / var21.field3424;
+ } else if (var21.rawWidth > 0) { // L: 6505
+ var21.modelZoom = var21.modelZoom * 32 / var21.rawWidth;
+ }
+
+ ChatChannel.invalidateWidget(var21); // L: 6506
}
- var1.serverPacket = null; // L: 6584
- return true; // L: 6585
+ var1.serverPacket = null; // L: 6508
+ return true; // L: 6509
}
- if (ServerPacket.field3126 == var1.serverPacket) { // L: 6587
- var3.offset += 28; // L: 6588
- if (var3.checkCrc()) { // L: 6589
- ViewportMouse.method4374(var3, var3.offset - 28);
+ if (ServerPacket.field3067 == var1.serverPacket) { // L: 6511
+ WorldMapSprite.method4998(class262.field3022); // L: 6512
+ var1.serverPacket = null; // L: 6513
+ return true; // L: 6514
+ }
+
+ if (ServerPacket.field3064 == var1.serverPacket) { // L: 6516
+ field692 = cycleCntr; // L: 6517
+ var65 = var3.readByte(); // L: 6518
+ if (var1.serverPacketLength == 1) { // L: 6519
+ if (var65 >= 0) { // L: 6520
+ currentClanChannels[var65] = null;
+ } else {
+ class150.guestClanChannel = null; // L: 6521
+ }
+
+ var1.serverPacket = null; // L: 6522
+ return true; // L: 6523
}
- var1.serverPacket = null; // L: 6590
- return true; // L: 6591
- }
-
- if (ServerPacket.field3183 == var1.serverPacket) { // L: 6593
- HorizontalAlignment.updateNpcs(false, var3); // L: 6594
- var1.serverPacket = null; // L: 6595
- return true; // L: 6596
- }
-
- if (ServerPacket.field3142 == var1.serverPacket) { // L: 6598
- var67 = var3.readInt(); // L: 6599
- var5 = var3.readUnsignedShort(); // L: 6600
- var22 = class92.getWidget(var67); // L: 6601
- if (var22.modelType != 2 || var5 != var22.modelId) { // L: 6602
- var22.modelType = 2; // L: 6603
- var22.modelId = var5; // L: 6604
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6605
+ if (var65 >= 0) { // L: 6525
+ currentClanChannels[var65] = new ClanChannel(var3); // L: 6526
+ } else {
+ class150.guestClanChannel = new ClanChannel(var3); // L: 6529
}
- var1.serverPacket = null; // L: 6607
- return true; // L: 6608
+ var1.serverPacket = null; // L: 6531
+ return true; // L: 6532
+ }
+
+ if (ServerPacket.field3063 == var1.serverPacket) { // L: 6534
+ WorldMapSprite.method4998(class262.field3019); // L: 6535
+ var1.serverPacket = null; // L: 6536
+ return true; // L: 6537
+ }
+
+ if (ServerPacket.field3132 == var1.serverPacket) { // L: 6539
+ var20 = var3.method7776(); // L: 6540
+ byte var64 = var3.method7952(); // L: 6541
+ Varps.Varps_temp[var20] = var64; // L: 6542
+ if (Varps.Varps_main[var20] != var64) { // L: 6543
+ Varps.Varps_main[var20] = var64; // L: 6544
+ }
+
+ class306.changeGameOptions(var20); // L: 6546
+ changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 6547
+ var1.serverPacket = null; // L: 6548
+ return true; // L: 6549
+ }
+
+ if (ServerPacket.field3099 == var1.serverPacket) { // L: 6551
+ var20 = var3.readInt(); // L: 6552
+ var5 = var3.readUnsignedShort(); // L: 6553
+ if (var20 < -70000) { // L: 6554
+ var5 += 32768;
+ }
+
+ if (var20 >= 0) { // L: 6556
+ var74 = class140.getWidget(var20);
+ } else {
+ var74 = null; // L: 6557
+ }
+
+ if (var74 != null) { // L: 6558
+ for (var7 = 0; var7 < var74.itemIds.length; ++var7) { // L: 6559
+ var74.itemIds[var7] = 0; // L: 6560
+ var74.itemQuantities[var7] = 0; // L: 6561
+ }
+ }
+
+ VerticalAlignment.clearItemContainer(var5); // L: 6564
+ var7 = var3.readUnsignedShort(); // L: 6565
+
+ for (var8 = 0; var8 < var7; ++var8) { // L: 6566
+ var9 = var3.method7766(); // L: 6567
+ if (var9 == 255) { // L: 6568
+ var9 = var3.readInt();
+ }
+
+ var10 = var3.readUnsignedShort(); // L: 6569
+ if (var74 != null && var8 < var74.itemIds.length) { // L: 6570 6571
+ var74.itemIds[var8] = var10; // L: 6572
+ var74.itemQuantities[var8] = var9; // L: 6573
+ }
+
+ ReflectionCheck.itemContainerSetItem(var5, var8, var10 - 1, var9); // L: 6576
+ }
+
+ if (var74 != null) { // L: 6578
+ ChatChannel.invalidateWidget(var74);
+ }
+
+ GraphicsObject.method1870(); // L: 6579
+ changedItemContainers[++field683 - 1 & 31] = var5 & 32767; // L: 6580
+ var1.serverPacket = null; // L: 6581
+ return true; // L: 6582
+ }
+
+ if (ServerPacket.field3066 == var1.serverPacket) { // L: 6584
+ Player.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6585
+ class126.FriendSystem_invalidateIgnoreds(); // L: 6586
+ field689 = cycleCntr; // L: 6587
+ var1.serverPacket = null; // L: 6588
+ return true; // L: 6589
+ }
+
+ if (ServerPacket.field3105 == var1.serverPacket) { // L: 6591
+ class10.field53 = var3.readUnsignedByte(); // L: 6592
+ class298.field3558 = var3.method7765(); // L: 6593
+
+ while (var3.offset < var1.serverPacketLength) { // L: 6594
+ var20 = var3.readUnsignedByte(); // L: 6595
+ class262 var85 = class128.method2856()[var20]; // L: 6596
+ WorldMapSprite.method4998(var85); // L: 6597
+ }
+
+ var1.serverPacket = null; // L: 6599
+ return true; // L: 6600
+ }
+
+ if (ServerPacket.field3082 == var1.serverPacket) { // L: 6602
+ class294.loadRegions(false, var1.packetBuffer); // L: 6603
+ var1.serverPacket = null; // L: 6604
+ return true; // L: 6605
+ }
+
+ if (ServerPacket.field3139 == var1.serverPacket) { // L: 6607
+ GraphicsObject.method1870(); // L: 6608
+ weight = var3.readShort(); // L: 6609
+ field695 = cycleCntr; // L: 6610
+ var1.serverPacket = null; // L: 6611
+ return true; // L: 6612
+ }
+
+ Widget var77;
+ if (ServerPacket.field3119 == var1.serverPacket) { // L: 6614
+ var20 = var3.method7785(); // L: 6615
+ var5 = var3.method7786(); // L: 6616
+ InterfaceParent var88 = (InterfaceParent)interfaceParents.get((long)var20); // L: 6617
+ var70 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6618
+ if (var70 != null) { // L: 6619
+ MusicPatchPcmStream.closeInterface(var70, var88 == null || var70.group != var88.group);
+ }
+
+ if (var88 != null) { // L: 6620
+ var88.remove(); // L: 6621
+ interfaceParents.put(var88, (long)var5); // L: 6622
+ }
+
+ var77 = class140.getWidget(var20); // L: 6624
+ if (var77 != null) { // L: 6625
+ ChatChannel.invalidateWidget(var77);
+ }
+
+ var77 = class140.getWidget(var5); // L: 6626
+ if (var77 != null) { // L: 6627
+ ChatChannel.invalidateWidget(var77); // L: 6628
+ BufferedNetSocket.revalidateWidgetScroll(SoundCache.Widget_interfaceComponents[var77.id >>> 16], var77, true); // L: 6629
+ }
+
+ if (rootInterface != -1) { // L: 6631
+ class7.runIntfCloseListeners(rootInterface, 1);
+ }
+
+ var1.serverPacket = null; // L: 6632
+ return true; // L: 6633
+ }
+
+ if (ServerPacket.field3137 == var1.serverPacket) { // L: 6635
+ UserComparator3.readReflectionCheck(var3, var1.serverPacketLength); // L: 6636
+ var1.serverPacket = null; // L: 6637
+ return true; // L: 6638
+ }
+
+ if (ServerPacket.field3100 == var1.serverPacket) { // L: 6640
+ var20 = var3.readInt(); // L: 6641
+ var5 = var3.readShort(); // L: 6642
+ var74 = class140.getWidget(var20); // L: 6643
+ if (var5 != var74.sequenceId || var5 == -1) { // L: 6644
+ var74.sequenceId = var5; // L: 6645
+ var74.modelFrame = 0; // L: 6646
+ var74.modelFrameCycle = 0; // L: 6647
+ ChatChannel.invalidateWidget(var74); // L: 6648
+ }
+
+ var1.serverPacket = null; // L: 6650
+ return true; // L: 6651
}
int var13;
- long var31;
- long var33;
- String var39;
- if (ServerPacket.field3086 == var1.serverPacket) { // L: 6610
- var48 = var3.readStringCp1252NullTerminated(); // L: 6611
- var31 = (long)var3.readUnsignedShort(); // L: 6612
- var33 = (long)var3.readMedium(); // L: 6613
- PlayerType var35 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var3.readUnsignedByte()); // L: 6614
- long var36 = var33 + (var31 << 32); // L: 6615
- boolean var87 = false; // L: 6616
-
- for (var13 = 0; var13 < 100; ++var13) { // L: 6617
- if (var36 == crossWorldMessageIds[var13]) { // L: 6618
- var87 = true; // L: 6619
- break; // L: 6620
- }
+ int var14;
+ int var16;
+ int var36;
+ if (ServerPacket.field3116 == var1.serverPacket) { // L: 6653
+ var6 = var3.readMedium(); // L: 6669
+ var20 = var6 >> 16; // L: 6670
+ var5 = var6 >> 8 & 255; // L: 6671
+ var7 = var20 + (var6 >> 4 & 7); // L: 6672
+ var8 = var5 + (var6 & 7); // L: 6673
+ var36 = var3.readUnsignedShort(); // L: 6674
+ int var18 = var3.method7765(); // L: 6675
+ var14 = var3.method7767() * 4; // L: 6676
+ byte var59 = var3.method7768(); // L: 6677
+ byte var57 = var3.readByte(); // L: 6678
+ var15 = var3.readUnsignedShort(); // L: 6679
+ int var17 = var3.method7765(); // L: 6680
+ var16 = var3.method7776(); // L: 6681
+ var13 = var3.method7765() * 4; // L: 6682
+ var11 = var3.method7779(); // L: 6683
+ var9 = var59 + var7; // L: 6684
+ var10 = var57 + var8; // L: 6685
+ if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var36 != 65535) { // L: 6686
+ var7 = var7 * 128 + 64; // L: 6687
+ var8 = var8 * 128 + 64; // L: 6688
+ var9 = var9 * 128 + 64; // L: 6689
+ var10 = var10 * 128 + 64; // L: 6690
+ Projectile var19 = new Projectile(var36, PacketWriter.Client_plane, var7, var8, SceneTilePaint.getTileHeight(var7, var8, PacketWriter.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var11, var14); // L: 6691
+ var19.setDestination(var9, var10, SceneTilePaint.getTileHeight(var9, var10, PacketWriter.Client_plane) - var14, var15 + cycle); // L: 6692
+ projectiles.addFirst(var19); // L: 6693
}
- if (BufferedSource.friendSystem.isIgnored(new Username(var48, class391.loginType))) { // L: 6623
- var87 = true;
+ var1.serverPacket = null; // L: 6695
+ return true; // L: 6696
+ }
+
+ if (ServerPacket.field3122 == var1.serverPacket) { // L: 6698
+ Player.friendSystem.method1635(); // L: 6699
+ field689 = cycleCntr; // L: 6700
+ var1.serverPacket = null; // L: 6701
+ return true; // L: 6702
+ }
+
+ if (ServerPacket.field3121 == var1.serverPacket) { // L: 6704
+ isCameraLocked = true; // L: 6705
+ field667 = false; // L: 6706
+ class12.field65 = var3.readUnsignedByte(); // L: 6707
+ class146.field1682 = var3.readUnsignedByte(); // L: 6708
+ InterfaceParent.field1043 = var3.readUnsignedShort(); // L: 6709
+ PlayerComposition.field3346 = var3.readUnsignedByte(); // L: 6710
+ UserComparator3.field1391 = var3.readUnsignedByte(); // L: 6711
+ if (UserComparator3.field1391 >= 100) { // L: 6712
+ class18.cameraX = class12.field65 * 128 + 64; // L: 6713
+ class228.cameraZ = class146.field1682 * 128 + 64; // L: 6714
+ class16.cameraY = SceneTilePaint.getTileHeight(class18.cameraX, class228.cameraZ, PacketWriter.Client_plane) - InterfaceParent.field1043; // L: 6715
}
- if (!var87 && field606 == 0) { // L: 6624
- crossWorldMessageIds[crossWorldMessageIdsIndex] = var36; // L: 6625
- crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6626
- var39 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(var3))); // L: 6627
- byte var89;
- if (var35.isPrivileged) { // L: 6629
- var89 = 7;
- } else {
- var89 = 3; // L: 6630
- }
-
- if (var35.modIcon != -1) { // L: 6631
- WorldMapEvent.addGameMessage(var89, StudioGame.method5590(var35.modIcon) + var48, var39);
- } else {
- WorldMapEvent.addGameMessage(var89, var48, var39); // L: 6632
- }
- }
-
- var1.serverPacket = null; // L: 6634
- return true; // L: 6635
+ var1.serverPacket = null; // L: 6717
+ return true; // L: 6718
}
- if (ServerPacket.field3087 == var1.serverPacket) { // L: 6637
- var67 = var3.readShort(); // L: 6638
- var5 = var3.readInt(); // L: 6639
- var22 = class92.getWidget(var5); // L: 6640
- if (var67 != var22.sequenceId || var67 == -1) { // L: 6641
- var22.sequenceId = var67; // L: 6642
- var22.modelFrame = 0; // L: 6643
- var22.modelFrameCycle = 0; // L: 6644
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 6645
- }
-
- var1.serverPacket = null; // L: 6647
- return true; // L: 6648
- }
-
- if (ServerPacket.field3119 == var1.serverPacket) { // L: 6650
- isCameraLocked = true; // L: 6651
- field742 = false; // L: 6652
- class267.field3206 = var3.readUnsignedByte(); // L: 6653
- AbstractWorldMapData.field2851 = var3.readUnsignedByte(); // L: 6654
- ScriptFrame.field457 = var3.readUnsignedShort(); // L: 6655
- class17.field88 = var3.readUnsignedByte(); // L: 6656
- PacketBufferNode.field3083 = var3.readUnsignedByte(); // L: 6657
- if (PacketBufferNode.field3083 >= 100) { // L: 6658
- var67 = class267.field3206 * 128 + 64; // L: 6659
- var5 = AbstractWorldMapData.field2851 * 128 + 64; // L: 6660
- var6 = class202.getTileHeight(var67, var5, class128.Client_plane) - ScriptFrame.field457; // L: 6661
- var27 = var67 - class343.cameraX; // L: 6662
- var28 = var6 - class295.cameraY; // L: 6663
- var9 = var5 - FaceNormal.cameraZ; // L: 6664
- var29 = (int)Math.sqrt((double)(var9 * var9 + var27 * var27)); // L: 6665
- GameEngine.cameraPitch = (int)(Math.atan2((double)var28, (double)var29) * 325.9490051269531D) & 2047; // L: 6666
- StudioGame.cameraYaw = (int)(Math.atan2((double)var27, (double)var9) * -325.9490051269531D) & 2047; // L: 6667
- if (GameEngine.cameraPitch < 128) { // L: 6668
- GameEngine.cameraPitch = 128;
- }
-
- if (GameEngine.cameraPitch > 383) { // L: 6669
- GameEngine.cameraPitch = 383;
- }
- }
-
- var1.serverPacket = null; // L: 6671
- return true; // L: 6672
- }
-
- if (ServerPacket.field3139 == var1.serverPacket) { // L: 6674
- World var50 = new World(); // L: 6675
- var50.host = var3.readStringCp1252NullTerminated(); // L: 6676
- var50.id = var3.readUnsignedShort(); // L: 6677
- var5 = var3.readInt(); // L: 6678
- var50.properties = var5; // L: 6679
- PendingSpawn.updateGameState(45); // L: 6680
- var2.close(); // L: 6681
- var2 = null; // L: 6682
- InvDefinition.changeWorld(var50); // L: 6683
- var1.serverPacket = null; // L: 6684
- return false; // L: 6685
- }
-
- if (ServerPacket.field3161 == var1.serverPacket) { // L: 6687
- var67 = var3.method7716(); // L: 6688
- ScriptFrame.method1066(var67); // L: 6689
- changedItemContainers[++field683 - 1 & 31] = var67 & 32767; // L: 6690
- var1.serverPacket = null; // L: 6691
- return true; // L: 6692
- }
-
- NPC var54;
- if (ServerPacket.field3123 == var1.serverPacket) { // L: 6694
- var6 = var3.method7716(); // L: 6699
- var67 = var3.readUnsignedShort(); // L: 6700
- var54 = npcs[var67]; // L: 6701
- var5 = var3.method7567(); // L: 6702
- if (var54 != null) { // L: 6703
- var54.spotAnimation = var6; // L: 6704
- var54.spotAnimationHeight = var5 >> 16; // L: 6705
- var54.field1185 = (var5 & 65535) + cycle; // L: 6706
- var54.spotAnimationFrame = 0; // L: 6707
- var54.spotAnimationFrameCycle = 0; // L: 6708
- if (var54.field1185 > cycle) { // L: 6709
- var54.spotAnimationFrame = -1; // L: 6710
- }
-
- if (var54.spotAnimation == 65535) { // L: 6712
- var54.spotAnimation = -1; // L: 6713
- }
- }
-
- var1.serverPacket = null; // L: 6716
- return true; // L: 6717
- }
-
- Widget var26;
- if (ServerPacket.field3153 == var1.serverPacket) { // L: 6719
- var67 = var3.method7716(); // L: 6720
- var5 = var3.method7716(); // L: 6721
- var6 = var3.method7568(); // L: 6722
- var27 = var3.method7554(); // L: 6723
- var26 = class92.getWidget(var6); // L: 6724
- if (var27 != var26.modelAngleX || var67 != var26.modelAngleY || var5 != var26.modelZoom) { // L: 6725
- var26.modelAngleX = var27; // L: 6726
- var26.modelAngleY = var67; // L: 6727
- var26.modelZoom = var5; // L: 6728
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var26); // L: 6729
- }
-
- var1.serverPacket = null; // L: 6731
- return true; // L: 6732
- }
-
- if (ServerPacket.field3106 == var1.serverPacket) { // L: 6734
- BufferedSource.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6735
- field689 = cycleCntr; // L: 6736
- var1.serverPacket = null; // L: 6737
- return true; // L: 6738
- }
-
- if (ServerPacket.field3172 == var1.serverPacket) { // L: 6740
- var67 = var3.method7576(); // L: 6745
- Player var56;
- if (var67 == localPlayerIndex) { // L: 6746
- var56 = ModelData0.localPlayer; // L: 6747
+ if (ServerPacket.field3062 == var1.serverPacket) { // L: 6720
+ var68 = var3.readUnsignedByte() == 1; // L: 6721
+ if (var68) { // L: 6722
+ class270.field3177 = class115.method2692() - var3.readLong(); // L: 6723
+ class143.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6724
} else {
- var56 = players[var67]; // L: 6750
+ class143.grandExchangeEvents = null; // L: 6726
}
- var6 = var3.readInt(); // L: 6752
- var5 = var3.method7716(); // L: 6753
- if (var56 != null) { // L: 6754
- var56.spotAnimation = var5; // L: 6755
- var56.spotAnimationHeight = var6 >> 16; // L: 6756
- var56.field1185 = (var6 & 65535) + cycle; // L: 6757
- var56.spotAnimationFrame = 0; // L: 6758
- var56.spotAnimationFrameCycle = 0; // L: 6759
- if (var56.field1185 > cycle) { // L: 6760
- var56.spotAnimationFrame = -1; // L: 6761
- }
+ field661 = cycleCntr; // L: 6727
+ var1.serverPacket = null; // L: 6728
+ return true; // L: 6729
+ }
- if (var56.spotAnimation == 65535) { // L: 6763
- var56.spotAnimation = -1; // L: 6764
+ if (ServerPacket.field3039 == var1.serverPacket) { // L: 6731
+ var20 = var3.readUnsignedByte(); // L: 6732
+ var5 = var3.readUnsignedByte(); // L: 6733
+ var6 = var3.readUnsignedByte(); // L: 6734
+ var7 = var3.readUnsignedByte(); // L: 6735
+ field743[var20] = true; // L: 6736
+ field762[var20] = var5; // L: 6737
+ field745[var20] = var6; // L: 6738
+ field537[var20] = var7; // L: 6739
+ field747[var20] = 0; // L: 6740
+ var1.serverPacket = null; // L: 6741
+ return true; // L: 6742
+ }
+
+ if (ServerPacket.field3061 == var1.serverPacket) { // L: 6744
+ destinationX = var3.readUnsignedByte(); // L: 6745
+ if (destinationX == 255) { // L: 6746
+ destinationX = 0;
+ }
+
+ destinationY = var3.readUnsignedByte(); // L: 6747
+ if (destinationY == 255) { // L: 6748
+ destinationY = 0;
+ }
+
+ var1.serverPacket = null; // L: 6749
+ return true; // L: 6750
+ }
+
+ if (ServerPacket.field3057 == var1.serverPacket) { // L: 6752
+ var5 = var3.readUnsignedShort(); // L: 6756
+ var20 = var3.method7774(); // L: 6757
+ var6 = var3.method7767(); // L: 6758
+ if (var5 == 65535) { // L: 6759
+ var5 = -1; // L: 6760
+ }
+
+ var69 = npcs[var20]; // L: 6762
+ if (var69 != null) { // L: 6763
+ if (var5 == var69.sequence && var5 != -1) { // L: 6764
+ var8 = ScriptFrame.SequenceDefinition_get(var5).field2174; // L: 6765
+ if (var8 == 1) { // L: 6766
+ var69.sequenceFrame = 0; // L: 6767
+ var69.sequenceFrameCycle = 0; // L: 6768
+ var69.sequenceDelay = var6; // L: 6769
+ var69.field1190 = 0; // L: 6770
+ } else if (var8 == 2) { // L: 6772
+ var69.field1190 = 0; // L: 6773
+ }
+ } else if (var5 == -1 || var69.sequence == -1 || ScriptFrame.SequenceDefinition_get(var5).field2183 >= ScriptFrame.SequenceDefinition_get(var69.sequence).field2183) { // L: 6776
+ var69.sequence = var5; // L: 6777
+ var69.sequenceFrame = 0; // L: 6778
+ var69.sequenceFrameCycle = 0; // L: 6779
+ var69.sequenceDelay = var6; // L: 6780
+ var69.field1190 = 0; // L: 6781
+ var69.field1203 = var69.pathLength; // L: 6782
}
}
- var1.serverPacket = null; // L: 6767
- return true; // L: 6768
+ var1.serverPacket = null; // L: 6786
+ return true; // L: 6787
}
- if (ServerPacket.field3118 == var1.serverPacket) { // L: 6770
- var67 = var3.method7576(); // L: 6771
- var5 = var3.method7701(); // L: 6772
- Varps.Varps_temp[var67] = var5; // L: 6773
- if (Varps.Varps_main[var67] != var5) { // L: 6774
- Varps.Varps_main[var67] = var5; // L: 6775
- }
-
- class321.changeGameOptions(var67); // L: 6777
- changedVarps[++changedVarpCount - 1 & 31] = var67; // L: 6778
- var1.serverPacket = null; // L: 6779
- return true; // L: 6780
+ if (ServerPacket.field3136 == var1.serverPacket) { // L: 6789
+ var51 = var3.readStringCp1252NullTerminated(); // L: 6790
+ var34 = AbstractFont.escapeBrackets(ArchiveDiskAction.method5777(class134.method2904(var3))); // L: 6791
+ class290.addGameMessage(6, var51, var34); // L: 6792
+ var1.serverPacket = null; // L: 6793
+ return true; // L: 6794
}
- if (ServerPacket.field3146 == var1.serverPacket) { // L: 6782
- minimapState = var3.readUnsignedByte(); // L: 6783
- var1.serverPacket = null; // L: 6784
- return true; // L: 6785
- }
+ if (ServerPacket.field3142 == var1.serverPacket) { // L: 6796
+ class10.field53 = var3.method7766(); // L: 6797
+ class298.field3558 = var3.method7767(); // L: 6798
- if (ServerPacket.field3154 == var1.serverPacket) { // L: 6787
- Occluder.method4222(class263.field3062); // L: 6788
- var1.serverPacket = null; // L: 6789
- return true; // L: 6790
- }
-
- if (ServerPacket.field3121 == var1.serverPacket) { // L: 6792
- var67 = var3.readShort(); // L: 6793
- var5 = var3.method7567(); // L: 6794
- var6 = var3.method7522(); // L: 6795
- var55 = class92.getWidget(var5); // L: 6796
- if (var67 != var55.rawX || var6 != var55.rawY || var55.xAlignment != 0 || var55.yAlignment != 0) { // L: 6797
- var55.rawX = var67; // L: 6798
- var55.rawY = var6; // L: 6799
- var55.xAlignment = 0; // L: 6800
- var55.yAlignment = 0; // L: 6801
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var55); // L: 6802
- this.alignWidget(var55); // L: 6803
- if (var55.type == 0) { // L: 6804
- UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var5 >> 16], var55, false);
+ for (var20 = class10.field53; var20 < class10.field53 + 8; ++var20) { // L: 6799
+ for (var5 = class298.field3558; var5 < class298.field3558 + 8; ++var5) { // L: 6800
+ if (groundItems[PacketWriter.Client_plane][var20][var5] != null) { // L: 6801
+ groundItems[PacketWriter.Client_plane][var20][var5] = null; // L: 6802
+ class133.updateItemPile(var20, var5); // L: 6803
+ }
}
}
- var1.serverPacket = null; // L: 6806
- return true; // L: 6807
+ for (PendingSpawn var53 = (PendingSpawn)pendingSpawns.last(); var53 != null; var53 = (PendingSpawn)pendingSpawns.previous()) { // L: 6807 6808 6810
+ if (var53.x >= class10.field53 && var53.x < class10.field53 + 8 && var53.y >= class298.field3558 && var53.y < class298.field3558 + 8 && var53.plane == PacketWriter.Client_plane) { // L: 6809
+ var53.hitpoints = 0;
+ }
+ }
+
+ var1.serverPacket = null; // L: 6812
+ return true; // L: 6813
}
- if (ServerPacket.field3180 == var1.serverPacket) { // L: 6809
- HorizontalAlignment.updateNpcs(true, var3); // L: 6810
- var1.serverPacket = null; // L: 6811
- return true; // L: 6812
+ if (ServerPacket.field3125 == var1.serverPacket) { // L: 6815
+ WorldMapSprite.method4998(class262.field3018); // L: 6816
+ var1.serverPacket = null; // L: 6817
+ return true; // L: 6818
}
- int var38;
- int var40;
- if (ServerPacket.field3085 == var1.serverPacket) { // L: 6814
- byte var61 = var3.readByte(); // L: 6830
- var38 = var3.method7716(); // L: 6831
- var6 = var3.method7561(); // L: 6832
- var67 = var6 >> 16; // L: 6833
- var5 = var6 >> 8 & 255; // L: 6834
- var27 = var67 + (var6 >> 4 & 7); // L: 6835
- var28 = var5 + (var6 & 7); // L: 6836
- var86 = var3.method7558(); // L: 6837
- int var18 = var3.readUnsignedByte(); // L: 6838
- byte var85 = var3.method7547(); // L: 6839
- var40 = var3.method7546() * 4; // L: 6840
- var16 = var3.method7716(); // L: 6841
- int var17 = var3.method7545(); // L: 6842
- var15 = var3.method7716(); // L: 6843
- var13 = var3.readUnsignedByte() * 4; // L: 6844
- var9 = var61 + var27; // L: 6845
- var29 = var85 + var28; // L: 6846
- if (var27 >= 0 && var28 >= 0 && var27 < 104 && var28 < 104 && var9 >= 0 && var29 >= 0 && var9 < 104 && var29 < 104 && var38 != 65535) { // L: 6847
- var27 = var27 * 128 + 64; // L: 6848
- var28 = var28 * 128 + 64; // L: 6849
- var9 = var9 * 128 + 64; // L: 6850
- var29 = var29 * 128 + 64; // L: 6851
- Projectile var19 = new Projectile(var38, class128.Client_plane, var27, var28, class202.getTileHeight(var27, var28, class128.Client_plane) - var13, var15 + cycle, var16 + cycle, var17, var18, var86, var40); // L: 6852
- var19.setDestination(var9, var29, class202.getTileHeight(var9, var29, class128.Client_plane) - var40, var15 + cycle); // L: 6853
- projectiles.addFirst(var19); // L: 6854
+ if (ServerPacket.field3081 == var1.serverPacket) { // L: 6820
+ var20 = var3.method7776(); // L: 6821
+ var5 = var3.method7785(); // L: 6822
+ Varps.Varps_temp[var20] = var5; // L: 6823
+ if (Varps.Varps_main[var20] != var5) { // L: 6824
+ Varps.Varps_main[var20] = var5; // L: 6825
+ }
+
+ class306.changeGameOptions(var20); // L: 6827
+ changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 6828
+ var1.serverPacket = null; // L: 6829
+ return true; // L: 6830
+ }
+
+ if (ServerPacket.field3080 == var1.serverPacket) { // L: 6832
+ var20 = var3.method7787(); // L: 6833
+ var83 = class140.getWidget(var20); // L: 6834
+
+ for (var6 = 0; var6 < var83.itemIds.length; ++var6) { // L: 6835
+ var83.itemIds[var6] = -1; // L: 6836
+ var83.itemIds[var6] = 0; // L: 6837
+ }
+
+ ChatChannel.invalidateWidget(var83); // L: 6839
+ var1.serverPacket = null; // L: 6840
+ return true; // L: 6841
+ }
+
+ if (ServerPacket.field3037 == var1.serverPacket) { // L: 6843
+ var20 = var3.method7787(); // L: 6844
+ var5 = var3.method7774(); // L: 6845
+ if (var5 == 65535) { // L: 6846
+ var5 = -1;
+ }
+
+ var6 = var3.method7786(); // L: 6847
+ var7 = var3.method7775(); // L: 6848
+ if (var7 == 65535) { // L: 6849
+ var7 = -1;
+ }
+
+ for (var8 = var7; var8 <= var5; ++var8) { // L: 6850
+ var26 = (long)var8 + ((long)var6 << 32); // L: 6851
+ Node var28 = widgetFlags.get(var26); // L: 6852
+ if (var28 != null) { // L: 6853
+ var28.remove();
+ }
+
+ widgetFlags.put(new IntegerNode(var20), var26); // L: 6854
}
var1.serverPacket = null; // L: 6856
return true; // L: 6857
}
- if (ServerPacket.field3111 == var1.serverPacket) { // L: 6859
- var67 = var3.readUnsignedByte(); // L: 6860
- Varcs.forceDisconnect(var67); // L: 6861
- var1.serverPacket = null; // L: 6862
- return false; // L: 6863
+ if (ServerPacket.field3107 == var1.serverPacket) { // L: 6859
+ MouseRecorder.logOut(); // L: 6860
+ var1.serverPacket = null; // L: 6861
+ return false; // L: 6862
}
- if (ServerPacket.field3179 == var1.serverPacket) { // L: 6865
- var84 = var3.readUnsignedByte() == 1; // L: 6866
- if (var84) { // L: 6867
- UserComparator8.field1380 = class113.method2624() - var3.readLong(); // L: 6868
- class120.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6869
- } else {
- class120.grandExchangeEvents = null; // L: 6871
- }
-
- field512 = cycleCntr; // L: 6872
- var1.serverPacket = null; // L: 6873
- return true; // L: 6874
+ if (ServerPacket.field3117 == var1.serverPacket) { // L: 6864
+ var20 = var3.method7786(); // L: 6865
+ var5 = var3.method7776(); // L: 6866
+ var6 = var3.readUnsignedShort(); // L: 6867
+ var21 = class140.getWidget(var20); // L: 6868
+ var21.field3373 = var5 + (var6 << 16); // L: 6869
+ var1.serverPacket = null; // L: 6870
+ return true; // L: 6871
}
- long var41;
- if (ServerPacket.field3171 == var1.serverPacket) { // L: 6876
- var67 = var3.method7701(); // L: 6877
- var5 = var3.method7716(); // L: 6878
- if (var5 == 65535) { // L: 6879
- var5 = -1;
+ if (ServerPacket.field3101 == var1.serverPacket) { // L: 6873
+ var20 = var3.readUnsignedShort(); // L: 6874
+ if (var20 == 65535) { // L: 6875
+ var20 = -1;
}
- var6 = var3.method7701(); // L: 6880
- var27 = var3.method7576(); // L: 6881
- if (var27 == 65535) { // L: 6882
- var27 = -1;
- }
-
- for (var28 = var27; var28 <= var5; ++var28) { // L: 6883
- var41 = ((long)var67 << 32) + (long)var28; // L: 6884
- Node var90 = widgetFlags.get(var41); // L: 6885
- if (var90 != null) { // L: 6886
- var90.remove();
- }
-
- widgetFlags.put(new IntegerNode(var6), var41); // L: 6887
- }
-
- var1.serverPacket = null; // L: 6889
- return true; // L: 6890
+ class16.playSong(var20); // L: 6876
+ var1.serverPacket = null; // L: 6877
+ return true; // L: 6878
}
- if (ServerPacket.field3130 == var1.serverPacket) { // L: 6892
- var5 = var3.readUnsignedShort(); // L: 6896
- var6 = var3.method7546(); // L: 6897
- var67 = var3.method7554(); // L: 6898
- if (var5 == 65535) { // L: 6899
- var5 = -1; // L: 6900
+ if (ServerPacket.field3059 == var1.serverPacket) { // L: 6880
+ var20 = var3.method7775(); // L: 6881
+ if (var20 == 65535) { // L: 6882
+ var20 = -1;
}
- var54 = npcs[var67]; // L: 6902
- if (var54 != null) { // L: 6903
- if (var5 == var54.sequence && var5 != -1) { // L: 6904
- var28 = class114.SequenceDefinition_get(var5).field2208; // L: 6905
- if (var28 == 1) { // L: 6906
- var54.sequenceFrame = 0; // L: 6907
- var54.sequenceFrameCycle = 0; // L: 6908
- var54.sequenceDelay = var6; // L: 6909
- var54.field1186 = 0; // L: 6910
- } else if (var28 == 2) { // L: 6912
- var54.field1186 = 0; // L: 6913
- }
- } else if (var5 == -1 || var54.sequence == -1 || class114.SequenceDefinition_get(var5).field2220 >= class114.SequenceDefinition_get(var54.sequence).field2220) { // L: 6916
- var54.sequence = var5; // L: 6917
- var54.sequenceFrame = 0; // L: 6918
- var54.sequenceFrameCycle = 0; // L: 6919
- var54.sequenceDelay = var6; // L: 6920
- var54.field1186 = 0; // L: 6921
- var54.field1200 = var54.pathLength; // L: 6922
- }
- }
-
- var1.serverPacket = null; // L: 6926
- return true; // L: 6927
+ var5 = var3.method7848(); // L: 6883
+ PcmPlayer.method719(var20, var5); // L: 6884
+ var1.serverPacket = null; // L: 6885
+ return true; // L: 6886
}
- if (ServerPacket.field3144 == var1.serverPacket) { // L: 6929
- class145.field1690 = var3.method7593(); // L: 6930
- class321.field4076 = var3.readUnsignedByte(); // L: 6931
-
- for (var67 = class145.field1690; var67 < class145.field1690 + 8; ++var67) { // L: 6932
- for (var5 = class321.field4076; var5 < class321.field4076 + 8; ++var5) { // L: 6933
- if (groundItems[class128.Client_plane][var67][var5] != null) { // L: 6934
- groundItems[class128.Client_plane][var67][var5] = null; // L: 6935
- Frames.updateItemPile(var67, var5); // L: 6936
- }
- }
- }
-
- for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { // L: 6940 6941 6943
- if (var49.x >= class145.field1690 && var49.x < class145.field1690 + 8 && var49.y >= class321.field4076 && var49.y < class321.field4076 + 8 && var49.plane == class128.Client_plane) { // L: 6942
- var49.hitpoints = 0;
- }
- }
-
- var1.serverPacket = null; // L: 6945
- return true; // L: 6946
+ if (ServerPacket.field3072 == var1.serverPacket) { // L: 6888
+ FontName.field4584 = null; // L: 6889
+ var1.serverPacket = null; // L: 6890
+ return true; // L: 6891
}
- if (ServerPacket.field3127 == var1.serverPacket) { // L: 6948
- rebootTimer = var3.method7554() * 30; // L: 6949
- field695 = cycleCntr; // L: 6950
- var1.serverPacket = null; // L: 6951
- return true; // L: 6952
- }
-
- InterfaceParent var7;
- long var44;
- if (ServerPacket.field3125 == var1.serverPacket) { // L: 6954
- var67 = var3.offset + var1.serverPacketLength; // L: 6955
- var5 = var3.readUnsignedShort(); // L: 6956
- var6 = var3.readUnsignedShort(); // L: 6957
- if (var5 != rootInterface) { // L: 6958
- rootInterface = var5; // L: 6959
- this.resizeRoot(false); // L: 6960
- GraphicsDefaults.Widget_resetModelFrames(rootInterface); // L: 6961
- AbstractWorldMapData.runWidgetOnLoadListener(rootInterface); // L: 6962
-
- for (var27 = 0; var27 < 100; ++var27) { // L: 6963
- field652[var27] = true;
- }
- }
-
- InterfaceParent var57;
- for (; var6-- > 0; var57.field1034 = true) { // L: 6965 6975
- var27 = var3.readInt(); // L: 6966
- var28 = var3.readUnsignedShort(); // L: 6967
- var9 = var3.readUnsignedByte(); // L: 6968
- var57 = (InterfaceParent)interfaceParents.get((long)var27); // L: 6969
- if (var57 != null && var28 != var57.group) { // L: 6970
- NetSocket.closeInterface(var57, true); // L: 6971
- var57 = null; // L: 6972
- }
-
- if (var57 == null) { // L: 6974
- var57 = class241.method4812(var27, var28, var9);
- }
- }
-
- for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { // L: 6977
- if (var7.field1034) { // L: 6978
- var7.field1034 = false;
+ if (ServerPacket.field3131 == var1.serverPacket) { // L: 6893
+ UserComparator5.method2586(); // L: 6894
+ var65 = var3.readByte(); // L: 6895
+ if (var1.serverPacketLength == 1) { // L: 6896
+ if (var65 >= 0) { // L: 6897
+ currentClanSettings[var65] = null;
} else {
- NetSocket.closeInterface(var7, true); // L: 6980
+ HealthBar.guestClanSettings = null; // L: 6898
}
+
+ var1.serverPacket = null; // L: 6899
+ return true; // L: 6900
}
- widgetFlags = new NodeHashTable(512); // L: 6983
-
- while (var3.offset < var67) { // L: 6984
- var27 = var3.readInt(); // L: 6985
- var28 = var3.readUnsignedShort(); // L: 6986
- var9 = var3.readUnsignedShort(); // L: 6987
- var29 = var3.readInt(); // L: 6988
-
- for (var86 = var28; var86 <= var9; ++var86) { // L: 6989
- var44 = ((long)var27 << 32) + (long)var86; // L: 6990
- widgetFlags.put(new IntegerNode(var29), var44); // L: 6991
- }
- }
-
- var1.serverPacket = null; // L: 6994
- return true; // L: 6995
- }
-
- if (ServerPacket.field3167 == var1.serverPacket) { // L: 6997
- Occluder.method4222(class263.field3068); // L: 6998
- var1.serverPacket = null; // L: 6999
- return true; // L: 7000
- }
-
- if (ServerPacket.field3159 == var1.serverPacket) { // L: 7002
- for (var67 = 0; var67 < VarpDefinition.VarpDefinition_fileCount; ++var67) { // L: 7003
- VarpDefinition var73 = class21.VarpDefinition_get(var67); // L: 7004
- if (var73 != null) { // L: 7005
- Varps.Varps_temp[var67] = 0; // L: 7006
- Varps.Varps_main[var67] = 0; // L: 7007
- }
- }
-
- class119.method2737(); // L: 7010
- changedVarpCount += 32; // L: 7011
- var1.serverPacket = null; // L: 7012
- return true; // L: 7013
- }
-
- if (ServerPacket.field3135 == var1.serverPacket) { // L: 7015
- Occluder.method4222(class263.field3064); // L: 7016
- var1.serverPacket = null; // L: 7017
- return true; // L: 7018
- }
-
- if (ServerPacket.field3102 == var1.serverPacket) { // L: 7020
- if (rootInterface != -1) { // L: 7021
- WorldMapLabelSize.runIntfCloseListeners(rootInterface, 0);
- }
-
- var1.serverPacket = null; // L: 7022
- return true; // L: 7023
- }
-
- if (ServerPacket.field3136 == var1.serverPacket) { // L: 7025
- class144.loadRegions(true, var1.packetBuffer); // L: 7026
- var1.serverPacket = null; // L: 7027
- return true; // L: 7028
- }
-
- if (ServerPacket.field3088 == var1.serverPacket) { // L: 7030
- var67 = var3.readUnsignedByte(); // L: 7031
- if (var3.readUnsignedByte() == 0) { // L: 7032
- grandExchangeOffers[var67] = new GrandExchangeOffer(); // L: 7033
- var3.offset += 18; // L: 7034
+ if (var65 >= 0) { // L: 6902
+ currentClanSettings[var65] = new ClanSettings(var3); // L: 6903
} else {
- --var3.offset; // L: 7037
- grandExchangeOffers[var67] = new GrandExchangeOffer(var3, false); // L: 7038
+ HealthBar.guestClanSettings = new ClanSettings(var3); // L: 6906
}
- field762 = cycleCntr; // L: 7040
- var1.serverPacket = null; // L: 7041
- return true; // L: 7042
+ var1.serverPacket = null; // L: 6908
+ return true; // L: 6909
}
- if (ServerPacket.field3110 == var1.serverPacket) { // L: 7044
- for (var67 = 0; var67 < Varps.Varps_main.length; ++var67) { // L: 7045
- if (Varps.Varps_main[var67] != Varps.Varps_temp[var67]) { // L: 7046
- Varps.Varps_main[var67] = Varps.Varps_temp[var67]; // L: 7047
- class321.changeGameOptions(var67); // L: 7048
- changedVarps[++changedVarpCount - 1 & 31] = var67; // L: 7049
+ if (ServerPacket.field3040 == var1.serverPacket) { // L: 6911
+ WorldMapSprite.method4998(class262.field3020); // L: 6912
+ var1.serverPacket = null; // L: 6913
+ return true; // L: 6914
+ }
+
+ if (ServerPacket.field3055 == var1.serverPacket) { // L: 6916
+ if (rootInterface != -1) { // L: 6917
+ class7.runIntfCloseListeners(rootInterface, 0);
+ }
+
+ var1.serverPacket = null; // L: 6918
+ return true; // L: 6919
+ }
+
+ if (ServerPacket.field3109 == var1.serverPacket) { // L: 6921
+ class4.method12(var3.readStringCp1252NullTerminated()); // L: 6922
+ var1.serverPacket = null; // L: 6923
+ return true; // L: 6924
+ }
+
+ if (ServerPacket.field3076 == var1.serverPacket) { // L: 6926
+ FontName.field4584 = new class391(ModeWhere.HitSplatDefinition_cached); // L: 6927
+ var1.serverPacket = null; // L: 6928
+ return true; // L: 6929
+ }
+
+ if (ServerPacket.field3074 == var1.serverPacket) { // L: 6931
+ var20 = var3.method7776(); // L: 6932
+ var5 = var3.method7775(); // L: 6933
+ var6 = var3.method7786(); // L: 6934
+ var7 = var3.method7775(); // L: 6935
+ var77 = class140.getWidget(var6); // L: 6936
+ if (var7 != var77.modelAngleX || var5 != var77.modelAngleY || var20 != var77.modelZoom) { // L: 6937
+ var77.modelAngleX = var7; // L: 6938
+ var77.modelAngleY = var5; // L: 6939
+ var77.modelZoom = var20; // L: 6940
+ ChatChannel.invalidateWidget(var77); // L: 6941
+ }
+
+ var1.serverPacket = null; // L: 6943
+ return true; // L: 6944
+ }
+
+ if (ServerPacket.field3114 == var1.serverPacket) { // L: 6946
+ var51 = var3.readStringCp1252NullTerminated(); // L: 6947
+ var5 = var3.method7766(); // L: 6948
+ var6 = var3.method7766(); // L: 6949
+ if (var6 >= 1 && var6 <= 8) { // L: 6950
+ if (var51.equalsIgnoreCase("null")) { // L: 6951
+ var51 = null;
}
+
+ playerMenuActions[var6 - 1] = var51; // L: 6952
+ playerOptionsPriorities[var6 - 1] = var5 == 0; // L: 6953
}
- var1.serverPacket = null; // L: 7052
- return true; // L: 7053
+ var1.serverPacket = null; // L: 6955
+ return true; // L: 6956
}
- if (ServerPacket.field3178 == var1.serverPacket) { // L: 7055
- Occluder.method4222(class263.field3060); // L: 7056
- var1.serverPacket = null; // L: 7057
- return true; // L: 7058
- }
-
- if (ServerPacket.field3117 == var1.serverPacket) { // L: 7060
- var67 = var3.readUnsignedShort(); // L: 7061
- var5 = var3.readUnsignedByte(); // L: 7062
- var6 = var3.readUnsignedShort(); // L: 7063
- WorldMapLabelSize.queueSoundEffect(var67, var5, var6); // L: 7064
- var1.serverPacket = null; // L: 7065
- return true; // L: 7066
- }
-
- if (ServerPacket.field3114 == var1.serverPacket) { // L: 7068
- var67 = var3.readInt(); // L: 7069
- var5 = var3.readUnsignedShort(); // L: 7070
- if (var67 < -70000) { // L: 7071
+ if (ServerPacket.field3042 == var1.serverPacket) { // L: 6958
+ var20 = var3.readInt(); // L: 6959
+ var5 = var3.readUnsignedShort(); // L: 6960
+ if (var20 < -70000) { // L: 6961
var5 += 32768;
}
- if (var67 >= 0) { // L: 7073
- var22 = class92.getWidget(var67);
+ if (var20 >= 0) { // L: 6963
+ var74 = class140.getWidget(var20);
} else {
- var22 = null; // L: 7074
+ var74 = null; // L: 6964
}
- if (var22 != null) { // L: 7075
- for (var27 = 0; var27 < var22.itemIds.length; ++var27) { // L: 7076
- var22.itemIds[var27] = 0; // L: 7077
- var22.itemQuantities[var27] = 0; // L: 7078
- }
- }
-
- class29.clearItemContainer(var5); // L: 7081
- var27 = var3.readUnsignedShort(); // L: 7082
-
- for (var28 = 0; var28 < var27; ++var28) { // L: 7083
- var9 = var3.readUnsignedByte(); // L: 7084
- if (var9 == 255) { // L: 7085
- var9 = var3.method7568();
- }
-
- var29 = var3.method7716(); // L: 7086
- if (var22 != null && var28 < var22.itemIds.length) { // L: 7087 7088
- var22.itemIds[var28] = var29; // L: 7089
- var22.itemQuantities[var28] = var9; // L: 7090
- }
-
- InvDefinition.itemContainerSetItem(var5, var28, var29 - 1, var9); // L: 7093
- }
-
- if (var22 != null) { // L: 7095
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22);
- }
-
- class119.method2737(); // L: 7096
- changedItemContainers[++field683 - 1 & 31] = var5 & 32767; // L: 7097
- var1.serverPacket = null; // L: 7098
- return true; // L: 7099
- }
-
- if (ServerPacket.field3173 == var1.serverPacket) { // L: 7101
- class175.method3373(); // L: 7102
- var20 = var3.readByte(); // L: 7103
- class131 var71 = new class131(var3); // L: 7104
- ClanSettings var79;
- if (var20 >= 0) { // L: 7106
- var79 = currentClanSettings[var20];
- } else {
- var79 = class358.guestClanSettings; // L: 7107
- }
-
- var71.method2822(var79); // L: 7108
- var1.serverPacket = null; // L: 7109
- return true; // L: 7110
- }
-
- if (ServerPacket.field3094 == var1.serverPacket) { // L: 7112
- class21.privateChatMode = class116.method2686(var3.readUnsignedByte()); // L: 7113
- var1.serverPacket = null; // L: 7114
- return true; // L: 7115
- }
-
- if (ServerPacket.field3145 == var1.serverPacket) { // L: 7117
- var67 = var3.readInt(); // L: 7118
- var5 = var3.readUnsignedShort(); // L: 7119
- if (var67 < -70000) { // L: 7120
- var5 += 32768;
- }
-
- if (var67 >= 0) { // L: 7122
- var22 = class92.getWidget(var67);
- } else {
- var22 = null; // L: 7123
- }
-
- for (; var3.offset < var1.serverPacketLength; InvDefinition.itemContainerSetItem(var5, var27, var28 - 1, var9)) { // L: 7124 7138
- var27 = var3.readUShortSmart(); // L: 7125
- var28 = var3.readUnsignedShort(); // L: 7126
- var9 = 0; // L: 7127
- if (var28 != 0) { // L: 7128
- var9 = var3.readUnsignedByte(); // L: 7129
- if (var9 == 255) { // L: 7130
+ for (; var3.offset < var1.serverPacketLength; ReflectionCheck.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6965 6979
+ var7 = var3.readUShortSmart(); // L: 6966
+ var8 = var3.readUnsignedShort(); // L: 6967
+ var9 = 0; // L: 6968
+ if (var8 != 0) { // L: 6969
+ var9 = var3.readUnsignedByte(); // L: 6970
+ if (var9 == 255) { // L: 6971
var9 = var3.readInt();
}
}
- if (var22 != null && var27 >= 0 && var27 < var22.itemIds.length) { // L: 7132 7133
- var22.itemIds[var27] = var28; // L: 7134
- var22.itemQuantities[var27] = var9; // L: 7135
+ if (var74 != null && var7 >= 0 && var7 < var74.itemIds.length) { // L: 6973 6974
+ var74.itemIds[var7] = var8; // L: 6975
+ var74.itemQuantities[var7] = var9; // L: 6976
}
}
- if (var22 != null) { // L: 7140
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22);
+ if (var74 != null) { // L: 6981
+ ChatChannel.invalidateWidget(var74);
}
- class119.method2737(); // L: 7141
- changedItemContainers[++field683 - 1 & 31] = var5 & 32767; // L: 7142
- var1.serverPacket = null; // L: 7143
- return true; // L: 7144
+ GraphicsObject.method1870(); // L: 6982
+ changedItemContainers[++field683 - 1 & 31] = var5 & 32767; // L: 6983
+ var1.serverPacket = null; // L: 6984
+ return true; // L: 6985
}
- if (ServerPacket.field3120 == var1.serverPacket) { // L: 7146
- var67 = var3.readUShortSmart(); // L: 7147
- boolean var53 = var3.readUnsignedByte() == 1; // L: 7148
- var76 = ""; // L: 7149
- boolean var82 = false; // L: 7150
- if (var53) { // L: 7151
- var76 = var3.readStringCp1252NullTerminated(); // L: 7152
- if (BufferedSource.friendSystem.isIgnored(new Username(var76, class391.loginType))) { // L: 7153
- var82 = true;
+ if (ServerPacket.field3138 == var1.serverPacket) { // L: 6987
+ var20 = var3.method7786(); // L: 6988
+ var5 = var3.method7775(); // L: 6989
+ var74 = class140.getWidget(var20); // L: 6990
+ if (var74.modelType != 2 || var5 != var74.modelId) { // L: 6991
+ var74.modelType = 2; // L: 6992
+ var74.modelId = var5; // L: 6993
+ ChatChannel.invalidateWidget(var74); // L: 6994
+ }
+
+ var1.serverPacket = null; // L: 6996
+ return true; // L: 6997
+ }
+
+ if (ServerPacket.field3126 == var1.serverPacket) { // L: 6999
+ var20 = var3.readUnsignedShort(); // L: 7000
+ var5 = var3.method7785(); // L: 7001
+ var74 = class140.getWidget(var5); // L: 7002
+ if (var74.modelType != 1 || var20 != var74.modelId) { // L: 7003
+ var74.modelType = 1; // L: 7004
+ var74.modelId = var20; // L: 7005
+ ChatChannel.invalidateWidget(var74); // L: 7006
+ }
+
+ var1.serverPacket = null; // L: 7008
+ return true; // L: 7009
+ }
+
+ if (ServerPacket.field3041 == var1.serverPacket) { // L: 7011
+ var20 = var3.method7776(); // L: 7012
+ var5 = var3.method7786(); // L: 7013
+ var6 = var20 >> 10 & 31; // L: 7014
+ var7 = var20 >> 5 & 31; // L: 7015
+ var8 = var20 & 31; // L: 7016
+ var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 7017
+ Widget var72 = class140.getWidget(var5); // L: 7018
+ if (var9 != var72.color) { // L: 7019
+ var72.color = var9; // L: 7020
+ ChatChannel.invalidateWidget(var72); // L: 7021
+ }
+
+ var1.serverPacket = null; // L: 7023
+ return true; // L: 7024
+ }
+
+ String var40;
+ if (ServerPacket.field3083 == var1.serverPacket) { // L: 7026
+ var51 = var3.readStringCp1252NullTerminated(); // L: 7027
+ var22 = (long)var3.readUnsignedShort(); // L: 7028
+ var24 = (long)var3.readMedium(); // L: 7029
+ PlayerType var37 = (PlayerType)Actor.findEnumerated(SoundSystem.PlayerType_values(), var3.readUnsignedByte()); // L: 7030
+ long var38 = var24 + (var22 << 32); // L: 7031
+ boolean var84 = false; // L: 7032
+
+ for (var13 = 0; var13 < 100; ++var13) { // L: 7033
+ if (crossWorldMessageIds[var13] == var38) { // L: 7034
+ var84 = true; // L: 7035
+ break; // L: 7036
}
}
- String var80 = var3.readStringCp1252NullTerminated(); // L: 7155
- if (!var82) { // L: 7156
- WorldMapEvent.addGameMessage(var67, var76, var80);
+ if (Player.friendSystem.isIgnored(new Username(var51, HealthBarDefinition.loginType))) { // L: 7039
+ var84 = true;
}
- var1.serverPacket = null; // L: 7157
- return true; // L: 7158
- }
-
- if (ServerPacket.field3133 == var1.serverPacket) { // L: 7160
- var67 = var3.method7716(); // L: 7161
- rootInterface = var67; // L: 7162
- this.resizeRoot(false); // L: 7163
- GraphicsDefaults.Widget_resetModelFrames(var67); // L: 7164
- AbstractWorldMapData.runWidgetOnLoadListener(rootInterface); // L: 7165
-
- for (var5 = 0; var5 < 100; ++var5) { // L: 7166
- field652[var5] = true;
- }
-
- var1.serverPacket = null; // L: 7167
- return true; // L: 7168
- }
-
- if (ServerPacket.field3124 == var1.serverPacket) { // L: 7170
- var13 = var3.method7554(); // L: 7181
- var9 = var3.method7545(); // L: 7182
- var29 = var9 >> 2; // L: 7183
- var86 = var9 & 3; // L: 7184
- var38 = field553[var29]; // L: 7185
- var6 = var3.method7544(); // L: 7186
- var67 = var6 >> 16; // L: 7187
- var5 = var6 >> 8 & 255; // L: 7188
- var27 = var67 + (var6 >> 4 & 7); // L: 7189
- var28 = var5 + (var6 & 7); // L: 7190
- if (var27 >= 0 && var28 >= 0 && var27 < 103 && var28 < 103) { // L: 7191
- if (var38 == 0) { // L: 7192
- BoundaryObject var65 = class175.scene.method4147(class128.Client_plane, var27, var28); // L: 7193
- if (var65 != null) { // L: 7194
- var15 = NetSocket.Entity_unpackID(var65.tag); // L: 7195
- if (var29 == 2) { // L: 7196
- var65.renderable1 = new DynamicObject(var15, 2, var86 + 4, class128.Client_plane, var27, var28, var13, false, var65.renderable1); // L: 7197
- var65.renderable2 = new DynamicObject(var15, 2, var86 + 1 & 3, class128.Client_plane, var27, var28, var13, false, var65.renderable2); // L: 7198
- } else {
- var65.renderable1 = new DynamicObject(var15, var29, var86, class128.Client_plane, var27, var28, var13, false, var65.renderable1); // L: 7200
- }
- }
- } else if (var38 == 1) { // L: 7203
- WallDecoration var63 = class175.scene.method4049(class128.Client_plane, var27, var28); // L: 7204
- if (var63 != null) { // L: 7205
- var15 = NetSocket.Entity_unpackID(var63.tag); // L: 7206
- if (var29 != 4 && var29 != 5) { // L: 7207
- if (var29 == 6) { // L: 7210
- var63.renderable1 = new DynamicObject(var15, 4, var86 + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7211
- } else if (var29 == 7) { // L: 7213
- var63.renderable1 = new DynamicObject(var15, 4, (var86 + 2 & 3) + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7214
- } else if (var29 == 8) { // L: 7216
- var63.renderable1 = new DynamicObject(var15, 4, var86 + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7217
- var63.renderable2 = new DynamicObject(var15, 4, (var86 + 2 & 3) + 4, class128.Client_plane, var27, var28, var13, false, var63.renderable2); // L: 7218
- }
- } else {
- var63.renderable1 = new DynamicObject(var15, 4, var86, class128.Client_plane, var27, var28, var13, false, var63.renderable1); // L: 7208
- }
- }
- } else if (var38 == 2) { // L: 7222
- var14 = class175.scene.getGameObject(class128.Client_plane, var27, var28); // L: 7223
- if (var29 == 11) { // L: 7224
- var29 = 10; // L: 7225
- }
-
- if (var14 != null) { // L: 7227
- var14.renderable = new DynamicObject(NetSocket.Entity_unpackID(var14.tag), var29, var86, class128.Client_plane, var27, var28, var13, false, var14.renderable); // L: 7228
- }
- } else if (var38 == 3) { // L: 7231
- FloorDecoration var62 = class175.scene.getFloorDecoration(class128.Client_plane, var27, var28); // L: 7232
- if (var62 != null) { // L: 7233
- var62.renderable = new DynamicObject(NetSocket.Entity_unpackID(var62.tag), 22, var86, class128.Client_plane, var27, var28, var13, false, var62.renderable); // L: 7234
- }
- }
- }
-
- var1.serverPacket = null; // L: 7238
- return true; // L: 7239
- }
-
- if (ServerPacket.field3105 == var1.serverPacket) { // L: 7241
- class321.field4076 = var3.readUnsignedByte(); // L: 7242
- class145.field1690 = var3.method7545(); // L: 7243
- var1.serverPacket = null; // L: 7244
- return true; // L: 7245
- }
-
- if (ServerPacket.field3164 == var1.serverPacket) { // L: 7247
- class1.updatePlayers(var3, var1.serverPacketLength); // L: 7248
- class101.method2552(); // L: 7249
- var1.serverPacket = null; // L: 7250
- return true; // L: 7251
- }
-
- Widget var68;
- if (ServerPacket.field3156 == var1.serverPacket) { // L: 7253
- var67 = var3.method7701(); // L: 7254
- var68 = class92.getWidget(var67); // L: 7255
- var68.modelType = 3; // L: 7256
- var68.modelId = ModelData0.localPlayer.appearance.getChatHeadId(); // L: 7257
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var68); // L: 7258
- var1.serverPacket = null; // L: 7259
- return true; // L: 7260
- }
-
- if (ServerPacket.field3176 == var1.serverPacket) { // L: 7262
- SecureRandomCallable.logOut(); // L: 7263
- var1.serverPacket = null; // L: 7264
- return false; // L: 7265
- }
-
- if (ServerPacket.field3181 == var1.serverPacket) { // L: 7267
- field692 = cycleCntr; // L: 7268
- var20 = var3.readByte(); // L: 7269
- class145 var69 = new class145(var3); // L: 7270
- ClanChannel var72;
- if (var20 >= 0) { // L: 7272
- var72 = currentClanChannels[var20];
- } else {
- var72 = UserComparator10.guestClanChannel; // L: 7273
- }
-
- var69.method2987(var72); // L: 7274
- var1.serverPacket = null; // L: 7275
- return true; // L: 7276
- }
-
- if (ServerPacket.field3143 == var1.serverPacket) { // L: 7278
- Occluder.method4222(class263.field3063); // L: 7279
- var1.serverPacket = null; // L: 7280
- return true; // L: 7281
- }
-
- if (ServerPacket.field3188 == var1.serverPacket) { // L: 7283
- var67 = var3.method7554(); // L: 7284
- var5 = var3.method7593(); // L: 7285
- var6 = var3.method7567(); // L: 7286
- var7 = (InterfaceParent)interfaceParents.get((long)var6); // L: 7287
- if (var7 != null) { // L: 7288
- NetSocket.closeInterface(var7, var67 != var7.group);
- }
-
- class241.method4812(var6, var67, var5); // L: 7289
- var1.serverPacket = null; // L: 7290
- return true; // L: 7291
- }
-
- if (ServerPacket.field3170 == var1.serverPacket) { // L: 7293
- var67 = var3.method7701(); // L: 7294
- var5 = var3.method7701(); // L: 7295
- InterfaceParent var70 = (InterfaceParent)interfaceParents.get((long)var67); // L: 7296
- var7 = (InterfaceParent)interfaceParents.get((long)var5); // L: 7297
- if (var7 != null) { // L: 7298
- NetSocket.closeInterface(var7, var70 == null || var70.group != var7.group);
- }
-
- if (var70 != null) { // L: 7299
- var70.remove(); // L: 7300
- interfaceParents.put(var70, (long)var5); // L: 7301
- }
-
- var26 = class92.getWidget(var67); // L: 7303
- if (var26 != null) { // L: 7304
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var26);
- }
-
- var26 = class92.getWidget(var5); // L: 7305
- if (var26 != null) { // L: 7306
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var26); // L: 7307
- UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var26.id >>> 16], var26, true); // L: 7308
- }
-
- if (rootInterface != -1) { // L: 7310
- WorldMapLabelSize.runIntfCloseListeners(rootInterface, 1);
- }
-
- var1.serverPacket = null; // L: 7311
- return true; // L: 7312
- }
-
- if (ServerPacket.field3108 == var1.serverPacket) { // L: 7314
- var48 = var3.readStringCp1252NullTerminated(); // L: 7315
- var31 = var3.readLong(); // L: 7316
- var33 = (long)var3.readUnsignedShort(); // L: 7317
- var41 = (long)var3.readMedium(); // L: 7318
- PlayerType var43 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var3.readUnsignedByte()); // L: 7319
- var44 = (var33 << 32) + var41; // L: 7320
- boolean var88 = false; // L: 7321
-
- for (var15 = 0; var15 < 100; ++var15) { // L: 7322
- if (crossWorldMessageIds[var15] == var44) { // L: 7323
- var88 = true; // L: 7324
- break; // L: 7325
- }
- }
-
- if (var43.isUser && BufferedSource.friendSystem.isIgnored(new Username(var48, class391.loginType))) { // L: 7328 7329
- var88 = true;
- }
-
- if (!var88 && field606 == 0) { // L: 7331
- crossWorldMessageIds[crossWorldMessageIdsIndex] = var44; // L: 7332
- crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7333
- var25 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(var3))); // L: 7334
- if (var43.modIcon != -1) { // L: 7335
- UserComparator7.addChatMessage(9, StudioGame.method5590(var43.modIcon) + var48, var25, class263.base37DecodeLong(var31));
+ if (!var84 && field607 == 0) { // L: 7040
+ crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 7041
+ crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7042
+ var40 = AbstractFont.escapeBrackets(ArchiveDiskAction.method5777(class134.method2904(var3))); // L: 7043
+ byte var62;
+ if (var37.isPrivileged) { // L: 7045
+ var62 = 7;
} else {
- UserComparator7.addChatMessage(9, var48, var25, class263.base37DecodeLong(var31)); // L: 7336
+ var62 = 3; // L: 7046
+ }
+
+ if (var37.modIcon != -1) { // L: 7047
+ class290.addGameMessage(var62, SecureRandomCallable.method2066(var37.modIcon) + var51, var40);
+ } else {
+ class290.addGameMessage(var62, var51, var40); // L: 7048
}
}
- var1.serverPacket = null; // L: 7338
- return true; // L: 7339
+ var1.serverPacket = null; // L: 7050
+ return true; // L: 7051
}
- if (ServerPacket.field3093 == var1.serverPacket) { // L: 7341
- class92.method2377(var3.readStringCp1252NullTerminated()); // L: 7342
- var1.serverPacket = null; // L: 7343
- return true; // L: 7344
+ if (ServerPacket.field3118 == var1.serverPacket) { // L: 7053
+ WorldMapSprite.method4998(class262.field3021); // L: 7054
+ var1.serverPacket = null; // L: 7055
+ return true; // L: 7056
}
- if (ServerPacket.field3190 == var1.serverPacket) { // L: 7346
- var67 = var3.method7701(); // L: 7347
- var68 = class92.getWidget(var67); // L: 7348
+ if (ServerPacket.field3140 == var1.serverPacket) { // L: 7058
+ WorldMapSprite.method4998(class262.field3015); // L: 7059
+ var1.serverPacket = null; // L: 7060
+ return true; // L: 7061
+ }
- for (var6 = 0; var6 < var68.itemIds.length; ++var6) { // L: 7349
- var68.itemIds[var6] = -1; // L: 7350
- var68.itemIds[var6] = 0; // L: 7351
+ if (ServerPacket.field3046 == var1.serverPacket) { // L: 7063
+ class294.loadRegions(true, var1.packetBuffer); // L: 7064
+ var1.serverPacket = null; // L: 7065
+ return true; // L: 7066
+ }
+
+ if (ServerPacket.field3091 == var1.serverPacket) { // L: 7068
+ GraphicsObject.method1870(); // L: 7069
+ var20 = var3.method7767(); // L: 7070
+ var5 = var3.readInt(); // L: 7071
+ var6 = var3.method7765(); // L: 7072
+ experience[var20] = var5; // L: 7073
+ currentLevels[var20] = var6; // L: 7074
+ levels[var20] = 1; // L: 7075
+
+ for (var7 = 0; var7 < 98; ++var7) { // L: 7076
+ if (var5 >= Skills.Skills_experienceTable[var7]) {
+ levels[var20] = var7 + 2;
+ }
}
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var68); // L: 7353
- var1.serverPacket = null; // L: 7354
- return true; // L: 7355
+ changedSkills[++changedSkillsCount - 1 & 31] = var20; // L: 7077
+ var1.serverPacket = null; // L: 7078
+ return true; // L: 7079
}
- if (ServerPacket.field3185 == var1.serverPacket) { // L: 7357
- var20 = var3.readByte(); // L: 7358
- var31 = (long)var3.readUnsignedShort(); // L: 7359
- var33 = (long)var3.readMedium(); // L: 7360
- var41 = var33 + (var31 << 32); // L: 7361
- boolean var30 = false; // L: 7362
- ClanChannel var12 = var20 >= 0 ? currentClanChannels[var20] : UserComparator10.guestClanChannel; // L: 7363
- if (var12 == null) { // L: 7364
- var30 = true;
+ if (ServerPacket.field3078 == var1.serverPacket) { // L: 7081
+ var20 = var3.readInt(); // L: 7082
+ InterfaceParent var81 = (InterfaceParent)interfaceParents.get((long)var20); // L: 7083
+ if (var81 != null) { // L: 7084
+ MusicPatchPcmStream.closeInterface(var81, true);
+ }
+
+ if (meslayerContinueWidget != null) { // L: 7085
+ ChatChannel.invalidateWidget(meslayerContinueWidget); // L: 7086
+ meslayerContinueWidget = null; // L: 7087
+ }
+
+ var1.serverPacket = null; // L: 7089
+ return true; // L: 7090
+ }
+
+ if (ServerPacket.field3049 == var1.serverPacket) { // L: 7092
+ var20 = var3.readInt(); // L: 7093
+ var5 = var3.readInt(); // L: 7094
+ var6 = FileSystem.getGcDuration(); // L: 7095
+ PacketBufferNode var67 = EnumComposition.getPacketBufferNode(ClientPacket.field3011, packetWriter.isaacCipher); // L: 7097
+ var67.packetBuffer.method7764(GameEngine.fps); // L: 7098
+ var67.packetBuffer.method7762(var6); // L: 7099
+ var67.packetBuffer.method7784(var20); // L: 7100
+ var67.packetBuffer.method7760(var5); // L: 7101
+ packetWriter.addNode(var67); // L: 7102
+ var1.serverPacket = null; // L: 7103
+ return true; // L: 7104
+ }
+
+ if (ServerPacket.field3112 == var1.serverPacket) { // L: 7106
+ return this.method1118(var1, 1); // L: 7107
+ }
+
+ if (ServerPacket.field3070 == var1.serverPacket) { // L: 7109
+ var20 = var3.method7775(); // L: 7110
+ GrandExchangeOfferTotalQuantityComparator.method5969(var20); // L: 7111
+ changedItemContainers[++field683 - 1 & 31] = var20 & 32767; // L: 7112
+ var1.serverPacket = null; // L: 7113
+ return true; // L: 7114
+ }
+
+ String var75;
+ if (ServerPacket.field3120 == var1.serverPacket) { // L: 7116
+ byte[] var52 = new byte[var1.serverPacketLength]; // L: 7117
+ var3.method7711(var52, 0, var52.length); // L: 7118
+ Buffer var80 = new Buffer(var52); // L: 7119
+ var75 = var80.readStringCp1252NullTerminated(); // L: 7120
+ class258.openURL(var75, true, false); // L: 7121
+ var1.serverPacket = null; // L: 7122
+ return true; // L: 7123
+ }
+
+ if (ServerPacket.field3093 == var1.serverPacket) { // L: 7125
+ var51 = var3.readStringCp1252NullTerminated(); // L: 7126
+ Object[] var78 = new Object[var51.length() + 1]; // L: 7127
+
+ for (var6 = var51.length() - 1; var6 >= 0; --var6) { // L: 7128
+ if (var51.charAt(var6) == 's') { // L: 7129
+ var78[var6 + 1] = var3.readStringCp1252NullTerminated();
+ } else {
+ var78[var6 + 1] = new Integer(var3.readInt()); // L: 7130
+ }
+ }
+
+ var78[0] = new Integer(var3.readInt()); // L: 7132
+ ScriptEvent var79 = new ScriptEvent(); // L: 7133
+ var79.args = var78; // L: 7134
+ BoundaryObject.runScriptEvent(var79); // L: 7135
+ var1.serverPacket = null; // L: 7136
+ return true; // L: 7137
+ }
+
+ if (ServerPacket.field3069 == var1.serverPacket) { // L: 7139
+ var20 = var3.readUShortSmart(); // L: 7140
+ boolean var54 = var3.readUnsignedByte() == 1; // L: 7141
+ var75 = ""; // L: 7142
+ boolean var55 = false; // L: 7143
+ if (var54) { // L: 7144
+ var75 = var3.readStringCp1252NullTerminated(); // L: 7145
+ if (Player.friendSystem.isIgnored(new Username(var75, HealthBarDefinition.loginType))) { // L: 7146
+ var55 = true;
+ }
+ }
+
+ String var35 = var3.readStringCp1252NullTerminated(); // L: 7148
+ if (!var55) { // L: 7149
+ class290.addGameMessage(var20, var75, var35);
+ }
+
+ var1.serverPacket = null; // L: 7150
+ return true; // L: 7151
+ }
+
+ if (ServerPacket.field3047 == var1.serverPacket) { // L: 7153
+ isCameraLocked = true; // L: 7154
+ field667 = false; // L: 7155
+ class165.field1809 = var3.readUnsignedByte(); // L: 7156
+ class434.field4664 = var3.readUnsignedByte(); // L: 7157
+ ClanChannel.field1690 = var3.readUnsignedShort(); // L: 7158
+ GameBuild.field3588 = var3.readUnsignedByte(); // L: 7159
+ MidiPcmStream.field3231 = var3.readUnsignedByte(); // L: 7160
+ if (MidiPcmStream.field3231 >= 100) { // L: 7161
+ var20 = class165.field1809 * 128 + 64; // L: 7162
+ var5 = class434.field4664 * 128 + 64; // L: 7163
+ var6 = SceneTilePaint.getTileHeight(var20, var5, PacketWriter.Client_plane) - ClanChannel.field1690; // L: 7164
+ var7 = var20 - class18.cameraX; // L: 7165
+ var8 = var6 - class16.cameraY; // L: 7166
+ var9 = var5 - class228.cameraZ; // L: 7167
+ var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 7168
+ ViewportMouse.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; // L: 7169
+ SoundCache.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 7170
+ if (ViewportMouse.cameraPitch < 128) { // L: 7171
+ ViewportMouse.cameraPitch = 128;
+ }
+
+ if (ViewportMouse.cameraPitch > 383) { // L: 7172
+ ViewportMouse.cameraPitch = 383;
+ }
+ }
+
+ var1.serverPacket = null; // L: 7174
+ return true; // L: 7175
+ }
+
+ if (ServerPacket.field3052 == var1.serverPacket) { // L: 7177
+ var20 = var3.readUnsignedShort(); // L: 7182
+ Player var66;
+ if (var20 == localPlayerIndex) { // L: 7183
+ var66 = class101.localPlayer; // L: 7184
} else {
- for (var13 = 0; var13 < 100; ++var13) { // L: 7366
- if (crossWorldMessageIds[var13] == var41) { // L: 7367
- var30 = true; // L: 7368
- break; // L: 7369
+ var66 = players[var20]; // L: 7187
+ }
+
+ var6 = var3.method7785(); // L: 7189
+ var5 = var3.method7774(); // L: 7190
+ if (var66 != null) { // L: 7191
+ var66.spotAnimation = var5; // L: 7192
+ var66.spotAnimationHeight = var6 >> 16; // L: 7193
+ var66.field1178 = (var6 & 65535) + cycle; // L: 7194
+ var66.spotAnimationFrame = 0; // L: 7195
+ var66.spotAnimationFrameCycle = 0; // L: 7196
+ if (var66.field1178 > cycle) { // L: 7197
+ var66.spotAnimationFrame = -1; // L: 7198
+ }
+
+ if (var66.spotAnimation == 65535) { // L: 7200
+ var66.spotAnimation = -1; // L: 7201
+ }
+ }
+
+ var1.serverPacket = null; // L: 7204
+ return true; // L: 7205
+ }
+
+ if (ServerPacket.field3108 == var1.serverPacket) { // L: 7207
+ tradeChatMode = var3.readUnsignedByte(); // L: 7208
+ publicChatMode = var3.method7767(); // L: 7209
+ var1.serverPacket = null; // L: 7210
+ return true; // L: 7211
+ }
+
+ if (ServerPacket.field3130 == var1.serverPacket) { // L: 7213
+ for (var20 = 0; var20 < Varps.Varps_main.length; ++var20) { // L: 7214
+ if (Varps.Varps_main[var20] != Varps.Varps_temp[var20]) { // L: 7215
+ Varps.Varps_main[var20] = Varps.Varps_temp[var20]; // L: 7216
+ class306.changeGameOptions(var20); // L: 7217
+ changedVarps[++changedVarpCount - 1 & 31] = var20; // L: 7218
+ }
+ }
+
+ var1.serverPacket = null; // L: 7221
+ return true; // L: 7222
+ }
+
+ if (ServerPacket.field3038 == var1.serverPacket) { // L: 7224
+ WorldMapSprite.method4998(class262.field3016); // L: 7225
+ var1.serverPacket = null; // L: 7226
+ return true; // L: 7227
+ }
+
+ if (ServerPacket.field3058 == var1.serverPacket) { // L: 7229
+ UserComparator4.updateNpcs(false, var3); // L: 7230
+ var1.serverPacket = null; // L: 7231
+ return true; // L: 7232
+ }
+
+ if (ServerPacket.field3113 == var1.serverPacket) { // L: 7234
+ var65 = var3.readByte(); // L: 7235
+ var22 = (long)var3.readUnsignedShort(); // L: 7236
+ var24 = (long)var3.readMedium(); // L: 7237
+ var26 = (var22 << 32) + var24; // L: 7238
+ boolean var58 = false; // L: 7239
+ ClanChannel var12 = var65 >= 0 ? currentClanChannels[var65] : class150.guestClanChannel; // L: 7240
+ if (var12 == null) { // L: 7241
+ var58 = true;
+ } else {
+ for (var13 = 0; var13 < 100; ++var13) { // L: 7243
+ if (crossWorldMessageIds[var13] == var26) { // L: 7244
+ var58 = true; // L: 7245
+ break; // L: 7246
}
}
}
- if (!var30) { // L: 7373
- crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 7374
- crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7375
- var39 = LoginPacket.method5025(var3); // L: 7376
- var40 = var20 >= 0 ? 43 : 46; // L: 7377
- UserComparator7.addChatMessage(var40, "", var39, var12.name); // L: 7378
+ if (!var58) { // L: 7250
+ crossWorldMessageIds[crossWorldMessageIdsIndex] = var26; // L: 7251
+ crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7252
+ var40 = class134.method2904(var3); // L: 7253
+ var14 = var65 >= 0 ? 43 : 46; // L: 7254
+ SecureRandomFuture.addChatMessage(var14, "", var40, var12.name); // L: 7255
+ }
+
+ var1.serverPacket = null; // L: 7257
+ return true; // L: 7258
+ }
+
+ if (ServerPacket.field3110 == var1.serverPacket) { // L: 7260
+ var68 = var3.readBoolean(); // L: 7261
+ if (var68) { // L: 7262
+ if (UrlRequester.field1362 == null) { // L: 7263
+ UrlRequester.field1362 = new class325();
+ }
+ } else {
+ UrlRequester.field1362 = null; // L: 7265
+ }
+
+ var1.serverPacket = null; // L: 7266
+ return true; // L: 7267
+ }
+
+ if (ServerPacket.field3088 == var1.serverPacket) { // L: 7269
+ var51 = var3.readStringCp1252NullTerminated(); // L: 7270
+ var5 = var3.method7786(); // L: 7271
+ var74 = class140.getWidget(var5); // L: 7272
+ if (!var51.equals(var74.text)) { // L: 7273
+ var74.text = var51; // L: 7274
+ ChatChannel.invalidateWidget(var74); // L: 7275
+ }
+
+ var1.serverPacket = null; // L: 7277
+ return true; // L: 7278
+ }
+
+ if (ServerPacket.field3098 == var1.serverPacket) { // L: 7280
+ return this.method1118(var1, 2); // L: 7281
+ }
+
+ if (ServerPacket.field3128 == var1.serverPacket) { // L: 7283
+ World var50 = new World(); // L: 7284
+ var50.host = var3.readStringCp1252NullTerminated(); // L: 7285
+ var50.id = var3.readUnsignedShort(); // L: 7286
+ var5 = var3.readInt(); // L: 7287
+ var50.properties = var5; // L: 7288
+ HealthBarUpdate.updateGameState(45); // L: 7289
+ var2.close(); // L: 7290
+ var2 = null; // L: 7291
+ class295.changeWorld(var50); // L: 7292
+ var1.serverPacket = null; // L: 7293
+ return false; // L: 7294
+ }
+
+ if (ServerPacket.field3086 == var1.serverPacket) { // L: 7296
+ return this.method1379(var1); // L: 7297
+ }
+
+ if (ServerPacket.field3096 == var1.serverPacket) { // L: 7299
+ class339.privateChatMode = Ignored.method6780(var3.readUnsignedByte()); // L: 7300
+ var1.serverPacket = null; // L: 7301
+ return true; // L: 7302
+ }
+
+ if (ServerPacket.field3111 == var1.serverPacket) { // L: 7304
+ GraphicsObject.method1870(); // L: 7305
+ runEnergy = var3.readUnsignedByte(); // L: 7306
+ field695 = cycleCntr; // L: 7307
+ var1.serverPacket = null; // L: 7308
+ return true; // L: 7309
+ }
+
+ if (ServerPacket.field3087 == var1.serverPacket) { // L: 7311
+ var20 = var3.readShort(); // L: 7312
+ var5 = var3.method7777(); // L: 7313
+ var6 = var3.readInt(); // L: 7314
+ var21 = class140.getWidget(var6); // L: 7315
+ if (var5 != var21.rawX || var20 != var21.rawY || var21.xAlignment != 0 || var21.yAlignment != 0) { // L: 7316
+ var21.rawX = var5; // L: 7317
+ var21.rawY = var20; // L: 7318
+ var21.xAlignment = 0; // L: 7319
+ var21.yAlignment = 0; // L: 7320
+ ChatChannel.invalidateWidget(var21); // L: 7321
+ this.alignWidget(var21); // L: 7322
+ if (var21.type == 0) { // L: 7323
+ BufferedNetSocket.revalidateWidgetScroll(SoundCache.Widget_interfaceComponents[var6 >> 16], var21, false);
+ }
+ }
+
+ var1.serverPacket = null; // L: 7325
+ return true; // L: 7326
+ }
+
+ if (ServerPacket.field3065 == var1.serverPacket) { // L: 7328
+ field692 = cycleCntr; // L: 7329
+ var65 = var3.readByte(); // L: 7330
+ class145 var76 = new class145(var3); // L: 7331
+ ClanChannel var33;
+ if (var65 >= 0) { // L: 7333
+ var33 = currentClanChannels[var65];
+ } else {
+ var33 = class150.guestClanChannel; // L: 7334
+ }
+
+ var76.method3075(var33); // L: 7335
+ var1.serverPacket = null; // L: 7336
+ return true; // L: 7337
+ }
+
+ if (ServerPacket.field3053 == var1.serverPacket) { // L: 7339
+ var20 = var3.readUnsignedShort(); // L: 7340
+ var5 = var3.readUnsignedByte(); // L: 7341
+ var6 = var3.readUnsignedShort(); // L: 7342
+ SoundSystem.queueSoundEffect(var20, var5, var6); // L: 7343
+ var1.serverPacket = null; // L: 7344
+ return true; // L: 7345
+ }
+
+ GameObject var47;
+ if (ServerPacket.field3048 == var1.serverPacket) { // L: 7347
+ var65 = var3.readByte(); // L: 7348
+ var34 = var3.readStringCp1252NullTerminated(); // L: 7349
+ long var41 = (long)var3.readUnsignedShort(); // L: 7350
+ long var43 = (long)var3.readMedium(); // L: 7351
+ PlayerType var32 = (PlayerType)Actor.findEnumerated(SoundSystem.PlayerType_values(), var3.readUnsignedByte()); // L: 7352
+ long var45 = (var41 << 32) + var43; // L: 7353
+ boolean var61 = false; // L: 7354
+ var47 = null; // L: 7355
+ ClanChannel var93 = var65 >= 0 ? currentClanChannels[var65] : class150.guestClanChannel; // L: 7357
+ if (var93 == null) { // L: 7358
+ var61 = true; // L: 7359
+ } else {
+ var15 = 0;
+
+ while (true) {
+ if (var15 >= 100) {
+ if (var32.isUser && Player.friendSystem.isIgnored(new Username(var34, HealthBarDefinition.loginType))) { // L: 7368 7369
+ var61 = true;
+ }
+ break;
+ }
+
+ if (crossWorldMessageIds[var15] == var45) { // L: 7363
+ var61 = true; // L: 7364
+ break; // L: 7365
+ }
+
+ ++var15; // L: 7362
+ }
+ }
+
+ if (!var61) { // L: 7372
+ crossWorldMessageIds[crossWorldMessageIdsIndex] = var45; // L: 7373
+ crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7374
+ var31 = AbstractFont.escapeBrackets(class134.method2904(var3)); // L: 7375
+ var16 = var65 >= 0 ? 41 : 44; // L: 7376
+ if (var32.modIcon != -1) { // L: 7377
+ SecureRandomFuture.addChatMessage(var16, SecureRandomCallable.method2066(var32.modIcon) + var34, var31, var93.name);
+ } else {
+ SecureRandomFuture.addChatMessage(var16, var34, var31, var93.name); // L: 7378
+ }
}
var1.serverPacket = null; // L: 7380
return true; // L: 7381
}
- if (ServerPacket.field3101 == var1.serverPacket) { // L: 7383
- if (var1.serverPacketLength == 0) { // L: 7384
- PcmPlayer.friendsChat = null; // L: 7385
- } else {
- if (PcmPlayer.friendsChat == null) { // L: 7388
- PcmPlayer.friendsChat = new FriendsChat(class391.loginType, class82.client); // L: 7389
+ if (ServerPacket.field3092 == var1.serverPacket) { // L: 7383
+ var3.offset += 28; // L: 7384
+ if (var3.checkCrc()) { // L: 7385
+ WorldMapIcon_1.method4590(var3, var3.offset - 28);
+ }
+
+ var1.serverPacket = null; // L: 7386
+ return true; // L: 7387
+ }
+
+ if (ServerPacket.field3133 == var1.serverPacket && isCameraLocked) { // L: 7389 7390
+ field667 = true; // L: 7391
+ PlayerComposition.field3346 = var3.readUnsignedByte(); // L: 7392
+ UserComparator3.field1391 = var3.readUnsignedByte(); // L: 7393
+ GameBuild.field3588 = var3.readUnsignedByte(); // L: 7394
+ MidiPcmStream.field3231 = var3.readUnsignedByte(); // L: 7395
+
+ for (var20 = 0; var20 < 5; ++var20) { // L: 7396
+ field743[var20] = false;
+ }
+
+ var1.serverPacket = null; // L: 7397
+ return true; // L: 7398
+ }
+
+ if (ServerPacket.field3104 == var1.serverPacket) { // L: 7401
+ var9 = var3.method7765(); // L: 7412
+ var10 = var9 >> 2; // L: 7413
+ var11 = var9 & 3; // L: 7414
+ var36 = field582[var10]; // L: 7415
+ var13 = var3.method7776(); // L: 7416
+ var6 = var3.method7780(); // L: 7417
+ var20 = var6 >> 16; // L: 7418
+ var5 = var6 >> 8 & 255; // L: 7419
+ var7 = var20 + (var6 >> 4 & 7); // L: 7420
+ var8 = var5 + (var6 & 7); // L: 7421
+ if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { // L: 7422
+ if (var36 == 0) { // L: 7423
+ BoundaryObject var92 = class356.scene.method4333(PacketWriter.Client_plane, var7, var8); // L: 7424
+ if (var92 != null) { // L: 7425
+ var15 = Decimator.Entity_unpackID(var92.tag); // L: 7426
+ if (var10 == 2) { // L: 7427
+ var92.renderable1 = new DynamicObject(var15, 2, var11 + 4, PacketWriter.Client_plane, var7, var8, var13, false, var92.renderable1); // L: 7428
+ var92.renderable2 = new DynamicObject(var15, 2, var11 + 1 & 3, PacketWriter.Client_plane, var7, var8, var13, false, var92.renderable2); // L: 7429
+ } else {
+ var92.renderable1 = new DynamicObject(var15, var10, var11, PacketWriter.Client_plane, var7, var8, var13, false, var92.renderable1); // L: 7431
+ }
+ }
+ } else if (var36 == 1) { // L: 7434
+ WallDecoration var91 = class356.scene.method4178(PacketWriter.Client_plane, var7, var8); // L: 7435
+ if (var91 != null) { // L: 7436
+ var15 = Decimator.Entity_unpackID(var91.tag); // L: 7437
+ if (var10 != 4 && var10 != 5) { // L: 7438
+ if (var10 == 6) { // L: 7441
+ var91.renderable1 = new DynamicObject(var15, 4, var11 + 4, PacketWriter.Client_plane, var7, var8, var13, false, var91.renderable1); // L: 7442
+ } else if (var10 == 7) { // L: 7444
+ var91.renderable1 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, PacketWriter.Client_plane, var7, var8, var13, false, var91.renderable1); // L: 7445
+ } else if (var10 == 8) { // L: 7447
+ var91.renderable1 = new DynamicObject(var15, 4, var11 + 4, PacketWriter.Client_plane, var7, var8, var13, false, var91.renderable1); // L: 7448
+ var91.renderable2 = new DynamicObject(var15, 4, (var11 + 2 & 3) + 4, PacketWriter.Client_plane, var7, var8, var13, false, var91.renderable2); // L: 7449
+ }
+ } else {
+ var91.renderable1 = new DynamicObject(var15, 4, var11, PacketWriter.Client_plane, var7, var8, var13, false, var91.renderable1); // L: 7439
+ }
+ }
+ } else if (var36 == 2) { // L: 7453
+ var47 = class356.scene.getGameObject(PacketWriter.Client_plane, var7, var8); // L: 7454
+ if (var10 == 11) { // L: 7455
+ var10 = 10; // L: 7456
+ }
+
+ if (var47 != null) { // L: 7458
+ var47.renderable = new DynamicObject(Decimator.Entity_unpackID(var47.tag), var10, var11, PacketWriter.Client_plane, var7, var8, var13, false, var47.renderable); // L: 7459
+ }
+ } else if (var36 == 3) { // L: 7462
+ FloorDecoration var90 = class356.scene.getFloorDecoration(PacketWriter.Client_plane, var7, var8); // L: 7463
+ if (var90 != null) { // L: 7464
+ var90.renderable = new DynamicObject(Decimator.Entity_unpackID(var90.tag), 22, var11, PacketWriter.Client_plane, var7, var8, var13, false, var90.renderable); // L: 7465
+ }
}
-
- PcmPlayer.friendsChat.readUpdate(var3); // L: 7391
}
- class194.method3804(); // L: 7393
- var1.serverPacket = null; // L: 7394
- return true; // L: 7395
+ var1.serverPacket = null; // L: 7469
+ return true; // L: 7470
}
- if (ServerPacket.field3104 == var1.serverPacket) { // L: 7397
- publicChatMode = var3.readUnsignedByte(); // L: 7398
- tradeChatMode = var3.method7546(); // L: 7399
- var1.serverPacket = null; // L: 7400
- return true; // L: 7401
+ class249.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1936739439 * -1523412337 : -1) + "," + (var1.field1347 != null ? var1.field1347.id * 1936739439 * -1523412337 : -1) + "," + (var1.field1352 != null ? var1.field1352.id * 1936739439 * -1523412337 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7472
+ MouseRecorder.logOut(); // L: 7473
+ } catch (IOException var48) { // L: 7475
+ class131.method2877(); // L: 7476
+ } catch (Exception var49) {
+ var34 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1936739439 * -1523412337 : -1) + "," + (var1.field1347 != null ? var1.field1347.id * 1936739439 * -1523412337 : -1) + "," + (var1.field1352 != null ? var1.field1352.id * 1936739439 * -1523412337 : -1) + "," + var1.serverPacketLength + "," + (class101.localPlayer.pathX[0] + class28.baseX) + "," + (class101.localPlayer.pathY[0] + WorldMapLabelSize.baseY) + ","; // L: 7479
+
+ for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7480
+ var34 = var34 + var3.array[var6] + ",";
}
- if (ServerPacket.field3168 == var1.serverPacket) { // L: 7403
- var67 = var3.readUnsignedByte(); // L: 7404
- var5 = var3.readUnsignedByte(); // L: 7405
- var6 = var3.readUnsignedByte(); // L: 7406
- var27 = var3.readUnsignedByte(); // L: 7407
- field743[var67] = true; // L: 7408
- field744[var67] = var5; // L: 7409
- field745[var67] = var6; // L: 7410
- field714[var67] = var27; // L: 7411
- field677[var67] = 0; // L: 7412
- var1.serverPacket = null; // L: 7413
- return true; // L: 7414
- }
-
- if (ServerPacket.field3109 == var1.serverPacket) { // L: 7416
- destinationX = var3.readUnsignedByte(); // L: 7417
- if (destinationX == 255) { // L: 7418
- destinationX = 0;
- }
-
- destinationY = var3.readUnsignedByte(); // L: 7419
- if (destinationY == 255) { // L: 7420
- destinationY = 0;
- }
-
- var1.serverPacket = null; // L: 7421
- return true; // L: 7422
- }
-
- if (ServerPacket.field3100 == var1.serverPacket) { // L: 7424
- class393.field4428 = true; // L: 7425
- HorizontalAlignment.updateNpcs(true, var3); // L: 7426
- var1.serverPacket = null; // L: 7427
- return true; // L: 7428
- }
-
- if (ServerPacket.field3137 == var1.serverPacket) { // L: 7430
- var67 = var3.method7567(); // L: 7431
- var5 = var3.method7716(); // L: 7432
- var6 = var5 >> 10 & 31; // L: 7433
- var27 = var5 >> 5 & 31; // L: 7434
- var28 = var5 & 31; // L: 7435
- var9 = (var27 << 11) + (var6 << 19) + (var28 << 3); // L: 7436
- Widget var10 = class92.getWidget(var67); // L: 7437
- if (var9 != var10.color) { // L: 7438
- var10.color = var9; // L: 7439
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 7440
- }
-
- var1.serverPacket = null; // L: 7442
- return true; // L: 7443
- }
-
- if (ServerPacket.field3129 == var1.serverPacket) { // L: 7445
- isCameraLocked = true; // L: 7446
- field742 = false; // L: 7447
- Players.field1317 = var3.readUnsignedByte(); // L: 7448
- TileItem.field1292 = var3.readUnsignedByte(); // L: 7449
- WorldMapSection1.field2898 = var3.readUnsignedShort(); // L: 7450
- class229.field2805 = var3.readUnsignedByte(); // L: 7451
- HitSplatDefinition.field2077 = var3.readUnsignedByte(); // L: 7452
- if (HitSplatDefinition.field2077 >= 100) { // L: 7453
- class343.cameraX = Players.field1317 * 128 + 64; // L: 7454
- FaceNormal.cameraZ = TileItem.field1292 * 128 + 64; // L: 7455
- class295.cameraY = class202.getTileHeight(class343.cameraX, FaceNormal.cameraZ, class128.Client_plane) - WorldMapSection1.field2898; // L: 7456
- }
-
- var1.serverPacket = null; // L: 7458
- return true; // L: 7459
- }
-
- if (ServerPacket.field3160 == var1.serverPacket) { // L: 7461
- hintArrowType = var3.readUnsignedByte(); // L: 7462
- if (hintArrowType == 1) { // L: 7463
- hintArrowNpcIndex = var3.readUnsignedShort();
- }
-
- if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 7464
- if (hintArrowType == 2) { // L: 7465
- hintArrowSubX = 64; // L: 7466
- hintArrowSubY = 64; // L: 7467
- }
-
- if (hintArrowType == 3) { // L: 7469
- hintArrowSubX = 0; // L: 7470
- hintArrowSubY = 64; // L: 7471
- }
-
- if (hintArrowType == 4) { // L: 7473
- hintArrowSubX = 128; // L: 7474
- hintArrowSubY = 64; // L: 7475
- }
-
- if (hintArrowType == 5) { // L: 7477
- hintArrowSubX = 64; // L: 7478
- hintArrowSubY = 0; // L: 7479
- }
-
- if (hintArrowType == 6) { // L: 7481
- hintArrowSubX = 64; // L: 7482
- hintArrowSubY = 128; // L: 7483
- }
-
- hintArrowType = 2; // L: 7485
- hintArrowX = var3.readUnsignedShort(); // L: 7486
- hintArrowY = var3.readUnsignedShort(); // L: 7487
- hintArrowHeight = var3.readUnsignedByte(); // L: 7488
- }
-
- if (hintArrowType == 10) { // L: 7490
- hintArrowPlayerIndex = var3.readUnsignedShort();
- }
-
- var1.serverPacket = null; // L: 7491
- return true; // L: 7492
- }
-
- if (ServerPacket.field3107 == var1.serverPacket) { // L: 7494
- var48 = var3.readStringCp1252NullTerminated(); // L: 7495
- var5 = var3.readInt(); // L: 7496
- var22 = class92.getWidget(var5); // L: 7497
- if (!var48.equals(var22.text)) { // L: 7498
- var22.text = var48; // L: 7499
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var22); // L: 7500
- }
-
- var1.serverPacket = null; // L: 7502
- return true; // L: 7503
- }
-
- if (ServerPacket.field3151 == var1.serverPacket) { // L: 7505
- class175.method3373(); // L: 7506
- var20 = var3.readByte(); // L: 7507
- if (var1.serverPacketLength == 1) { // L: 7508
- if (var20 >= 0) { // L: 7509
- currentClanSettings[var20] = null;
- } else {
- class358.guestClanSettings = null; // L: 7510
- }
-
- var1.serverPacket = null; // L: 7511
- return true; // L: 7512
- }
-
- if (var20 >= 0) { // L: 7514
- currentClanSettings[var20] = new ClanSettings(var3); // L: 7515
- } else {
- class358.guestClanSettings = new ClanSettings(var3); // L: 7518
- }
-
- var1.serverPacket = null; // L: 7520
- return true; // L: 7521
- }
-
- if (ServerPacket.field3149 == var1.serverPacket) { // L: 7523
- BufferedSource.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 7524
- class121.FriendSystem_invalidateIgnoreds(); // L: 7525
- field689 = cycleCntr; // L: 7526
- var1.serverPacket = null; // L: 7527
- return true; // L: 7528
- }
-
- ArchiveDiskActionHandler.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1340 != null ? var1.field1340.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1345 != null ? var1.field1345.id * 1118619813 * -1591353555 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7530
- SecureRandomCallable.logOut(); // L: 7531
- } catch (IOException var46) { // L: 7533
- class129.method2812(); // L: 7534
- } catch (Exception var47) {
- var21 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1340 != null ? var1.field1340.id * 1118619813 * -1591353555 : -1) + "," + (var1.field1345 != null ? var1.field1345.id * 1118619813 * -1591353555 : -1) + "," + var1.serverPacketLength + "," + (ModelData0.localPlayer.pathX[0] + SecureRandomCallable.baseX) + "," + (ModelData0.localPlayer.pathY[0] + GrandExchangeOfferOwnWorldComparator.baseY) + ","; // L: 7537
-
- for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7538
- var21 = var21 + var3.array[var6] + ",";
- }
-
- ArchiveDiskActionHandler.RunException_sendStackTrace(var21, var47); // L: 7539
- SecureRandomCallable.logOut(); // L: 7540
+ class249.RunException_sendStackTrace(var34, var49); // L: 7481
+ MouseRecorder.logOut(); // L: 7482
}
- return true; // L: 7542
+ return true; // L: 7484
}
}
- @ObfuscatedName("ik")
+ @ObfuscatedName("io")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1950620416"
+ garbageValue = "124880432"
)
@Export("menu")
final void menu() {
- boolean var1 = false; // L: 8728
+ boolean var1 = false; // L: 8504
int var2;
int var5;
- while (!var1) { // L: 8729
- var1 = true; // L: 8730
+ while (!var1) { // L: 8505
+ var1 = true; // L: 8506
- for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 8731
- if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 8732
- String var14 = menuTargets[var2]; // L: 8733
- menuTargets[var2] = menuTargets[var2 + 1]; // L: 8734
- menuTargets[var2 + 1] = var14; // L: 8735
- String var15 = menuActions[var2]; // L: 8736
- menuActions[var2] = menuActions[var2 + 1]; // L: 8737
- menuActions[var2 + 1] = var15; // L: 8738
- var5 = menuOpcodes[var2]; // L: 8739
- menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 8740
- menuOpcodes[var2 + 1] = var5; // L: 8741
- var5 = menuArguments1[var2]; // L: 8742
- menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 8743
- menuArguments1[var2 + 1] = var5; // L: 8744
- var5 = menuArguments2[var2]; // L: 8745
- menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 8746
- menuArguments2[var2 + 1] = var5; // L: 8747
- var5 = menuIdentifiers[var2]; // L: 8748
- menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 8749
- menuIdentifiers[var2 + 1] = var5; // L: 8750
- boolean var6 = menuShiftClick[var2]; // L: 8751
- menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 8752
- menuShiftClick[var2 + 1] = var6; // L: 8753
- var1 = false; // L: 8754
+ for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 8507
+ if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 8508
+ String var18 = menuTargets[var2]; // L: 8509
+ menuTargets[var2] = menuTargets[var2 + 1]; // L: 8510
+ menuTargets[var2 + 1] = var18; // L: 8511
+ String var19 = menuActions[var2]; // L: 8512
+ menuActions[var2] = menuActions[var2 + 1]; // L: 8513
+ menuActions[var2 + 1] = var19; // L: 8514
+ var5 = menuOpcodes[var2]; // L: 8515
+ menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 8516
+ menuOpcodes[var2 + 1] = var5; // L: 8517
+ var5 = menuArguments1[var2]; // L: 8518
+ menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 8519
+ menuArguments1[var2 + 1] = var5; // L: 8520
+ var5 = menuArguments2[var2]; // L: 8521
+ menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 8522
+ menuArguments2[var2 + 1] = var5; // L: 8523
+ var5 = menuIdentifiers[var2]; // L: 8524
+ menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 8525
+ menuIdentifiers[var2 + 1] = var5; // L: 8526
+ boolean var14 = menuShiftClick[var2]; // L: 8527
+ menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 8528
+ menuShiftClick[var2 + 1] = var14; // L: 8529
+ var1 = false; // L: 8530
}
}
}
- if (Canvas.dragInventoryWidget == null) { // L: 8759
- if (clickedWidget == null) { // L: 8760
- int var11;
- int var17;
- label262: {
- int var16 = MouseHandler.MouseHandler_lastButton; // L: 8761
- int var4;
- int var9;
- if (isMenuOpen) { // L: 8762
- int var3;
- if (var16 != 1 && (Login.mouseCam || var16 != 4)) { // L: 8763
- var2 = MouseHandler.MouseHandler_x; // L: 8764
- var3 = MouseHandler.MouseHandler_y; // L: 8765
- if (var2 < BuddyRankComparator.menuX - 10 || var2 > KeyHandler.menuWidth + BuddyRankComparator.menuX + 10 || var3 < FontName.menuY - 10 || var3 > FontName.menuY + class7.menuHeight + 10) { // L: 8766
- isMenuOpen = false; // L: 8767
- class132.method2836(BuddyRankComparator.menuX, FontName.menuY, KeyHandler.menuWidth, class7.menuHeight); // L: 8768
- }
- }
+ if (Interpreter.dragInventoryWidget == null) { // L: 8535
+ if (clickedWidget == null) { // L: 8536
+ int var20 = MouseHandler.MouseHandler_lastButton; // L: 8537
+ int var3;
+ int var4;
+ int var8;
+ int var10;
+ int var23;
+ if (isMenuOpen) { // L: 8538
+ int var21;
+ if (var20 != 1 && (class122.mouseCam || var20 != 4)) { // L: 8539
+ var2 = MouseHandler.MouseHandler_x; // L: 8540
+ var3 = MouseHandler.MouseHandler_y; // L: 8541
+ if (var2 < UserComparator3.menuX - 10 || var2 > Language.menuWidth + UserComparator3.menuX + 10 || var3 < ViewportMouse.menuY - 10 || var3 > Player.menuHeight + ViewportMouse.menuY + 10) { // L: 8542
+ isMenuOpen = false; // L: 8543
+ var4 = UserComparator3.menuX; // L: 8544
+ var5 = ViewportMouse.menuY; // L: 8545
+ var23 = Language.menuWidth; // L: 8546
+ var21 = Player.menuHeight; // L: 8547
- if (var16 == 1 || !Login.mouseCam && var16 == 4) { // L: 8771
- var2 = BuddyRankComparator.menuX; // L: 8772
- var3 = FontName.menuY; // L: 8773
- var4 = KeyHandler.menuWidth; // L: 8774
- var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8775
- var17 = MouseHandler.MouseHandler_lastPressedY; // L: 8776
- int var13 = -1; // L: 8777
-
- for (int var18 = 0; var18 < menuOptionsCount; ++var18) { // L: 8778
- var9 = (menuOptionsCount - 1 - var18) * 15 + var3 + 31; // L: 8779
- if (var5 > var2 && var5 < var2 + var4 && var17 > var9 - 13 && var17 < var9 + 3) { // L: 8780
- var13 = var18;
+ for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 8549
+ if (rootWidgetXs[var8] + rootWidgetWidths[var8] > var4 && rootWidgetXs[var8] < var4 + var23 && rootWidgetYs[var8] + rootWidgetHeights[var8] > var5 && rootWidgetYs[var8] < var21 + var5) { // L: 8550
+ field703[var8] = true;
}
}
-
- if (var13 != -1) { // L: 8782
- Renderable.method4211(var13);
- }
-
- isMenuOpen = false; // L: 8783
- class132.method2836(BuddyRankComparator.menuX, FontName.menuY, KeyHandler.menuWidth, class7.menuHeight); // L: 8784
- }
- } else {
- var2 = menuOptionsCount - 1; // L: 8790
- if ((var16 == 1 || !Login.mouseCam && var16 == 4) && var2 >= 0) { // L: 8793
- var4 = menuOpcodes[var2]; // L: 8794
- if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { // L: 8795
- var5 = menuArguments1[var2]; // L: 8796
- var17 = menuArguments2[var2]; // L: 8797
- Widget var7 = class92.getWidget(var17); // L: 8798
- var9 = UrlRequester.getWidgetFlags(var7); // L: 8800
- boolean var8 = (var9 >> 28 & 1) != 0; // L: 8802
- if (var8) { // L: 8805
- break label262;
- }
-
- var11 = UrlRequester.getWidgetFlags(var7); // L: 8807
- boolean var10 = (var11 >> 29 & 1) != 0; // L: 8809
- if (var10) { // L: 8811
- break label262;
- }
- }
- }
-
- if ((var16 == 1 || !Login.mouseCam && var16 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8841 8842
- var16 = 2; // L: 8843
- }
-
- if ((var16 == 1 || !Login.mouseCam && var16 == 4) && menuOptionsCount > 0) { // L: 8846
- Renderable.method4211(var2); // L: 8847
- }
-
- if (var16 == 2 && menuOptionsCount > 0) { // L: 8849
- this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
}
}
- return; // L: 8851
- }
+ if (var20 == 1 || !class122.mouseCam && var20 == 4) { // L: 8555
+ var2 = UserComparator3.menuX; // L: 8556
+ var3 = ViewportMouse.menuY; // L: 8557
+ var4 = Language.menuWidth; // L: 8558
+ var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8559
+ var23 = MouseHandler.MouseHandler_lastPressedY; // L: 8560
+ var21 = -1; // L: 8561
- if (Canvas.dragInventoryWidget != null && !field604 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8813 8814
- int var19 = draggedWidgetX; // L: 8815
- var11 = draggedWidgetY; // L: 8816
- MenuAction var12 = class116.tempMenuAction; // L: 8818
- if (var12 != null) { // L: 8820
- ModeWhere.menuAction(var12.param0, var12.param1, var12.opcode, var12.identifier, var12.action, var12.action, var19, var11); // L: 8821
+ int var22;
+ for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8562
+ var22 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; // L: 8563
+ if (var5 > var2 && var5 < var2 + var4 && var23 > var22 - 13 && var23 < var22 + 3) { // L: 8564
+ var21 = var8;
+ }
+ }
+
+ int var11;
+ if (var21 != -1 && var21 >= 0) { // L: 8566 8567
+ var8 = menuArguments1[var21]; // L: 8568
+ var22 = menuArguments2[var21]; // L: 8569
+ var10 = menuOpcodes[var21]; // L: 8570
+ var11 = menuIdentifiers[var21]; // L: 8571
+ String var12 = menuActions[var21]; // L: 8572
+ String var13 = menuTargets[var21]; // L: 8573
+ FriendsList.menuAction(var8, var22, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8574
+ }
+
+ isMenuOpen = false; // L: 8576
+ var8 = UserComparator3.menuX; // L: 8577
+ var22 = ViewportMouse.menuY; // L: 8578
+ var10 = Language.menuWidth; // L: 8579
+ var11 = Player.menuHeight; // L: 8580
+
+ for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 8582
+ if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var8 && rootWidgetXs[var17] < var10 + var8 && rootWidgetYs[var17] + rootWidgetHeights[var17] > var22 && rootWidgetYs[var17] < var11 + var22) { // L: 8583
+ field703[var17] = true;
+ }
+ }
+ }
+ } else {
+ var2 = class240.method5005(); // L: 8589
+ if ((var20 == 1 || !class122.mouseCam && var20 == 4) && var2 >= 0) { // L: 8590
+ var3 = menuOpcodes[var2]; // L: 8591
+ if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 8592
+ label310: {
+ var4 = menuArguments1[var2]; // L: 8593
+ var5 = menuArguments2[var2]; // L: 8594
+ Widget var6 = class140.getWidget(var5); // L: 8595
+ var8 = class124.getWidgetFlags(var6); // L: 8597
+ boolean var7 = (var8 >> 28 & 1) != 0; // L: 8599
+ if (!var7) { // L: 8602
+ var10 = class124.getWidgetFlags(var6); // L: 8604
+ boolean var9 = (var10 >> 29 & 1) != 0; // L: 8606
+ if (!var9) { // L: 8608
+ break label310;
+ }
+ }
+
+ if (Interpreter.dragInventoryWidget != null && !field705 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8610 8611
+ CollisionMap.method3906(draggedWidgetX, draggedWidgetY); // L: 8612
+ }
+
+ field705 = false; // L: 8615
+ itemDragDuration = 0; // L: 8616
+ if (Interpreter.dragInventoryWidget != null) { // L: 8617
+ ChatChannel.invalidateWidget(Interpreter.dragInventoryWidget);
+ }
+
+ Interpreter.dragInventoryWidget = class140.getWidget(var5); // L: 8618
+ dragItemSlotSource = var4; // L: 8619
+ draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8620
+ draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8621
+ if (var2 >= 0) { // L: 8622
+ WorldMapLabelSize.method4566(var2);
+ }
+
+ ChatChannel.invalidateWidget(Interpreter.dragInventoryWidget); // L: 8623
+ return; // L: 8624
+ }
+ }
}
- class116.tempMenuAction = null; // L: 8824
+ if ((var20 == 1 || !class122.mouseCam && var20 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8628 8629
+ var20 = 2; // L: 8630
+ }
+
+ if ((var20 == 1 || !class122.mouseCam && var20 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 8633 8635
+ var3 = menuArguments1[var2]; // L: 8636
+ var4 = menuArguments2[var2]; // L: 8637
+ var5 = menuOpcodes[var2]; // L: 8638
+ var23 = menuIdentifiers[var2]; // L: 8639
+ String var15 = menuActions[var2]; // L: 8640
+ String var16 = menuTargets[var2]; // L: 8641
+ FriendsList.menuAction(var3, var4, var5, var23, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8642
+ }
+
+ if (var20 == 2 && menuOptionsCount > 0) { // L: 8645
+ this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+ }
}
- field604 = false; // L: 8828
- itemDragDuration = 0; // L: 8829
- if (Canvas.dragInventoryWidget != null) { // L: 8830
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Canvas.dragInventoryWidget);
- }
-
- Canvas.dragInventoryWidget = class92.getWidget(var17); // L: 8831
- dragItemSlotSource = var5; // L: 8832
- draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8833
- draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8834
- if (var2 >= 0) { // L: 8835
- Players.method2426(var2);
- }
-
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Canvas.dragInventoryWidget); // L: 8836
}
}
- } // L: 8837
+ } // L: 8647
@ObfuscatedName("ih")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "1"
+ descriptor = "(I)Z",
+ garbageValue = "-1842905867"
)
@Export("shouldLeftClickOpenMenu")
final boolean shouldLeftClickOpenMenu() {
- int var1 = menuOptionsCount - 1; // L: 8856
- return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || UrlRequester.method2539(var1)) && !menuShiftClick[var1]; // L: 8859
+ int var1 = class240.method5005(); // L: 8650
+ return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || VarpDefinition.method3373(var1)) && !menuShiftClick[var1]; // L: 8651
}
- @ObfuscatedName("in")
+ @ObfuscatedName("iu")
@ObfuscatedSignature(
- descriptor = "(IIB)V",
- garbageValue = "-25"
+ descriptor = "(III)V",
+ garbageValue = "1919809935"
)
@Export("openMenu")
final void openMenu(int var1, int var2) {
- class119.method2739(var1, var2); // L: 8863
- var1 -= viewportOffsetX; // L: 8864
- var2 -= viewportOffsetY; // L: 8865
- class175.scene.menuOpen(class128.Client_plane, var1, var2, false); // L: 8866
- isMenuOpen = true; // L: 8867
- } // L: 8868
+ UserComparator8.method2571(var1, var2); // L: 8655
+ var1 -= viewportOffsetX; // L: 8656
+ var2 -= viewportOffsetY; // L: 8657
+ class356.scene.menuOpen(PacketWriter.Client_plane, var1, var2, false); // L: 8658
+ isMenuOpen = true; // L: 8659
+ } // L: 8660
- @ObfuscatedName("ja")
+ @ObfuscatedName("jc")
@ObfuscatedSignature(
descriptor = "(ZB)V",
- garbageValue = "16"
+ garbageValue = "105"
)
@Export("resizeRoot")
final void resizeRoot(boolean var1) {
- int var2 = rootInterface; // L: 10739
- int var3 = GraphicsObject.canvasWidth; // L: 10740
- int var4 = class433.canvasHeight; // L: 10741
- if (WorldMapDecoration.loadInterface(var2)) { // L: 10743
- Language.resizeInterface(NetSocket.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 10744
+ int var2 = rootInterface; // L: 10627
+ int var3 = Script.canvasWidth; // L: 10628
+ int var4 = class78.canvasHeight; // L: 10629
+ if (WorldMapSection2.loadInterface(var2)) { // L: 10631
+ class118.resizeInterface(SoundCache.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 10632
}
- } // L: 10746
+ } // L: 10634
- @ObfuscatedName("jm")
+ @ObfuscatedName("jl")
@ObfuscatedSignature(
- descriptor = "(Lki;B)V",
- garbageValue = "7"
+ descriptor = "(Lkb;B)V",
+ garbageValue = "93"
)
@Export("alignWidget")
void alignWidget(Widget var1) {
- Widget var2 = var1.parentId == -1 ? null : class92.getWidget(var1.parentId); // L: 10749
+ Widget var2 = var1.parentId == -1 ? null : class140.getWidget(var1.parentId); // L: 10637
int var3;
int var4;
- if (var2 == null) { // L: 10752
- var3 = GraphicsObject.canvasWidth; // L: 10753
- var4 = class433.canvasHeight; // L: 10754
+ if (var2 == null) { // L: 10640
+ var3 = Script.canvasWidth; // L: 10641
+ var4 = class78.canvasHeight; // L: 10642
} else {
- var3 = var2.width; // L: 10757
- var4 = var2.height; // L: 10758
+ var3 = var2.width; // L: 10645
+ var4 = var2.height; // L: 10646
}
- FloorOverlayDefinition.alignWidgetSize(var1, var3, var4, false); // L: 10760
- ChatChannel.alignWidgetPosition(var1, var3, var4); // L: 10761
- } // L: 10762
+ Decimator.alignWidgetSize(var1, var3, var4, false); // L: 10648
+ class240.alignWidgetPosition(var1, var3, var4); // L: 10649
+ } // L: 10650
- @ObfuscatedName("jz")
+ @ObfuscatedName("kp")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1857303053"
+ garbageValue = "-1883142675"
)
- final void method1150() {
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(clickedWidget); // L: 11793
- ++SoundSystem.widgetDragDuration; // L: 11794
- int var1;
- int var2;
- if (field675 && field574) { // L: 11795
- var1 = MouseHandler.MouseHandler_x; // L: 11814
- var2 = MouseHandler.MouseHandler_y; // L: 11815
- var1 -= widgetClickX; // L: 11816
- var2 -= widgetClickY; // L: 11817
- if (var1 < field747) { // L: 11818
- var1 = field747;
+ final void method1511() {
+ ChatChannel.invalidateWidget(clickedWidget); // L: 11646
+ ++Timer.widgetDragDuration; // L: 11647
+ if (field675 && field767) { // L: 11648
+ int var1 = MouseHandler.MouseHandler_x; // L: 11657
+ int var2 = MouseHandler.MouseHandler_y; // L: 11658
+ var1 -= widgetClickX; // L: 11659
+ var2 -= widgetClickY; // L: 11660
+ if (var1 < field664) { // L: 11661
+ var1 = field664;
}
- if (var1 + clickedWidget.width > field747 + clickedWidgetParent.width) { // L: 11819
- var1 = field747 + clickedWidgetParent.width - clickedWidget.width;
+ if (var1 + clickedWidget.width > field664 + clickedWidgetParent.width) { // L: 11662
+ var1 = field664 + clickedWidgetParent.width - clickedWidget.width;
}
- if (var2 < field674) { // L: 11820
- var2 = field674;
+ if (var2 < field550) { // L: 11663
+ var2 = field550;
}
- if (var2 + clickedWidget.height > field674 + clickedWidgetParent.height) { // L: 11821
- var2 = field674 + clickedWidgetParent.height - clickedWidget.height;
+ if (var2 + clickedWidget.height > field550 + clickedWidgetParent.height) { // L: 11664
+ var2 = field550 + clickedWidgetParent.height - clickedWidget.height;
}
- int var3 = var1 - field653; // L: 11822
- int var4 = var2 - field612; // L: 11823
- int var5 = clickedWidget.dragZoneSize; // L: 11824
- if (SoundSystem.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11825 11826
- isDraggingWidget = true; // L: 11827
+ int var3 = var1 - field775; // L: 11665
+ int var4 = var2 - field677; // L: 11666
+ int var5 = clickedWidget.dragZoneSize; // L: 11667
+ if (Timer.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11668 11669
+ isDraggingWidget = true; // L: 11670
}
- int var6 = var1 - field747 + clickedWidgetParent.scrollX; // L: 11830
- int var7 = var2 - field674 + clickedWidgetParent.scrollY; // L: 11831
+ int var6 = var1 - field664 + clickedWidgetParent.scrollX; // L: 11673
+ int var7 = var2 - field550 + clickedWidgetParent.scrollY; // L: 11674
ScriptEvent var8;
- if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11832
- var8 = new ScriptEvent(); // L: 11833
- var8.widget = clickedWidget; // L: 11834
- var8.mouseX = var6; // L: 11835
- var8.mouseY = var7; // L: 11836
- var8.args = clickedWidget.onDrag; // L: 11837
- class144.runScriptEvent(var8); // L: 11838
+ if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11675
+ var8 = new ScriptEvent(); // L: 11676
+ var8.widget = clickedWidget; // L: 11677
+ var8.mouseX = var6; // L: 11678
+ var8.mouseY = var7; // L: 11679
+ var8.args = clickedWidget.onDrag; // L: 11680
+ BoundaryObject.runScriptEvent(var8); // L: 11681
}
- if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11840
- if (isDraggingWidget) { // L: 11841
- if (clickedWidget.onDragComplete != null) { // L: 11842
- var8 = new ScriptEvent(); // L: 11843
- var8.widget = clickedWidget; // L: 11844
- var8.mouseX = var6; // L: 11845
- var8.mouseY = var7; // L: 11846
- var8.dragTarget = draggedOnWidget; // L: 11847
- var8.args = clickedWidget.onDragComplete; // L: 11848
- class144.runScriptEvent(var8); // L: 11849
+ if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11683
+ if (isDraggingWidget) { // L: 11684
+ if (clickedWidget.onDragComplete != null) { // L: 11685
+ var8 = new ScriptEvent(); // L: 11686
+ var8.widget = clickedWidget; // L: 11687
+ var8.mouseX = var6; // L: 11688
+ var8.mouseY = var7; // L: 11689
+ var8.dragTarget = draggedOnWidget; // L: 11690
+ var8.args = clickedWidget.onDragComplete; // L: 11691
+ BoundaryObject.runScriptEvent(var8); // L: 11692
}
- if (draggedOnWidget != null) { // L: 11851
- Widget var15 = clickedWidget; // L: 11853
- int var11 = UrlRequester.getWidgetFlags(var15); // L: 11856
- int var16 = var11 >> 17 & 7; // L: 11858
- int var12 = var16; // L: 11860
- Widget var18;
- if (var16 == 0) { // L: 11861
- var18 = null; // L: 11862
- } else {
- int var13 = 0;
-
- while (true) {
- if (var13 >= var12) {
- var18 = var15; // L: 11872
- break;
- }
-
- var15 = class92.getWidget(var15.parentId); // L: 11866
- if (var15 == null) { // L: 11867
- var18 = null; // L: 11868
- break; // L: 11869
- }
-
- ++var13; // L: 11865
- }
- }
-
- if (var18 != null) { // L: 11874
- PacketBufferNode var19 = WallDecoration.getPacketBufferNode(ClientPacket.field3029, packetWriter.isaacCipher); // L: 11876
- var19.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11877
- var19.packetBuffer.method7563(draggedOnWidget.id); // L: 11878
- var19.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11879
- var19.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 11880
- var19.packetBuffer.writeIntME(clickedWidget.id); // L: 11881
- var19.packetBuffer.writeShort(clickedWidget.itemId); // L: 11882
- packetWriter.addNode(var19); // L: 11883
- }
+ if (draggedOnWidget != null && UserComparator10.method2610(clickedWidget) != null) { // L: 11694
+ PacketBufferNode var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2912, packetWriter.isaacCipher); // L: 11696
+ var9.packetBuffer.method7784(clickedWidget.id); // L: 11697
+ var9.packetBuffer.method7863(clickedWidget.childIndex); // L: 11698
+ var9.packetBuffer.method7760(draggedOnWidget.id); // L: 11699
+ var9.packetBuffer.writeIntME(draggedOnWidget.childIndex); // L: 11700
+ var9.packetBuffer.method7929(clickedWidget.itemId); // L: 11701
+ var9.packetBuffer.writeIntME(draggedOnWidget.itemId); // L: 11702
+ packetWriter.addNode(var9); // L: 11703
}
- } else if (this.shouldLeftClickOpenMenu()) { // L: 11888
- this.openMenu(widgetClickX + field653, widgetClickY + field612); // L: 11889
- } else if (menuOptionsCount > 0) { // L: 11891
- int var14 = field653 + widgetClickX; // L: 11892
- int var9 = widgetClickY + field612; // L: 11893
- MenuAction var10 = class116.tempMenuAction; // L: 11895
- if (var10 != null) { // L: 11897
- ModeWhere.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var14, var9); // L: 11898
- }
-
- class116.tempMenuAction = null; // L: 11901
+ } else if (this.shouldLeftClickOpenMenu()) { // L: 11707
+ this.openMenu(field775 + widgetClickX, widgetClickY + field677); // L: 11708
+ } else if (menuOptionsCount > 0) { // L: 11710
+ CollisionMap.method3906(field775 + widgetClickX, widgetClickY + field677); // L: 11711
}
- clickedWidget = null; // L: 11905
+ clickedWidget = null; // L: 11714
}
} else {
- if (SoundSystem.widgetDragDuration > 1) { // L: 11796
- if (!isDraggingWidget && menuOptionsCount > 0) { // L: 11797
- var1 = widgetClickX + field653; // L: 11798
- var2 = field612 + widgetClickY; // L: 11799
- MenuAction var17 = class116.tempMenuAction; // L: 11801
- if (var17 != null) { // L: 11803
- ModeWhere.menuAction(var17.param0, var17.param1, var17.opcode, var17.identifier, var17.action, var17.action, var1, var2); // L: 11804
- }
-
- class116.tempMenuAction = null; // L: 11807
+ if (Timer.widgetDragDuration > 1) { // L: 11649
+ if (!isDraggingWidget && menuOptionsCount > 0) { // L: 11650
+ CollisionMap.method3906(widgetClickX + field775, widgetClickY + field677); // L: 11651
}
- clickedWidget = null; // L: 11810
+ clickedWidget = null; // L: 11653
}
}
- } // L: 11812 11907
+ } // L: 11655 11716
- @ObfuscatedName("lt")
+ @ObfuscatedName("la")
@ObfuscatedSignature(
- descriptor = "(B)Lqv;",
- garbageValue = "-38"
+ descriptor = "(I)Lqa;",
+ garbageValue = "1509373240"
)
@Export("username")
public Username username() {
- return ModelData0.localPlayer != null ? ModelData0.localPlayer.username : null; // L: 12651
+ return class101.localPlayer != null ? class101.localPlayer.username : null; // L: 12410
}
- public void setOtlTokenRequester(OtlTokenRequester var1) {
- if (var1 != null) { // L: 824
- this.field478 = var1; // L: 827
- class126.method2799(10); // L: 828
- }
- } // L: 825 829
-
- public long getAccountHash() {
- return this.field531; // L: 848
- }
-
- public boolean isOnLoginScreen() {
- return gameState == 10; // L: 843
- }
-
- public void setRefreshTokenRequester(RefreshAccessTokenRequester var1) {
- if (var1 != null) { // L: 834
- this.field577 = var1; // L: 837
- }
- } // L: 835 838
-
public final void init() {
try {
- if (this.checkHost()) { // L: 689
- for (int var1 = 0; var1 <= 28; ++var1) { // L: 690
- String var2 = this.getParameter(Integer.toString(var1)); // L: 691
- if (var2 != null) { // L: 692
- switch(var1) { // L: 693
- case 1:
- useBufferedSocket = Integer.parseInt(var2) != 0; // L: 696
- case 2:
+ if (this.checkHost()) { // L: 739
+ for (int var1 = 0; var1 <= 28; ++var1) { // L: 740
+ String var2 = this.getParameter(Integer.toString(var1)); // L: 741
+ if (var2 != null) { // L: 742
+ int var4;
+ switch(var1) { // L: 743
+ case 3:
+ if (var2.equalsIgnoreCase("true")) { // L: 840
+ isMembersWorld = true;
+ } else {
+ isMembersWorld = false; // L: 841
+ }
+ break;
+ case 4:
+ if (clientType == -1) { // L: 772
+ clientType = Integer.parseInt(var2); // L: 773
+ }
+ break;
+ case 5:
+ worldProperties = Integer.parseInt(var2); // L: 757
+ break; // L: 758
+ case 6:
+ var4 = Integer.parseInt(var2); // L: 812
+ Language var13;
+ if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 814
+ var13 = Language.Language_valuesOrdered[var4]; // L: 818
+ } else {
+ var13 = null; // L: 815
+ }
+
+ class134.clientLanguage = var13; // L: 820
+ break; // L: 821
+ case 7:
+ var4 = Integer.parseInt(var2); // L: 785
+ GameBuild[] var5 = MusicPatch.method5433(); // L: 788
+ int var6 = 0;
+
+ GameBuild var12;
+ while (true) {
+ if (var6 >= var5.length) {
+ var12 = null; // L: 799
+ break;
+ }
+
+ GameBuild var7 = var5[var6]; // L: 790
+ if (var4 == var7.buildId) { // L: 792
+ var12 = var7; // L: 793
+ break; // L: 794
+ }
+
+ ++var6; // L: 789
+ }
+
+ Players.field1305 = var12; // L: 801
+ break; // L: 802
+ case 8:
+ if (var2.equalsIgnoreCase("true")) { // L: 846
+ }
+ break;
+ case 9:
+ GrandExchangeOfferTotalQuantityComparator.field4045 = var2; // L: 830
+ break; // L: 831
+ case 10:
+ StudioGame[] var3 = new StudioGame[]{StudioGame.game3, StudioGame.game4, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.game5, StudioGame.runescape}; // L: 748
+ class285.field3313 = (StudioGame)Actor.findEnumerated(var3, Integer.parseInt(var2)); // L: 750
+ if (class285.field3313 == StudioGame.oldscape) { // L: 751
+ HealthBarDefinition.loginType = LoginType.oldscape;
+ } else {
+ HealthBarDefinition.loginType = LoginType.field4620; // L: 752
+ }
+ break;
+ case 11:
+ UserComparator5.field1387 = var2; // L: 779
+ break; // L: 780
+ case 12:
+ worldId = Integer.parseInt(var2); // L: 825
case 13:
case 16:
case 18:
@@ -6564,792 +6475,245 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi {
case 20:
default:
break;
- case 3:
- if (var2.equalsIgnoreCase("true")) { // L: 747
- isMembersWorld = true;
- } else {
- isMembersWorld = false; // L: 748
- }
- break;
- case 4:
- if (clientType == -1) { // L: 773
- clientType = Integer.parseInt(var2); // L: 774
- }
- break;
- case 5:
- worldProperties = Integer.parseInt(var2); // L: 753
- break; // L: 754
- case 6:
- int var4 = Integer.parseInt(var2); // L: 713
- Language var9;
- if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 715
- var9 = Language.Language_valuesOrdered[var4]; // L: 719
- } else {
- var9 = null; // L: 716
- }
-
- class263.clientLanguage = var9; // L: 721
- break; // L: 722
- case 7:
- AbstractArchive.field4038 = AbstractWorldMapData.method4799(Integer.parseInt(var2)); // L: 763
- break; // L: 764
- case 8:
- if (var2.equalsIgnoreCase("true")) { // L: 706
- }
- break;
- case 9:
- field662 = var2; // L: 758
- break; // L: 759
- case 10:
- StudioGame[] var3 = new StudioGame[]{StudioGame.game3, StudioGame.runescape, StudioGame.stellardawn, StudioGame.game5, StudioGame.game4, StudioGame.oldscape}; // L: 728
- ApproximateRouteStrategy.field473 = (StudioGame)class291.findEnumerated(var3, Integer.parseInt(var2)); // L: 730
- if (ApproximateRouteStrategy.field473 == StudioGame.oldscape) { // L: 731
- class391.loginType = LoginType.oldscape;
- } else {
- class391.loginType = LoginType.field4616; // L: 732
- }
- break;
- case 11:
- ApproximateRouteStrategy.field471 = var2; // L: 780
- break; // L: 781
- case 12:
- worldId = Integer.parseInt(var2); // L: 785
- break; // L: 786
case 14:
- class230.field2807 = Integer.parseInt(var2); // L: 742
- break; // L: 743
+ class17.field99 = Integer.parseInt(var2); // L: 762
+ break; // L: 763
case 15:
- gameBuild = Integer.parseInt(var2); // L: 790
- break;
+ gameBuild = Integer.parseInt(var2); // L: 767
+ break; // L: 768
case 17:
- class93.field1280 = var2; // L: 737
- break; // L: 738
+ field481 = var2; // L: 835
+ break; // L: 836
case 21:
- field484 = Integer.parseInt(var2); // L: 768
- break; // L: 769
- case 22:
- field493 = Integer.parseInt(var2) != 0; // L: 701
+ field482 = Integer.parseInt(var2); // L: 806
}
}
}
- JagexCache.method3155(); // L: 796
- Timer.worldHost = this.getCodeBase().getHost(); // L: 797
- String var5 = AbstractArchive.field4038.name; // L: 798
- byte var6 = 0; // L: 799
+ SecureRandomFuture.method1967(); // L: 853
+ StructComposition.worldHost = this.getCodeBase().getHost(); // L: 854
+ String var8 = Players.field1305.name; // L: 855
+ byte var9 = 0; // L: 856
try {
- PendingSpawn.method2160("oldschool", var5, var6, 21); // L: 801
- } catch (Exception var7) { // L: 803
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var7); // L: 804
+ class117.method2727("oldschool", var8, var9, 22); // L: 858
+ } catch (Exception var10) { // L: 860
+ class249.RunException_sendStackTrace((String)null, var10); // L: 861
}
- class82.client = this; // L: 806
- class430.clientType = clientType; // L: 807
- if (field486 == -1) { // L: 808
- field486 = 0; // L: 809
+ class353.client = this; // L: 863
+ class20.clientType = clientType; // L: 864
+ if (field484 == -1) { // L: 865
+ field484 = 0; // L: 866
}
- Decimator.field406 = System.getenv("JX_ACCESS_TOKEN"); // L: 811
- ModelData0.field2661 = System.getenv("JX_REFRESH_TOKEN"); // L: 812
- this.startThread(765, 503, 205); // L: 813
+ class21.field122 = System.getenv("JX_ACCESS_TOKEN"); // L: 868
+ VarcInt.field1851 = System.getenv("JX_REFRESH_TOKEN"); // L: 869
+ if (Boolean.parseBoolean(System.getProperty("jagex.disableBouncyCastle"))) { // L: 870
+ this.field523 = true; // L: 871
+ }
+
+ this.startThread(765, 503, 206, 1); // L: 873
}
- } catch (RuntimeException var8) {
- throw HealthBarUpdate.newRunException(var8, "client.init(" + ')');
+ } catch (RuntimeException var11) {
+ throw MilliClock.newRunException(var11, "client.init(" + ')');
}
- } // L: 814
+ } // L: 874
- @ObfuscatedName("ad")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "2074222337"
- )
- static int method1240(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3845
- class12.Interpreter_intStackSize -= 2; // L: 3846
- field748 = (short)InterfaceParent.method2066(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]); // L: 3847
- if (field748 <= 0) { // L: 3848
- field748 = 256;
- }
-
- field749 = (short)InterfaceParent.method2066(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 3849
- if (field749 <= 0) { // L: 3850
- field749 = 256;
- }
-
- return 1; // L: 3851
- } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3853
- class12.Interpreter_intStackSize -= 2; // L: 3854
- zoomHeight = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3855
- if (zoomHeight <= 0) { // L: 3856
- zoomHeight = 256;
- }
-
- zoomWidth = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3857
- if (zoomWidth <= 0) { // L: 3858
- zoomWidth = 320;
- }
-
- return 1; // L: 3859
- } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3861
- class12.Interpreter_intStackSize -= 4; // L: 3862
- field752 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3863
- if (field752 <= 0) { // L: 3864
- field752 = 1;
- }
-
- field753 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3865
- if (field753 <= 0) { // L: 3866
- field753 = 32767;
- } else if (field753 < field752) { // L: 3867
- field753 = field752;
- }
-
- field656 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3868
- if (field656 <= 0) { // L: 3869
- field656 = 1;
- }
-
- field755 = (short)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 3870
- if (field755 <= 0) { // L: 3871
- field755 = 32767;
- } else if (field755 < field656) { // L: 3872
- field755 = field656;
- }
-
- return 1; // L: 3873
- } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3875
- if (viewportWidget != null) { // L: 3876
- GrandExchangeOfferOwnWorldComparator.setViewportShape(0, 0, viewportWidget.width, viewportWidget.height, false); // L: 3877
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = viewportWidth; // L: 3878
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = viewportHeight; // L: 3879
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3882
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3883
- }
-
- return 1; // L: 3885
- } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3887
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = zoomHeight; // L: 3888
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = zoomWidth; // L: 3889
- return 1; // L: 3890
- } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3892
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.method278(field748); // L: 3893
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.method278(field749); // L: 3894
- return 1; // L: 3895
- } else if (var0 == 6220) { // L: 3897
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3898
- return 1; // L: 3899
- } else if (var0 == 6221) { // L: 3901
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3902
- return 1; // L: 3903
- } else if (var0 == 6222) { // L: 3905
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GraphicsObject.canvasWidth; // L: 3906
- return 1; // L: 3907
- } else if (var0 == 6223) { // L: 3909
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class433.canvasHeight; // L: 3910
- return 1; // L: 3911
- } else {
- return 2; // L: 3913
+ public void setOtlTokenRequester(OtlTokenRequester var1) {
+ if (var1 != null) { // L: 884
+ this.field733 = var1; // L: 887
+ WorldMapData_1.method4872(10); // L: 888
}
+ } // L: 885 889
+
+ public boolean isOnLoginScreen() {
+ return gameState == 10; // L: 903
+ }
+
+ public long getAccountHash() {
+ return this.field707; // L: 908
}
- @ObfuscatedName("hu")
@ObfuscatedSignature(
- descriptor = "(Lcx;IIIIII)V",
- garbageValue = "-1622528173"
+ descriptor = "(Lcom/jagex/oldscape/pub/RefreshAccessTokenRequester;)V"
)
- @Export("drawActor2d")
- static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
- if (var0 != null && var0.isVisible()) { // L: 5032
- if (var0 instanceof NPC) { // L: 5033
- NPCComposition var6 = ((NPC)var0).definition; // L: 5034
- if (var6.transforms != null) { // L: 5035
- var6 = var6.transform();
- }
-
- if (var6 == null) { // L: 5036
- return;
- }
- }
-
- int var75 = Players.Players_count; // L: 5038
- int[] var7 = Players.Players_indices; // L: 5039
- byte var8 = 0; // L: 5040
- if (var1 < var75 && var0.playerCycle == cycle && class118.method2720((Player)var0)) { // L: 5041
- Player var9 = (Player)var0; // L: 5042
- if (var1 < var75) { // L: 5043
- ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5044
- AbstractFont var10 = (AbstractFont)fontsMap.get(FontName.FontName_plain12); // L: 5045
- byte var11 = 9; // L: 5046
- var10.drawCentered(var9.username.getName(), var2 + viewportTempX, var3 + viewportTempY - var11, 16777215, 0); // L: 5047
- var8 = 18; // L: 5048
- }
- }
-
- int var76 = -2; // L: 5051
- int var22;
- int var23;
- int var24;
- int var77;
- if (!var0.healthBars.method5986()) { // L: 5052
- var77 = var0.defaultHeight + 15; // L: 5053
- AbstractWorldMapIcon.worldToScreen(var0.x, var0.y, var77); // L: 5055
-
- for (HealthBar var78 = (HealthBar)var0.healthBars.last(); var78 != null; var78 = (HealthBar)var0.healthBars.previous()) { // L: 5057
- HealthBarUpdate var80 = var78.get(cycle); // L: 5058
- if (var80 == null) { // L: 5059
- if (var78.isEmpty()) { // L: 5117
- var78.remove();
- }
- } else {
- HealthBarDefinition var13 = var78.definition; // L: 5060
- SpritePixels var81 = var13.getBackSprite(); // L: 5061
- SpritePixels var82 = var13.getFrontSprite(); // L: 5062
- int var17 = 0; // L: 5064
- int var83;
- if (var81 != null && var82 != null) { // L: 5065
- if (var13.widthPadding * 2 < var82.subWidth) { // L: 5066
- var17 = var13.widthPadding;
- }
-
- var83 = var82.subWidth - var17 * 2; // L: 5067
- } else {
- var83 = var13.width; // L: 5069
- }
-
- int var84 = 255; // L: 5070
- boolean var85 = true; // L: 5071
- int var86 = cycle - var80.cycle; // L: 5072
- int var87 = var83 * var80.health2 / var13.width; // L: 5073
- int var94;
- if (var80.cycleOffset > var86) { // L: 5074
- var22 = var13.field1915 == 0 ? 0 : var13.field1915 * (var86 / var13.field1915); // L: 5075
- var23 = var83 * var80.health / var13.width; // L: 5076
- var94 = var22 * (var87 - var23) / var80.cycleOffset + var23; // L: 5077
- } else {
- var94 = var87; // L: 5080
- var22 = var13.int5 + var80.cycleOffset - var86; // L: 5081
- if (var13.int3 >= 0) { // L: 5082
- var84 = (var22 << 8) / (var13.int5 - var13.int3);
- }
- }
-
- if (var80.health2 > 0 && var94 < 1) { // L: 5084
- var94 = 1;
- }
-
- if (var81 != null && var82 != null) { // L: 5085
- if (var83 == var94) { // L: 5086
- var94 += var17 * 2;
- } else {
- var94 += var17; // L: 5087
- }
-
- var22 = var81.subHeight; // L: 5088
- var76 += var22; // L: 5089
- var23 = var2 + viewportTempX - (var83 >> 1); // L: 5090
- var24 = var3 + viewportTempY - var76; // L: 5091
- var23 -= var17; // L: 5092
- if (var84 >= 0 && var84 < 255) { // L: 5093
- var81.drawTransAt(var23, var24, var84); // L: 5094
- Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var22 + var24); // L: 5095
- var82.drawTransAt(var23, var24, var84); // L: 5096
- } else {
- var81.drawTransBgAt(var23, var24); // L: 5099
- Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var22 + var24); // L: 5100
- var82.drawTransBgAt(var23, var24); // L: 5101
- }
-
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5103
- var76 += 2; // L: 5104
- } else {
- var76 += 5; // L: 5107
- if (viewportTempX > -1) { // L: 5108
- var22 = var2 + viewportTempX - (var83 >> 1); // L: 5109
- var23 = var3 + viewportTempY - var76; // L: 5110
- Rasterizer2D.Rasterizer2D_fillRectangle(var22, var23, var94, 5, 65280); // L: 5111
- Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var22, var23, var83 - var94, 5, 16711680); // L: 5112
- }
-
- var76 += 2; // L: 5114
- }
- }
- }
- }
-
- if (var76 == -2) { // L: 5120
- var76 += 7;
- }
-
- var76 += var8; // L: 5121
- if (var1 < var75) { // L: 5122
- Player var88 = (Player)var0; // L: 5123
- if (var88.isHidden) { // L: 5124
- return;
- }
-
- if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 5125
- ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5126
- if (viewportTempX > -1) { // L: 5127
- if (var88.headIconPk != -1) { // L: 5128
- var76 += 25; // L: 5129
- UserComparator4.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - var76); // L: 5130
- }
-
- if (var88.headIconPrayer != -1) { // L: 5132
- var76 += 25; // L: 5133
- ChatChannel.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - var76); // L: 5134
- }
- }
- }
-
- if (var1 >= 0 && hintArrowType == 10 && var7[var1] == hintArrowPlayerIndex) { // L: 5138
- ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5139
- if (viewportTempX > -1) { // L: 5140
- var76 += class21.headIconHintSprites[1].subHeight; // L: 5141
- class21.headIconHintSprites[1].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - var76); // L: 5142
- }
- }
- } else {
- NPCComposition var89 = ((NPC)var0).definition; // L: 5147
- if (var89.transforms != null) { // L: 5148
- var89 = var89.transform();
- }
-
- if (var89.headIconPrayer >= 0 && var89.headIconPrayer < ChatChannel.headIconPrayerSprites.length) { // L: 5149
- ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5150
- if (viewportTempX > -1) { // L: 5151
- ChatChannel.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - 30); // L: 5152
- }
- }
-
- if (hintArrowType == 1 && npcIndices[var1 - var75] == hintArrowNpcIndex && cycle % 20 < 10) { // L: 5155
- ByteArrayPool.method6357(var0, var0.defaultHeight + 15); // L: 5156
- if (viewportTempX > -1) { // L: 5157
- class21.headIconHintSprites[0].drawTransBgAt(var2 + viewportTempX - 12, var3 + viewportTempY - 28);
- }
- }
- }
-
- if (var0.overheadText != null && (var1 >= var75 || !var0.field1198 && (publicChatMode == 4 || !var0.isAutoChatting && (publicChatMode == 0 || publicChatMode == 3 || publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5160 5161
- ByteArrayPool.method6357(var0, var0.defaultHeight); // L: 5162
- if (viewportTempX > -1 && overheadTextCount < overheadTextLimit) { // L: 5163
- overheadTextXOffsets[overheadTextCount] = ChatChannel.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5164
- overheadTextAscents[overheadTextCount] = ChatChannel.fontBold12.ascent; // L: 5165
- overheadTextXs[overheadTextCount] = viewportTempX; // L: 5166
- overheadTextYs[overheadTextCount] = viewportTempY; // L: 5167
- overheadTextColors[overheadTextCount] = var0.overheadTextColor; // L: 5168
- overheadTextEffects[overheadTextCount] = var0.overheadTextEffect; // L: 5169
- overheadTextCyclesRemaining[overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5170
- overheadText[overheadTextCount] = var0.overheadText; // L: 5171
- ++overheadTextCount; // L: 5172
- }
- }
-
- for (var77 = 0; var77 < 4; ++var77) { // L: 5176
- int var90 = var0.hitSplatCycles[var77]; // L: 5177
- int var12 = var0.hitSplatTypes[var77]; // L: 5178
- HitSplatDefinition var91 = null; // L: 5179
- int var14 = 0; // L: 5180
- if (var12 >= 0) { // L: 5181
- if (var90 <= cycle) { // L: 5182
- continue;
- }
-
- var91 = UserComparator4.method2567(var0.hitSplatTypes[var77]); // L: 5183
- var14 = var91.field2071; // L: 5184
- if (var91 != null && var91.transforms != null) { // L: 5185
- var91 = var91.transform(); // L: 5186
- if (var91 == null) { // L: 5187
- var0.hitSplatCycles[var77] = -1; // L: 5188
- continue;
- }
- }
- } else if (var90 < 0) { // L: 5193
- continue;
- }
-
- int var15 = var0.hitSplatTypes2[var77]; // L: 5194
- HitSplatDefinition var16 = null; // L: 5195
- if (var15 >= 0) { // L: 5196
- var16 = UserComparator4.method2567(var15); // L: 5197
- if (var16 != null && var16.transforms != null) { // L: 5198
- var16 = var16.transform();
- }
- }
-
- if (var90 - var14 <= cycle) { // L: 5200
- if (var91 == null) { // L: 5201
- var0.hitSplatCycles[var77] = -1; // L: 5202
- } else {
- ByteArrayPool.method6357(var0, var0.defaultHeight / 2); // L: 5205
- if (viewportTempX > -1) { // L: 5206
- boolean var92 = true; // L: 5207
- if (var77 == 1) { // L: 5208
- viewportTempY -= 20; // L: 5209
- }
-
- if (var77 == 2) { // L: 5211
- viewportTempX -= 15; // L: 5212
- viewportTempY -= 10; // L: 5213
- }
-
- if (var77 == 3) { // L: 5215
- viewportTempX += 15; // L: 5216
- viewportTempY -= 10; // L: 5217
- }
-
- SpritePixels var18 = null; // L: 5219
- SpritePixels var19 = null; // L: 5220
- SpritePixels var20 = null; // L: 5221
- SpritePixels var21 = null; // L: 5222
- var22 = 0; // L: 5223
- var23 = 0; // L: 5224
- var24 = 0; // L: 5225
- int var25 = 0; // L: 5226
- int var26 = 0; // L: 5227
- int var27 = 0; // L: 5228
- int var28 = 0; // L: 5229
- int var29 = 0; // L: 5230
- SpritePixels var30 = null; // L: 5231
- SpritePixels var31 = null; // L: 5232
- SpritePixels var32 = null; // L: 5233
- SpritePixels var33 = null; // L: 5234
- int var34 = 0; // L: 5235
- int var35 = 0; // L: 5236
- int var36 = 0; // L: 5237
- int var37 = 0; // L: 5238
- int var38 = 0; // L: 5239
- int var39 = 0; // L: 5240
- int var40 = 0; // L: 5241
- int var41 = 0; // L: 5242
- int var42 = 0; // L: 5243
- var18 = var91.method3531(); // L: 5244
- int var43;
- if (var18 != null) { // L: 5245
- var22 = var18.subWidth; // L: 5246
- var43 = var18.subHeight; // L: 5247
- if (var43 > var42) { // L: 5248
- var42 = var43;
- }
-
- var26 = var18.xOffset; // L: 5249
- }
-
- var19 = var91.method3534(); // L: 5251
- if (var19 != null) { // L: 5252
- var23 = var19.subWidth; // L: 5253
- var43 = var19.subHeight; // L: 5254
- if (var43 > var42) { // L: 5255
- var42 = var43;
- }
-
- var27 = var19.xOffset; // L: 5256
- }
-
- var20 = var91.method3533(); // L: 5258
- if (var20 != null) { // L: 5259
- var24 = var20.subWidth; // L: 5260
- var43 = var20.subHeight; // L: 5261
- if (var43 > var42) { // L: 5262
- var42 = var43;
- }
-
- var28 = var20.xOffset; // L: 5263
- }
-
- var21 = var91.method3559(); // L: 5265
- if (var21 != null) { // L: 5266
- var25 = var21.subWidth; // L: 5267
- var43 = var21.subHeight; // L: 5268
- if (var43 > var42) { // L: 5269
- var42 = var43;
- }
-
- var29 = var21.xOffset; // L: 5270
- }
-
- if (var16 != null) { // L: 5272
- var30 = var16.method3531(); // L: 5273
- if (var30 != null) { // L: 5274
- var34 = var30.subWidth; // L: 5275
- var43 = var30.subHeight; // L: 5276
- if (var43 > var42) { // L: 5277
- var42 = var43;
- }
-
- var38 = var30.xOffset; // L: 5278
- }
-
- var31 = var16.method3534(); // L: 5280
- if (var31 != null) { // L: 5281
- var35 = var31.subWidth; // L: 5282
- var43 = var31.subHeight; // L: 5283
- if (var43 > var42) { // L: 5284
- var42 = var43;
- }
-
- var39 = var31.xOffset; // L: 5285
- }
-
- var32 = var16.method3533(); // L: 5287
- if (var32 != null) { // L: 5288
- var36 = var32.subWidth; // L: 5289
- var43 = var32.subHeight; // L: 5290
- if (var43 > var42) { // L: 5291
- var42 = var43;
- }
-
- var40 = var32.xOffset; // L: 5292
- }
-
- var33 = var16.method3559(); // L: 5294
- if (var33 != null) { // L: 5295
- var37 = var33.subWidth; // L: 5296
- var43 = var33.subHeight; // L: 5297
- if (var43 > var42) { // L: 5298
- var42 = var43;
- }
-
- var41 = var33.xOffset; // L: 5299
- }
- }
-
- Font var79 = var91.getFont(); // L: 5304
- if (var79 == null) { // L: 5305
- var79 = Varcs.fontPlain11;
- }
-
- Font var44;
- if (var16 != null) { // L: 5306
- var44 = var16.getFont(); // L: 5307
- if (var44 == null) { // L: 5308
- var44 = Varcs.fontPlain11;
- }
- } else {
- var44 = Varcs.fontPlain11; // L: 5310
- }
-
- String var45 = null; // L: 5311
- String var46 = null; // L: 5312
- boolean var47 = false; // L: 5313
- int var48 = 0; // L: 5314
- var45 = var91.getString(var0.hitSplatValues[var77]); // L: 5315
- int var93 = var79.stringWidth(var45); // L: 5316
- if (var16 != null) { // L: 5317
- var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 5318
- var48 = var44.stringWidth(var46); // L: 5319
- }
-
- int var49 = 0; // L: 5321
- int var50 = 0; // L: 5322
- if (var23 > 0) { // L: 5323
- if (var20 == null && var21 == null) { // L: 5324
- var49 = 1; // L: 5325
- } else {
- var49 = var93 / var23 + 1;
- }
- }
-
- if (var16 != null && var35 > 0) { // L: 5327 5328
- if (var32 == null && var33 == null) { // L: 5329
- var50 = 1; // L: 5330
- } else {
- var50 = var48 / var35 + 1;
- }
- }
-
- int var51 = 0; // L: 5333
- int var52 = var51; // L: 5334
- if (var22 > 0) { // L: 5335
- var51 += var22;
- }
-
- var51 += 2; // L: 5336
- int var53 = var51; // L: 5337
- if (var24 > 0) { // L: 5338
- var51 += var24;
- }
-
- int var54 = var51; // L: 5339
- int var55 = var51; // L: 5340
- int var56;
- if (var23 > 0) { // L: 5341
- var56 = var49 * var23; // L: 5342
- var51 += var56; // L: 5343
- var55 += (var56 - var93) / 2; // L: 5344
- } else {
- var51 += var93; // L: 5347
- }
-
- var56 = var51; // L: 5349
- if (var25 > 0) { // L: 5350
- var51 += var25;
- }
-
- int var57 = 0; // L: 5351
- int var58 = 0; // L: 5352
- int var59 = 0; // L: 5353
- int var60 = 0; // L: 5354
- int var61 = 0; // L: 5355
- int var62;
- if (var16 != null) { // L: 5356
- var51 += 2; // L: 5357
- var57 = var51; // L: 5358
- if (var34 > 0) { // L: 5359
- var51 += var34;
- }
-
- var51 += 2; // L: 5360
- var58 = var51; // L: 5361
- if (var36 > 0) { // L: 5362
- var51 += var36;
- }
-
- var59 = var51; // L: 5363
- var61 = var51; // L: 5364
- if (var35 > 0) { // L: 5365
- var62 = var50 * var35; // L: 5366
- var51 += var62; // L: 5367
- var61 += (var62 - var48) / 2; // L: 5368
- } else {
- var51 += var48; // L: 5371
- }
-
- var60 = var51; // L: 5373
- if (var37 > 0) { // L: 5374
- var51 += var37;
- }
- }
-
- var62 = var0.hitSplatCycles[var77] - cycle; // L: 5376
- int var63 = var91.field2055 - var62 * var91.field2055 / var91.field2071; // L: 5377
- int var64 = var62 * var91.field2074 / var91.field2071 + -var91.field2074; // L: 5378
- int var65 = var63 + (var2 + viewportTempX - (var51 >> 1)); // L: 5379
- int var66 = var3 + viewportTempY - 12 + var64; // L: 5380
- int var67 = var66; // L: 5381
- int var68 = var66 + var42; // L: 5382
- int var69 = var66 + var91.field2068 + 15; // L: 5383
- int var70 = var69 - var79.maxAscent; // L: 5384
- int var71 = var69 + var79.maxDescent; // L: 5385
- if (var70 < var66) { // L: 5386
- var67 = var70;
- }
-
- if (var71 > var68) { // L: 5387
- var68 = var71;
- }
-
- int var72 = 0; // L: 5388
- int var73;
- int var74;
- if (var16 != null) { // L: 5389
- var72 = var66 + var16.field2068 + 15; // L: 5390
- var73 = var72 - var44.maxAscent; // L: 5391
- var74 = var72 + var44.maxDescent; // L: 5392
- if (var73 < var67) { // L: 5393
- ;
- }
-
- if (var74 > var68) { // L: 5394
- ;
- }
- }
-
- var73 = 255; // L: 5396
- if (var91.field2072 >= 0) { // L: 5397
- var73 = (var62 << 8) / (var91.field2071 - var91.field2072);
- }
-
- if (var73 >= 0 && var73 < 255) { // L: 5398
- if (var18 != null) { // L: 5399
- var18.drawTransAt(var52 + var65 - var26, var66, var73);
- }
-
- if (var20 != null) { // L: 5400
- var20.drawTransAt(var65 + var53 - var28, var66, var73);
- }
-
- if (var19 != null) { // L: 5401
- for (var74 = 0; var74 < var49; ++var74) { // L: 5402
- var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 5403
- }
- }
-
- if (var21 != null) { // L: 5406
- var21.drawTransAt(var65 + var56 - var29, var66, var73);
- }
-
- var79.drawAlpha(var45, var55 + var65, var69, var91.textColor, 0, var73); // L: 5407
- if (var16 != null) { // L: 5408
- if (var30 != null) { // L: 5409
- var30.drawTransAt(var65 + var57 - var38, var66, var73);
- }
-
- if (var32 != null) { // L: 5410
- var32.drawTransAt(var65 + var58 - var40, var66, var73);
- }
-
- if (var31 != null) { // L: 5411
- for (var74 = 0; var74 < var50; ++var74) { // L: 5412
- var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); // L: 5413
- }
- }
-
- if (var33 != null) { // L: 5416
- var33.drawTransAt(var60 + var65 - var41, var66, var73);
- }
-
- var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 5417
- }
- } else {
- if (var18 != null) { // L: 5421
- var18.drawTransBgAt(var52 + var65 - var26, var66);
- }
-
- if (var20 != null) { // L: 5422
- var20.drawTransBgAt(var65 + var53 - var28, var66);
- }
-
- if (var19 != null) { // L: 5423
- for (var74 = 0; var74 < var49; ++var74) { // L: 5424
- var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); // L: 5425
- }
- }
-
- if (var21 != null) { // L: 5428
- var21.drawTransBgAt(var56 + var65 - var29, var66);
- }
-
- var79.draw(var45, var65 + var55, var69, var91.textColor | -16777216, 0); // L: 5429
- if (var16 != null) { // L: 5430
- if (var30 != null) { // L: 5431
- var30.drawTransBgAt(var57 + var65 - var38, var66);
- }
-
- if (var32 != null) { // L: 5432
- var32.drawTransBgAt(var65 + var58 - var40, var66);
- }
-
- if (var31 != null) { // L: 5433
- for (var74 = 0; var74 < var50; ++var74) { // L: 5434
- var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); // L: 5435
- }
- }
-
- if (var33 != null) { // L: 5438
- var33.drawTransBgAt(var65 + var60 - var41, var66);
- }
-
- var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 5439
- }
- }
- }
- }
- }
- }
-
+ public void setRefreshTokenRequester(RefreshAccessTokenRequester var1) {
+ if (var1 != null) { // L: 894
+ this.field673 = var1; // L: 897
}
- } // L: 5444
+ } // L: 895 898
+
+ @ObfuscatedName("ab")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-92"
+ )
+ static int method1177(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2720
+ if (HealthBar.guestClanSettings != null) { // L: 2721
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2722
+ WorldMapID.field2842 = HealthBar.guestClanSettings; // L: 2723
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2725
+ }
+
+ return 1; // L: 2726
+ } else {
+ int var3;
+ if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2728
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2729
+ if (currentClanSettings[var3] != null) { // L: 2730
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2731
+ WorldMapID.field2842 = currentClanSettings[var3]; // L: 2732
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2734
+ }
+
+ return 1; // L: 2735
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2737
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapID.field2842.name; // L: 2738
+ return 1; // L: 2739
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2741
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.allowGuests ? 1 : 0; // L: 2742
+ return 1; // L: 2743
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2745
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1637; // L: 2746
+ return 1; // L: 2747
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2749
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1633; // L: 2750
+ return 1; // L: 2751
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2753
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1634; // L: 2754
+ return 1; // L: 2755
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2757
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1645; // L: 2758
+ return 1; // L: 2759
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2761
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.memberCount; // L: 2762
+ return 1; // L: 2763
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2765
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2766
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapID.field2842.memberNames[var3]; // L: 2767
+ return 1; // L: 2768
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2770
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2771
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.memberRanks[var3]; // L: 2772
+ return 1; // L: 2773
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2775
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.bannedMemberCount; // L: 2776
+ return 1; // L: 2777
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2779
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2780
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapID.field2842.bannedMemberNames[var3]; // L: 2781
+ return 1; // L: 2782
+ } else {
+ int var5;
+ int var6;
+ if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2784
+ class446.Interpreter_intStackSize -= 3; // L: 2785
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2786
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2787
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 2788
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.method2972(var3, var6, var5); // L: 2789
+ return 1; // L: 2790
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2792
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.currentOwner; // L: 2793
+ return 1; // L: 2794
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2796
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1644; // L: 2797
+ return 1; // L: 2798
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2800
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.method2991(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2801
+ return 1; // L: 2802
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2804
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.getSortedMembers()[Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1]]; // L: 2805
+ return 1; // L: 2806
+ } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2808
+ class446.Interpreter_intStackSize -= 2; // L: 2809
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2810
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2811
+ ServerPacket.method5209(var6, var3); // L: 2812
+ return 1; // L: 2813
+ } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2815
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2816
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1649[var3]; // L: 2817
+ return 1; // L: 2818
+ } else {
+ if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2820
+ class446.Interpreter_intStackSize -= 3; // L: 2821
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2822
+ boolean var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1] == 1; // L: 2823
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 2824
+ SceneTilePaint.method4530(var5, var3, var4); // L: 2825
+ }
+
+ if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2827
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2828
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.field2842.field1642[var3] ? 1 : 0; // L: 2829
+ return 1; // L: 2830
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2832
+ if (class150.guestClanChannel != null) { // L: 2833
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2834
+ UserComparator5.field1386 = class150.guestClanChannel; // L: 2835
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2837
+ }
+
+ return 1; // L: 2838
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2840
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2841
+ if (currentClanChannels[var3] != null) { // L: 2842
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2843
+ UserComparator5.field1386 = currentClanChannels[var3]; // L: 2844
+ Interpreter.field838 = var3; // L: 2845
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2847
+ }
+
+ return 1; // L: 2848
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2850
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = UserComparator5.field1386.name; // L: 2851
+ return 1; // L: 2852
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2854
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = UserComparator5.field1386.field1696; // L: 2855
+ return 1; // L: 2856
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2858
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = UserComparator5.field1386.field1695; // L: 2859
+ return 1; // L: 2860
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2862
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = UserComparator5.field1386.method3113(); // L: 2863
+ return 1; // L: 2864
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2866
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2867
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((ClanChannelMember)UserComparator5.field1386.members.get(var3)).username.getName(); // L: 2868
+ return 1; // L: 2869
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2871
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2872
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ((ClanChannelMember)UserComparator5.field1386.members.get(var3)).rank; // L: 2873
+ return 1; // L: 2874
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2876
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2877
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ((ClanChannelMember)UserComparator5.field1386.members.get(var3)).world; // L: 2878
+ return 1; // L: 2879
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2881
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2882
+ ApproximateRouteStrategy.method1086(Interpreter.field838, var3); // L: 2883
+ return 1; // L: 2884
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2886
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = UserComparator5.field1386.method3102(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2887
+ return 1; // L: 2888
+ } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2890
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1] = UserComparator5.field1386.getSortedMembers()[Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1]]; // L: 2891
+ return 1; // L: 2892
+ } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2894
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = FontName.field4584 != null ? 1 : 0; // L: 2895
+ return 1; // L: 2896
+ } else {
+ return 2; // L: 2898
+ }
+ }
+ }
+ }
+ }
}
diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java
index e13b5fc98a..487de6e335 100644
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
@@ -4,675 +4,708 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jj")
+@ObfuscatedName("ju")
@Implements("ClientPacket")
-public class ClientPacket implements class261 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3040;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2949;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2950;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- static final ClientPacket field2951;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2952;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3009;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3000;
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3038;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2956;
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2957;
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2958;
+public class ClientPacket implements class260 {
@ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2959;
- @ObfuscatedName("w")
+ static final ClientPacket field2926;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2960;
- @ObfuscatedName("b")
+ static final ClientPacket field2906;
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2961;
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2962;
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2963;
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3048;
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3032;
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2955;
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- static final ClientPacket field2991;
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2968;
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- static final ClientPacket field3055;
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2983;
- @ObfuscatedName("z")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2971;
- @ObfuscatedName("i")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2972;
- @ObfuscatedName("u")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2973;
- @ObfuscatedName("ag")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3044;
- @ObfuscatedName("ar")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2975;
- @ObfuscatedName("am")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2969;
- @ObfuscatedName("ac")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2977;
- @ObfuscatedName("ab")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2978;
- @ObfuscatedName("aj")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2979;
- @ObfuscatedName("ae")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2980;
- @ObfuscatedName("az")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2981;
- @ObfuscatedName("ap")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2982;
- @ObfuscatedName("as")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3019;
- @ObfuscatedName("au")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3050;
- @ObfuscatedName("ak")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2985;
- @ObfuscatedName("af")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2990;
- @ObfuscatedName("al")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2984;
- @ObfuscatedName("aq")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2988;
- @ObfuscatedName("ad")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2989;
- @ObfuscatedName("an")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3020;
- @ObfuscatedName("aw")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2954;
- @ObfuscatedName("ah")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2967;
- @ObfuscatedName("ao")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2993;
- @ObfuscatedName("av")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2994;
- @ObfuscatedName("ai")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2995;
- @ObfuscatedName("ay")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3018;
- @ObfuscatedName("aa")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2997;
- @ObfuscatedName("ax")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
public static final ClientPacket field2998;
- @ObfuscatedName("at")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2999;
- @ObfuscatedName("br")
+ public static final ClientPacket field2957;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3007;
- @ObfuscatedName("ba")
+ public static final ClientPacket field2909;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3001;
- @ObfuscatedName("bk")
+ public static final ClientPacket field2910;
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3002;
- @ObfuscatedName("bi")
+ public static final ClientPacket field2961;
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2948;
- @ObfuscatedName("bc")
+ public static final ClientPacket field2912;
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3004;
- @ObfuscatedName("bo")
+ public static final ClientPacket field2973;
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- static final ClientPacket field3005;
- @ObfuscatedName("bl")
+ public static final ClientPacket field2914;
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3006;
- @ObfuscatedName("bs")
+ public static final ClientPacket field2915;
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3024;
- @ObfuscatedName("bx")
+ public static final ClientPacket field2916;
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3008;
- @ObfuscatedName("bd")
+ public static final ClientPacket field2917;
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3010;
- @ObfuscatedName("bj")
+ public static final ClientPacket field2918;
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2996;
- @ObfuscatedName("be")
+ public static final ClientPacket field2919;
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3011;
- @ObfuscatedName("bf")
+ public static final ClientPacket field2942;
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3012;
- @ObfuscatedName("bz")
+ public static final ClientPacket field2921;
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3013;
- @ObfuscatedName("bv")
+ static final ClientPacket field2922;
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3014;
- @ObfuscatedName("bt")
+ public static final ClientPacket field2923;
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3015;
- @ObfuscatedName("bu")
+ public static final ClientPacket field2905;
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2970;
- @ObfuscatedName("bq")
+ public static final ClientPacket field2925;
+ @ObfuscatedName("b")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3016;
- @ObfuscatedName("bh")
+ public static final ClientPacket field2954;
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2976;
- @ObfuscatedName("bb")
+ public static final ClientPacket field2920;
+ @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3025;
- @ObfuscatedName("bm")
+ public static final ClientPacket field2928;
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3017;
- @ObfuscatedName("by")
+ public static final ClientPacket field2908;
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2987;
- @ObfuscatedName("bn")
+ public static final ClientPacket field2991;
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3022;
- @ObfuscatedName("bg")
+ public static final ClientPacket field2931;
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3023;
- @ObfuscatedName("bp")
+ public static final ClientPacket field2934;
+ @ObfuscatedName("al")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3057;
- @ObfuscatedName("bw")
+ public static final ClientPacket field2933;
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2966;
- @ObfuscatedName("co")
+ public static final ClientPacket field2943;
+ @ObfuscatedName("ab")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3026;
- @ObfuscatedName("ck")
+ public static final ClientPacket field2935;
+ @ObfuscatedName("ap")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3027;
- @ObfuscatedName("cr")
+ public static final ClientPacket field2936;
+ @ObfuscatedName("ac")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3028;
- @ObfuscatedName("cv")
+ public static final ClientPacket field2937;
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3029;
- @ObfuscatedName("cs")
+ public static final ClientPacket field2938;
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3030;
- @ObfuscatedName("cm")
+ public static final ClientPacket field2939;
+ @ObfuscatedName("am")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3031;
- @ObfuscatedName("ca")
+ public static final ClientPacket field2940;
+ @ObfuscatedName("an")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field2953;
- @ObfuscatedName("ci")
+ public static final ClientPacket field2924;
+ @ObfuscatedName("af")
@ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3033;
- @ObfuscatedName("cx")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3034;
- @ObfuscatedName("cn")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3035;
- @ObfuscatedName("cc")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3036;
- @ObfuscatedName("cy")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- static final ClientPacket field3037;
- @ObfuscatedName("ct")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3041;
- @ObfuscatedName("cd")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3039;
- @ObfuscatedName("cw")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3054;
- @ObfuscatedName("cf")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2974;
- @ObfuscatedName("cq")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3042;
- @ObfuscatedName("cg")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3043;
- @ObfuscatedName("cl")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2986;
- @ObfuscatedName("cu")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3003;
- @ObfuscatedName("ch")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3046;
- @ObfuscatedName("cz")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field3047;
- @ObfuscatedName("ce")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
public static final ClientPacket field2965;
+ @ObfuscatedName("ax")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3005;
+ @ObfuscatedName("ar")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2944;
+ @ObfuscatedName("at")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2945;
+ @ObfuscatedName("ag")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2930;
+ @ObfuscatedName("aq")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2947;
+ @ObfuscatedName("ah")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ static final ClientPacket field2950;
+ @ObfuscatedName("ai")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2949;
+ @ObfuscatedName("az")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2997;
+ @ObfuscatedName("av")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2951;
+ @ObfuscatedName("aw")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2952;
+ @ObfuscatedName("au")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2953;
+ @ObfuscatedName("aa")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2993;
+ @ObfuscatedName("ay")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2955;
+ @ObfuscatedName("as")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2956;
+ @ObfuscatedName("be")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3003;
+ @ObfuscatedName("bz")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3009;
+ @ObfuscatedName("bp")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2959;
+ @ObfuscatedName("bf")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2966;
+ @ObfuscatedName("bg")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2975;
+ @ObfuscatedName("br")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2968;
+ @ObfuscatedName("bn")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2963;
+ @ObfuscatedName("bq")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2964;
+ @ObfuscatedName("bc")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2946;
+ @ObfuscatedName("bl")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2907;
+ @ObfuscatedName("bv")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3013;
+ @ObfuscatedName("bt")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2962;
+ @ObfuscatedName("bh")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2969;
+ @ObfuscatedName("bs")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2970;
+ @ObfuscatedName("bk")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2971;
+ @ObfuscatedName("bb")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2972;
+ @ObfuscatedName("ba")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2948;
+ @ObfuscatedName("bu")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2974;
+ @ObfuscatedName("bw")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2995;
+ @ObfuscatedName("bi")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2976;
+ @ObfuscatedName("bo")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2932;
+ @ObfuscatedName("bx")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2927;
+ @ObfuscatedName("bm")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2979;
+ @ObfuscatedName("by")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2980;
+ @ObfuscatedName("bj")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2967;
+ @ObfuscatedName("bd")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ static final ClientPacket field2982;
+ @ObfuscatedName("cr")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2983;
+ @ObfuscatedName("cq")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2984;
+ @ObfuscatedName("cw")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2985;
+ @ObfuscatedName("cx")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2986;
+ @ObfuscatedName("cc")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2987;
+ @ObfuscatedName("cm")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2988;
+ @ObfuscatedName("ci")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2989;
+ @ObfuscatedName("cg")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2990;
@ObfuscatedName("cj")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3049;
- @ObfuscatedName("cb")
- @ObfuscatedSignature(
- descriptor = "Ljj;"
- )
- public static final ClientPacket field2992;
+ public static final ClientPacket field2913;
@ObfuscatedName("cp")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3051;
- @ObfuscatedName("dc")
+ public static final ClientPacket field2992;
+ @ObfuscatedName("cf")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3052;
- @ObfuscatedName("dp")
+ public static final ClientPacket field2978;
+ @ObfuscatedName("cv")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3053;
- @ObfuscatedName("dg")
+ public static final ClientPacket field2994;
+ @ObfuscatedName("cn")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- public static final ClientPacket field3045;
- @ObfuscatedName("dy")
+ public static final ClientPacket field2941;
+ @ObfuscatedName("co")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
- static final ClientPacket field3056;
- @ObfuscatedName("dh")
+ public static final ClientPacket field2996;
+ @ObfuscatedName("cz")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2977;
+ @ObfuscatedName("cu")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2958;
+ @ObfuscatedName("ce")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2999;
+ @ObfuscatedName("cy")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3000;
+ @ObfuscatedName("ca")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3001;
+ @ObfuscatedName("ck")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3002;
+ @ObfuscatedName("cb")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ static final ClientPacket field2981;
+ @ObfuscatedName("cs")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3004;
+ @ObfuscatedName("cd")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2960;
+ @ObfuscatedName("cl")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3006;
+ @ObfuscatedName("ct")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3007;
+ @ObfuscatedName("ch")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3008;
+ @ObfuscatedName("dm")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field2911;
+ @ObfuscatedName("dd")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3010;
+ @ObfuscatedName("dz")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3011;
+ @ObfuscatedName("dr")
+ @ObfuscatedSignature(
+ descriptor = "Lju;"
+ )
+ public static final ClientPacket field3012;
+ @ObfuscatedName("dv")
@ObfuscatedGetter(
- intValue = -1090102203
+ intValue = 1069667359
)
@Export("id")
final int id;
- @ObfuscatedName("dj")
+ @ObfuscatedName("dy")
@ObfuscatedGetter(
- intValue = 1549322101
+ intValue = -121952161
)
@Export("length")
final int length;
static {
- field3040 = new ClientPacket(0, -1); // L: 5
- field2949 = new ClientPacket(1, -2); // L: 6
- field2950 = new ClientPacket(2, 2); // L: 7
- field2951 = new ClientPacket(3, -1); // L: 8
- field2952 = new ClientPacket(4, -1); // L: 9
- field3009 = new ClientPacket(5, -1); // L: 10
- field3000 = new ClientPacket(6, 22); // L: 11
- field3038 = new ClientPacket(7, 1); // L: 12
- field2956 = new ClientPacket(8, 8); // L: 13
- field2957 = new ClientPacket(9, -1); // L: 14
- field2958 = new ClientPacket(10, -1); // L: 15
- field2959 = new ClientPacket(11, -1); // L: 16
- field2960 = new ClientPacket(12, 8); // L: 17
- field2961 = new ClientPacket(13, 8); // L: 18
- field2962 = new ClientPacket(14, 3); // L: 19
- field2963 = new ClientPacket(15, 16); // L: 20
- field3048 = new ClientPacket(16, -1); // L: 21
- field3032 = new ClientPacket(17, 8); // L: 22
- field2955 = new ClientPacket(18, 9); // L: 23
- field2991 = new ClientPacket(19, 7); // L: 24
- field2968 = new ClientPacket(20, 8); // L: 25
- field3055 = new ClientPacket(21, 2); // L: 26
- field2983 = new ClientPacket(22, -1); // L: 27
- field2971 = new ClientPacket(23, 8); // L: 28
- field2972 = new ClientPacket(24, 4); // L: 29
- field2973 = new ClientPacket(25, -1); // L: 30
- field3044 = new ClientPacket(26, -2); // L: 31
- field2975 = new ClientPacket(27, 3); // L: 32
- field2969 = new ClientPacket(28, 3); // L: 33
- field2977 = new ClientPacket(29, 3); // L: 34
- field2978 = new ClientPacket(30, 7); // L: 35
- field2979 = new ClientPacket(31, 8); // L: 36
- field2980 = new ClientPacket(32, 3); // L: 37
- field2981 = new ClientPacket(33, 15); // L: 38
- field2982 = new ClientPacket(34, 0); // L: 39
- field3019 = new ClientPacket(35, 3); // L: 40
- field3050 = new ClientPacket(36, 8); // L: 41
- field2985 = new ClientPacket(37, 11); // L: 42
- field2990 = new ClientPacket(38, 7); // L: 43
- field2984 = new ClientPacket(39, 11); // L: 44
- field2988 = new ClientPacket(40, -1); // L: 45
- field2989 = new ClientPacket(41, 8); // L: 46
- field3020 = new ClientPacket(42, 0); // L: 47
- field2954 = new ClientPacket(43, -1); // L: 48
- field2967 = new ClientPacket(44, 6); // L: 49
- field2993 = new ClientPacket(45, -1); // L: 50
- field2994 = new ClientPacket(46, 7); // L: 51
- field2995 = new ClientPacket(47, 3); // L: 52
- field3018 = new ClientPacket(48, 8); // L: 53
- field2997 = new ClientPacket(49, 7); // L: 54
- field2998 = new ClientPacket(50, -1); // L: 55
- field2999 = new ClientPacket(51, 7); // L: 56
- field3007 = new ClientPacket(52, 11); // L: 57
- field3001 = new ClientPacket(53, 0); // L: 58
- field3002 = new ClientPacket(54, 8); // L: 59
- field2948 = new ClientPacket(55, 4); // L: 60
- field3004 = new ClientPacket(56, 3); // L: 61
- field3005 = new ClientPacket(57, -1); // L: 62
- field3006 = new ClientPacket(58, 8); // L: 63
- field3024 = new ClientPacket(59, 8); // L: 64
- field3008 = new ClientPacket(60, 8); // L: 65
- field3010 = new ClientPacket(61, 15); // L: 66
- field2996 = new ClientPacket(62, 15); // L: 67
- field3011 = new ClientPacket(63, 8); // L: 68
- field3012 = new ClientPacket(64, 13); // L: 69
- field3013 = new ClientPacket(65, 7); // L: 70
- field3014 = new ClientPacket(66, 4); // L: 71
- field3015 = new ClientPacket(67, 8); // L: 72
- field2970 = new ClientPacket(68, -1); // L: 73
- field3016 = new ClientPacket(69, 2); // L: 74
- field2976 = new ClientPacket(70, 7); // L: 75
- field3025 = new ClientPacket(71, 14); // L: 76
- field3017 = new ClientPacket(72, 2); // L: 77
- field2987 = new ClientPacket(73, 7); // L: 78
- field3022 = new ClientPacket(74, 11); // L: 79
- field3023 = new ClientPacket(75, -1); // L: 80
- field3057 = new ClientPacket(76, 15); // L: 81
- field2966 = new ClientPacket(77, 8); // L: 82
- field3026 = new ClientPacket(78, -1); // L: 83
- field3027 = new ClientPacket(79, 0); // L: 84
- field3028 = new ClientPacket(80, 8); // L: 85
- field3029 = new ClientPacket(81, 16); // L: 86
- field3030 = new ClientPacket(82, 3); // L: 87
- field3031 = new ClientPacket(83, 0); // L: 88
- field2953 = new ClientPacket(84, -2); // L: 89
- field3033 = new ClientPacket(85, -1); // L: 90
- field3034 = new ClientPacket(86, -1); // L: 91
- field3035 = new ClientPacket(87, 4); // L: 92
- field3036 = new ClientPacket(88, 3); // L: 93
- field3037 = new ClientPacket(89, -1); // L: 94
- field3041 = new ClientPacket(90, 7); // L: 95
- field3039 = new ClientPacket(91, -1); // L: 96
- field3054 = new ClientPacket(92, 5); // L: 97
- field2974 = new ClientPacket(93, 4); // L: 98
- field3042 = new ClientPacket(94, 9); // L: 99
- field3043 = new ClientPacket(95, 8); // L: 100
- field2986 = new ClientPacket(96, 2); // L: 101
- field3003 = new ClientPacket(97, 3); // L: 102
- field3046 = new ClientPacket(98, 3); // L: 103
- field3047 = new ClientPacket(99, -1); // L: 104
- field2965 = new ClientPacket(100, 3); // L: 105
- field3049 = new ClientPacket(101, 7); // L: 106
- field2992 = new ClientPacket(102, 16); // L: 107
- field3051 = new ClientPacket(103, 6); // L: 108
- field3052 = new ClientPacket(104, 3); // L: 109
- field3053 = new ClientPacket(105, 10); // L: 110
- field3045 = new ClientPacket(106, 8); // L: 111
- field3056 = new ClientPacket(107, 6); // L: 112
+ field2926 = new ClientPacket(0, 6); // L: 5
+ field2906 = new ClientPacket(1, -1); // L: 6
+ field2998 = new ClientPacket(2, 8); // L: 7
+ field2957 = new ClientPacket(3, 6); // L: 8
+ field2909 = new ClientPacket(4, 7); // L: 9
+ field2910 = new ClientPacket(5, 11); // L: 10
+ field2961 = new ClientPacket(6, 7); // L: 11
+ field2912 = new ClientPacket(7, 16); // L: 12
+ field2973 = new ClientPacket(8, -1); // L: 13
+ field2914 = new ClientPacket(9, -1); // L: 14
+ field2915 = new ClientPacket(10, 8); // L: 15
+ field2916 = new ClientPacket(11, 3); // L: 16
+ field2917 = new ClientPacket(12, -2); // L: 17
+ field2918 = new ClientPacket(13, -1); // L: 18
+ field2919 = new ClientPacket(14, 7); // L: 19
+ field2942 = new ClientPacket(15, -1); // L: 20
+ field2921 = new ClientPacket(16, -1); // L: 21
+ field2922 = new ClientPacket(17, 2); // L: 22
+ field2923 = new ClientPacket(18, -1); // L: 23
+ field2905 = new ClientPacket(19, 8); // L: 24
+ field2925 = new ClientPacket(20, 16); // L: 25
+ field2954 = new ClientPacket(21, 8); // L: 26
+ field2920 = new ClientPacket(22, 7); // L: 27
+ field2928 = new ClientPacket(23, -1); // L: 28
+ field2908 = new ClientPacket(24, 11); // L: 29
+ field2991 = new ClientPacket(25, 3); // L: 30
+ field2931 = new ClientPacket(26, -1); // L: 31
+ field2934 = new ClientPacket(27, 8); // L: 32
+ field2933 = new ClientPacket(28, 14); // L: 33
+ field2943 = new ClientPacket(29, 8); // L: 34
+ field2935 = new ClientPacket(30, 8); // L: 35
+ field2936 = new ClientPacket(31, 7); // L: 36
+ field2937 = new ClientPacket(32, 7); // L: 37
+ field2938 = new ClientPacket(33, 8); // L: 38
+ field2939 = new ClientPacket(34, 3); // L: 39
+ field2940 = new ClientPacket(35, 3); // L: 40
+ field2924 = new ClientPacket(36, 11); // L: 41
+ field2965 = new ClientPacket(37, 3);
+ field3005 = new ClientPacket(38, 7);
+ field2944 = new ClientPacket(39, -1);
+ field2945 = new ClientPacket(40, 0);
+ field2930 = new ClientPacket(41, 8);
+ field2947 = new ClientPacket(42, 3);
+ field2950 = new ClientPacket(43, -1); // L: 48
+ field2949 = new ClientPacket(44, -1); // L: 49
+ field2997 = new ClientPacket(45, 15); // L: 50
+ field2951 = new ClientPacket(46, -2);
+ field2952 = new ClientPacket(47, 8);
+ field2953 = new ClientPacket(48, 3);
+ field2993 = new ClientPacket(49, 16); // L: 54
+ field2955 = new ClientPacket(50, 7);
+ field2956 = new ClientPacket(51, 0);
+ field3003 = new ClientPacket(52, 7);
+ field3009 = new ClientPacket(53, 7); // L: 58
+ field2959 = new ClientPacket(54, 3); // L: 59
+ field2966 = new ClientPacket(55, 9); // L: 60
+ field2975 = new ClientPacket(56, 8); // L: 61
+ field2968 = new ClientPacket(57, 8); // L: 62
+ field2963 = new ClientPacket(58, 8); // L: 63
+ field2964 = new ClientPacket(59, -1); // L: 64
+ field2946 = new ClientPacket(60, 4); // L: 65
+ field2907 = new ClientPacket(61, 3); // L: 66
+ field3013 = new ClientPacket(62, -1); // L: 67
+ field2962 = new ClientPacket(63, -1); // L: 68
+ field2969 = new ClientPacket(64, 0); // L: 69
+ field2970 = new ClientPacket(65, 3); // L: 70
+ field2971 = new ClientPacket(66, -1); // L: 71
+ field2972 = new ClientPacket(67, 9); // L: 72
+ field2948 = new ClientPacket(68, 3); // L: 73
+ field2974 = new ClientPacket(69, 8); // L: 74
+ field2995 = new ClientPacket(70, 6); // L: 75
+ field2976 = new ClientPacket(71, 2); // L: 76
+ field2932 = new ClientPacket(72, -2); // L: 77
+ field2927 = new ClientPacket(73, 2); // L: 78
+ field2979 = new ClientPacket(74, 15); // L: 79
+ field2980 = new ClientPacket(75, 15); // L: 80
+ field2967 = new ClientPacket(76, 8);
+ field2982 = new ClientPacket(77, -1); // L: 82
+ field2983 = new ClientPacket(78, 8); // L: 83
+ field2984 = new ClientPacket(79, 3); // L: 84
+ field2985 = new ClientPacket(80, -1); // L: 85
+ field2986 = new ClientPacket(81, 3); // L: 86
+ field2987 = new ClientPacket(82, 0); // L: 87
+ field2988 = new ClientPacket(83, 8); // L: 88
+ field2989 = new ClientPacket(84, 0); // L: 89
+ field2990 = new ClientPacket(85, 4); // L: 90
+ field2913 = new ClientPacket(86, -1); // L: 91
+ field2992 = new ClientPacket(87, 15); // L: 92
+ field2978 = new ClientPacket(88, 8); // L: 93
+ field2994 = new ClientPacket(89, 3); // L: 94
+ field2941 = new ClientPacket(90, 2); // L: 95
+ field2996 = new ClientPacket(91, 8); // L: 96
+ field2977 = new ClientPacket(92, 8); // L: 97
+ field2958 = new ClientPacket(93, -1); // L: 98
+ field2999 = new ClientPacket(94, 4); // L: 99
+ field3000 = new ClientPacket(95, -1); // L: 100
+ field3001 = new ClientPacket(96, -1); // L: 101
+ field3002 = new ClientPacket(97, 1); // L: 102
+ field2981 = new ClientPacket(98, 7); // L: 103
+ field3004 = new ClientPacket(99, 2); // L: 104
+ field2960 = new ClientPacket(100, -1); // L: 105
+ field3006 = new ClientPacket(101, 4); // L: 106
+ field3007 = new ClientPacket(102, 4); // L: 107
+ field3008 = new ClientPacket(103, 5); // L: 108
+ field2911 = new ClientPacket(104, 11); // L: 109
+ field3010 = new ClientPacket(105, 13); // L: 110
+ field3011 = new ClientPacket(106, 10); // L: 111
+ field3012 = new ClientPacket(107, 22); // L: 112
}
ClientPacket(int var1, int var2) {
this.id = var1; // L: 117
this.length = var2; // L: 118
} // L: 119
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(ILnd;Llc;B)V",
+ garbageValue = "10"
+ )
+ static void method5191(int var0, ArchiveDisk var1, Archive var2) {
+ byte[] var3 = null; // L: 42
+ synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 43
+ for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 44
+ if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { // L: 45
+ var3 = var5.data; // L: 46
+ break; // L: 47
+ }
+ }
+ }
+
+ if (var3 != null) { // L: 51
+ var2.load(var1, var0, var3, true); // L: 52
+ } else {
+ byte[] var4 = var1.read(var0); // L: 55
+ var2.load(var1, var0, var4, true); // L: 56
+ }
+ } // L: 53 57
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;IB)I",
+ garbageValue = "-72"
+ )
+ public static int method5190(CharSequence var0, int var1) {
+ return HealthBar.method2356(var0, var1, true); // L: 81
+ }
}
diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java
index 8722617280..a3c81d18bf 100644
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -1,4 +1,4 @@
-import java.net.URL;
+import java.awt.Component;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
@@ -8,68 +8,74 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cy")
+@ObfuscatedName("cv")
@Implements("ClientPreferences")
public class ClientPreferences {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1127997151
+ intValue = 229725929
)
@Export("ClientPreferences_optionCount")
static int ClientPreferences_optionCount;
- @ObfuscatedName("l")
+ @ObfuscatedName("ic")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
+ )
+ @Export("modIconSprites")
+ static IndexedSprite[] modIconSprites;
+ @ObfuscatedName("q")
@Export("roofsHidden")
boolean roofsHidden;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("hideUsername")
boolean hideUsername;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("titleMusicDisabled")
boolean titleMusicDisabled;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("displayFps")
boolean displayFps;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 698831053
+ intValue = -334746973
)
- int field1252;
- @ObfuscatedName("s")
+ int field1238;
+ @ObfuscatedName("w")
@Export("brightness")
double brightness;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -1690436583
+ intValue = -1124707181
)
@Export("musicVolume")
int musicVolume;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1205613435
+ intValue = -1649253505
)
@Export("soundEffectsVolume")
int soundEffectsVolume;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -1618721713
+ intValue = 214111179
)
@Export("areaSoundEffectsVolume")
int areaSoundEffectsVolume;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -1550048415
+ intValue = 1784690563
)
- int field1249;
- @ObfuscatedName("w")
+ int field1247;
+ @ObfuscatedName("z")
@Export("rememberedUsername")
String rememberedUsername;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 1272591553
+ intValue = 2087035801
)
@Export("windowMode")
int windowMode;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("parameters")
LinkedHashMap parameters;
@@ -84,15 +90,15 @@ public class ClientPreferences {
this.musicVolume = 127;
this.soundEffectsVolume = 127;
this.areaSoundEffectsVolume = 127;
- this.field1249 = -1;
+ this.field1247 = -1;
this.rememberedUsername = null;
this.windowMode = 1;
this.parameters = new LinkedHashMap();
- this.method2318(true); // L: 28
+ this.method2242(true); // L: 28
} // L: 29
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
ClientPreferences(Buffer var1) {
this.hideUsername = false; // L: 14
@@ -101,37 +107,37 @@ public class ClientPreferences {
this.musicVolume = 127; // L: 19
this.soundEffectsVolume = 127; // L: 20
this.areaSoundEffectsVolume = 127; // L: 21
- this.field1249 = -1; // L: 22
+ this.field1247 = -1; // L: 22
this.rememberedUsername = null; // L: 23
this.windowMode = 1; // L: 24
this.parameters = new LinkedHashMap(); // L: 25
if (var1 != null && var1.array != null) { // L: 32
- int var2 = var1.readUnsignedByte();
- if (var2 >= 0 && var2 <= ClientPreferences_optionCount) {
- if (var1.readUnsignedByte() == 1) {
- this.roofsHidden = true;
+ int var2 = var1.readUnsignedByte(); // L: 36
+ if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 37
+ if (var1.readUnsignedByte() == 1) { // L: 41
+ this.roofsHidden = true; // L: 42
}
- if (var2 > 1) {
- this.titleMusicDisabled = var1.readUnsignedByte() == 1;
+ if (var2 > 1) { // L: 44
+ this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 45
}
- if (var2 > 3) {
+ if (var2 > 3) { // L: 47
this.windowMode = var1.readUnsignedByte(); // L: 48
}
- if (var2 > 2) {
- int var3 = var1.readUnsignedByte();
+ if (var2 > 2) { // L: 50
+ int var3 = var1.readUnsignedByte(); // L: 51
for (int var4 = 0; var4 < var3; ++var4) { // L: 52
int var5 = var1.readInt(); // L: 53
int var6 = var1.readInt(); // L: 54
- this.parameters.put(var5, var6);
+ this.parameters.put(var5, var6); // L: 55
}
}
if (var2 > 4) { // L: 58
- this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull();
+ this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 59
}
if (var2 > 5) { // L: 61
@@ -146,7 +152,7 @@ public class ClientPreferences {
}
if (var2 > 7) { // L: 70
- this.field1249 = var1.readUnsignedByte(); // L: 71
+ this.field1247 = var1.readUnsignedByte(); // L: 71
}
if (var2 > 8) { // L: 73
@@ -154,29 +160,29 @@ public class ClientPreferences {
}
if (var2 > 9) { // L: 76
- this.field1252 = var1.readInt(); // L: 77
+ this.field1238 = var1.readInt(); // L: 77
}
} else {
- this.method2318(true);
+ this.method2242(true); // L: 38
}
} else {
- this.method2318(true);
+ this.method2242(true); // L: 33
}
} // L: 81
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(ZI)V",
- garbageValue = "-1505304764"
+ garbageValue = "-998073107"
)
- void method2318(boolean var1) {
+ void method2242(boolean var1) {
} // L: 83
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lpx;",
- garbageValue = "1983267736"
+ descriptor = "(B)Lqt;",
+ garbageValue = "26"
)
@Export("toBuffer")
Buffer toBuffer() {
@@ -196,298 +202,258 @@ public class ClientPreferences {
var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 99
var1.writeBoolean(this.hideUsername); // L: 100
- var1.writeByte((int)(this.brightness * 100.0D)); // L: 101
+ var1.writeByte((int)(100.0D * this.brightness)); // L: 101
var1.writeByte(this.musicVolume); // L: 102
var1.writeByte(this.soundEffectsVolume); // L: 103
var1.writeByte(this.areaSoundEffectsVolume); // L: 104
- var1.writeByte(this.field1249); // L: 105
+ var1.writeByte(this.field1247); // L: 105
var1.writeByte(this.displayFps ? 1 : 0); // L: 106
- var1.writeInt(this.field1252); // L: 107
+ var1.writeInt(this.field1238); // L: 107
return var1; // L: 108
}
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "1415859216"
- )
- void method2219(boolean var1) {
- this.roofsHidden = var1; // L: 128
- class270.savePreferences(); // L: 129
- } // L: 130
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1094538117"
- )
- boolean method2222() {
- return this.roofsHidden; // L: 133
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "1823199962"
- )
- void method2223(boolean var1) {
- this.hideUsername = var1; // L: 137
- class270.savePreferences(); // L: 138
- } // L: 139
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "242395257"
- )
- boolean method2257() {
- return this.hideUsername; // L: 142
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "-2129317630"
- )
- void method2305(boolean var1) {
- this.titleMusicDisabled = var1; // L: 146
- class270.savePreferences(); // L: 147
- } // L: 148
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1061667438"
- )
- boolean method2226() {
- return this.titleMusicDisabled; // L: 151
- }
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "-1459067556"
- )
- void method2227(boolean var1) {
- this.displayFps = var1; // L: 155
- class270.savePreferences(); // L: 156
- } // L: 157
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "96"
- )
- void method2228() {
- this.method2227(!this.displayFps); // L: 160
- } // L: 161
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "6"
- )
- boolean method2229() {
- return this.displayFps; // L: 164
- }
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "936974237"
- )
- void method2230(int var1) {
- this.field1252 = var1; // L: 168
- class270.savePreferences(); // L: 169
- } // L: 170
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "2093496919"
- )
- int method2231() {
- return this.field1252; // L: 173
- }
-
- @ObfuscatedName("t")
- void method2232(double var1) {
- this.brightness = var1; // L: 177
- class270.savePreferences(); // L: 178
- } // L: 179
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(I)D",
- garbageValue = "-2107962943"
- )
- double method2225() {
- return this.brightness; // L: 182
- }
-
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1172859341"
- )
- void method2234(int var1) {
- this.musicVolume = var1; // L: 186
- class270.savePreferences(); // L: 187
- } // L: 188
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-874911160"
- )
- int method2248() {
- return this.musicVolume; // L: 191
- }
-
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1131698297"
- )
- @Export("updateSoundEffectVolume")
- void updateSoundEffectVolume(int var1) {
- this.soundEffectsVolume = var1; // L: 195
- class270.savePreferences(); // L: 196
- } // L: 197
-
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-971935263"
- )
- int method2244() {
- return this.soundEffectsVolume; // L: 200
- }
-
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1856408650"
- )
- void method2278(int var1) {
- this.areaSoundEffectsVolume = var1; // L: 204
- class270.savePreferences(); // L: 205
- } // L: 206
-
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "750592599"
- )
- int method2239() {
- return this.areaSoundEffectsVolume; // L: 209
- }
-
@ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-64324606"
+ descriptor = "(ZI)V",
+ garbageValue = "-399700086"
)
- void method2297(String var1) {
- this.rememberedUsername = var1; // L: 213
- class270.savePreferences(); // L: 214
- } // L: 215
+ void method2339(boolean var1) {
+ this.roofsHidden = var1; // L: 150
+ class220.savePreferences(); // L: 151
+ } // L: 152
- @ObfuscatedName("z")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "2088208815"
+ descriptor = "(I)Z",
+ garbageValue = "931670239"
)
- String method2241() {
- return this.rememberedUsername; // L: 218
+ boolean method2245() {
+ return this.roofsHidden;
}
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(ZS)V",
+ garbageValue = "2048"
+ )
+ void method2246(boolean var1) {
+ this.hideUsername = var1; // L: 159
+ class220.savePreferences(); // L: 160
+ } // L: 161
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "-737599418"
+ )
+ boolean method2247() {
+ return this.hideUsername; // L: 164
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(ZI)V",
+ garbageValue = "-1124391002"
+ )
+ void method2248(boolean var1) {
+ this.titleMusicDisabled = var1; // L: 168
+ class220.savePreferences(); // L: 169
+ } // L: 170
+
@ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-586904848"
+ descriptor = "(I)Z",
+ garbageValue = "1328840913"
)
- void method2306(int var1) {
- this.field1249 = var1; // L: 222
- class270.savePreferences(); // L: 223
- } // L: 224
+ boolean method2317() {
+ return this.titleMusicDisabled; // L: 173
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(ZB)V",
+ garbageValue = "0"
+ )
+ void method2250(boolean var1) {
+ this.displayFps = var1; // L: 177
+ class220.savePreferences(); // L: 178
+ } // L: 179
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1624511223"
+ )
+ void method2251() {
+ this.method2250(!this.displayFps); // L: 182
+ } // L: 183
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(B)Z",
+ garbageValue = "1"
+ )
+ boolean method2252() {
+ return this.displayFps; // L: 186
+ }
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(IB)V",
+ garbageValue = "92"
+ )
+ void method2330(int var1) {
+ this.field1238 = var1; // L: 190
+ class220.savePreferences(); // L: 191
+ } // L: 192
@ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "19888"
+ descriptor = "(I)I",
+ garbageValue = "-1945148699"
)
int method2243() {
- return this.field1249; // L: 227
+ return this.field1238; // L: 195
}
- @ObfuscatedName("ag")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "54"
- )
- void method2245(int var1) {
- this.windowMode = var1; // L: 231
- class270.savePreferences(); // L: 232
- } // L: 233
+ @ObfuscatedName("k")
+ void method2255(double var1) {
+ this.brightness = var1; // L: 199
+ class220.savePreferences(); // L: 200
+ } // L: 201
- @ObfuscatedName("ar")
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(I)D",
+ garbageValue = "-871452438"
+ )
+ double method2254() {
+ return this.brightness; // L: 204
+ }
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(IS)V",
+ garbageValue = "5560"
+ )
+ void method2297(int var1) {
+ this.musicVolume = var1; // L: 208
+ class220.savePreferences(); // L: 209
+ } // L: 210
+
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1757790636"
+ )
+ int method2258() {
+ return this.musicVolume; // L: 213
+ }
+
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-1680251159"
+ )
+ @Export("updateSoundEffectVolume")
+ void updateSoundEffectVolume(int var1) {
+ this.soundEffectsVolume = var1; // L: 217
+ class220.savePreferences(); // L: 218
+ } // L: 219
+
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1274127259"
+ )
+ int method2241() {
+ return this.soundEffectsVolume; // L: 222
+ }
+
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "2115644002"
+ )
+ void method2341(int var1) {
+ this.areaSoundEffectsVolume = var1; // L: 226
+ class220.savePreferences(); // L: 227
+ } // L: 228
+
+ @ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "82"
+ garbageValue = "50"
)
- int method2274() {
- return this.windowMode; // L: 236
+ int method2262() {
+ return this.areaSoundEffectsVolume; // L: 231
}
@ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-66"
+ descriptor = "(Ljava/lang/String;B)V",
+ garbageValue = "-106"
)
- @Export("loadWorlds")
- static boolean loadWorlds() {
- try {
- if (NPC.World_request == null) { // L: 31
- NPC.World_request = UserComparator7.urlRequester.request(new URL(class93.field1280));
- } else if (NPC.World_request.isDone()) { // L: 33
- byte[] var0 = NPC.World_request.getResponse(); // L: 34
- Buffer var1 = new Buffer(var0); // L: 35
- var1.readInt(); // L: 36
- World.World_count = var1.readUnsignedShort(); // L: 37
- World.World_worlds = new World[World.World_count]; // L: 38
+ void method2260(String var1) {
+ this.rememberedUsername = var1; // L: 235
+ class220.savePreferences(); // L: 236
+ } // L: 237
- World var3;
- for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47
- var3 = World.World_worlds[var2] = new World(); // L: 40
- var3.id = var1.readUnsignedShort(); // L: 41
- var3.properties = var1.readInt(); // L: 42
- var3.host = var1.readStringCp1252NullTerminated(); // L: 43
- var3.activity = var1.readStringCp1252NullTerminated(); // L: 44
- var3.location = var1.readUnsignedByte(); // L: 45
- var3.population = var1.readShort(); // L: 46
- }
-
- UserComparator8.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
- NPC.World_request = null; // L: 50
- return true; // L: 51
- }
- } catch (Exception var4) { // L: 55
- var4.printStackTrace(); // L: 56
- NPC.World_request = null; // L: 57
- }
-
- return false; // L: 59
- }
-
- @ObfuscatedName("p")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "(I)Lbx;",
- garbageValue = "-1660202002"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-78579784"
)
- @Export("worldListStart")
- static World worldListStart() {
- World.World_listCount = 0; // L: 247
- return class146.getNextWorldListWorld(); // L: 248
+ String method2264() {
+ return this.rememberedUsername; // L: 240
}
+
+ @ObfuscatedName("d")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-1094835721"
+ )
+ void method2307(int var1) {
+ this.field1247 = var1; // L: 244
+ class220.savePreferences(); // L: 245
+ } // L: 246
+
+ @ObfuscatedName("ad")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "8"
+ )
+ int method2266() {
+ return this.field1247; // L: 249
+ }
+
+ @ObfuscatedName("ak")
+ @ObfuscatedSignature(
+ descriptor = "(IB)V",
+ garbageValue = "4"
+ )
+ void method2280(int var1) {
+ this.windowMode = var1; // L: 253
+ class220.savePreferences(); // L: 254
+ } // L: 255
+
+ @ObfuscatedName("al")
+ @ObfuscatedSignature(
+ descriptor = "(S)I",
+ garbageValue = "510"
+ )
+ int method2268() {
+ return this.windowMode; // L: 258
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/awt/Component;I)V",
+ garbageValue = "-1915359303"
+ )
+ static void method2344(Component var0) {
+ var0.setFocusTraversalKeysEnabled(false); // L: 155
+ var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 156
+ var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 157
+ } // L: 158
}
diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java
index a8034d89db..6f80ea43ff 100644
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -1,96 +1,36 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fo")
+@ObfuscatedName("fv")
@Implements("Clock")
public abstract class Clock {
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Lqd;"
- )
- static IndexedSprite field1839;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -440159509
- )
- @Export("musicTrackVolume")
- public static int musicTrackVolume;
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Lqd;"
- )
- @Export("logoSprite")
- static IndexedSprite logoSprite;
- @ObfuscatedName("eb")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive1")
- static Archive archive1;
- @ObfuscatedName("qu")
- @ObfuscatedSignature(
- descriptor = "Lfy;"
- )
- @Export("mouseWheel")
- static class158 mouseWheel;
-
Clock() {
} // L: 4
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1993169750"
+ garbageValue = "814382249"
)
@Export("mark")
public abstract void mark();
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1389334721"
+ descriptor = "(IIB)I",
+ garbageValue = "-83"
)
@Export("wait")
public abstract int wait(int var1, int var2);
- @ObfuscatedName("aw")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "([BIIB)I",
- garbageValue = "43"
+ descriptor = "(II)Z",
+ garbageValue = "2013103742"
)
- public static int method3249(byte[] var0, int var1, int var2) {
- int var3 = -1; // L: 47
-
- for (int var4 = var1; var4 < var2; ++var4) { // L: 48
- var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49
- }
-
- var3 = ~var3; // L: 51
- return var3; // L: 52
- }
-
- @ObfuscatedName("jd")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lki;I)Ljava/lang/String;",
- garbageValue = "2108423281"
- )
- static String method3248(String var0, Widget var1) {
- if (var0.indexOf("%") != -1) { // L: 10716
- for (int var2 = 1; var2 <= 5; ++var2) { // L: 10717
- while (true) {
- int var3 = var0.indexOf("%" + var2); // L: 10719
- if (var3 == -1) { // L: 10720
- break;
- }
-
- var0 = var0.substring(0, var3) + class14.method165(Players.method2413(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10721
- }
- }
- }
-
- return var0; // L: 10725
+ public static boolean method3331(int var0) {
+ return var0 >= WorldMapDecorationType.field3553.id && var0 <= WorldMapDecorationType.field3552.id; // L: 43
}
}
diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java
index ce5fdf1420..c3b98ebd3d 100644
--- a/runescape-client/src/main/java/CollisionMap.java
+++ b/runescape-client/src/main/java/CollisionMap.java
@@ -4,34 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gh")
+@ObfuscatedName("gv")
@Implements("CollisionMap")
public class CollisionMap {
- @ObfuscatedName("az")
+ @ObfuscatedName("uq")
+ @ObfuscatedSignature(
+ descriptor = "Lnd;"
+ )
+ @Export("masterDisk")
+ static ArchiveDisk masterDisk;
+ @ObfuscatedName("ae")
@ObfuscatedGetter(
- intValue = -676684941
+ intValue = 414195973
)
@Export("xInset")
public int xInset;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = 1940639369
+ intValue = 1573477015
)
@Export("yInset")
public int yInset;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = -1585012931
+ intValue = 288008669
)
@Export("xSize")
int xSize;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = -515009777
+ intValue = 1138846055
)
@Export("ySize")
int ySize;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@Export("flags")
public int[][] flags;
@@ -44,10 +50,10 @@ public class CollisionMap {
this.clear(); // L: 49
} // L: 50
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "788330087"
+ descriptor = "(S)V",
+ garbageValue = "171"
)
@Export("clear")
public void clear() {
@@ -63,12 +69,12 @@ public class CollisionMap {
} // L: 59
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(IIIIZI)V",
- garbageValue = "1519045367"
+ garbageValue = "740345801"
)
- public void method3749(int var1, int var2, int var3, int var4, boolean var5) {
+ public void method3878(int var1, int var2, int var3, int var4, boolean var5) {
var1 -= this.xInset; // L: 62
var2 -= this.yInset; // L: 63
if (var3 == 0) { // L: 64
@@ -215,10 +221,10 @@ public class CollisionMap {
} // L: 182
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IIIIZI)V",
- garbageValue = "-1626418421"
+ garbageValue = "129633396"
)
@Export("addGameObject")
public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -242,10 +248,10 @@ public class CollisionMap {
} // L: 196
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-402472734"
+ garbageValue = "-1940880076"
)
@Export("setBlockedByFloor")
public void setBlockedByFloor(int var1, int var2) {
@@ -255,10 +261,10 @@ public class CollisionMap {
var10000[var2] |= 2097152;
} // L: 202
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-1395781534"
+ garbageValue = "-2021417424"
)
@Export("setBlockedByFloorDec")
public void setBlockedByFloorDec(int var1, int var2) {
@@ -268,10 +274,10 @@ public class CollisionMap {
var10000[var2] |= 262144;
} // L: 208
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "-1322228791"
+ descriptor = "(IIIB)V",
+ garbageValue = "-124"
)
@Export("setFlag")
void setFlag(int var1, int var2, int var3) {
@@ -279,12 +285,12 @@ public class CollisionMap {
var10000[var2] |= var3;
} // L: 212
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(IIIIZI)V",
- garbageValue = "1406016066"
+ descriptor = "(IIIIZB)V",
+ garbageValue = "-83"
)
- public void method3756(int var1, int var2, int var3, int var4, boolean var5) {
+ public void method3883(int var1, int var2, int var3, int var4, boolean var5) {
var1 -= this.xInset; // L: 215
var2 -= this.yInset; // L: 216
if (var3 == 0) { // L: 217
@@ -431,10 +437,10 @@ public class CollisionMap {
} // L: 335
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(IIIIIZI)V",
- garbageValue = "1684782174"
+ garbageValue = "1140474967"
)
@Export("setFlagOffNonSquare")
public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -464,10 +470,10 @@ public class CollisionMap {
} // L: 354
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(IIIB)V",
- garbageValue = "1"
+ descriptor = "(IIII)V",
+ garbageValue = "-2090051353"
)
@Export("setFlagOff")
void setFlagOff(int var1, int var2, int var3) {
@@ -475,36 +481,48 @@ public class CollisionMap {
var10000[var2] &= ~var3;
} // L: 358
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-1586126857"
+ garbageValue = "-2033602418"
)
- public void method3759(int var1, int var2) {
+ public void method3886(int var1, int var2) {
var1 -= this.xInset; // L: 361
var2 -= this.yInset; // L: 362
int[] var10000 = this.flags[var1]; // L: 363
var10000[var2] &= -262145;
} // L: 364
- @ObfuscatedName("gb")
+ @ObfuscatedName("hs")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "2105208583"
+ garbageValue = "35579750"
)
- static void method3778() {
- if (Client.renderSelf) { // L: 4947
- class263.addPlayerToScene(ModelData0.localPlayer, false); // L: 4948
+ static final void method3907() {
+ for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4873 4874 4881
+ if (var0.plane == PacketWriter.Client_plane && !var0.isFinished) { // L: 4875
+ if (Client.cycle >= var0.cycleStart) { // L: 4876
+ var0.advance(Client.field555); // L: 4877
+ if (var0.isFinished) { // L: 4878
+ var0.remove();
+ } else {
+ class356.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4879
+ }
+ }
+ } else {
+ var0.remove();
+ }
}
- } // L: 4950
+ } // L: 4883
- @ObfuscatedName("ix")
+ @ObfuscatedName("kd")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1996457670"
+ descriptor = "(III)V",
+ garbageValue = "-122477483"
)
- static final boolean method3788() {
- return Client.isMenuOpen; // L: 8711
- }
+ static void method3906(int var0, int var1) {
+ class229.method4904(class20.tempMenuAction, var0, var1); // L: 11728
+ class20.tempMenuAction = null; // L: 11729
+ } // L: 11730
}
diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java
index 248fef3f57..4d9ae7410a 100644
--- a/runescape-client/src/main/java/Coord.java
+++ b/runescape-client/src/main/java/Coord.java
@@ -7,29 +7,21 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("kd")
@Implements("Coord")
public class Coord {
- @ObfuscatedName("ui")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 98471251
- )
- @Export("foundItemIndex")
- static int foundItemIndex;
- @ObfuscatedName("r")
- public static short[] field3352;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 1023382847
+ intValue = 1382052049
)
@Export("plane")
public int plane;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1531148769
+ intValue = 798305999
)
@Export("x")
public int x;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -991712687
+ intValue = -1552762679
)
@Export("y")
public int y;
@@ -60,10 +52,10 @@ public class Coord {
} // L: 27
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "60"
+ garbageValue = "34"
)
@Export("packed")
public int packed() {
@@ -74,10 +66,10 @@ public class Coord {
return var1; // L: 37
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(Lkd;I)Z",
- garbageValue = "-95969340"
+ garbageValue = "-326273528"
)
@Export("equalsCoord")
boolean equalsCoord(Coord var1) {
@@ -90,10 +82,10 @@ public class Coord {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
- garbageValue = "959391461"
+ garbageValue = "65710498"
)
@Export("toString")
String toString(String var1) {
@@ -108,30 +100,59 @@ public class Coord {
}
}
- public String toString() {
- return this.toString(","); // L: 60
- }
-
public int hashCode() {
return this.packed(); // L: 56
}
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "474672865"
- )
- public static boolean method5370() {
- return class273.musicPlayerStatus != 0 ? true : class273.midiPcmStream.isReady(); // L: 68 69
+ public String toString() {
+ return this.toString(","); // L: 60
}
- @ObfuscatedName("c")
+ @ObfuscatedName("in")
@ObfuscatedSignature(
- descriptor = "(CI)Z",
- garbageValue = "1630457870"
+ descriptor = "(ILjava/lang/String;I)V",
+ garbageValue = "1586830806"
)
- @Export("isDigit")
- public static boolean isDigit(char var0) {
- return var0 >= '0' && var0 <= '9'; // L: 150
- }
+ static void method5549(int var0, String var1) {
+ int var2 = Players.Players_count; // L: 9514
+ int[] var3 = Players.Players_indices; // L: 9515
+ boolean var4 = false; // L: 9516
+ Username var5 = new Username(var1, HealthBarDefinition.loginType); // L: 9517
+
+ for (int var6 = 0; var6 < var2; ++var6) { // L: 9518
+ Player var7 = Client.players[var3[var6]]; // L: 9519
+ if (var7 != null && var7 != class101.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9520
+ PacketBufferNode var8;
+ if (var0 == 1) { // L: 9521
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 9523
+ var8.packetBuffer.writeShort(var3[var6]); // L: 9524
+ var8.packetBuffer.writeByte(0); // L: 9525
+ Client.packetWriter.addNode(var8); // L: 9526
+ } else if (var0 == 4) { // L: 9528
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 9530
+ var8.packetBuffer.method7762(0); // L: 9531
+ var8.packetBuffer.method7863(var3[var6]); // L: 9532
+ Client.packetWriter.addNode(var8); // L: 9533
+ } else if (var0 == 6) { // L: 9535
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9537
+ var8.packetBuffer.writeIntME(var3[var6]); // L: 9538
+ var8.packetBuffer.method7762(0); // L: 9539
+ Client.packetWriter.addNode(var8); // L: 9540
+ } else if (var0 == 7) { // L: 9542
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2947, Client.packetWriter.isaacCipher); // L: 9544
+ var8.packetBuffer.writeShort(var3[var6]); // L: 9545
+ var8.packetBuffer.writeByte(0); // L: 9546
+ Client.packetWriter.addNode(var8); // L: 9547
+ }
+
+ var4 = true; // L: 9549
+ break;
+ }
+ }
+
+ if (!var4) { // L: 9553
+ class290.addGameMessage(4, "", "Unable to find " + var1);
+ }
+
+ } // L: 9554
}
diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java
index 54695b6e51..42f8f73472 100644
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -3,148 +3,596 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("br")
+@ObfuscatedName("be")
@Implements("Decimator")
public class Decimator {
- @ObfuscatedName("re")
- @Export("ClanChat_inClanChat")
- static boolean ClanChat_inClanChat;
- @ObfuscatedName("s")
- @Export("SpriteBuffer_spritePalette")
- public static int[] SpriteBuffer_spritePalette;
- @ObfuscatedName("j")
+ @ObfuscatedName("te")
@ObfuscatedGetter(
- intValue = 1552308037
+ intValue = -2007745669
)
- @Export("loginBoxCenter")
- static int loginBoxCenter;
- @ObfuscatedName("ft")
- static String field406;
- @ObfuscatedName("k")
+ static int field402;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1371041797
+ intValue = -477105871
)
@Export("inputRate")
int inputRate;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 327497787
+ intValue = -718168197
)
@Export("outputRate")
int outputRate;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("table")
int[][] table;
public Decimator(int var1, int var2) {
if (var2 != var1) { // L: 14
- int var3 = class343.method6137(var1, var2); // L: 15
- var1 /= var3; // L: 16
- var2 /= var3; // L: 17
- this.inputRate = var1; // L: 18
- this.outputRate = var2; // L: 19
- this.table = new int[var1][14]; // L: 20
+ int var4 = var1; // L: 16
+ int var5 = var2; // L: 17
+ if (var2 > var1) { // L: 19
+ var4 = var2; // L: 21
+ var5 = var1; // L: 22
+ }
- for (int var4 = 0; var4 < var1; ++var4) { // L: 21
- int[] var5 = this.table[var4]; // L: 22
- double var6 = 6.0D + (double)var4 / (double)var1; // L: 23
- int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24
- if (var8 < 0) { // L: 25
- var8 = 0;
+ while (var5 != 0) { // L: 24
+ int var6 = var4 % var5; // L: 25
+ var4 = var5; // L: 26
+ var5 = var6; // L: 27
+ }
+
+ var1 /= var4;
+ var2 /= var4;
+ this.inputRate = var1; // L: 34
+ this.outputRate = var2;
+ this.table = new int[var1][14];
+
+ for (int var7 = 0; var7 < var1; ++var7) {
+ int[] var8 = this.table[var7];
+ double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39
+ int var11 = (int)Math.floor(1.0D + (var9 - 7.0D));
+ if (var11 < 0) {
+ var11 = 0;
}
- int var9 = (int)Math.ceil(var6 + 7.0D); // L: 26
- if (var9 > 14) { // L: 27
- var9 = 14;
+ int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42
+ if (var12 > 14) { // L: 43
+ var12 = 14;
}
- for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29
- double var12 = 3.141592653589793D * ((double)var8 - var6); // L: 30
- double var14 = var10; // L: 31
- if (var12 < -1.0E-4D || var12 > 1.0E-4D) { // L: 32
- var14 = var10 * (Math.sin(var12) / var12);
+ for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45
+ double var15 = ((double)var11 - var9) * 3.141592653589793D; // L: 46
+ double var17 = var13; // L: 47
+ if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48
+ var17 = var13 * (Math.sin(var15) / var15);
}
- var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); // L: 33
- var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); // L: 34
+ var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49
+ var8[var11] = (int)Math.floor(0.5D + 65536.0D * var17); // L: 50
}
}
}
- } // L: 37
+ } // L: 53
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "([BI)[B",
- garbageValue = "1041792317"
+ garbageValue = "-792171906"
)
@Export("resample")
byte[] resample(byte[] var1) {
- if (this.table != null) { // L: 40
- int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 41
- int[] var3 = new int[var2]; // L: 42
- int var4 = 0; // L: 43
- int var5 = 0; // L: 44
+ if (this.table != null) { // L: 56
+ int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; // L: 57
+ int[] var3 = new int[var2]; // L: 58
+ int var4 = 0; // L: 59
+ int var5 = 0; // L: 60
int var6;
- for (var6 = 0; var6 < var1.length; ++var6) { // L: 45
- byte var7 = var1[var6]; // L: 46
- int[] var8 = this.table[var5]; // L: 47
+ for (var6 = 0; var6 < var1.length; ++var6) { // L: 61
+ byte var7 = var1[var6]; // L: 62
+ int[] var8 = this.table[var5]; // L: 63
int var9;
- for (var9 = 0; var9 < 14; ++var9) { // L: 48
+ for (var9 = 0; var9 < 14; ++var9) { // L: 64
var3[var9 + var4] += var8[var9] * var7;
}
- var5 += this.outputRate; // L: 49
- var9 = var5 / this.inputRate; // L: 50
- var4 += var9; // L: 51
- var5 -= var9 * this.inputRate; // L: 52
+ var5 += this.outputRate; // L: 65
+ var9 = var5 / this.inputRate; // L: 66
+ var4 += var9; // L: 67
+ var5 -= var9 * this.inputRate; // L: 68
}
- var1 = new byte[var2]; // L: 54
+ var1 = new byte[var2]; // L: 70
- for (var6 = 0; var6 < var2; ++var6) { // L: 55
- int var10 = var3[var6] + 32768 >> 16; // L: 56
- if (var10 < -128) { // L: 57
+ for (var6 = 0; var6 < var2; ++var6) { // L: 71
+ int var10 = var3[var6] + 32768 >> 16; // L: 72
+ if (var10 < -128) { // L: 73
var1[var6] = -128;
- } else if (var10 > 127) { // L: 58
+ } else if (var10 > 127) { // L: 74
var1[var6] = 127;
} else {
- var1[var6] = (byte)var10; // L: 59
+ var1[var6] = (byte)var10; // L: 75
}
}
}
- return var1; // L: 62
+ return var1; // L: 78
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "2059785269"
+ )
+ @Export("scaleRate")
+ int scaleRate(int var1) {
+ if (this.table != null) {
+ var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); // L: 82
+ }
+
+ return var1; // L: 83
}
@ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IB)I",
- garbageValue = "69"
- )
- @Export("scaleRate")
- int scaleRate(int var1) {
- if (this.table != null) { // L: 66
- var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate);
- }
-
- return var1; // L: 67
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "814340508"
+ garbageValue = "1"
)
@Export("scalePosition")
int scalePosition(int var1) {
- if (this.table != null) { // L: 71
- var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
+ if (this.table != null) { // L: 87
+ var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6;
}
- return var1; // L: 72
+ return var1; // L: 88
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-387941357"
+ )
+ static void method1018() {
+ for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
+ if (var0.stream1 != null) { // L: 31
+ class21.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32
+ var0.stream1 = null; // L: 33
+ }
+
+ if (var0.stream2 != null) { // L: 35
+ class21.pcmStreamMixer.removeSubStream(var0.stream2);
+ var0.stream2 = null;
+ }
+ }
+
+ ObjectSound.objectSounds.clear(); // L: 40
+ } // L: 41
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1283916070"
+ )
+ public static void method1005(int var0) {
+ if (class272.musicPlayerStatus != 0) { // L: 36
+ class272.musicTrackVolume = var0;
+ } else {
+ class272.midiPcmStream.setPcmStreamVolume(var0); // L: 37
+ }
+
+ } // L: 38
+
+ @ObfuscatedName("w")
+ @Export("Entity_unpackID")
+ public static int Entity_unpackID(long var0) {
+ return (int)(var0 >>> 17 & 4294967295L); // L: 85
+ }
+
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "407625357"
+ )
+ static int method1019(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1892
+ class446.Interpreter_intStackSize -= 3; // L: 1893
+ SoundSystem.queueSoundEffect(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]); // L: 1894
+ return 1; // L: 1895
+ } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1897
+ class16.playSong(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1898
+ return 1; // L: 1899
+ } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1901
+ class446.Interpreter_intStackSize -= 2; // L: 1902
+ PcmPlayer.method719(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 1903
+ return 1; // L: 1904
+ } else {
+ class83 var3;
+ class82 var4;
+ int var5;
+ int var6;
+ String var7;
+ if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1906
+ if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2018
+ return var0 == 3211 ? 1 : 2; // L: 2127 2128 2130
+ } else {
+ var3 = class83.field1074; // L: 2019
+ var4 = class82.field1069; // L: 2020
+ boolean var8 = false; // L: 2021
+ if (var0 == 3214) { // L: 2022
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2023
+ var3 = (class83)Actor.findEnumerated(MilliClock.method3310(), var6); // L: 2024
+ if (var3 == null) { // L: 2025
+ throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2026
+ }
+ }
+
+ if (var0 == 3215) { // L: 2029
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2030
+ var4 = (class82)Actor.findEnumerated(WorldMapData_1.method4867(), var6); // L: 2031
+ if (var4 == null) { // L: 2032
+ throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2033
+ }
+ }
+
+ if (var0 == 3210) { // L: 2036
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2037
+ var3 = (class83)Actor.findEnumerated(MilliClock.method3310(), var6); // L: 2038
+ if (var3 == null) { // L: 2039
+ var4 = (class82)Actor.findEnumerated(WorldMapData_1.method4867(), var6); // L: 2040
+ if (var4 == null) { // L: 2041
+ throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2042
+ }
+ }
+ } else if (var0 == 3182) { // L: 2046
+ var3 = class83.field1079; // L: 2047
+ } else if (var0 == 3204) { // L: 2049
+ var4 = class82.field1067; // L: 2050
+ } else if (var0 == 3206) { // L: 2052
+ var4 = class82.field1068; // L: 2053
+ } else if (var0 == 3208) { // L: 2055
+ var4 = class82.field1073; // L: 2056
+ }
+
+ if (var4 == class82.field1069) { // L: 2058
+ switch(var3.field1080) { // L: 2059
+ case 1:
+ var5 = class19.clientPreferences.method2247() ? 1 : 0; // L: 2087
+ break; // L: 2088
+ case 2:
+ var5 = class19.clientPreferences.method2317() ? 1 : 0; // L: 2082
+ break; // L: 2083
+ case 3:
+ var5 = class19.clientPreferences.method2252() ? 1 : 0; // L: 2067
+ break; // L: 2068
+ case 4:
+ var5 = class19.clientPreferences.method2243(); // L: 2062
+ break;
+ case 5:
+ var5 = class193.method3919(); // L: 2072
+ break; // L: 2073
+ default:
+ var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2077
+ throw new RuntimeException(var7); // L: 2078
+ }
+ } else {
+ switch(var4.field1065) { // L: 2093
+ case 1:
+ var5 = class19.clientPreferences.method2245() ? 1 : 0; // L: 2096
+ break; // L: 2097
+ case 2:
+ var6 = class19.clientPreferences.method2258(); // L: 2118
+ var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2119
+ break; // L: 2120
+ case 3:
+ var6 = class19.clientPreferences.method2241(); // L: 2112
+ var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2113
+ break; // L: 2114
+ case 4:
+ var6 = class19.clientPreferences.method2262(); // L: 2106
+ var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2107
+ break; // L: 2108
+ default:
+ var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2101
+ throw new RuntimeException(var7); // L: 2102
+ }
+ }
+
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5; // L: 2124
+ return 1; // L: 2125
+ }
+ } else {
+ var3 = class83.field1074; // L: 1907
+ var4 = class82.field1069; // L: 1908
+ var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1909
+ if (var0 == 3212) { // L: 1910
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1911
+ var3 = (class83)Actor.findEnumerated(MilliClock.method3310(), var6); // L: 1912
+ if (var3 == null) { // L: 1913
+ throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1914
+ }
+ }
+
+ if (var0 == 3213) { // L: 1917
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1918
+ var4 = (class82)Actor.findEnumerated(WorldMapData_1.method4867(), var6); // L: 1919
+ if (var4 == null) { // L: 1920
+ throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1921
+ }
+ }
+
+ if (var0 == 3209) { // L: 1924
+ var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1925
+ var3 = (class83)Actor.findEnumerated(MilliClock.method3310(), var6); // L: 1926
+ if (var3 == null) { // L: 1927
+ var4 = (class82)Actor.findEnumerated(WorldMapData_1.method4867(), var6); // L: 1928
+ if (var4 == null) { // L: 1929
+ throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1930
+ }
+ }
+ } else if (var0 == 3181) { // L: 1934
+ var3 = class83.field1079; // L: 1935
+ } else if (var0 == 3203) { // L: 1937
+ var4 = class82.field1067; // L: 1938
+ } else if (var0 == 3205) { // L: 1940
+ var4 = class82.field1068; // L: 1941
+ } else if (var0 == 3207) { // L: 1943
+ var4 = class82.field1073; // L: 1944
+ }
+
+ if (var4 == class82.field1069) { // L: 1946
+ switch(var3.field1080) { // L: 1947
+ case 1:
+ class19.clientPreferences.method2246(var5 == 1); // L: 1971
+ break; // L: 1972
+ case 2:
+ class19.clientPreferences.method2248(var5 == 1); // L: 1950
+ break;
+ case 3:
+ class19.clientPreferences.method2250(var5 == 1); // L: 1966
+ break; // L: 1967
+ case 4:
+ if (var5 < 0) { // L: 1960
+ var5 = 0;
+ }
+
+ class19.clientPreferences.method2330(var5); // L: 1961
+ break; // L: 1962
+ case 5:
+ WorldMapEvent.method5120(var5); // L: 1955
+ break; // L: 1956
+ default:
+ var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1976
+ throw new RuntimeException(var7); // L: 1977
+ }
+ } else {
+ switch(var4.field1065) { // L: 1982
+ case 1:
+ class19.clientPreferences.method2339(var5 == 1); // L: 1992
+ break; // L: 1993
+ case 2:
+ var5 = Math.min(Math.max(var5, 0), 100); // L: 1997
+ var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1998
+ PacketBufferNode.method5196(var6); // L: 1999
+ break; // L: 2000
+ case 3:
+ var5 = Math.min(Math.max(var5, 0), 100); // L: 2004
+ var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 2005
+ WorldMapData_0.method4563(var6); // L: 2006
+ break; // L: 2007
+ case 4:
+ var5 = Math.min(Math.max(var5, 0), 100); // L: 1985
+ var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1986
+ WorldMapEvent.method5121(var6); // L: 1987
+ break; // L: 1988
+ default:
+ var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2011
+ throw new RuntimeException(var7); // L: 2012
+ }
+ }
+
+ return 1; // L: 2016
+ }
+ }
+ }
+
+ @ObfuscatedName("ht")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIS)V",
+ garbageValue = "1000"
+ )
+ @Export("drawObject")
+ static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
+ long var5 = class356.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5921
+ int var7;
+ int var8;
+ int var9;
+ int var10;
+ int var12;
+ int var13;
+ if (0L != var5) { // L: 5922
+ var7 = class356.scene.getObjectFlags(var0, var1, var2, var5); // L: 5923
+ var8 = var7 >> 6 & 3; // L: 5924
+ var9 = var7 & 31; // L: 5925
+ var10 = var3; // L: 5926
+ if (Canvas.method322(var5)) { // L: 5927
+ var10 = var4;
+ }
+
+ int[] var11 = FloorUnderlayDefinition.sceneMinimapSprite.pixels; // L: 5928
+ var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5929
+ var13 = Entity_unpackID(var5); // L: 5930
+ ObjectComposition var14 = class162.getObjectDefinition(var13); // L: 5931
+ if (var14.mapSceneId != -1) { // L: 5932
+ IndexedSprite var15 = class13.mapSceneSprites[var14.mapSceneId]; // L: 5933
+ if (var15 != null) { // L: 5934
+ int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5935
+ int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5936
+ var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5937
+ }
+ } else {
+ if (var9 == 0 || var9 == 2) { // L: 5941
+ if (var8 == 0) { // L: 5942
+ var11[var12] = var10; // L: 5943
+ var11[var12 + 512] = var10; // L: 5944
+ var11[var12 + 1024] = var10; // L: 5945
+ var11[var12 + 1536] = var10; // L: 5946
+ } else if (var8 == 1) { // L: 5948
+ var11[var12] = var10; // L: 5949
+ var11[var12 + 1] = var10; // L: 5950
+ var11[var12 + 2] = var10; // L: 5951
+ var11[var12 + 3] = var10; // L: 5952
+ } else if (var8 == 2) { // L: 5954
+ var11[var12 + 3] = var10; // L: 5955
+ var11[var12 + 512 + 3] = var10; // L: 5956
+ var11[var12 + 1024 + 3] = var10; // L: 5957
+ var11[var12 + 1536 + 3] = var10; // L: 5958
+ } else if (var8 == 3) { // L: 5960
+ var11[var12 + 1536] = var10; // L: 5961
+ var11[var12 + 1536 + 1] = var10; // L: 5962
+ var11[var12 + 1536 + 2] = var10; // L: 5963
+ var11[var12 + 1536 + 3] = var10; // L: 5964
+ }
+ }
+
+ if (var9 == 3) { // L: 5967
+ if (var8 == 0) { // L: 5968
+ var11[var12] = var10;
+ } else if (var8 == 1) { // L: 5969
+ var11[var12 + 3] = var10;
+ } else if (var8 == 2) { // L: 5970
+ var11[var12 + 1536 + 3] = var10;
+ } else if (var8 == 3) { // L: 5971
+ var11[var12 + 1536] = var10;
+ }
+ }
+
+ if (var9 == 2) { // L: 5973
+ if (var8 == 3) { // L: 5974
+ var11[var12] = var10; // L: 5975
+ var11[var12 + 512] = var10; // L: 5976
+ var11[var12 + 1024] = var10; // L: 5977
+ var11[var12 + 1536] = var10; // L: 5978
+ } else if (var8 == 0) { // L: 5980
+ var11[var12] = var10; // L: 5981
+ var11[var12 + 1] = var10; // L: 5982
+ var11[var12 + 2] = var10; // L: 5983
+ var11[var12 + 3] = var10; // L: 5984
+ } else if (var8 == 1) { // L: 5986
+ var11[var12 + 3] = var10; // L: 5987
+ var11[var12 + 512 + 3] = var10; // L: 5988
+ var11[var12 + 1024 + 3] = var10; // L: 5989
+ var11[var12 + 1536 + 3] = var10; // L: 5990
+ } else if (var8 == 2) { // L: 5992
+ var11[var12 + 1536] = var10; // L: 5993
+ var11[var12 + 1536 + 1] = var10; // L: 5994
+ var11[var12 + 1536 + 2] = var10; // L: 5995
+ var11[var12 + 1536 + 3] = var10; // L: 5996
+ }
+ }
+ }
+ }
+
+ var5 = class356.scene.getGameObjectTag(var0, var1, var2); // L: 6001
+ if (0L != var5) { // L: 6002
+ var7 = class356.scene.getObjectFlags(var0, var1, var2, var5); // L: 6003
+ var8 = var7 >> 6 & 3; // L: 6004
+ var9 = var7 & 31; // L: 6005
+ var10 = Entity_unpackID(var5); // L: 6006
+ ObjectComposition var24 = class162.getObjectDefinition(var10); // L: 6007
+ int var19;
+ if (var24.mapSceneId != -1) { // L: 6008
+ IndexedSprite var20 = class13.mapSceneSprites[var24.mapSceneId]; // L: 6009
+ if (var20 != null) { // L: 6010
+ var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 6011
+ var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 6012
+ var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 6013
+ }
+ } else if (var9 == 9) { // L: 6016
+ var12 = 15658734; // L: 6017
+ if (Canvas.method322(var5)) { // L: 6018
+ var12 = 15597568;
+ }
+
+ int[] var18 = FloorUnderlayDefinition.sceneMinimapSprite.pixels; // L: 6019
+ var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6020
+ if (var8 != 0 && var8 != 2) { // L: 6021
+ var18[var19] = var12; // L: 6028
+ var18[var19 + 1 + 512] = var12; // L: 6029
+ var18[var19 + 1024 + 2] = var12; // L: 6030
+ var18[var19 + 1536 + 3] = var12; // L: 6031
+ } else {
+ var18[var19 + 1536] = var12; // L: 6022
+ var18[var19 + 1 + 1024] = var12; // L: 6023
+ var18[var19 + 512 + 2] = var12; // L: 6024
+ var18[var19 + 3] = var12; // L: 6025
+ }
+ }
+ }
+
+ var5 = class356.scene.getFloorDecorationTag(var0, var1, var2); // L: 6035
+ if (var5 != 0L) { // L: 6036
+ var7 = Entity_unpackID(var5); // L: 6037
+ ObjectComposition var21 = class162.getObjectDefinition(var7); // L: 6038
+ if (var21.mapSceneId != -1) { // L: 6039
+ IndexedSprite var22 = class13.mapSceneSprites[var21.mapSceneId]; // L: 6040
+ if (var22 != null) { // L: 6041
+ var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6042
+ int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6043
+ var22.drawAt(var10 + var1 * 4 + 48, var23 + (104 - var2 - var21.sizeY) * 4 + 48); // L: 6044
+ }
+ }
+ }
+
+ } // L: 6048
+
+ @ObfuscatedName("jq")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IIZI)V",
+ garbageValue = "2074727207"
+ )
+ @Export("alignWidgetSize")
+ static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
+ int var4 = var0.width; // L: 10684
+ int var5 = var0.height; // L: 10685
+ if (var0.widthAlignment == 0) { // L: 10686
+ var0.width = var0.rawWidth;
+ } else if (var0.widthAlignment == 1) { // L: 10687
+ var0.width = var1 - var0.rawWidth;
+ } else if (var0.widthAlignment == 2) { // L: 10688
+ var0.width = var0.rawWidth * var1 >> 14;
+ }
+
+ if (var0.heightAlignment == 0) { // L: 10689
+ var0.height = var0.rawHeight;
+ } else if (var0.heightAlignment == 1) { // L: 10690
+ var0.height = var2 - var0.rawHeight;
+ } else if (var0.heightAlignment == 2) { // L: 10691
+ var0.height = var2 * var0.rawHeight >> 14;
+ }
+
+ if (var0.widthAlignment == 4) { // L: 10692
+ var0.width = var0.height * var0.field3385 / var0.field3386;
+ }
+
+ if (var0.heightAlignment == 4) { // L: 10693
+ var0.height = var0.field3386 * var0.width / var0.field3385;
+ }
+
+ if (var0.contentType == 1337) { // L: 10694
+ Client.viewportWidget = var0;
+ }
+
+ if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10695
+ ScriptEvent var6 = new ScriptEvent(); // L: 10696
+ var6.widget = var0; // L: 10697
+ var6.args = var0.onResize; // L: 10698
+ Client.scriptEvents.addFirst(var6); // L: 10699
+ }
+
+ } // L: 10701
}
diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java
index a737a36fa4..09d7ea7dc4 100644
--- a/runescape-client/src/main/java/DefaultsGroup.java
+++ b/runescape-client/src/main/java/DefaultsGroup.java
@@ -4,26 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ny")
+@ObfuscatedName("na")
@Implements("DefaultsGroup")
public class DefaultsGroup {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lny;"
+ descriptor = "Lna;"
)
- static final DefaultsGroup field4370;
- @ObfuscatedName("q")
+ static final DefaultsGroup field4363;
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1549368493
+ intValue = 44353579
)
@Export("group")
final int group;
static {
- field4370 = new DefaultsGroup(3); // L: 4
+ field4363 = new DefaultsGroup(3); // L: 4
}
DefaultsGroup(int var1) {
this.group = var1; // L: 8
} // L: 9
+
+ @ObfuscatedName("fc")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1365746841"
+ )
+ @Export("forceDisconnect")
+ static final void forceDisconnect(int var0) {
+ MouseRecorder.logOut(); // L: 2923
+ switch(var0) { // L: 2924
+ case 1:
+ WorldMapData_1.method4872(24); // L: 2936
+ class101.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2937
+ break;
+ case 2:
+ WorldMapData_1.method4872(24); // L: 2928
+ class101.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2929
+ }
+
+ } // L: 2942
}
diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java
index a91a9fe605..19126e6690 100644
--- a/runescape-client/src/main/java/DemotingHashTable.java
+++ b/runescape-client/src/main/java/DemotingHashTable.java
@@ -6,29 +6,29 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ic")
@Implements("DemotingHashTable")
public final class DemotingHashTable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("capacity")
int capacity;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("remaining")
int remaining;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("hashTable")
IterableNodeHashTable hashTable;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lma;"
+ descriptor = "Lmh;"
)
@Export("queue")
IterableDualNodeQueue queue;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Liu;"
+ descriptor = "Lig;"
)
- class253 field2932;
+ class252 field2890;
public DemotingHashTable(int var1, int var2) {
this.queue = new IterableDualNodeQueue(); // L: 11
@@ -46,7 +46,7 @@ public final class DemotingHashTable {
this(var1, var1); // L: 15
} // L: 16
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("get")
public Object get(long var1) {
Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27
@@ -77,16 +77,16 @@ public final class DemotingHashTable {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("remove")
void remove(long var1) {
Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52
this.removeWrapper(var3); // L: 53
} // L: 54
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lim;)V"
+ descriptor = "(Lip;)V"
)
@Export("removeWrapper")
void removeWrapper(Wrapper var1) {
@@ -98,12 +98,12 @@ public final class DemotingHashTable {
} // L: 62
- @ObfuscatedName("k")
- public void method4942(Object var1, long var2) {
+ @ObfuscatedName("f")
+ public void method5130(Object var1, long var2) {
this.put(var1, var2, 1); // L: 65
} // L: 66
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("put")
public void put(Object var1, long var2, int var4) {
if (var4 > this.capacity) { // L: 69
@@ -122,8 +122,8 @@ public final class DemotingHashTable {
}
this.removeWrapper(var5); // L: 78
- if (this.field2932 != null) { // L: 79
- this.field2932.method4937(var5.get()); // L: 80
+ if (this.field2890 != null) { // L: 79
+ this.field2890.method5124(var5.get()); // L: 80
}
}
@@ -134,7 +134,7 @@ public final class DemotingHashTable {
}
} // L: 87
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("demote")
public void demote(int var1) {
for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90
@@ -155,7 +155,7 @@ public final class DemotingHashTable {
} // L: 109
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("clear")
public void clear() {
this.queue.clear(); // L: 112
diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
index c74273320c..7c171bffbb 100644
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -4,40 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("of")
+@ObfuscatedName("og")
@Implements("DesktopPlatformInfoProvider")
public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
- @ObfuscatedName("v")
- public static short[][] field4469;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 673826891
+ intValue = -199170423
+ )
+ int field4467;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1842203815
)
int field4468;
- @ObfuscatedName("a")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1902875041
+ intValue = -1586858741
)
- int field4472;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 658179341
- )
- int field4473;
+ int field4469;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)Lom;",
- garbageValue = "-12"
+ descriptor = "(I)Los;",
+ garbageValue = "51821248"
)
@Export("get")
public PlatformInfo get() {
byte var1;
- if (WorldMapArea.formattedOperatingSystemName.startsWith("win")) { // L: 16
+ if (NetFileRequest.formattedOperatingSystemName.startsWith("win")) { // L: 16
var1 = 1;
- } else if (WorldMapArea.formattedOperatingSystemName.startsWith("mac")) { // L: 17
+ } else if (NetFileRequest.formattedOperatingSystemName.startsWith("mac")) { // L: 17
var1 = 2;
- } else if (WorldMapArea.formattedOperatingSystemName.startsWith("linux")) { // L: 18
+ } else if (NetFileRequest.formattedOperatingSystemName.startsWith("linux")) { // L: 18
var1 = 3;
} else {
var1 = 4; // L: 19
@@ -111,8 +109,8 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var7 = 24;
} else if (var3.indexOf("10.9") != -1) { // L: 64
var7 = 25;
- } else if (var3.indexOf("10.10") != -1) {
- var7 = 26; // L: 65
+ } else if (var3.indexOf("10.10") != -1) { // L: 65
+ var7 = 26;
} else if (var3.indexOf("10.11") != -1) { // L: 66
var7 = 27;
} else if (var3.indexOf("10.12") != -1) { // L: 67
@@ -135,11 +133,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var8 = 4; // L: 75
}
- this.method6988(var5); // L: 76
+ this.method7151(var5); // L: 76
boolean var9 = false; // L: 77
int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78
int var11;
- if (this.field4468 > 3) { // L: 81
+ if (this.field4467 > 3) { // L: 81
var11 = Runtime.getRuntime().availableProcessors();
} else {
var11 = 0; // L: 82
@@ -160,53 +158,53 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
boolean var24 = false; // L: 95
String var25 = ""; // L: 96
boolean var26 = false; // L: 97
- return new PlatformInfo(var1, var27, var7, var8, this.field4468, this.field4472, this.field4473, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98
+ return new PlatformInfo(var1, var27, var7, var8, this.field4467, this.field4468, this.field4469, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "99"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "-1038587213"
)
- void method6988(String var1) {
+ void method7151(String var1) {
if (var1.startsWith("1.")) { // L: 102
- this.method6991(var1); // L: 103
+ this.method7152(var1); // L: 103
} else {
- this.method6996(var1); // L: 106
+ this.method7153(var1); // L: 106
}
} // L: 108
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-380169429"
+ garbageValue = "-1489289662"
)
- void method6991(String var1) {
+ void method7152(String var1) {
String[] var2 = var1.split("\\."); // L: 111
try {
- this.field4468 = Integer.parseInt(var2[1]); // L: 113
+ this.field4467 = Integer.parseInt(var2[1]); // L: 113
var2 = var2[2].split("_"); // L: 114
- this.field4472 = Integer.parseInt(var2[0]); // L: 115
- this.field4473 = Integer.parseInt(var2[1]); // L: 116
+ this.field4468 = Integer.parseInt(var2[0]); // L: 115
+ this.field4469 = Integer.parseInt(var2[1]); // L: 116
} catch (Exception var4) { // L: 118
}
} // L: 119
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "-68"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "530635410"
)
- void method6996(String var1) {
+ void method7153(String var1) {
String[] var2 = var1.split("\\."); // L: 122
try {
- this.field4468 = Integer.parseInt(var2[0]); // L: 124
- this.field4472 = Integer.parseInt(var2[1]); // L: 125
- this.field4473 = Integer.parseInt(var2[2]); // L: 126
+ this.field4467 = Integer.parseInt(var2[0]); // L: 124
+ this.field4468 = Integer.parseInt(var2[1]); // L: 125
+ this.field4469 = Integer.parseInt(var2[2]); // L: 126
} catch (Exception var4) { // L: 128
}
diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java
index eb682d757e..6c61e66e4a 100644
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -9,55 +9,55 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ag")
+@ObfuscatedName("ad")
@Implements("DevicePcmPlayer")
public class DevicePcmPlayer extends PcmPlayer {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("format")
AudioFormat format;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("line")
SourceDataLine line;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 30092841
+ intValue = -1450561083
)
@Export("capacity2")
int capacity2;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("byteSamples")
byte[] byteSamples;
DevicePcmPlayer() {
} // L: 18
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-125708948"
+ garbageValue = "-609921240"
)
@Export("init")
protected void init() {
- this.format = new AudioFormat((float)PcmPlayer.field300, 16, ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22
- this.byteSamples = new byte[256 << (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)]; // L: 23
+ this.format = new AudioFormat((float)PcmPlayer.field287, 16, BuddyRankComparator.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22
+ this.byteSamples = new byte[256 << (BuddyRankComparator.PcmPlayer_stereo ? 2 : 1)]; // L: 23
} // L: 24
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IS)V",
- garbageValue = "-30840"
+ descriptor = "(II)V",
+ garbageValue = "1372651644"
)
@Export("open")
protected void open(int var1) throws LineUnavailableException {
try {
- Info var2 = new Info(SourceDataLine.class, this.format, var1 << (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)); // L: 29
+ Info var2 = new Info(SourceDataLine.class, this.format, var1 << (BuddyRankComparator.PcmPlayer_stereo ? 2 : 1)); // L: 29
this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 30
this.line.open(); // L: 31
this.line.start(); // L: 32
this.capacity2 = var1; // L: 33
} catch (LineUnavailableException var3) { // L: 35
- if (VarcInt.method3324(var1) != 1) { // L: 36
- this.open(FontName.method7228(var1)); // L: 37
+ if (class269.method5223(var1) != 1) { // L: 36
+ this.open(class135.method2910(var1)); // L: 37
} else {
this.line = null; // L: 40
throw var3; // L: 41
@@ -65,21 +65,21 @@ public class DevicePcmPlayer extends PcmPlayer {
}
} // L: 38 43
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "181"
+ descriptor = "(I)I",
+ garbageValue = "2144118703"
)
@Export("position")
protected int position() {
- return this.capacity2 - (this.line.available() >> (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)); // L: 47
+ return this.capacity2 - (this.line.available() >> (BuddyRankComparator.PcmPlayer_stereo ? 2 : 1)); // L: 47
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("write")
protected void write() {
int var1 = 256; // L: 53
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 54
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 54
var1 <<= 1;
}
@@ -96,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer {
this.line.write(this.byteSamples, 0, var1 << 1); // L: 63
} // L: 64
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "25"
+ garbageValue = "-49"
)
@Export("close")
protected void close() {
@@ -110,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer {
} // L: 72
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "207475579"
+ descriptor = "(B)V",
+ garbageValue = "35"
)
@Export("discard")
protected void discard() {
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index c1e2005a24..bc5560bc7f 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -3,119 +3,103 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("i")
+@ObfuscatedName("m")
@Implements("DevicePcmPlayerProvider")
public class DevicePcmPlayerProvider implements class47 {
- @ObfuscatedName("aq")
+ @ObfuscatedName("w")
+ @Export("ItemDefinition_inMembersWorld")
+ static boolean ItemDefinition_inMembersWorld;
+ @ObfuscatedName("hx")
@ObfuscatedSignature(
- descriptor = "Lqi;"
+ descriptor = "Lmt;"
)
- @Export("rasterProvider")
- public static AbstractRasterProvider rasterProvider;
+ @Export("fontPlain12")
+ static Font fontPlain12;
DevicePcmPlayerProvider() {
} // L: 7
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lal;",
- garbageValue = "-1051033843"
+ descriptor = "(B)Lar;",
+ garbageValue = "71"
)
@Export("player")
public PcmPlayer player() {
return new DevicePcmPlayer(); // L: 11
}
- @ObfuscatedName("o")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;I)I",
- garbageValue = "654375877"
+ descriptor = "(II)I",
+ garbageValue = "933240326"
)
- static int method338(AbstractArchive var0, AbstractArchive var1) {
- int var2 = 0;
- String[] var3 = Login.field910;
-
- int var4;
- String var5;
- for (var4 = 0; var4 < var3.length; ++var4) { // L: 162
- var5 = var3[var4]; // L: 163
- if (var0.tryLoadFileByNames(var5, "")) { // L: 165
- ++var2;
- }
- }
-
- var3 = Login.field911; // L: 170
-
- for (var4 = 0; var4 < var3.length; ++var4) { // L: 171
- var5 = var3[var4]; // L: 172
- if (var1.tryLoadFileByNames(var5, "")) { // L: 174
- ++var2;
- }
- }
-
- return var2; // L: 178
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "296751671"
- )
- static void method336(int var0, int var1) {
- long var2 = (long)((var0 << 16) + var1); // L: 157
- NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 158
- if (var4 != null) { // L: 159
- NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 160
- }
- } // L: 161
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(IIB)I",
- garbageValue = "7"
- )
- static final int method340(int var0, int var1) {
- if (var0 == -1) { // L: 969
- return 12345678;
+ static int method305(int var0) {
+ Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 50
+ if (var1 == null) { // L: 51
+ return -1;
} else {
- var1 = (var0 & 127) * var1 / 128; // L: 970
- if (var1 < 2) { // L: 971
- var1 = 2;
- } else if (var1 > 126) { // L: 972
- var1 = 126;
- }
-
- return (var0 & 65408) + var1; // L: 973
+ return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 52 53
}
}
- @ObfuscatedName("ao")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1672362230"
+ descriptor = "(Ljava/lang/String;II)V",
+ garbageValue = "-1946812407"
)
- static int method335(int var0, Script var1, boolean var2) {
- if (var0 == 6800) { // L: 4511
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4512
- return 1; // L: 4513
- } else if (var0 != 6801 && var0 != 6802) { // L: 4515
- if (var0 == 6850) { // L: 4519
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4520
- return 1; // L: 4521
- } else if (var0 != 6851 && var0 != 6852) { // L: 4523
- if (var0 == 6853) { // L: 4527
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4528
- return 1; // L: 4529
- } else {
- return 2; // L: 4531
+ static final void method309(String var0, int var1) {
+ PacketBufferNode var2 = EnumComposition.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 260
+ var2.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 261
+ var2.packetBuffer.method7762(var1); // L: 262
+ var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 263
+ Client.packetWriter.addNode(var2); // L: 264
+ } // L: 265
+
+ @ObfuscatedName("ll")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;ZB)V",
+ garbageValue = "20"
+ )
+ @Export("findItemDefinitions")
+ static void findItemDefinitions(String var0, boolean var1) {
+ var0 = var0.toLowerCase(); // L: 12361
+ short[] var2 = new short[16]; // L: 12362
+ int var3 = 0; // L: 12363
+
+ for (int var4 = 0; var4 < PacketBufferNode.ItemDefinition_fileCount; ++var4) { // L: 12364
+ ItemComposition var9 = EnumComposition.ItemDefinition_get(var4); // L: 12365
+ if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12366 12367 12368
+ if (var3 >= 250) { // L: 12369
+ HealthBarUpdate.foundItemIdCount = -1; // L: 12370
+ class10.foundItemIds = null; // L: 12371
+ return; // L: 12372
}
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4524
- return 1; // L: 4525
+
+ if (var3 >= var2.length) { // L: 12374
+ short[] var6 = new short[var2.length * 2]; // L: 12375
+
+ for (int var7 = 0; var7 < var3; ++var7) { // L: 12376
+ var6[var7] = var2[var7];
+ }
+
+ var2 = var6; // L: 12377
+ }
+
+ var2[var3++] = (short)var4; // L: 12379
}
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4516
- return 1; // L: 4517
}
- }
+
+ class10.foundItemIds = var2; // L: 12381
+ TriBool.foundItemIndex = 0; // L: 12382
+ HealthBarUpdate.foundItemIdCount = var3; // L: 12383
+ String[] var8 = new String[HealthBarUpdate.foundItemIdCount]; // L: 12384
+
+ for (int var5 = 0; var5 < HealthBarUpdate.foundItemIdCount; ++var5) { // L: 12385
+ var8[var5] = EnumComposition.ItemDefinition_get(var2[var5]).name;
+ }
+
+ short[] var10 = class10.foundItemIds; // L: 12386
+ ObjectSound.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 12388
+ } // L: 12390
}
diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java
index a8fa1875b7..f9d54f2ae9 100644
--- a/runescape-client/src/main/java/DirectByteArrayCopier.java
+++ b/runescape-client/src/main/java/DirectByteArrayCopier.java
@@ -1,28 +1,29 @@
import java.nio.ByteBuffer;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jl")
+@ObfuscatedName("jr")
@Implements("DirectByteArrayCopier")
public class DirectByteArrayCopier extends AbstractByteArrayCopier {
- @ObfuscatedName("gx")
- @ObfuscatedSignature(
- descriptor = "Lnf;"
+ @ObfuscatedName("fy")
+ @ObfuscatedGetter(
+ intValue = -1703500315
)
- static AbstractSocket field3337;
- @ObfuscatedName("o")
+ static int field3306;
+ @ObfuscatedName("c")
@Export("directBuffer")
ByteBuffer directBuffer;
DirectByteArrayCopier() {
} // L: 10
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(B)[B",
- garbageValue = "70"
+ garbageValue = "-87"
)
@Export("get")
byte[] get() {
@@ -32,37 +33,50 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
return var1; // L: 16
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "([BI)V",
- garbageValue = "-362326915"
+ garbageValue = "2067022612"
)
@Export("set")
void set(byte[] var1) {
- this.directBuffer = ByteBuffer.allocateDirect(var1.length);
- this.directBuffer.position(0);
- this.directBuffer.put(var1);
- }
+ this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20
+ this.directBuffer.position(0); // L: 21
+ this.directBuffer.put(var1); // L: 22
+ } // L: 23
- @ObfuscatedName("o")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IB)Lft;",
- garbageValue = "12"
+ descriptor = "(Llc;IB)V",
+ garbageValue = "20"
)
- @Export("getInvDefinition")
- public static InvDefinition getInvDefinition(int var0) {
- InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17
- if (var1 != null) { // L: 18
- return var1;
- } else {
- byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19
- var1 = new InvDefinition(); // L: 20
- if (var2 != null) { // L: 21
- var1.decode(new Buffer(var2));
+ public static void method5512(Archive var0, int var1) {
+ KitDefinition.field1862.offset = var1 * 8 + 5; // L: 87
+ if (KitDefinition.field1862.offset >= KitDefinition.field1862.array.length) { // L: 88
+ if (var0.field3990) { // L: 89
+ var0.method5822(); // L: 90
+ } else {
+ throw new RuntimeException(""); // L: 93
}
+ } else {
+ int var2 = KitDefinition.field1862.readInt(); // L: 95
+ int var3 = KitDefinition.field1862.readInt(); // L: 96
+ var0.loadIndex(var2, var3); // L: 97
+ }
+ } // L: 91 98
- InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22
- return var1; // L: 23
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "1018448231"
+ )
+ @Export("Messages_getLastChatID")
+ static int Messages_getLastChatID(int var0) {
+ Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 57
+ if (var1 == null) { // L: 58
+ return -1;
+ } else {
+ return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 59 60
}
}
}
diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java
index bc02e6a1c9..c605c24998 100644
--- a/runescape-client/src/main/java/DirectWrapper.java
+++ b/runescape-client/src/main/java/DirectWrapper.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("il")
+@ObfuscatedName("ib")
@Implements("DirectWrapper")
public class DirectWrapper extends Wrapper {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("obj")
Object obj;
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
this.obj = var1; // L: 8
} // L: 9
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("get")
Object get() {
return this.obj; // L: 12
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("isSoft")
boolean isSoft() {
return false; // L: 16
diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java
index 48ca6c2ab2..1526360416 100644
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oq")
+@ObfuscatedName("oo")
@Implements("DualNode")
public class DualNode extends Node {
- @ObfuscatedName("dh")
+ @ObfuscatedName("dv")
@Export("keyDual")
public long keyDual;
- @ObfuscatedName("dj")
+ @ObfuscatedName("dy")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("previousDual")
public DualNode previousDual;
- @ObfuscatedName("dx")
+ @ObfuscatedName("ds")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("nextDual")
public DualNode nextDual;
- @ObfuscatedName("dx")
+ @ObfuscatedName("dc")
@Export("removeDual")
public void removeDual() {
if (this.nextDual != null) { // L: 9
diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java
index 75084c461e..505f745f6a 100644
--- a/runescape-client/src/main/java/DualNodeDeque.java
+++ b/runescape-client/src/main/java/DualNodeDeque.java
@@ -6,9 +6,9 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("lr")
@Implements("DualNodeDeque")
public final class DualNodeDeque {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("sentinel")
DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
this.sentinel.nextDual = this.sentinel; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Loq;)V"
+ descriptor = "(Loo;)V"
)
@Export("addFirst")
public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
var1.previousDual.nextDual = var1; // L: 18
} // L: 19
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Loq;)V"
+ descriptor = "(Loo;)V"
)
@Export("addLast")
public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
var1.previousDual.nextDual = var1; // L: 26
} // L: 27
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "()Loq;"
+ descriptor = "()Loo;"
)
@Export("removeLast")
public DualNode removeLast() {
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index fd117844e9..112c845085 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -5,79 +5,90 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("bm")
+@ObfuscatedName("bo")
@Implements("DynamicObject")
public class DynamicObject extends Renderable {
- @ObfuscatedName("o")
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "Lqu;"
+ )
+ static IndexedSprite field979;
+ @ObfuscatedName("iw")
+ @ObfuscatedSignature(
+ descriptor = "[Lqe;"
+ )
+ @Export("mapMarkerSprites")
+ static SpritePixels[] mapMarkerSprites;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 393913769
+ intValue = -1798375219
)
@Export("id")
int id;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 992153197
+ intValue = 1429314391
)
@Export("type")
int type;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 849198695
+ intValue = -1262653635
)
@Export("orientation")
int orientation;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 2111003401
+ intValue = 1960172765
)
@Export("plane")
int plane;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1849101915
+ intValue = -1525281289
)
@Export("x")
int x;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1844772961
+ intValue = 1977706273
)
@Export("y")
int y;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lgq;"
+ descriptor = "Lgc;"
)
@Export("sequenceDefinition")
SequenceDefinition sequenceDefinition;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 1649346091
+ intValue = 896150091
)
@Export("frame")
int frame;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -1098148309
+ intValue = 1038078247
)
@Export("cycleStart")
int cycleStart;
@ObfuscatedSignature(
- descriptor = "(IIIIIIIZLgx;)V"
+ descriptor = "(IIIIIIIZLgj;)V"
)
DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
this.id = var1; // L: 20
- this.type = var2; // L: 21
+ this.type = var2;
this.orientation = var3; // L: 22
- this.plane = var4; // L: 23
+ this.plane = var4;
this.x = var5; // L: 24
- this.y = var6; // L: 25
+ this.y = var6;
if (var7 != -1) { // L: 26
- this.sequenceDefinition = class114.SequenceDefinition_get(var7); // L: 27
+ this.sequenceDefinition = ScriptFrame.SequenceDefinition_get(var7); // L: 27
this.frame = 0; // L: 28
this.cycleStart = Client.cycle - 1; // L: 29
- if (this.sequenceDefinition.field2208 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
+ if (this.sequenceDefinition.field2174 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
DynamicObject var10 = (DynamicObject)var9; // L: 31
if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32
this.frame = var10.frame; // L: 33
@@ -91,17 +102,17 @@ public class DynamicObject extends Renderable {
this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 40
this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 41
} else {
- this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3729()); // L: 44
+ this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3835()); // L: 44
}
}
}
} // L: 48
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected final Model getModel() {
@@ -113,7 +124,7 @@ public class DynamicObject extends Renderable {
}
if (this.sequenceDefinition.isCachedModelIdSet()) { // L: 54
- var2 = this.sequenceDefinition.method3729(); // L: 68
+ var2 = this.sequenceDefinition.method3835(); // L: 68
this.frame += var1; // L: 69
var1 = 0; // L: 70
if (this.frame >= var2) { // L: 71
@@ -123,11 +134,11 @@ public class DynamicObject extends Renderable {
}
}
} else {
- label81: {
+ label79: {
do {
do {
if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55
- break label81;
+ break label79;
}
var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56
@@ -144,7 +155,7 @@ public class DynamicObject extends Renderable {
this.cycleStart = Client.cycle - var1; // L: 78
}
- ObjectComposition var12 = class82.getObjectDefinition(this.id); // L: 80
+ ObjectComposition var12 = class162.getObjectDefinition(this.id); // L: 80
if (var12.transforms != null) { // L: 81
var12 = var12.transform();
}
@@ -166,439 +177,183 @@ public class DynamicObject extends Renderable {
int var6 = (var3 >> 1) + this.y; // L: 95
int var7 = (var3 + 1 >> 1) + this.y; // L: 96
int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 97
- int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; // L: 98
+ int var9 = var8[var5][var6] + var8[var4][var6] + var8[var4][var7] + var8[var5][var7] >> 2; // L: 98
int var10 = (this.x << 7) + (var2 << 6); // L: 99
int var11 = (this.y << 7) + (var3 << 6); // L: 100
return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 101
}
}
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(IIII)I",
- garbageValue = "-1327477180"
- )
- public static int method1957(int var0, int var1, int var2) {
- int var3 = class147.method3000(var2 - var1 + 1); // L: 62
- var3 <<= var1; // L: 63
- return var0 & ~var3; // L: 64
- }
+ @ObfuscatedName("c")
+ public static final void method1991(long var0) {
+ if (var0 > 0L) { // L: 9
+ if (0L == var0 % 10L) { // L: 10
+ GrandExchangeOfferAgeComparator.method5989(var0 - 1L); // L: 11
- @ObfuscatedName("z")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "2018004509"
- )
- static int method1963(int var0, Script var1, boolean var2) {
- String var7;
- if (var0 == ScriptOpcodes.MES) { // L: 1470
- var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1471
- WorldMapEvent.addGameMessage(0, "", var7); // L: 1472
- return 1; // L: 1473
- } else if (var0 == ScriptOpcodes.ANIM) {
- class12.Interpreter_intStackSize -= 2; // L: 1476
- JagexCache.performPlayerAnimation(ModelData0.localPlayer, Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 1477
- return 1; // L: 1478
- } else if (var0 == ScriptOpcodes.IF_CLOSE) {
- if (!Interpreter.field833) { // L: 1481
- Interpreter.field835 = true; // L: 1482
+ try {
+ Thread.sleep(1L); // L: 14
+ } catch (InterruptedException var4) { // L: 16
+ }
+ } else {
+ try {
+ Thread.sleep(var0); // L: 21
+ } catch (InterruptedException var3) { // L: 23
+ }
}
- return 1; // L: 1484
+ }
+ } // L: 25
+
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-313188539"
+ )
+ static int method1987(int var0, Script var1, boolean var2) {
+ Widget var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1351
+ if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1352
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1353
+ return 1; // L: 1354
+ } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1356
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1357
+ return 1; // L: 1358
+ } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1360
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1361
+ return 1; // L: 1362
+ } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1364
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1365
+ return 1; // L: 1366
+ } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1368
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1369
+ return 1; // L: 1370
+ } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1372
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1373
+ return 1; // L: 1374
+ } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1376
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1377
+ return 1; // L: 1378
+ } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1380
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1381
+ return 1; // L: 1382
+ } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1384
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1385
+ return 1; // L: 1386
+ } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1388
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1389
+ return 1; // L: 1390
+ } else if (var0 == 2610) { // L: 1392
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1393
+ return 1; // L: 1394
+ } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1396
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.color; // L: 1397
+ return 1; // L: 1398
+ } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1400
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.color2; // L: 1401
+ return 1; // L: 1402
+ } else if (var0 == 2613) { // L: 1404
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1405
+ return 1; // L: 1406
+ } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1408
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1409
+ return 1; // L: 1410
+ } else if (var0 != 2615 && var0 != 2616) { // L: 1412
+ return 2; // L: 1416
} else {
- int var15;
- if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
- var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1487
- var15 = 0; // L: 1488
- if (NetFileRequest.isNumber(var7)) { // L: 1489
- var15 = class92.method2373(var7);
+ ++class446.Interpreter_intStackSize; // L: 1413
+ return 1; // L: 1414
+ }
+ }
+
+ @ObfuscatedName("ja")
+ @ObfuscatedSignature(
+ descriptor = "(Lci;IIII)V",
+ garbageValue = "-902983167"
+ )
+ @Export("addPlayerToMenu")
+ static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
+ if (class101.localPlayer != var0) { // L: 9987
+ if (Client.menuOptionsCount < 400) { // L: 9988
+ String var4;
+ int var7;
+ if (var0.skillLevel == 0) { // L: 9990
+ String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9991
+ var7 = var0.combatLevel; // L: 9993
+ int var8 = class101.localPlayer.combatLevel; // L: 9994
+ int var9 = var8 - var7; // L: 9996
+ String var6;
+ if (var9 < -9) { // L: 9997
+ var6 = class122.colorStartTag(16711680); // L: 9998
+ } else if (var9 < -6) { // L: 10001
+ var6 = class122.colorStartTag(16723968); // L: 10002
+ } else if (var9 < -3) { // L: 10005
+ var6 = class122.colorStartTag(16740352); // L: 10006
+ } else if (var9 < 0) { // L: 10009
+ var6 = class122.colorStartTag(16756736); // L: 10010
+ } else if (var9 > 9) { // L: 10013
+ var6 = class122.colorStartTag(65280); // L: 10014
+ } else if (var9 > 6) { // L: 10017
+ var6 = class122.colorStartTag(4259584); // L: 10018
+ } else if (var9 > 3) { // L: 10021
+ var6 = class122.colorStartTag(8453888); // L: 10022
+ } else if (var9 > 0) { // L: 10025
+ var6 = class122.colorStartTag(12648192); // L: 10026
+ } else {
+ var6 = class122.colorStartTag(16776960); // L: 10029
+ }
+
+ var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 10031
+ } else {
+ var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10033
}
- PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 1491
- var13.packetBuffer.writeInt(var15); // L: 1492
- Client.packetWriter.addNode(var13); // L: 1493
- return 1; // L: 1494
- } else {
- PacketBufferNode var11;
- if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
- var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1497
- var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3048, Client.packetWriter.isaacCipher); // L: 1499
- var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500
- var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501
- Client.packetWriter.addNode(var11); // L: 1502
- return 1; // L: 1503
- } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
- var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1506
- var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3033, Client.packetWriter.isaacCipher); // L: 1508
- var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509
- var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510
- Client.packetWriter.addNode(var11); // L: 1511
- return 1; // L: 1512
+ int var10;
+ if (Client.isItemSelected == 1) { // L: 10034
+ class4.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class122.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10035
+ } else if (Client.isSpellSelected) { // L: 10038
+ if ((HealthBar.selectedSpellFlags & 8) == 8) { // L: 10039
+ class4.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class122.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10040
+ }
} else {
- String var4;
- int var10;
- if (var0 == ScriptOpcodes.OPPLAYER) {
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1515
- var4 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1516
- method1964(var10, var4); // L: 1517
- return 1; // L: 1518
- } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
- class12.Interpreter_intStackSize -= 3; // L: 1521
- var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1522
- var15 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1523
- int var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 1524
- Widget var14 = class92.getWidget(var9); // L: 1525
- class10.clickWidget(var14, var10, var15); // L: 1526
- return 1; // L: 1527
- } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
- class12.Interpreter_intStackSize -= 2; // L: 1530
- var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1531
- var15 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1532
- Widget var12 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1533
- class10.clickWidget(var12, var10, var15); // L: 1534
- return 1; // L: 1535
- } else if (var0 == ScriptOpcodes.MOUSECAM) {
- Login.mouseCam = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1538
- return 1; // L: 1539
- } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2222() ? 1 : 0; // L: 1542
- return 1; // L: 1543
- } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
- class12.clientPreferences.method2219(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1); // L: 1546
- return 1; // L: 1547
- } else if (var0 == ScriptOpcodes.OPENURL) {
- var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1550
- boolean var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1551
- ScriptEvent.openURL(var7, var8, false); // L: 1552
- return 1; // L: 1553
- } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1556
- var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3017, Client.packetWriter.isaacCipher); // L: 1558
- var11.packetBuffer.writeShort(var10); // L: 1559
- Client.packetWriter.addNode(var11); // L: 1560
- return 1; // L: 1561
- } else if (var0 == ScriptOpcodes.BUG_REPORT) {
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1564
- class9.Interpreter_stringStackSize -= 2; // L: 1565
- var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 1566
- String var5 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 1567
- if (var4.length() > 500) { // L: 1568
- return 1;
- } else if (var5.length() > 500) { // L: 1569
- return 1;
- } else {
- PacketBufferNode var6 = WallDecoration.getPacketBufferNode(ClientPacket.field3044, Client.packetWriter.isaacCipher); // L: 1570
- var6.packetBuffer.writeShort(1 + class392.stringCp1252NullTerminatedByteSize(var4) + class392.stringCp1252NullTerminatedByteSize(var5)); // L: 1571
- var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1572
- var6.packetBuffer.method7687(var10); // L: 1573
- var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1574
- Client.packetWriter.addNode(var6); // L: 1575
- return 1; // L: 1576
- }
- } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
- Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1579
- return 1; // L: 1580
- } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
- Client.showMouseOverText = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1583
- return 1; // L: 1584
- } else if (var0 == ScriptOpcodes.RENDERSELF) {
- Client.renderSelf = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1587
- return 1; // L: 1588
- } else if (var0 == 3120) {
- if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1591
- Client.drawPlayerNames |= 1;
- } else {
- Client.drawPlayerNames &= -2; // L: 1592
- }
+ for (var10 = 7; var10 >= 0; --var10) { // L: 10045
+ if (Client.playerMenuActions[var10] != null) { // L: 10046
+ short var11 = 0; // L: 10047
+ if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 10048
+ if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10049
+ continue;
+ }
- return 1; // L: 1593
- } else if (var0 == 3121) {
- if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1596
- Client.drawPlayerNames |= 2;
- } else {
- Client.drawPlayerNames &= -3; // L: 1597
- }
+ if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > class101.localPlayer.combatLevel) { // L: 10050
+ var11 = 2000; // L: 10051
+ }
- return 1; // L: 1598
- } else if (var0 == 3122) {
- if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1601
- Client.drawPlayerNames |= 4;
- } else {
- Client.drawPlayerNames &= -5; // L: 1602
- }
-
- return 1; // L: 1603
- } else if (var0 == 3123) {
- if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1606
- Client.drawPlayerNames |= 8;
- } else {
- Client.drawPlayerNames &= -9; // L: 1607
- }
-
- return 1; // L: 1608
- } else if (var0 == 3124) {
- Client.drawPlayerNames = 0; // L: 1611
- return 1; // L: 1612
- } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
- Client.showMouseCross = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1615
- return 1; // L: 1616
- } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
- Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1619
- return 1; // L: 1620
- } else if (var0 == ScriptOpcodes.SETTAPTODROP) {
- class33.setTapToDrop(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1); // L: 1623
- return 1; // L: 1624
- } else if (var0 == ScriptOpcodes.GETTAPTODROP) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WallDecoration.getTapToDrop() ? 1 : 0; // L: 1627
- return 1; // L: 1628
- } else if (var0 == 3129) {
- class12.Interpreter_intStackSize -= 2; // L: 1631
- Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1632
- Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1633
- return 1; // L: 1634
- } else if (var0 == 3130) {
- class12.Interpreter_intStackSize -= 2; // L: 1637
- return 1; // L: 1638
- } else if (var0 == 3131) {
- --class12.Interpreter_intStackSize; // L: 1641
- return 1; // L: 1642
- } else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GraphicsObject.canvasWidth; // L: 1645
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class433.canvasHeight; // L: 1646
- return 1; // L: 1647
- } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
- --class12.Interpreter_intStackSize; // L: 1650
- return 1; // L: 1651
- } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
- return 1; // L: 1654
- } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
- class12.Interpreter_intStackSize -= 2; // L: 1657
- return 1; // L: 1658
- } else if (var0 == 3136) {
- Client.field487 = 3; // L: 1661
- Client.field657 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1662
- return 1; // L: 1663
- } else if (var0 == 3137) {
- Client.field487 = 2; // L: 1666
- Client.field657 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1667
- return 1; // L: 1668
- } else if (var0 == 3138) {
- Client.field487 = 0; // L: 1671
- return 1; // L: 1672
- } else if (var0 == 3139) {
- Client.field487 = 1; // L: 1675
- return 1; // L: 1676
- } else if (var0 == 3140) {
- Client.field487 = 3; // L: 1679
- Client.field657 = var2 ? Interpreter.scriptDotWidget.id * 1115174973 * -203153643 : KeyHandler.scriptActiveWidget.id * 1115174973 * -203153643; // L: 1680
- return 1; // L: 1681
- } else {
- boolean var3;
- if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1684
- class12.clientPreferences.method2223(var3); // L: 1685
- return 1; // L: 1686
- } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2257() ? 1 : 0; // L: 1689
- return 1; // L: 1690
- } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1693
- Client.Login_isUsernameRemembered = var3; // L: 1694
- if (!var3) { // L: 1695
- class12.clientPreferences.method2297(""); // L: 1696
+ if (class101.localPlayer.team != 0 && var0.team != 0) { // L: 10053
+ if (var0.team == class101.localPlayer.team) { // L: 10054
+ var11 = 2000;
+ } else {
+ var11 = 0; // L: 10055
+ }
+ } else if (Client.playerAttackOption == AttackOption.field1294 && var0.isClanMember()) { // L: 10057
+ var11 = 2000; // L: 10058
+ }
+ } else if (Client.playerOptionsPriorities[var10]) { // L: 10061
+ var11 = 2000;
}
- return 1; // L: 1698
- } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701
- return 1; // L: 1702
- } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
- return 1; // L: 1705
- } else if (var0 == 3146) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1708
- class12.clientPreferences.method2305(!var3); // L: 1709
- return 1; // L: 1710
- } else if (var0 == 3147) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2226() ? 0 : 1; // L: 1713
- return 1; // L: 1714
- } else if (var0 == 3148) {
- return 1; // L: 1717
- } else if (var0 == 3149) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1720
- return 1; // L: 1721
- } else if (var0 == 3150) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1724
- return 1; // L: 1725
- } else if (var0 == 3151) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1728
- return 1; // L: 1729
- } else if (var0 == 3152) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1732
- return 1; // L: 1733
- } else if (var0 == 3153) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736
- return 1; // L: 1737
- } else if (var0 == 3154) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class136.method2868(); // L: 1740
- return 1; // L: 1741
- } else if (var0 == 3155) {
- --class9.Interpreter_stringStackSize; // L: 1744
- return 1; // L: 1745
- } else if (var0 == 3156) {
- return 1; // L: 1748
- } else if (var0 == 3157) {
- class12.Interpreter_intStackSize -= 2; // L: 1751
- return 1; // L: 1752
- } else if (var0 == 3158) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1755
- return 1; // L: 1756
- } else if (var0 == 3159) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1759
- return 1; // L: 1760
- } else if (var0 == 3160) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1763
- return 1; // L: 1764
- } else if (var0 == 3161) {
- --class12.Interpreter_intStackSize; // L: 1767
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1768
- return 1; // L: 1769
- } else if (var0 == 3162) {
- --class12.Interpreter_intStackSize; // L: 1772
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1773
- return 1; // L: 1774
- } else if (var0 == 3163) {
- --class9.Interpreter_stringStackSize; // L: 1777
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1778
- return 1; // L: 1779
- } else if (var0 == 3164) {
- --class12.Interpreter_intStackSize; // L: 1782
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1783
- return 1; // L: 1784
- } else if (var0 == 3165) {
- --class12.Interpreter_intStackSize; // L: 1787
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1788
- return 1; // L: 1789
- } else if (var0 == 3166) {
- class12.Interpreter_intStackSize -= 2; // L: 1792
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1793
- return 1; // L: 1794
- } else if (var0 == 3167) {
- class12.Interpreter_intStackSize -= 2; // L: 1797
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1798
- return 1; // L: 1799
- } else if (var0 == 3168) {
- class12.Interpreter_intStackSize -= 2; // L: 1802
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1803
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1804
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1805
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1806
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1807
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1808
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1809
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1810
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1811
- return 1; // L: 1812
- } else if (var0 == 3169) {
- return 1; // L: 1815
- } else if (var0 == 3170) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1818
- return 1; // L: 1819
- } else if (var0 == 3171) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1822
- return 1; // L: 1823
- } else if (var0 == 3172) {
- --class12.Interpreter_intStackSize; // L: 1826
- return 1; // L: 1827
- } else if (var0 == 3173) {
- --class12.Interpreter_intStackSize; // L: 1830
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1831
- return 1; // L: 1832
- } else if (var0 == 3174) {
- --class12.Interpreter_intStackSize; // L: 1835
- return 1; // L: 1836
- } else if (var0 == 3175) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1839
- return 1; // L: 1840
- } else if (var0 == 3176) {
- return 1; // L: 1843
- } else if (var0 == 3177) {
- return 1; // L: 1846
- } else if (var0 == 3178) {
- --class9.Interpreter_stringStackSize; // L: 1849
- return 1; // L: 1850
- } else if (var0 == 3179) {
- return 1; // L: 1853
- } else if (var0 == 3180) {
- --class9.Interpreter_stringStackSize; // L: 1856
- return 1; // L: 1857
- } else if (var0 == 3181) {
- World.method1664(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1860
- return 1; // L: 1861
- } else if (var0 == 3182) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GameBuild.method5586(); // L: 1864
- return 1; // L: 1865
- } else if (var0 != 3183 && var0 != 3184) {
- if (var0 == 3187) {
- class9.Interpreter_stringStackSize -= 2; // L: 1872
- return 1; // L: 1873
- } else {
- return var0 == 3188 ? 1 : 2; // L: 1876 1878
- }
- } else {
- --class12.Interpreter_intStackSize; // L: 1868
- return 1; // L: 1869
+ boolean var12 = false; // L: 10062
+ var7 = Client.playerMenuOpcodes[var10] + var11; // L: 10063
+ class4.insertMenuItemNoShift(Client.playerMenuActions[var10], class122.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 10064
}
}
}
- }
- }
- }
- @ObfuscatedName("ii")
- @ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;I)V",
- garbageValue = "424896925"
- )
- static void method1964(int var0, String var1) {
- int var2 = Players.Players_count; // L: 9727
- int[] var3 = Players.Players_indices; // L: 9728
- boolean var4 = false; // L: 9729
- Username var5 = new Username(var1, class391.loginType); // L: 9730
-
- for (int var6 = 0; var6 < var2; ++var6) { // L: 9731
- Player var7 = Client.players[var3[var6]]; // L: 9732
- if (var7 != null && var7 != ModelData0.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9733
- PacketBufferNode var8;
- if (var0 == 1) { // L: 9734
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9736
- var8.packetBuffer.writeShort(var3[var6]); // L: 9737
- var8.packetBuffer.method7687(0); // L: 9738
- Client.packetWriter.addNode(var8); // L: 9739
- } else if (var0 == 4) { // L: 9741
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 9743
- var8.packetBuffer.writeByte(0); // L: 9744
- var8.packetBuffer.method7641(var3[var6]); // L: 9745
- Client.packetWriter.addNode(var8); // L: 9746
- } else if (var0 == 6) { // L: 9748
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9750
- var8.packetBuffer.method7641(var3[var6]); // L: 9751
- var8.packetBuffer.method7687(0); // L: 9752
- Client.packetWriter.addNode(var8); // L: 9753
- } else if (var0 == 7) { // L: 9755
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9757
- var8.packetBuffer.method7596(0); // L: 9758
- var8.packetBuffer.method7641(var3[var6]); // L: 9759
- Client.packetWriter.addNode(var8); // L: 9760
+ for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 10069
+ if (Client.menuOpcodes[var10] == 23) { // L: 10070
+ Client.menuTargets[var10] = class122.colorStartTag(16777215) + var4; // L: 10071
+ break;
+ }
}
- var4 = true; // L: 9762
- break;
}
}
-
- if (!var4) { // L: 9766
- WorldMapEvent.addGameMessage(4, "", "Unable to find " + var1);
- }
-
- } // L: 9767
+ } // L: 10075
}
diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java
index fea85d7788..6674133081 100644
--- a/runescape-client/src/main/java/EnumComposition.java
+++ b/runescape-client/src/main/java/EnumComposition.java
@@ -4,49 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fc")
+@ObfuscatedName("fs")
@Implements("EnumComposition")
public class EnumComposition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("EnumDefinition_archive")
- public static AbstractArchive EnumDefinition_archive;
- @ObfuscatedName("q")
+ static AbstractArchive EnumDefinition_archive;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("EnumDefinition_cached")
static EvictingDualNodeHashTable EnumDefinition_cached;
- @ObfuscatedName("l")
+ @ObfuscatedName("nc")
+ @ObfuscatedGetter(
+ intValue = -2102626567
+ )
+ @Export("selectedItemSlot")
+ static int selectedItemSlot;
+ @ObfuscatedName("q")
@Export("inputType")
public char inputType;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("outputType")
public char outputType;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("defaultStr")
public String defaultStr;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1422398085
+ intValue = -735765161
)
@Export("defaultInt")
public int defaultInt;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -1977259169
+ intValue = 367199611
)
@Export("outputCount")
public int outputCount;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("keys")
public int[] keys;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("intVals")
public int[] intVals;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("strVals")
public String[] strVals;
@@ -61,106 +67,173 @@ public class EnumComposition extends DualNode {
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "2"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "110"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 36
- if (var2 == 0) { // L: 37
- return; // L: 40
+ int var2 = var1.readUnsignedByte();
+ if (var2 == 0) {
+ return; // L: 44
}
- this.decodeNext(var1, var2); // L: 38
+ this.decodeNext(var1, var2); // L: 42
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "2123865922"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-1048481170"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 1) { // L: 43
+ if (var2 == 1) { // L: 47
this.inputType = (char)var1.readUnsignedByte();
- } else if (var2 == 2) { // L: 44
+ } else if (var2 == 2) { // L: 48
this.outputType = (char)var1.readUnsignedByte();
- } else if (var2 == 3) { // L: 45
+ } else if (var2 == 3) { // L: 49
this.defaultStr = var1.readStringCp1252NullTerminated();
- } else if (var2 == 4) { // L: 46
+ } else if (var2 == 4) { // L: 50
this.defaultInt = var1.readInt();
} else {
int var3;
- if (var2 == 5) { // L: 47
- this.outputCount = var1.readUnsignedShort(); // L: 48
- this.keys = new int[this.outputCount]; // L: 49
- this.strVals = new String[this.outputCount]; // L: 50
+ if (var2 == 5) { // L: 51
+ this.outputCount = var1.readUnsignedShort(); // L: 52
+ this.keys = new int[this.outputCount]; // L: 53
+ this.strVals = new String[this.outputCount]; // L: 54
- for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51
- this.keys[var3] = var1.readInt(); // L: 52
- this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53
+ for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55
+ this.keys[var3] = var1.readInt(); // L: 56
+ this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57
}
- } else if (var2 == 6) { // L: 56
- this.outputCount = var1.readUnsignedShort(); // L: 57
- this.keys = new int[this.outputCount]; // L: 58
- this.intVals = new int[this.outputCount]; // L: 59
+ } else if (var2 == 6) { // L: 60
+ this.outputCount = var1.readUnsignedShort(); // L: 61
+ this.keys = new int[this.outputCount]; // L: 62
+ this.intVals = new int[this.outputCount]; // L: 63
- for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60
- this.keys[var3] = var1.readInt(); // L: 61
- this.intVals[var3] = var1.readInt(); // L: 62
+ for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64
+ this.keys[var3] = var1.readInt(); // L: 65
+ this.intVals[var3] = var1.readInt(); // L: 66
}
}
}
- } // L: 66
+ } // L: 70
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1493000853"
+ garbageValue = "75421574"
)
@Export("size")
public int size() {
- return this.outputCount; // L: 69
+ return this.outputCount; // L: 73
}
- @ObfuscatedName("l")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([BIII)Ljava/lang/String;",
- garbageValue = "2111850720"
+ descriptor = "(Lju;Lqv;I)Ljt;",
+ garbageValue = "870680813"
)
- @Export("decodeStringCp1252")
- public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
- char[] var3 = new char[var2]; // L: 82
- int var4 = 0; // L: 83
-
- for (int var5 = 0; var5 < var2; ++var5) { // L: 84
- int var6 = var0[var5 + var1] & 255; // L: 85
- if (var6 != 0) { // L: 86
- if (var6 >= 128 && var6 < 160) { // L: 87
- char var7 = class341.cp1252AsciiExtension[var6 - 128]; // L: 88
- if (var7 == 0) { // L: 89
- var7 = '?';
- }
-
- var6 = var7; // L: 90
- }
-
- var3[var4++] = (char)var6; // L: 92
- }
+ @Export("getPacketBufferNode")
+ public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
+ PacketBufferNode var2;
+ if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24
+ var2 = new PacketBufferNode(); // L: 25
+ } else {
+ var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28
}
- return new String(var3, 0, var4); // L: 94
+ var2.clientPacket = var0; // L: 31
+ var2.clientPacketLength = var0.length; // L: 32
+ if (var2.clientPacketLength == -1) {
+ var2.packetBuffer = new PacketBuffer(260); // L: 33
+ } else if (var2.clientPacketLength == -2) { // L: 34
+ var2.packetBuffer = new PacketBuffer(10000);
+ } else if (var2.clientPacketLength <= 18) { // L: 35
+ var2.packetBuffer = new PacketBuffer(20);
+ } else if (var2.clientPacketLength <= 98) { // L: 36
+ var2.packetBuffer = new PacketBuffer(100);
+ } else {
+ var2.packetBuffer = new PacketBuffer(260); // L: 37
+ }
+
+ var2.packetBuffer.setIsaacCipher(var1); // L: 38
+ var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39
+ var2.index = 0; // L: 40
+ return var2; // L: 41
}
- @ObfuscatedName("p")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2023636787"
+ descriptor = "(IB)Lgs;",
+ garbageValue = "-21"
)
- public static void method3400() {
- FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 96
- } // L: 97
+ @Export("ItemDefinition_get")
+ public static ItemComposition ItemDefinition_get(int var0) {
+ ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92
+ if (var1 != null) { // L: 93
+ return var1;
+ } else {
+ byte[] var2 = UserComparator4.ItemDefinition_archive.takeFile(10, var0); // L: 94
+ var1 = new ItemComposition(); // L: 95
+ var1.id = var0; // L: 96
+ if (var2 != null) { // L: 97
+ var1.decode(new Buffer(var2));
+ }
+
+ var1.post(); // L: 98
+ if (var1.noteTemplate != -1) { // L: 99
+ var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
+ }
+
+ if (var1.notedId != -1) { // L: 100
+ var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
+ }
+
+ if (var1.placeholderTemplate != -1) { // L: 101
+ var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
+ }
+
+ if (!DevicePcmPlayerProvider.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102
+ var1.name = "Members object"; // L: 103
+ var1.isTradable = false; // L: 104
+
+ int var3;
+ for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 105
+ var1.groundActions[var3] = null; // L: 106
+ }
+
+ for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 108
+ if (var3 != 4) { // L: 109
+ var1.inventoryActions[var3] = null; // L: 110
+ }
+ }
+
+ var1.shiftClickIndex = -2; // L: 113
+ var1.team = 0; // L: 114
+ if (var1.params != null) { // L: 115
+ boolean var6 = false; // L: 116
+
+ for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 117
+ ParamComposition var5 = class174.getParamDefinition((int)var4.key); // L: 118
+ if (var5.autoDisable) { // L: 119
+ var4.remove();
+ } else {
+ var6 = true; // L: 120
+ }
+ }
+
+ if (!var6) {
+ var1.params = null; // L: 122
+ }
+ }
+ }
+
+ ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 125
+ return var1; // L: 126
+ }
+ }
}
diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
index 5fabda62b7..5e0683bfc7 100644
--- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java
+++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
@@ -3,30 +3,30 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ir")
+@ObfuscatedName("ii")
@Implements("EvictingDualNodeHashTable")
public final class EvictingDualNodeHashTable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("dualNode")
DualNode dualNode;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("capacity")
int capacity;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("remainingCapacity")
int remainingCapacity;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("hashTable")
IterableNodeHashTable hashTable;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lma;"
+ descriptor = "Lmh;"
)
@Export("deque")
IterableDualNodeQueue deque;
@@ -44,9 +44,9 @@ public final class EvictingDualNodeHashTable {
this.hashTable = new IterableNodeHashTable(var2); // L: 19
} // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(J)Loq;"
+ descriptor = "(J)Loo;"
)
@Export("get")
public DualNode get(long var1) {
@@ -58,7 +58,7 @@ public final class EvictingDualNodeHashTable {
return var3; // L: 29
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("remove")
public void remove(long var1) {
DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 33
@@ -70,9 +70,9 @@ public final class EvictingDualNodeHashTable {
} // L: 39
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Loq;J)V"
+ descriptor = "(Loo;J)V"
)
@Export("put")
public void put(DualNode var1, long var2) {
@@ -93,7 +93,7 @@ public final class EvictingDualNodeHashTable {
this.deque.add(var1); // L: 54
} // L: 55
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("clear")
public void clear() {
this.deque.clear(); // L: 58
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index f5fad0e5e9..e6729a3913 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -3,32 +3,25 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("gg")
+@ObfuscatedName("gt")
@Implements("FaceNormal")
public class FaceNormal {
- @ObfuscatedName("jg")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1186041129
- )
- @Export("cameraZ")
- static int cameraZ;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 1839266109
+ intValue = 2045687167
)
@Export("x")
int x;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 475209611
+ intValue = 259443193
)
@Export("y")
int y;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1225057041
+ intValue = 1323517785
)
@Export("z")
int z;
@@ -36,59 +29,12 @@ public class FaceNormal {
FaceNormal() {
} // L: 8
- @ObfuscatedName("e")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-1800924378"
+ descriptor = "(Ljava/lang/CharSequence;I)I",
+ garbageValue = "-1766790995"
)
- static int method4212(int var0, Script var1, boolean var2) {
- Widget var7;
- if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269
- int var4;
- if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286
- var7 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1287
- var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1288
- if (var4 >= 1 && var4 <= 10) { // L: 1289
- class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292
- Interpreter.field821.add(var8); // L: 1293
- return 1; // L: 1294
- } else {
- throw new RuntimeException(); // L: 1290
- }
- } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296
- class12.Interpreter_intStackSize -= 3; // L: 1297
- int var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1298
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1299
- int var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 1300
- if (var5 >= 1 && var5 <= 10) { // L: 1301
- class93 var6 = new class93(var5, var3, var4, class92.getWidget(var3).itemId); // L: 1304
- Interpreter.field821.add(var6); // L: 1305
- return 1; // L: 1306
- } else {
- throw new RuntimeException(); // L: 1302
- }
- } else {
- return 2; // L: 1308
- }
- } else if (Interpreter.field823 >= 10) { // L: 1270
- throw new RuntimeException(); // L: 1271
- } else {
- if (var0 >= 2000) { // L: 1274
- var7 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1275
- } else {
- var7 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1277
- }
-
- if (var7.onResize == null) { // L: 1278
- return 0;
- } else {
- ScriptEvent var9 = new ScriptEvent(); // L: 1279
- var9.widget = var7; // L: 1280
- var9.args = var7.onResize; // L: 1281
- var9.field1054 = Interpreter.field823 + 1; // L: 1282
- Client.scriptEvents.addFirst(var9); // L: 1283
- return 1; // L: 1284
- }
- }
+ public static int method4344(CharSequence var0) {
+ return HealthBar.method2356(var0, 10, true); // L: 77
}
}
diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java
index 59707a3b74..cb86a29f0b 100644
--- a/runescape-client/src/main/java/FileSystem.java
+++ b/runescape-client/src/main/java/FileSystem.java
@@ -1,144 +1,183 @@
import java.io.File;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
import java.util.Hashtable;
+import java.util.Iterator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fg")
+@ObfuscatedName("fw")
@Implements("FileSystem")
public class FileSystem {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("FileSystem_hasPermissions")
static boolean FileSystem_hasPermissions;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("FileSystem_cacheDir")
static File FileSystem_cacheDir;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("FileSystem_cacheFiles")
static Hashtable FileSystem_cacheFiles;
- @ObfuscatedName("x")
- @Export("ByteArrayPool_alternativeSizes")
- static int[] ByteArrayPool_alternativeSizes;
static {
FileSystem_hasPermissions = false; // L: 7
FileSystem_cacheFiles = new Hashtable(16);
} // L: 9
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IB)Lgl;",
- garbageValue = "75"
+ descriptor = "([FIFB)F",
+ garbageValue = "-127"
)
- @Export("ItemDefinition_get")
- public static ItemComposition ItemDefinition_get(int var0) {
- ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84
- if (var1 != null) { // L: 85
- return var1;
+ static float method3281(float[] var0, int var1, float var2) {
+ float var3 = var0[var1]; // L: 108
+
+ for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109
+ var3 = var2 * var3 + var0[var4]; // L: 110
+ }
+
+ return var3; // L: 112
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(CLlb;I)C",
+ garbageValue = "2136665955"
+ )
+ @Export("standardizeChar")
+ static char standardizeChar(char var0, Language var1) {
+ if (var0 >= 192 && var0 <= 255) { // L: 69
+ if (var0 >= 192 && var0 <= 198) { // L: 70
+ return 'A';
+ }
+
+ if (var0 == 199) { // L: 71
+ return 'C';
+ }
+
+ if (var0 >= 200 && var0 <= 203) { // L: 72
+ return 'E';
+ }
+
+ if (var0 >= 204 && var0 <= 207) { // L: 73
+ return 'I';
+ }
+
+ if (var0 == 209 && var1 != Language.Language_ES) { // L: 74
+ return 'N';
+ }
+
+ if (var0 >= 210 && var0 <= 214) { // L: 75
+ return 'O';
+ }
+
+ if (var0 >= 217 && var0 <= 220) { // L: 76
+ return 'U';
+ }
+
+ if (var0 == 221) { // L: 77
+ return 'Y';
+ }
+
+ if (var0 == 223) { // L: 78
+ return 's';
+ }
+
+ if (var0 >= 224 && var0 <= 230) { // L: 79
+ return 'a';
+ }
+
+ if (var0 == 231) { // L: 80
+ return 'c';
+ }
+
+ if (var0 >= 232 && var0 <= 235) { // L: 81
+ return 'e';
+ }
+
+ if (var0 >= 236 && var0 <= 239) { // L: 82
+ return 'i';
+ }
+
+ if (var0 == 241 && var1 != Language.Language_ES) { // L: 83
+ return 'n';
+ }
+
+ if (var0 >= 242 && var0 <= 246) { // L: 84
+ return 'o';
+ }
+
+ if (var0 >= 249 && var0 <= 252) { // L: 85
+ return 'u';
+ }
+
+ if (var0 == 253 || var0 == 255) { // L: 86
+ return 'y';
+ }
+ }
+
+ if (var0 == 338) { // L: 88
+ return 'O';
+ } else if (var0 == 339) { // L: 89
+ return 'o';
+ } else if (var0 == 376) { // L: 90
+ return 'Y';
} else {
- byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); // L: 86
- var1 = new ItemComposition(); // L: 87
- var1.id = var0; // L: 88
- if (var2 != null) { // L: 89
- var1.decode(new Buffer(var2));
- }
-
- var1.post(); // L: 90
- if (var1.noteTemplate != -1) { // L: 91
- var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
- }
-
- if (var1.notedId != -1) { // L: 92
- var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
- }
-
- if (var1.placeholderTemplate != -1) { // L: 93
- var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
- }
-
- if (!class82.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94
- var1.name = "Members object"; // L: 95
- var1.isTradable = false; // L: 96
-
- int var3;
- for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97
- var1.groundActions[var3] = null; // L: 98
- }
-
- for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100
- if (var3 != 4) { // L: 101
- var1.inventoryActions[var3] = null; // L: 102
- }
- }
-
- var1.shiftClickIndex = -2; // L: 105
- var1.team = 0; // L: 106
- if (var1.params != null) { // L: 107
- boolean var6 = false; // L: 108
-
- for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109
- ParamComposition var5 = class78.getParamDefinition((int)var4.key); // L: 110
- if (var5.autoDisable) { // L: 111
- var4.remove();
- } else {
- var6 = true; // L: 112
- }
- }
-
- if (!var6) { // L: 114
- var1.params = null;
- }
- }
- }
-
- ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117
- return var1; // L: 118
+ return var0; // L: 91
}
}
- @ObfuscatedName("jf")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lki;IIIIIIB)V",
- garbageValue = "-43"
+ descriptor = "(I)V",
+ garbageValue = "-1243687493"
)
- static final void method3168(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
- if (Client.field559) { // L: 10831
- Client.alternativeScrollbarWidth = 32;
- } else {
- Client.alternativeScrollbarWidth = 0; // L: 10832
- }
+ public static void method3282() {
+ SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 117
+ SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 118
+ } // L: 119
- Client.field559 = false; // L: 10833
- int var7;
- if (MouseHandler.MouseHandler_currentButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10834
- if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10835
- var0.scrollY -= 4; // L: 10836
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10837
- } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10839
- var0.scrollY += 4; // L: 10840
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10841
- } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10843
- var7 = var3 * (var3 - 32) / var4; // L: 10844
- if (var7 < 8) { // L: 10845
- var7 = 8;
+ @ObfuscatedName("aq")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1055608683"
+ )
+ @Export("getGcDuration")
+ protected static int getGcDuration() {
+ int var0 = 0; // L: 572
+ if (class162.garbageCollector == null || !class162.garbageCollector.isValid()) { // L: 573
+ try {
+ Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 575
+
+ while (var1.hasNext()) {
+ GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 576
+ if (var2.isValid()) { // L: 578
+ class162.garbageCollector = var2; // L: 579
+ GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 580
+ GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 581
+ }
}
-
- int var8 = var6 - var2 - 16 - var7 / 2; // L: 10846
- int var9 = var3 - 32 - var7; // L: 10847
- var0.scrollY = var8 * (var4 - var3) / var9; // L: 10848
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10849
- Client.field559 = true; // L: 10850
+ } catch (Throwable var11) { // L: 586
}
}
- if (Client.mouseWheelRotation != 0) { // L: 10853
- var7 = var0.width; // L: 10854
- if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10855
- var0.scrollY += Client.mouseWheelRotation * 45; // L: 10856
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10857
+ if (class162.garbageCollector != null) { // L: 588
+ long var9 = class115.method2692(); // L: 589
+ long var3 = class162.garbageCollector.getCollectionTime(); // L: 590
+ if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 591
+ long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 592
+ long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 593
+ if (0L != var7) { // L: 594
+ var0 = (int)(var5 * 100L / var7);
+ }
}
+
+ GameEngine.garbageCollectorLastCollectionTime = var3; // L: 596
+ GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 597
}
- } // L: 10860
+ return var0; // L: 599
+ }
}
diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java
index a64af0aa6c..0e2f89c456 100644
--- a/runescape-client/src/main/java/FillMode.java
+++ b/runescape-client/src/main/java/FillMode.java
@@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qw")
+@ObfuscatedName("qy")
@Implements("FillMode")
public enum FillMode implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lqw;"
+ descriptor = "Lqy;"
)
@Export("SOLID")
SOLID(0, 0),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lqy;"
+ )
+ field4778(1, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lqw;"
+ descriptor = "Lqy;"
)
- field4754(1, 1),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lqw;"
- )
- field4753(2, 2);
+ field4783(2, 2);
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1271749217
+ intValue = 112722803
)
- public final int field4756;
- @ObfuscatedName("a")
+ public final int field4781;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1401042551
+ intValue = 773830597
)
- final int field4757;
+ final int field4782;
FillMode(int var3, int var4) {
- this.field4756 = var3; // L: 19
- this.field4757 = var4; // L: 20
+ this.field4781 = var3; // L: 19
+ this.field4782 = var4; // L: 20
} // L: 21
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field4757; // L: 25
+ return this.field4782; // L: 25
}
}
diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java
index c23810fa27..582a88a1f1 100644
--- a/runescape-client/src/main/java/FloorDecoration.java
+++ b/runescape-client/src/main/java/FloorDecoration.java
@@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ga")
+@ObfuscatedName("ge")
@Implements("FloorDecoration")
public final class FloorDecoration {
- @ObfuscatedName("o")
+ @ObfuscatedName("ff")
@ObfuscatedGetter(
- intValue = -1072704917
+ intValue = 512715127
+ )
+ @Export("worldPort")
+ static int worldPort;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1018448231
)
@Export("z")
int z;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1879154845
+ intValue = 934546239
)
@Export("x")
int x;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -514738537
+ intValue = 230480863
)
@Export("y")
int y;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("renderable")
public Renderable renderable;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- longValue = 7063129096182387665L
+ longValue = -1913872919662932177L
)
@Export("tag")
public long tag;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 43519557
+ intValue = -1980232569
)
@Export("flags")
int flags;
diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java
index b6d08f6719..44dc7fade4 100644
--- a/runescape-client/src/main/java/FloorOverlayDefinition.java
+++ b/runescape-client/src/main/java/FloorOverlayDefinition.java
@@ -1,78 +1,86 @@
+import java.util.Iterator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("gi")
+@ObfuscatedName("gp")
@Implements("FloorOverlayDefinition")
public class FloorOverlayDefinition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("FloorOverlayDefinition_archive")
- public static AbstractArchive FloorOverlayDefinition_archive;
- @ObfuscatedName("q")
+ static AbstractArchive FloorOverlayDefinition_archive;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("FloorOverlayDefinition_cached")
public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
- @ObfuscatedName("l")
+ @ObfuscatedName("dh")
+ @ObfuscatedSignature(
+ descriptor = "Lfm;"
+ )
+ @Export("js5SocketTask")
+ static Task js5SocketTask;
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 789415847
+ intValue = -745094769
)
@Export("primaryRgb")
public int primaryRgb;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1583015683
+ intValue = -1107449607
)
@Export("texture")
public int texture;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("hideUnderlay")
public boolean hideUnderlay;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 84531747
+ intValue = -857633047
)
@Export("secondaryRgb")
public int secondaryRgb;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 416276119
+ intValue = -1839344211
)
@Export("hue")
public int hue;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 334853597
+ intValue = 1018665071
)
@Export("saturation")
public int saturation;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -1974079687
+ intValue = -1467483581
)
@Export("lightness")
public int lightness;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 247371203
+ intValue = 581238699
)
@Export("secondaryHue")
public int secondaryHue;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -1197955665
+ intValue = 502614653
)
@Export("secondarySaturation")
public int secondarySaturation;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 845891437
+ intValue = -1702098767
)
@Export("secondaryLightness")
public int secondaryLightness;
@@ -81,186 +89,261 @@ public class FloorOverlayDefinition extends DualNode {
FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
}
- public FloorOverlayDefinition() {
+ FloorOverlayDefinition() {
this.primaryRgb = 0; // L: 12
this.texture = -1; // L: 13
this.hideUnderlay = true; // L: 14
this.secondaryRgb = -1; // L: 15
- }
+ } // L: 23
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "462057937"
+ descriptor = "(B)V",
+ garbageValue = "75"
)
@Export("postDecode")
- public void postDecode() {
- if (this.secondaryRgb != -1) { // L: 39
- this.setHsl(this.secondaryRgb); // L: 40
- this.secondaryHue = this.hue; // L: 41
- this.secondarySaturation = this.saturation; // L: 42
- this.secondaryLightness = this.lightness; // L: 43
+ void postDecode() {
+ if (this.secondaryRgb != -1) { // L: 41
+ this.setHsl(this.secondaryRgb); // L: 42
+ this.secondaryHue = this.hue; // L: 43
+ this.secondarySaturation = this.saturation; // L: 44
+ this.secondaryLightness = this.lightness; // L: 45
}
- this.setHsl(this.primaryRgb); // L: 45
- } // L: 46
+ this.setHsl(this.primaryRgb); // L: 47
+ } // L: 48
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "125"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-662297766"
)
@Export("decode")
- public void decode(Buffer var1, int var2) {
+ void decode(Buffer var1, int var2) {
while (true) {
- int var3 = var1.readUnsignedByte(); // L: 50
- if (var3 == 0) { // L: 51
- return; // L: 54
+ int var3 = var1.readUnsignedByte(); // L: 52
+ if (var3 == 0) { // L: 53
+ return; // L: 56
}
- this.decodeNext(var1, var3, var2); // L: 52
+ this.decodeNext(var1, var3, var2); // L: 54
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpx;IIB)V",
- garbageValue = "104"
+ descriptor = "(Lqt;IIB)V",
+ garbageValue = "-73"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2, int var3) {
- if (var2 == 1) { // L: 57
+ if (var2 == 1) { // L: 59
this.primaryRgb = var1.readMedium();
- } else if (var2 == 2) { // L: 58
- this.texture = var1.readUnsignedByte();
- } else if (var2 == 5) { // L: 59
+ } else if (var2 == 2) {
+ this.texture = var1.readUnsignedByte(); // L: 60
+ } else if (var2 == 5) { // L: 61
this.hideUnderlay = false;
} else if (var2 == 7) {
- this.secondaryRgb = var1.readMedium(); // L: 60
- } else if (var2 == 8) { // L: 61
+ this.secondaryRgb = var1.readMedium(); // L: 62
+ } else if (var2 == 8) {
}
- } // L: 63
+ }
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "-451287005"
+ garbageValue = "-1979978882"
)
@Export("setHsl")
void setHsl(int var1) {
- double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 66
- double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 67
- double var6 = (double)(var1 & 255) / 256.0D; // L: 68
- double var8 = var2; // L: 69
- if (var4 < var2) { // L: 70
+ double var2 = (double)(var1 >> 16 & 255) / 256.0D;
+ double var4 = (double)(var1 >> 8 & 255) / 256.0D;
+ double var6 = (double)(var1 & 255) / 256.0D; // L: 70
+ double var8 = var2;
+ if (var4 < var2) { // L: 72
var8 = var4;
}
- if (var6 < var8) { // L: 71
+ if (var6 < var8) { // L: 73
var8 = var6;
}
- double var10 = var2; // L: 72
- if (var4 > var2) { // L: 73
+ double var10 = var2;
+ if (var4 > var2) { // L: 75
var10 = var4;
}
- if (var6 > var10) { // L: 74
+ if (var6 > var10) { // L: 76
var10 = var6;
}
- double var12 = 0.0D; // L: 75
- double var14 = 0.0D; // L: 76
- double var16 = (var10 + var8) / 2.0D; // L: 77
- if (var8 != var10) { // L: 78
- if (var16 < 0.5D) { // L: 79
- var14 = (var10 - var8) / (var8 + var10);
+ double var12 = 0.0D; // L: 77
+ double var14 = 0.0D; // L: 78
+ double var16 = (var10 + var8) / 2.0D; // L: 79
+ if (var8 != var10) { // L: 80
+ if (var16 < 0.5D) { // L: 81
+ var14 = (var10 - var8) / (var10 + var8);
}
- if (var16 >= 0.5D) { // L: 80
+ if (var16 >= 0.5D) { // L: 82
var14 = (var10 - var8) / (2.0D - var10 - var8);
}
- if (var2 == var10) { // L: 81
+ if (var2 == var10) { // L: 83
var12 = (var4 - var6) / (var10 - var8);
- } else if (var10 == var4) { // L: 82
+ } else if (var10 == var4) { // L: 84
var12 = (var6 - var2) / (var10 - var8) + 2.0D;
} else if (var6 == var10) {
- var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 83
+ var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 85
}
}
- var12 /= 6.0D; // L: 85
- this.hue = (int)(var12 * 256.0D); // L: 86
- this.saturation = (int)(256.0D * var14); // L: 87
- this.lightness = (int)(256.0D * var16); // L: 88
- if (this.saturation < 0) { // L: 89
+ var12 /= 6.0D; // L: 87
+ this.hue = (int)(var12 * 256.0D); // L: 88
+ this.saturation = (int)(256.0D * var14); // L: 89
+ this.lightness = (int)(256.0D * var16); // L: 90
+ if (this.saturation < 0) { // L: 91
this.saturation = 0;
- } else if (this.saturation > 255) { // L: 90
+ } else if (this.saturation > 255) { // L: 92
this.saturation = 255;
}
- if (this.lightness < 0) { // L: 91
+ if (this.lightness < 0) { // L: 93
this.lightness = 0;
- } else if (this.lightness > 255) { // L: 92
+ } else if (this.lightness > 255) { // L: 94
this.lightness = 255;
}
- } // L: 93
+ } // L: 95
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Ljm;",
- garbageValue = "2018260435"
+ descriptor = "(IIIB)I",
+ garbageValue = "0"
)
- static PacketBufferNode method3700() {
- return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23
+ public static int method3818(int var0, int var1, int var2) {
+ var2 &= 3; // L: 17
+ if (var2 == 0) { // L: 18
+ return var1;
+ } else if (var2 == 1) { // L: 19
+ return 7 - var0;
+ } else {
+ return var2 == 2 ? 7 - var1 : var0; // L: 20
+ }
}
- @ObfuscatedName("jb")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lki;IIZB)V",
- garbageValue = "60"
+ descriptor = "(IIIIIII)I",
+ garbageValue = "-21815441"
)
- @Export("alignWidgetSize")
- static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
- int var4 = var0.width; // L: 10796
- int var5 = var0.height; // L: 10797
- if (var0.widthAlignment == 0) { // L: 10798
- var0.width = var0.rawWidth;
- } else if (var0.widthAlignment == 1) { // L: 10799
- var0.width = var1 - var0.rawWidth;
- } else if (var0.widthAlignment == 2) { // L: 10800
- var0.width = var0.rawWidth * var1 >> 14;
+ public static int method3810(int var0, int var1, int var2, int var3, int var4, int var5) {
+ if ((var5 & 1) == 1) { // L: 25
+ int var6 = var3; // L: 26
+ var3 = var4; // L: 27
+ var4 = var6; // L: 28
}
- if (var0.heightAlignment == 0) { // L: 10801
- var0.height = var0.rawHeight;
- } else if (var0.heightAlignment == 1) { // L: 10802
- var0.height = var2 - var0.rawHeight;
- } else if (var0.heightAlignment == 2) {
- var0.height = var2 * var0.rawHeight >> 14; // L: 10803
+ var2 &= 3; // L: 30
+ if (var2 == 0) { // L: 31
+ return var0;
+ } else if (var2 == 1) { // L: 32
+ return var1;
+ } else {
+ return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 33 34
+ }
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)V",
+ garbageValue = "61"
+ )
+ static void method3808(int var0, int var1) {
+ long var2 = (long)((var0 << 16) + var1); // L: 136
+ NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 137
+ if (var4 != null) { // L: 138
+ NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 139
+ }
+ } // L: 140
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;J)V"
+ )
+ static void method3822(Buffer var0, long var1) {
+ var1 /= 10L; // L: 63
+ if (var1 < 0L) {
+ var1 = 0L;
+ } else if (var1 > 65535L) {
+ var1 = 65535L;
}
- if (var0.widthAlignment == 4) { // L: 10804
- var0.width = var0.height * var0.field3411 / var0.field3494;
+ var0.writeShort((int)var1);
+ } // L: 67
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-4424218"
+ )
+ static String method3815() {
+ StringBuilder var0 = new StringBuilder(); // L: 64
+
+ Message var2;
+ for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0.append(var2.text).append('\n')) { // L: 65 71
+ var2 = (Message)var1.next(); // L: 66
+ if (var2.sender != null && !var2.sender.isEmpty()) { // L: 68
+ var0.append(var2.sender).append(':'); // L: 69
+ }
}
- if (var0.heightAlignment == 4) { // L: 10805
- var0.height = var0.field3494 * var0.width / var0.field3411;
- }
+ return var0.toString(); // L: 74
+ }
- if (var0.contentType == 1337) { // L: 10806
- Client.viewportWidget = var0;
- }
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(CI)Z",
+ garbageValue = "1839518083"
+ )
+ @Export("isAlphaNumeric")
+ public static boolean isAlphaNumeric(char var0) {
+ return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 163
+ }
- if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10807
- ScriptEvent var6 = new ScriptEvent(); // L: 10808
- var6.widget = var0; // L: 10809
- var6.args = var0.onResize; // L: 10810
- Client.scriptEvents.addFirst(var6); // L: 10811
- }
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "13"
+ )
+ static int method3817(int var0, Script var1, boolean var2) {
+ Widget var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1258
+ if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1259
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(class124.getWidgetFlags(var3)); // L: 1260
+ return 1; // L: 1261
+ } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1263
+ if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1270
+ if (var3.dataText == null) { // L: 1271
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1272
+ }
- } // L: 10813
+ return 1; // L: 1273
+ } else {
+ return 2; // L: 1275
+ }
+ } else {
+ int var4 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1264
+ --var4; // L: 1265
+ if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1266
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1267
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+ }
+
+ return 1; // L: 1268
+ }
+ }
}
diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java
index 05dc82a77a..2b88fe8182 100644
--- a/runescape-client/src/main/java/FloorUnderlayDefinition.java
+++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java
@@ -4,57 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fa")
+@ObfuscatedName("fd")
@Implements("FloorUnderlayDefinition")
public class FloorUnderlayDefinition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("ss")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Lqe;"
+ )
+ @Export("sceneMinimapSprite")
+ static SpritePixels sceneMinimapSprite;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
)
@Export("FloorUnderlayDefinition_archive")
public static AbstractArchive FloorUnderlayDefinition_archive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("FloorUnderlayDefinition_cached")
- static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
- @ObfuscatedName("hn")
- @Export("regionMapArchives")
- static byte[][] regionMapArchives;
- @ObfuscatedName("iz")
+ public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1688031679
- )
- @Export("selectedItemId")
- static int selectedItemId;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 1166691661
+ intValue = -1886230441
)
@Export("rgb")
int rgb;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1101049757
+ intValue = -1580613665
)
@Export("hue")
public int hue;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 2015074227
+ intValue = -957882951
)
@Export("saturation")
public int saturation;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1371638813
+ intValue = 900719109
)
@Export("lightness")
public int lightness;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -1786707103
+ intValue = 604774139
)
@Export("hueMultiplier")
public int hueMultiplier;
@@ -63,240 +60,156 @@ public class FloorUnderlayDefinition extends DualNode {
FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
}
- FloorUnderlayDefinition() {
+ public FloorUnderlayDefinition() {
this.rgb = 0; // L: 12
- } // L: 18
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1750111550"
+ )
+ @Export("postDecode")
+ public void postDecode() {
+ this.setHsl(this.rgb);
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "-100"
+ )
+ @Export("decode")
+ public void decode(Buffer var1, int var2) {
+ while (true) {
+ int var3 = var1.readUnsignedByte();
+ if (var3 == 0) { // L: 25
+ return; // L: 28
+ }
+
+ this.decodeNext(var1, var3, var2); // L: 26
+ }
+ }
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "86"
- )
- @Export("postDecode")
- void postDecode() {
- this.setHsl(this.rgb); // L: 32
- } // L: 33
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1229195714"
- )
- @Export("decode")
- void decode(Buffer var1, int var2) {
- while (true) {
- int var3 = var1.readUnsignedByte(); // L: 37
- if (var3 == 0) { // L: 38
- return; // L: 41
- }
-
- this.decodeNext(var1, var3, var2); // L: 39
- }
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Lpx;III)V",
- garbageValue = "1871549003"
+ descriptor = "(Lqt;III)V",
+ garbageValue = "-2023862800"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2, int var3) {
- if (var2 == 1) { // L: 44
+ if (var2 == 1) { // L: 31
this.rgb = var1.readMedium();
}
- } // L: 46
+ } // L: 33
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "118"
+ descriptor = "(II)V",
+ garbageValue = "-1276241137"
)
@Export("setHsl")
void setHsl(int var1) {
- double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 49
- double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 50
- double var6 = (double)(var1 & 255) / 256.0D; // L: 51
- double var8 = var2; // L: 52
- if (var4 < var2) { // L: 53
+ double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 36
+ double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 37
+ double var6 = (double)(var1 & 255) / 256.0D; // L: 38
+ double var8 = var2; // L: 39
+ if (var4 < var2) { // L: 40
var8 = var4;
}
- if (var6 < var8) { // L: 54
+ if (var6 < var8) { // L: 41
var8 = var6;
}
- double var10 = var2; // L: 55
- if (var4 > var2) { // L: 56
+ double var10 = var2; // L: 42
+ if (var4 > var2) { // L: 43
var10 = var4;
}
- if (var6 > var10) { // L: 57
+ if (var6 > var10) { // L: 44
var10 = var6;
}
- double var12 = 0.0D; // L: 58
- double var14 = 0.0D; // L: 59
- double var16 = (var10 + var8) / 2.0D; // L: 60
- if (var8 != var10) { // L: 61
- if (var16 < 0.5D) { // L: 62
+ double var12 = 0.0D; // L: 45
+ double var14 = 0.0D; // L: 46
+ double var16 = (var10 + var8) / 2.0D; // L: 47
+ if (var8 != var10) { // L: 48
+ if (var16 < 0.5D) { // L: 49
var14 = (var10 - var8) / (var8 + var10);
}
- if (var16 >= 0.5D) { // L: 63
+ if (var16 >= 0.5D) { // L: 50
var14 = (var10 - var8) / (2.0D - var10 - var8);
}
- if (var2 == var10) { // L: 64
+ if (var2 == var10) { // L: 51
var12 = (var4 - var6) / (var10 - var8);
- } else if (var10 == var4) { // L: 65
- var12 = (var6 - var2) / (var10 - var8) + 2.0D;
- } else if (var6 == var10) {
- var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 66
+ } else if (var4 == var10) { // L: 52
+ var12 = 2.0D + (var6 - var2) / (var10 - var8);
+ } else if (var10 == var6) {
+ var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53
}
}
- var12 /= 6.0D; // L: 68
- this.saturation = (int)(var14 * 256.0D); // L: 69
- this.lightness = (int)(256.0D * var16); // L: 70
- if (this.saturation < 0) { // L: 71
+ var12 /= 6.0D; // L: 55
+ this.saturation = (int)(var14 * 256.0D); // L: 56
+ this.lightness = (int)(256.0D * var16); // L: 57
+ if (this.saturation < 0) { // L: 58
this.saturation = 0;
- } else if (this.saturation > 255) { // L: 72
+ } else if (this.saturation > 255) { // L: 59
this.saturation = 255;
}
- if (this.lightness < 0) { // L: 73
+ if (this.lightness < 0) { // L: 60
this.lightness = 0;
- } else if (this.lightness > 255) { // L: 74
+ } else if (this.lightness > 255) { // L: 61
this.lightness = 255;
}
- if (var16 > 0.5D) { // L: 75
- this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14);
+ if (var16 > 0.5D) { // L: 62
+ this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D);
} else {
- this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 76
+ this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63
}
- if (this.hueMultiplier < 1) { // L: 77
+ if (this.hueMultiplier < 1) { // L: 64
this.hueMultiplier = 1;
}
- this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 78
- } // L: 79
+ this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 65
+ } // L: 66
- @ObfuscatedName("a")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpc;II)Z",
- garbageValue = "1224143507"
+ descriptor = "(I)[Ljn;",
+ garbageValue = "-2098307250"
)
- @Export("updateExternalPlayer")
- static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
- int var2 = var0.readBits(2); // L: 376
- int var3;
- int var4;
- int var7;
- int var8;
- int var9;
- int var10;
- if (var2 == 0) { // L: 377
- if (var0.readBits(1) != 0) { // L: 378
- updateExternalPlayer(var0, var1);
- }
+ @Export("ServerPacket_values")
+ public static ServerPacket[] ServerPacket_values() {
+ return new ServerPacket[]{ServerPacket.field3093, ServerPacket.field3037, ServerPacket.field3038, ServerPacket.field3118, ServerPacket.field3040, ServerPacket.field3041, ServerPacket.field3142, ServerPacket.field3109, ServerPacket.field3130, ServerPacket.field3067, ServerPacket.field3046, ServerPacket.field3113, ServerPacket.field3048, ServerPacket.field3049, ServerPacket.field3050, ServerPacket.field3039, ServerPacket.field3052, ServerPacket.field3053, ServerPacket.field3054, ServerPacket.field3055, ServerPacket.field3056, ServerPacket.field3057, ServerPacket.field3058, ServerPacket.field3097, ServerPacket.field3079, ServerPacket.field3061, ServerPacket.field3051, ServerPacket.field3063, ServerPacket.field3044, ServerPacket.field3059, ServerPacket.field3066, ServerPacket.field3092, ServerPacket.field3068, ServerPacket.field3119, ServerPacket.field3070, ServerPacket.field3071, ServerPacket.field3129, ServerPacket.field3042, ServerPacket.field3069, ServerPacket.field3075, ServerPacket.field3076, ServerPacket.field3110, ServerPacket.field3078, ServerPacket.field3127, ServerPacket.field3080, ServerPacket.field3126, ServerPacket.field3082, ServerPacket.field3083, ServerPacket.field3084, ServerPacket.field3085, ServerPacket.field3086, ServerPacket.field3087, ServerPacket.field3088, ServerPacket.field3060, ServerPacket.field3090, ServerPacket.field3091, ServerPacket.field3096, ServerPacket.field3140, ServerPacket.field3094, ServerPacket.field3095, ServerPacket.field3045, ServerPacket.field3043, ServerPacket.field3062, ServerPacket.field3138, ServerPacket.field3100, ServerPacket.field3101, ServerPacket.field3064, ServerPacket.field3099, ServerPacket.field3104, ServerPacket.field3105, ServerPacket.field3047, ServerPacket.field3107, ServerPacket.field3081, ServerPacket.field3106, ServerPacket.field3074, ServerPacket.field3111, ServerPacket.field3112, ServerPacket.field3073, ServerPacket.field3114, ServerPacket.field3077, ServerPacket.field3116, ServerPacket.field3117, ServerPacket.field3108, ServerPacket.field3089, ServerPacket.field3120, ServerPacket.field3121, ServerPacket.field3122, ServerPacket.field3123, ServerPacket.field3124, ServerPacket.field3125, ServerPacket.field3072, ServerPacket.field3103, ServerPacket.field3128, ServerPacket.field3102, ServerPacket.field3065, ServerPacket.field3131, ServerPacket.field3132, ServerPacket.field3133, ServerPacket.field3134, ServerPacket.field3135, ServerPacket.field3136, ServerPacket.field3137, ServerPacket.field3115, ServerPacket.field3139, ServerPacket.field3098}; // L: 114
+ }
- var3 = var0.readBits(13); // L: 379
- var4 = var0.readBits(13); // L: 380
- boolean var12 = var0.readBits(1) == 1; // L: 381
- if (var12) { // L: 382
- Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
- }
-
- if (Client.players[var1] != null) { // L: 383
- throw new RuntimeException(); // L: 384
- } else {
- Player var11 = Client.players[var1] = new Player(); // L: 386
- var11.index = var1; // L: 387
- if (Players.field1307[var1] != null) { // L: 388
- var11.read(Players.field1307[var1]);
- }
-
- var11.orientation = Players.Players_orientations[var1]; // L: 389
- var11.targetIndex = Players.Players_targetIndices[var1]; // L: 390
- var7 = Players.Players_regions[var1]; // L: 391
- var8 = var7 >> 28; // L: 392
- var9 = var7 >> 14 & 255; // L: 393
- var10 = var7 & 255; // L: 394
- var11.pathTraversed[0] = Players.field1302[var1]; // L: 395
- var11.plane = (byte)var8; // L: 396
- var11.resetPath((var9 << 13) + var3 - SecureRandomCallable.baseX, (var10 << 13) + var4 - GrandExchangeOfferOwnWorldComparator.baseY); // L: 397
- var11.field1095 = false; // L: 398
- return true; // L: 399
- }
- } else if (var2 == 1) { // L: 401
- var3 = var0.readBits(2); // L: 402
- var4 = Players.Players_regions[var1]; // L: 403
- Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 404
- return false; // L: 405
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IS)Lfp;",
+ garbageValue = "180"
+ )
+ @Export("VarpDefinition_get")
+ public static VarpDefinition VarpDefinition_get(int var0) {
+ VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18
+ if (var1 != null) { // L: 19
+ return var1;
} else {
- int var5;
- int var6;
- if (var2 == 2) { // L: 407
- var3 = var0.readBits(5); // L: 408
- var4 = var3 >> 3; // L: 409
- var5 = var3 & 7; // L: 410
- var6 = Players.Players_regions[var1]; // L: 411
- var7 = (var6 >> 28) + var4 & 3; // L: 412
- var8 = var6 >> 14 & 255; // L: 413
- var9 = var6 & 255; // L: 414
- if (var5 == 0) { // L: 415
- --var8; // L: 416
- --var9; // L: 417
- }
-
- if (var5 == 1) { // L: 419
- --var9;
- }
-
- if (var5 == 2) { // L: 420
- ++var8; // L: 421
- --var9; // L: 422
- }
-
- if (var5 == 3) { // L: 424
- --var8;
- }
-
- if (var5 == 4) { // L: 425
- ++var8;
- }
-
- if (var5 == 5) { // L: 426
- --var8; // L: 427
- ++var9; // L: 428
- }
-
- if (var5 == 6) { // L: 430
- ++var9;
- }
-
- if (var5 == 7) { // L: 431
- ++var8; // L: 432
- ++var9; // L: 433
- }
-
- Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 435
- return false; // L: 436
- } else {
- var3 = var0.readBits(18); // L: 438
- var4 = var3 >> 16; // L: 439
- var5 = var3 >> 8 & 255; // L: 440
- var6 = var3 & 255; // L: 441
- var7 = Players.Players_regions[var1]; // L: 442
- var8 = (var7 >> 28) + var4 & 3; // L: 443
- var9 = var5 + (var7 >> 14) & 255; // L: 444
- var10 = var7 + var6 & 255; // L: 445
- Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 446
- return false; // L: 447
+ byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20
+ var1 = new VarpDefinition(); // L: 21
+ if (var2 != null) { // L: 22
+ var1.decode(new Buffer(var2));
}
+
+ VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23
+ return var1; // L: 24
}
}
}
diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java
index 600dbb2c40..f510bf7aee 100644
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -2,7 +2,7 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("mx")
+@ObfuscatedName("mt")
@Implements("Font")
public final class Font extends AbstractFont {
public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
@@ -13,7 +13,7 @@ public final class Font extends AbstractFont {
super(var1); // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("drawGlyph")
final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15
@@ -55,7 +55,7 @@ public final class Font extends AbstractFont {
}
} // L: 44
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("drawGlyphAlpha")
final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 1c6f9b2bb1..aae8a0db68 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -1,68 +1,60 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("pi")
+@ObfuscatedName("pd")
@Implements("FontName")
public class FontName {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("FontName_plain11")
public static final FontName FontName_plain11;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("FontName_plain12")
public static final FontName FontName_plain12;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("FontName_bold12")
public static final FontName FontName_bold12;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("FontName_verdana11")
public static final FontName FontName_verdana11;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("FontName_verdana13")
public static final FontName FontName_verdana13;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("FontName_verdana15")
public static final FontName FontName_verdana15;
- @ObfuscatedName("g")
+ @ObfuscatedName("qt")
@ObfuscatedSignature(
- descriptor = "Lek;"
+ descriptor = "Lok;"
)
- static ClanSettings field4583;
- @ObfuscatedName("mm")
- @ObfuscatedGetter(
- intValue = 957028551
- )
- @Export("menuY")
- static int menuY;
- @ObfuscatedName("p")
+ static class391 field4584;
+ @ObfuscatedName("g")
@Export("name")
String name;
static {
FontName_plain11 = new FontName("p11_full"); // L: 7
FontName_plain12 = new FontName("p12_full"); // L: 8
- FontName_bold12 = new FontName("b12_full"); // L: 9
+ FontName_bold12 = new FontName("b12_full");
FontName_verdana11 = new FontName("verdana_11pt_regular"); // L: 10
FontName_verdana13 = new FontName("verdana_13pt_regular"); // L: 11
FontName_verdana15 = new FontName("verdana_15pt_regular"); // L: 12
@@ -72,264 +64,30 @@ public class FontName {
this.name = var1; // L: 20
} // L: 21
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "2051101893"
+ descriptor = "(B)[Lpd;",
+ garbageValue = "0"
)
- static void method7230(int var0) {
- } // L: 32
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)[Lpi;",
- garbageValue = "-1328353728"
- )
- public static FontName[] method7232() {
- return new FontName[]{FontName_plain11, FontName_verdana13, FontName_bold12, FontName_verdana15, FontName_verdana11, FontName_plain12}; // L: 16
+ public static FontName[] method7382() {
+ return new FontName[]{FontName_verdana15, FontName_plain12, FontName_bold12, FontName_verdana11, FontName_plain11, FontName_verdana13}; // L: 16
}
- @ObfuscatedName("p")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "25"
+ descriptor = "(II)Z",
+ garbageValue = "-1771875487"
)
- public static int method7228(int var0) {
- --var0; // L: 75
- var0 |= var0 >>> 1; // L: 76
- var0 |= var0 >>> 2; // L: 77
- var0 |= var0 >>> 4; // L: 78
- var0 |= var0 >>> 8; // L: 79
- var0 |= var0 >>> 16; // L: 80
- return var0 + 1; // L: 81
+ public static boolean method7385(int var0) {
+ return (var0 & 1) != 0; // L: 9
}
- @ObfuscatedName("as")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "2124893336"
+ descriptor = "(II)Z",
+ garbageValue = "1224707658"
)
- static int method7231(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526
- return 1; // L: 3527
- } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529
- class12.Interpreter_intStackSize -= 3; // L: 3530
- Client.publicChatMode = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3531
- class21.privateChatMode = class116.method2686(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 3532
- if (class21.privateChatMode == null) { // L: 3533
- class21.privateChatMode = PrivateChatMode.field4794;
- }
-
- Client.tradeChatMode = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3534
- PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field3052, Client.packetWriter.isaacCipher); // L: 3536
- var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537
- var13.packetBuffer.writeByte(class21.privateChatMode.field4796); // L: 3538
- var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539
- Client.packetWriter.addNode(var13); // L: 3540
- return 1; // L: 3541
- } else {
- PacketBufferNode var6;
- int var7;
- String var8;
- int var9;
- if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543
- var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3544
- class12.Interpreter_intStackSize -= 2; // L: 3545
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3546
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3547
- var6 = WallDecoration.getPacketBufferNode(ClientPacket.field3039, Client.packetWriter.isaacCipher); // L: 3549
- var6.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550
- var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551
- var6.packetBuffer.writeByte(var7 - 1); // L: 3552
- var6.packetBuffer.writeByte(var9); // L: 3553
- Client.packetWriter.addNode(var6); // L: 3554
- return 1; // L: 3555
- } else {
- int var3;
- Message var5;
- if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557
- class12.Interpreter_intStackSize -= 2; // L: 3558
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3559
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3560
- var5 = class175.Messages_getByChannelAndID(var3, var7); // L: 3561
- if (var5 != null) { // L: 3562
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.count; // L: 3563
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3571
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3572
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3573
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3574
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3575
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3576
- }
-
- return 1; // L: 3578
- } else {
- Message var4;
- if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3581
- var4 = class12.Messages_getMessage(var3); // L: 3582
- if (var4 != null) { // L: 3583
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.type; // L: 3584
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3592
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3593
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3594
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3595
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3596
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3597
- }
-
- return 1; // L: 3599
- } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601
- if (class21.privateChatMode == null) { // L: 3602
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.privateChatMode.field4796; // L: 3603
- }
-
- return 1; // L: 3604
- } else {
- PacketBufferNode var12;
- if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606
- var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3607
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3608
- var12 = GrandExchangeOfferNameComparator.method5784(var7, var8, class263.clientLanguage, -1); // L: 3609
- Client.packetWriter.addNode(var12); // L: 3610
- return 1; // L: 3611
- } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613
- class9.Interpreter_stringStackSize -= 2; // L: 3614
- var8 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3615
- String var11 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3616
- var12 = WallDecoration.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 3618
- var12.packetBuffer.writeShort(0); // L: 3619
- int var10 = var12.packetBuffer.offset; // L: 3620
- var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621
- User.method6525(var12.packetBuffer, var11); // L: 3622
- var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623
- Client.packetWriter.addNode(var12); // L: 3624
- return 1; // L: 3625
- } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627
- var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3628
- class12.Interpreter_intStackSize -= 2; // L: 3629
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3630
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3631
- var6 = GrandExchangeOfferNameComparator.method5784(var7, var8, class263.clientLanguage, var9); // L: 3632
- Client.packetWriter.addNode(var6); // L: 3633
- return 1; // L: 3634
- } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636
- if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644
- return 1; // L: 3645
- } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3648
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class92.Messages_getHistorySize(var3); // L: 3649
- return 1; // L: 3650
- } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3653
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class4.Messages_getLastChatID(var3); // L: 3654
- return 1; // L: 3655
- } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3658
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PendingSpawn.method2163(var3); // L: 3659
- return 1; // L: 3660
- } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662
- var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3663
- UrlRequester.doCheat(var8); // L: 3664
- return 1; // L: 3665
- } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667
- Client.field549 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668
- return 1; // L: 3669
- } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = Client.field549; // L: 3672
- return 1; // L: 3673
- } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675
- var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3676
- System.out.println(var8); // L: 3677
- return 1; // L: 3678
- } else if (var0 == 5024) { // L: 3680
- --class12.Interpreter_intStackSize; // L: 3681
- return 1; // L: 3682
- } else if (var0 == 5025) { // L: 3684
- ++class12.Interpreter_intStackSize; // L: 3685
- return 1; // L: 3686
- } else if (var0 == 5030) { // L: 3688
- class12.Interpreter_intStackSize -= 2; // L: 3689
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3690
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3691
- var5 = class175.Messages_getByChannelAndID(var3, var7); // L: 3692
- if (var5 != null) { // L: 3693
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.count; // L: 3694
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3700
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3701
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3704
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3705
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3706
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3707
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3708
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3709
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3710
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3711
- }
-
- return 1; // L: 3713
- } else if (var0 == 5031) { // L: 3715
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3716
- var4 = class12.Messages_getMessage(var3); // L: 3717
- if (var4 != null) { // L: 3718
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.type; // L: 3719
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3725
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3726
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3729
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3730
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3731
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3732
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3733
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3734
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3735
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3736
- }
-
- return 1; // L: 3738
- } else {
- return 2; // L: 3740
- }
- } else {
- if (ModelData0.localPlayer != null && ModelData0.localPlayer.username != null) { // L: 3638
- var8 = ModelData0.localPlayer.username.getName();
- } else {
- var8 = ""; // L: 3639
- }
-
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8; // L: 3640
- return 1; // L: 3641
- }
- }
- }
- }
- }
+ public static boolean method7386(int var0) {
+ return (var0 >> 31 & 1) != 0; // L: 37
}
}
diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java
index 73d61ac6f3..69dc02d09d 100644
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -4,33 +4,30 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("po")
+@ObfuscatedName("oy")
@Implements("Fonts")
public class Fonts {
- @ObfuscatedName("sc")
+ @ObfuscatedName("h")
+ @Export("cacheParentPaths")
+ static String[] cacheParentPaths;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lal;"
- )
- @Export("pcmPlayer1")
- static PcmPlayer pcmPlayer1;
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("spritesArchive")
AbstractArchive spritesArchive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("fontsArchive")
AbstractArchive fontsArchive;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("map")
HashMap map;
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;)V"
+ descriptor = "(Llh;Llh;)V"
)
public Fonts(AbstractArchive var1, AbstractArchive var2) {
this.spritesArchive = var1; // L: 14
@@ -38,10 +35,10 @@ public class Fonts {
this.map = new HashMap(); // L: 16
} // L: 17
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([Lpi;I)Ljava/util/HashMap;",
- garbageValue = "1588025566"
+ descriptor = "([Lpd;B)Ljava/util/HashMap;",
+ garbageValue = "82"
)
@Export("createMap")
public HashMap createMap(FontName[] var1) {
@@ -53,7 +50,7 @@ public class Fonts {
if (this.map.containsKey(var5)) { // L: 26
var2.put(var5, this.map.get(var5)); // L: 27
} else {
- Font var6 = GrandExchangeOfferWorldComparator.method5808(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
+ Font var6 = ServerPacket.method5211(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
if (var6 != null) { // L: 31
this.map.put(var5, var6); // L: 32
var2.put(var5, var6); // L: 33
@@ -63,231 +60,4 @@ public class Fonts {
return var2; // L: 39
}
-
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "(IIIIIIILgm;Lgh;I)V",
- garbageValue = "1253814318"
- )
- static final void method7226(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
- ObjectComposition var9 = class82.getObjectDefinition(var4); // L: 999
- int var10;
- int var11;
- if (var5 != 1 && var5 != 3) { // L: 1002
- var10 = var9.sizeX; // L: 1007
- var11 = var9.sizeY; // L: 1008
- } else {
- var10 = var9.sizeY; // L: 1003
- var11 = var9.sizeX; // L: 1004
- }
-
- int var12;
- int var13;
- if (var10 + var2 <= 104) { // L: 1014
- var12 = (var10 >> 1) + var2; // L: 1015
- var13 = var2 + (var10 + 1 >> 1); // L: 1016
- } else {
- var12 = var2; // L: 1019
- var13 = var2 + 1; // L: 1020
- }
-
- int var14;
- int var15;
- if (var3 + var11 <= 104) { // L: 1022
- var14 = var3 + (var11 >> 1); // L: 1023
- var15 = var3 + (var11 + 1 >> 1); // L: 1024
- } else {
- var14 = var3; // L: 1027
- var15 = var3 + 1; // L: 1028
- }
-
- int[][] var16 = Tiles.Tiles_heights[var1]; // L: 1030
- int var17 = var16[var13][var15] + var16[var12][var15] + var16[var12][var14] + var16[var13][var14] >> 2; // L: 1031
- int var18 = (var2 << 7) + (var10 << 6); // L: 1032
- int var19 = (var3 << 7) + (var11 << 6); // L: 1033
- long var20 = VarbitComposition.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 1034
- int var22 = (var5 << 6) + var6; // L: 1035
- if (var9.int3 == 1) { // L: 1036
- var22 += 256;
- }
-
- Object var30;
- if (var6 == 22) { // L: 1037
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1039
- var30 = var9.getModel(22, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1040
- }
-
- var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 1041
- if (var9.interactType == 1) { // L: 1042
- var8.setBlockedByFloorDec(var2, var3);
- }
-
- } else if (var6 != 10 && var6 != 11) { // L: 1045
- if (var6 >= 12) { // L: 1053
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1055
- var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1056
- }
-
- var7.method4176(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1057
- if (var9.interactType != 0) { // L: 1058
- var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
- }
-
- } else if (var6 == 0) { // L: 1061
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1063
- var30 = var9.getModel(0, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1064
- }
-
- var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field988[var5], 0, var20, var22); // L: 1065
- if (var9.interactType != 0) { // L: 1066
- var8.method3749(var2, var3, var6, var5, var9.boolean1);
- }
-
- } else if (var6 == 1) { // L: 1069
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1071
- var30 = var9.getModel(1, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1072
- }
-
- var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field989[var5], 0, var20, var22); // L: 1073
- if (var9.interactType != 0) { // L: 1074
- var8.method3749(var2, var3, var6, var5, var9.boolean1);
- }
-
- } else {
- int var23;
- if (var6 == 2) { // L: 1077
- var23 = var5 + 1 & 3; // L: 1078
- Object var25;
- Object var31;
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1081
- var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 1082
- var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 1083
- } else {
- var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1086
- var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1087
- }
-
- var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field988[var5], Tiles.field988[var23], var20, var22); // L: 1089
- if (var9.interactType != 0) { // L: 1090
- var8.method3749(var2, var3, var6, var5, var9.boolean1);
- }
-
- } else if (var6 == 3) { // L: 1093
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1095
- var30 = var9.getModel(3, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1096
- }
-
- var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field989[var5], 0, var20, var22); // L: 1097
- if (var9.interactType != 0) { // L: 1098
- var8.method3749(var2, var3, var6, var5, var9.boolean1);
- }
-
- } else if (var6 == 9) { // L: 1101
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1103
- var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1104
- }
-
- var7.method4176(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1105
- if (var9.interactType != 0) { // L: 1106
- var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
- }
-
- } else if (var6 == 4) { // L: 1109
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1111
- var30 = var9.getModel(4, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1112
- }
-
- var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field988[var5], 0, 0, 0, var20, var22); // L: 1113
- } else {
- long var24;
- Object var26;
- if (var6 == 5) { // L: 1116
- var23 = 16; // L: 1117
- var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1118
- if (var24 != 0L) { // L: 1119
- var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2;
- }
-
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1121
- var26 = var9.getModel(4, var5, var16, var18, var17, var19);
- } else {
- var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1122
- }
-
- var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field988[var5], 0, var23 * Tiles.field990[var5], var23 * Tiles.field991[var5], var20, var22); // L: 1123
- } else if (var6 == 6) { // L: 1126
- var23 = 8; // L: 1127
- var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1128
- if (0L != var24) { // L: 1129
- var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2 / 2;
- }
-
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1131
- var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
- } else {
- var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1132
- }
-
- var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field995[var5], var23 * Tiles.field993[var5], var20, var22); // L: 1133
- } else if (var6 == 7) { // L: 1136
- int var29 = var5 + 2 & 3; // L: 1138
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1139
- var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1140
- }
-
- var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1141
- } else if (var6 == 8) { // L: 1144
- var23 = 8; // L: 1145
- var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1146
- if (0L != var24) { // L: 1147
- var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2 / 2;
- }
-
- int var28 = var5 + 2 & 3; // L: 1150
- Object var27;
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1151
- var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1152
- var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1153
- } else {
- var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1156
- var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1157
- }
-
- var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field995[var5], var23 * Tiles.field993[var5], var20, var22); // L: 1159
- }
- }
- }
- } else {
- if (var9.animationId == -1 && var9.transforms == null) { // L: 1047
- var30 = var9.getModel(10, var5, var16, var18, var17, var19);
- } else {
- var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1048
- }
-
- if (var30 != null) { // L: 1049
- var7.method4176(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
- }
-
- if (var9.interactType != 0) {
- var8.addGameObject(var2, var3, var10, var11, var9.boolean1); // L: 1050
- }
-
- }
- } // L: 1043 1051 1059 1067 1075 1091 1099 1107 1114 1124 1134 1142 1160 1162
}
diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java
index eb05bd6410..6a5dd5dc87 100644
--- a/runescape-client/src/main/java/Frames.java
+++ b/runescape-client/src/main/java/Frames.java
@@ -1,187 +1,111 @@
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import javax.imageio.ImageIO;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gt")
+@ObfuscatedName("gh")
@Implements("Frames")
public class Frames extends DualNode {
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = -780977341
- )
- public static int field2492;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "[Lgu;"
+ descriptor = "[Lgl;"
)
@Export("frames")
Animation[] frames;
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;IZ)V",
- garbageValue = "0"
+ descriptor = "(Llh;Llh;IZ)V"
)
- public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
- NodeDeque var5 = new NodeDeque(); // L: 11
- int var6 = var1.getGroupFileCount(var3); // L: 12
- this.frames = new Animation[var6]; // L: 13
- int[] var7 = var1.getGroupFileIds(var3); // L: 14
+ Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
+ NodeDeque var5 = new NodeDeque();
+ int var6 = var1.getGroupFileCount(var3);
+ this.frames = new Animation[var6]; // L: 37
+ int[] var7 = var1.getGroupFileIds(var3); // L: 38
- for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15
- byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16
- Skeleton var10 = null; // L: 17
- int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18
+ for (int var8 = 0; var8 < var7.length; ++var8) {
+ byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40
+ Skeleton var10 = null; // L: 41
+ int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42
- for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19
- if (var11 == var12.id) { // L: 21
- var10 = var12;
+ for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 49
+ if (var11 == var12.id) { // L: 45
+ var10 = var12; // L: 46
break;
}
}
- if (var10 == null) {
- byte[] var13 = var2.getFile(var11, 0);
- var10 = new Skeleton(var11, var13); // L: 31
- var5.addFirst(var10);
+ if (var10 == null) { // L: 51
+ byte[] var13;
+ if (var4) { // L: 53
+ var13 = var2.getFile(0, var11);
+ } else {
+ var13 = var2.getFile(var11, 0); // L: 54
+ }
+
+ var10 = new Skeleton(var11, var13); // L: 55
+ var5.addFirst(var10); // L: 56
}
- this.frames[var7[var8]] = new Animation(var9, var10);
+ this.frames[var7[var8]] = new Animation(var9, var10); // L: 58
}
- } // L: 36
+ } // L: 60
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "-15"
+ descriptor = "(II)Z",
+ garbageValue = "-473814926"
)
@Export("hasAlphaTransform")
public boolean hasAlphaTransform(int var1) {
- return this.frames[var1].hasAlphaTransform; // L: 39
+ return this.frames[var1].hasAlphaTransform; // L: 63
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([BB)Lqr;",
- garbageValue = "7"
+ descriptor = "(B)I",
+ garbageValue = "117"
)
- public static final SpritePixels method4217(byte[] var0) {
- BufferedImage var1 = null; // L: 20
-
- try {
- Class var2 = ImageIO.class; // L: 22
- synchronized(ImageIO.class) {
- var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 23
- } // L: 24
-
- int var6 = var1.getWidth(); // L: 25
- int var7 = var1.getHeight(); // L: 26
- int[] var4 = new int[var7 * var6]; // L: 27
- PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); // L: 28
- var5.grabPixels(); // L: 29
- return new SpritePixels(var4, var6, var7); // L: 30
- } catch (IOException var9) { // L: 32
- } catch (InterruptedException var10) { // L: 33
- }
-
- return new SpritePixels(0, 0); // L: 34
+ public static int method4349() {
+ return ViewportMouse.ViewportMouse_entityCount; // L: 44
}
- @ObfuscatedName("m")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;B)[Lqr;",
- garbageValue = "16"
+ descriptor = "(Lqt;[II)[Ljava/lang/Object;",
+ garbageValue = "746047274"
)
- public static SpritePixels[] method4218(AbstractArchive var0, String var1, String var2) {
- int var3 = var0.getGroupId(var1); // L: 91
- int var4 = var0.getFileId(var3, var2); // L: 92
- SpritePixels[] var5;
- if (!User.method6514(var0, var3, var4)) { // L: 95
- var5 = null; // L: 96
- } else {
- SpritePixels[] var7 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 101
+ static Object[] method4353(Buffer var0, int[] var1) {
+ int var2 = var0.readUShortSmart(); // L: 30
+ Object[] var3 = new Object[var1.length * var2]; // L: 31
- for (int var8 = 0; var8 < class453.SpriteBuffer_spriteCount; ++var8) { // L: 102
- SpritePixels var9 = var7[var8] = new SpritePixels(); // L: 103
- var9.width = class453.SpriteBuffer_spriteWidth; // L: 104
- var9.height = class453.SpriteBuffer_spriteHeight; // L: 105
- var9.xOffset = class453.SpriteBuffer_xOffsets[var8]; // L: 106
- var9.yOffset = class453.SpriteBuffer_yOffsets[var8]; // L: 107
- var9.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var8]; // L: 108
- var9.subHeight = class453.SpriteBuffer_spriteHeights[var8]; // L: 109
- int var10 = var9.subHeight * var9.subWidth; // L: 110
- byte[] var11 = class127.SpriteBuffer_pixels[var8]; // L: 111
- var9.pixels = new int[var10]; // L: 112
-
- for (int var12 = 0; var12 < var10; ++var12) { // L: 113
- var9.pixels[var12] = Decimator.SpriteBuffer_spritePalette[var11[var12] & 255];
- }
+ for (int var4 = 0; var4 < var2; ++var4) { // L: 32
+ for (int var5 = 0; var5 < var1.length; ++var5) { // L: 33
+ int var6 = var1.length * var4 + var5; // L: 34
+ class432 var7 = MusicPatchNode.method5472(var1[var5]); // L: 35
+ var3[var6] = var7.method7565(var0); // L: 36
}
-
- VarcInt.method3325(); // L: 115
- var5 = var7; // L: 118
}
- return var5; // L: 120
+ return var3; // L: 39
}
- @ObfuscatedName("he")
+ @ObfuscatedName("at")
@ObfuscatedSignature(
- descriptor = "(IIB)V",
- garbageValue = "13"
+ descriptor = "(IB)I",
+ garbageValue = "20"
)
- @Export("updateItemPile")
- static final void updateItemPile(int var0, int var1) {
- NodeDeque var2 = Client.groundItems[class128.Client_plane][var0][var1]; // L: 7964
- if (var2 == null) { // L: 7965
- class175.scene.removeGroundItemPile(class128.Client_plane, var0, var1); // L: 7966
- } else {
- long var3 = -99999999L; // L: 7969
- TileItem var5 = null; // L: 7970
+ static int method4350(int var0) {
+ return (int)((Math.log((double)var0) / Interpreter.field845 - 7.0D) * 256.0D); // L: 3851
+ }
- TileItem var6;
- for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7971 7972 7980
- ItemComposition var7 = FileSystem.ItemDefinition_get(var6.id); // L: 7973
- long var11 = (long)var7.price; // L: 7974
- if (var7.isStackable == 1) {
- var11 *= (long)(var6.quantity + 1); // L: 7975
- }
-
- if (var11 > var3) { // L: 7976
- var3 = var11; // L: 7977
- var5 = var6; // L: 7978
- }
- }
-
- if (var5 == null) { // L: 7982
- class175.scene.removeGroundItemPile(class128.Client_plane, var0, var1); // L: 7983
- } else {
- var2.addLast(var5); // L: 7986
- TileItem var13 = null; // L: 7987
- TileItem var8 = null; // L: 7988
-
- for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7989 7990 7995
- if (var6.id != var5.id) { // L: 7991
- if (var13 == null) { // L: 7992
- var13 = var6;
- }
-
- if (var13.id != var6.id && var8 == null) { // L: 7993
- var8 = var6;
- }
- }
- }
-
- long var9 = VarbitComposition.calculateTag(var0, var1, 3, false, 0); // L: 7997
- class175.scene.newGroundItemPile(class128.Client_plane, var0, var1, class202.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class128.Client_plane), var5, var9, var13, var8); // L: 7998
- }
- }
- } // L: 7967 7984 7999
+ @ObfuscatedName("ln")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I)Z",
+ garbageValue = "-824638040"
+ )
+ @Export("isComponentHidden")
+ static boolean isComponentHidden(Widget var0) {
+ return var0.isHidden; // L: 12305
+ }
}
diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java
index 271d5b3d1b..b3c58ee29f 100644
--- a/runescape-client/src/main/java/Friend.java
+++ b/runescape-client/src/main/java/Friend.java
@@ -1,23 +1,25 @@
+import java.io.File;
+import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nn")
+@ObfuscatedName("nr")
@Implements("Friend")
public class Friend extends Buddy {
- @ObfuscatedName("o")
- boolean field4311;
- @ObfuscatedName("q")
- boolean field4312;
+ @ObfuscatedName("c")
+ boolean field4299;
+ @ObfuscatedName("v")
+ boolean field4298;
Friend() {
} // L: 9
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lnn;I)I",
- garbageValue = "1190428650"
+ descriptor = "(Lnr;I)I",
+ garbageValue = "-1436702085"
)
@Export("compareToFriend")
int compareToFriend(Friend var1) {
@@ -29,23 +31,23 @@ public class Friend extends Buddy {
return -1;
} else if (var1.world != 0 && super.world == 0) { // L: 15
return 1;
- } else if (this.field4311 && !var1.field4311) { // L: 16
+ } else if (this.field4299 && !var1.field4299) { // L: 16
return -1;
- } else if (!this.field4311 && var1.field4311) { // L: 17
+ } else if (!this.field4299 && var1.field4299) { // L: 17
return 1;
- } else if (this.field4312 && !var1.field4312) { // L: 18
+ } else if (this.field4298 && !var1.field4298) { // L: 18
return -1;
- } else if (!this.field4312 && var1.field4312) { // L: 19
+ } else if (!this.field4298 && var1.field4298) { // L: 19
return 1;
} else {
return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lnb;I)I",
- garbageValue = "434999779"
+ descriptor = "(Lne;B)I",
+ garbageValue = "-81"
)
@Export("compareTo_user")
public int compareTo_user(User var1) {
@@ -55,4 +57,246 @@ public class Friend extends Buddy {
public int compareTo(Object var1) {
return this.compareToFriend((Friend)var1); // L: 33
}
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;IB)Ljava/io/File;",
+ garbageValue = "-29"
+ )
+ static File method6630(String var0, String var1, int var2) {
+ String var3 = var2 == 0 ? "" : "" + var2; // L: 123
+ class267.JagexCache_locationFile = new File(class123.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 124
+ String var4 = null; // L: 125
+ String var5 = null; // L: 126
+ boolean var6 = false; // L: 127
+ Buffer var8;
+ File var23;
+ if (class267.JagexCache_locationFile.exists()) { // L: 128
+ try {
+ AccessFile var7 = new AccessFile(class267.JagexCache_locationFile, "rw", 10000L); // L: 131
+
+ int var9;
+ for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 132 133 136
+ var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 134
+ if (var9 == -1) { // L: 135
+ throw new IOException();
+ }
+ }
+
+ var8.offset = 0; // L: 138
+ var9 = var8.readUnsignedByte(); // L: 139
+ if (var9 < 1 || var9 > 3) {
+ throw new IOException("" + var9); // L: 140
+ }
+
+ int var10 = 0; // L: 141
+ if (var9 > 1) { // L: 142
+ var10 = var8.readUnsignedByte();
+ }
+
+ if (var9 <= 2) { // L: 143
+ var4 = var8.readStringCp1252NullCircumfixed(); // L: 144
+ if (var10 == 1) { // L: 145
+ var5 = var8.readStringCp1252NullCircumfixed();
+ }
+ } else {
+ var4 = var8.readCESU8(); // L: 148
+ if (var10 == 1) { // L: 149
+ var5 = var8.readCESU8();
+ }
+ }
+
+ var7.close(); // L: 151
+ } catch (IOException var21) { // L: 153
+ var21.printStackTrace(); // L: 154
+ }
+
+ if (var4 != null) { // L: 156
+ var23 = new File(var4); // L: 157
+ if (!var23.exists()) { // L: 158
+ var4 = null; // L: 159
+ }
+ }
+
+ if (var4 != null) { // L: 162
+ var23 = new File(var4, "test.dat"); // L: 163
+ if (!Varcs.method2474(var23, true)) { // L: 164
+ var4 = null; // L: 165
+ }
+ }
+ }
+
+ if (var4 == null && var2 == 0) { // L: 169
+ label140:
+ for (int var15 = 0; var15 < JagexCache.cacheSubPaths.length; ++var15) { // L: 170
+ for (int var16 = 0; var16 < Fonts.cacheParentPaths.length; ++var16) { // L: 171
+ File var17 = new File(Fonts.cacheParentPaths[var16] + JagexCache.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 172
+ if (var17.exists() && Varcs.method2474(new File(var17, "test.dat"), true)) { // L: 173 174
+ var4 = var17.toString(); // L: 175
+ var6 = true; // L: 176
+ break label140; // L: 177
+ }
+ }
+ }
+ }
+
+ if (var4 == null) { // L: 183
+ var4 = class123.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 184
+ var6 = true; // L: 185
+ }
+
+ File var22;
+ if (var5 != null) { // L: 187
+ var22 = new File(var5); // L: 188
+ var23 = new File(var4); // L: 189
+
+ try {
+ File[] var24 = var22.listFiles(); // L: 191
+ File[] var18 = var24; // L: 193
+
+ for (int var11 = 0; var11 < var18.length; ++var11) { // L: 194
+ File var12 = var18[var11]; // L: 195
+ File var13 = new File(var23, var12.getName()); // L: 197
+ boolean var14 = var12.renameTo(var13); // L: 198
+ if (!var14) { // L: 199
+ throw new IOException();
+ }
+ }
+ } catch (Exception var20) { // L: 204
+ var20.printStackTrace(); // L: 205
+ }
+
+ var6 = true; // L: 207
+ }
+
+ if (var6) { // L: 209
+ var22 = new File(var4); // L: 210
+ var8 = null; // L: 211
+
+ try {
+ AccessFile var25 = new AccessFile(class267.JagexCache_locationFile, "rw", 10000L); // L: 215
+ Buffer var26 = new Buffer(500); // L: 216
+ var26.writeByte(3); // L: 217
+ var26.writeByte(var8 != null ? 1 : 0); // L: 218
+ var26.writeCESU8(var22.getPath()); // L: 219
+ if (var8 != null) { // L: 220
+ var26.writeCESU8("");
+ }
+
+ var25.write(var26.array, 0, var26.offset); // L: 221
+ var25.close(); // L: 222
+ } catch (IOException var19) { // L: 224
+ var19.printStackTrace(); // L: 225
+ }
+ }
+
+ return new File(var4); // L: 229
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "44"
+ )
+ static int method6619(int var0, Script var1, boolean var2) {
+ if (var0 < 1000) { // L: 435
+ return JagexCache.method3271(var0, var1, var2);
+ } else if (var0 < 1100) { // L: 436
+ return PendingSpawn.method2180(var0, var1, var2);
+ } else if (var0 < 1200) { // L: 437
+ return Varcs.method2475(var0, var1, var2);
+ } else if (var0 < 1300) { // L: 438
+ return StructComposition.method3617(var0, var1, var2);
+ } else if (var0 < 1400) { // L: 439
+ return ChatChannel.method2003(var0, var1, var2);
+ } else if (var0 < 1500) { // L: 440
+ return ViewportMouse.method4514(var0, var1, var2);
+ } else if (var0 < 1600) { // L: 441
+ return class125.method2821(var0, var1, var2);
+ } else if (var0 < 1700) { // L: 442
+ return class1.method7(var0, var1, var2);
+ } else if (var0 < 1800) { // L: 443
+ return GameObject.method4553(var0, var1, var2);
+ } else if (var0 < 1900) { // L: 444
+ return FloorOverlayDefinition.method3817(var0, var1, var2);
+ } else if (var0 < 2000) { // L: 445
+ return ReflectionCheck.method576(var0, var1, var2);
+ } else if (var0 < 2100) { // L: 446
+ return PendingSpawn.method2180(var0, var1, var2);
+ } else if (var0 < 2200) { // L: 447
+ return Varcs.method2475(var0, var1, var2);
+ } else if (var0 < 2300) { // L: 448
+ return StructComposition.method3617(var0, var1, var2);
+ } else if (var0 < 2400) { // L: 449
+ return ChatChannel.method2003(var0, var1, var2);
+ } else if (var0 < 2500) { // L: 450
+ return ViewportMouse.method4514(var0, var1, var2);
+ } else if (var0 < 2600) { // L: 451
+ return WorldMapDecoration.method4992(var0, var1, var2);
+ } else if (var0 < 2700) { // L: 452
+ return DynamicObject.method1987(var0, var1, var2);
+ } else if (var0 < 2800) { // L: 453
+ return class353.method6506(var0, var1, var2);
+ } else if (var0 < 2900) { // L: 454
+ return class238.method5001(var0, var1, var2);
+ } else if (var0 < 3000) { // L: 455
+ return ReflectionCheck.method576(var0, var1, var2);
+ } else if (var0 < 3200) { // L: 456
+ return class115.method2682(var0, var1, var2);
+ } else if (var0 < 3300) { // L: 457
+ return Decimator.method1019(var0, var1, var2);
+ } else if (var0 < 3400) { // L: 458
+ return UserComparator10.method2605(var0, var1, var2);
+ } else if (var0 < 3500) { // L: 459
+ return class131.method2875(var0, var1, var2);
+ } else if (var0 < 3600) { // L: 460
+ return InterfaceParent.method2097(var0, var1, var2);
+ } else if (var0 < 3700) { // L: 461
+ return JagexCache.method3249(var0, var1, var2);
+ } else if (var0 < 3800) { // L: 462
+ return ArchiveLoader.method2073(var0, var1, var2);
+ } else if (var0 < 3900) { // L: 463
+ return Client.method1177(var0, var1, var2);
+ } else if (var0 < 4000) { // L: 464
+ return WorldMapSectionType.method4953(var0, var1, var2);
+ } else if (var0 < 4100) {
+ return Language.method6068(var0, var1, var2); // L: 465
+ } else if (var0 < 4200) { // L: 466
+ return UserComparator3.method2592(var0, var1, var2);
+ } else if (var0 < 4300) { // L: 467
+ return UserComparator6.method2628(var0, var1, var2);
+ } else if (var0 < 5100) { // L: 468
+ return class118.method2742(var0, var1, var2);
+ } else if (var0 < 5400) { // L: 469
+ return VarcInt.method3411(var0, var1, var2);
+ } else if (var0 < 5600) { // L: 470
+ return class118.method2744(var0, var1, var2);
+ } else if (var0 < 5700) { // L: 471
+ return class21.method264(var0, var1, var2);
+ } else if (var0 < 6300) { // L: 472
+ return class387.method7021(var0, var1, var2);
+ } else if (var0 < 6600) { // L: 473
+ return ParamComposition.method3574(var0, var1, var2);
+ } else if (var0 < 6700) { // L: 474
+ return UserList.method6754(var0, var1, var2);
+ } else if (var0 < 6800) { // L: 475
+ return class14.method155(var0, var1, var2);
+ } else if (var0 < 6900) { // L: 476
+ return class162.method3298(var0, var1, var2);
+ } else if (var0 < 7000) { // L: 477
+ return MilliClock.method3308(var0, var1, var2);
+ } else if (var0 < 7100) { // L: 478
+ return SpriteMask.method5524(var0, var1, var2);
+ } else if (var0 < 7200) { // L: 479
+ return class11.method96(var0, var1, var2);
+ } else if (var0 < 7300) { // L: 480
+ return WorldMapSectionType.method4948(var0, var1, var2);
+ } else if (var0 < 7500) { // L: 481
+ return Renderable.method4339(var0, var1, var2);
+ } else if (var0 < 7600) { // L: 482
+ return MouseHandler.method547(var0, var1, var2);
+ } else {
+ return var0 < 7700 ? UserComparator3.method2590(var0, var1, var2) : 2; // L: 483 484
+ }
+ }
}
diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java
index edc32f763b..0602ae6ccf 100644
--- a/runescape-client/src/main/java/FriendLoginUpdate.java
+++ b/runescape-client/src/main/java/FriendLoginUpdate.java
@@ -4,30 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nr")
+@ObfuscatedName("nh")
@Implements("FriendLoginUpdate")
public class FriendLoginUpdate extends Link {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 281202653
+ intValue = 105823237
)
- public int field4314;
- @ObfuscatedName("q")
+ public int field4300;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lqv;"
+ descriptor = "Lqa;"
)
@Export("username")
public Username username;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("world")
public short world;
@ObfuscatedSignature(
- descriptor = "(Lqv;I)V"
+ descriptor = "(Lqa;I)V"
)
FriendLoginUpdate(Username var1, int var2) {
- this.field4314 = (int)(class113.method2624() / 1000L); // L: 109
+ this.field4300 = (int)(class115.method2692() / 1000L); // L: 109
this.username = var1; // L: 110
this.world = (short)var2; // L: 111
} // L: 112
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lpx;",
+ garbageValue = "-1096065009"
+ )
+ public static class437 method6631(int var0) {
+ class437 var1 = (class437)class437.Widget_cachedSprites.get((long)var0); // L: 24
+ if (var1 != null) { // L: 25
+ return var1;
+ } else {
+ byte[] var2 = class437.field4675.takeFile(38, var0); // L: 26
+ var1 = new class437(); // L: 27
+ if (var2 != null) { // L: 28
+ var1.method7635(new Buffer(var2));
+ }
+
+ var1.method7636(); // L: 29
+ class437.Widget_cachedSprites.put(var1, (long)var0); // L: 30
+ return var1; // L: 31
+ }
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;B)V",
+ garbageValue = "-1"
+ )
+ static final void method6632(String var0) {
+ StringBuilder var10000 = (new StringBuilder()).append(var0);
+ Object var10001 = null;
+ String var1 = var10000.append(" is already on your friend list").toString(); // L: 135
+ class290.addGameMessage(30, "", var1); // L: 137
+ } // L: 139
}
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index 14578dc23f..5fc20e0fe3 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -5,70 +5,76 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bd")
+@ObfuscatedName("bl")
@Implements("FriendSystem")
public class FriendSystem {
- @ObfuscatedName("k")
+ @ObfuscatedName("cc")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "[Lqu;"
+ )
+ @Export("worldSelectArrows")
+ static IndexedSprite[] worldSelectArrows;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lpe;"
)
@Export("loginType")
final LoginType loginType;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lna;"
+ descriptor = "Lng;"
)
@Export("friendsList")
public final FriendsList friendsList;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lnd;"
+ descriptor = "Lmi;"
)
@Export("ignoreList")
public final IgnoreList ignoreList;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -2020260253
+ intValue = 594500445
)
- int field803;
+ int field802;
@ObfuscatedSignature(
- descriptor = "(Lpj;)V"
+ descriptor = "(Lpe;)V"
)
FriendSystem(LoginType var1) {
- this.field803 = 0; // L: 23
+ this.field802 = 0; // L: 23
this.loginType = var1; // L: 26
this.friendsList = new FriendsList(var1); // L: 27
this.ignoreList = new IgnoreList(var1); // L: 28
} // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)Z",
- garbageValue = "-76"
+ garbageValue = "3"
)
- boolean method1666() {
- return this.field803 == 2; // L: 32
+ boolean method1634() {
+ return this.field802 == 2; // L: 32
}
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-499734620"
+ )
+ final void method1635() {
+ this.field802 = 1; // L: 36
+ } // L: 37
+
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-990336643"
- )
- final void method1667() {
- this.field803 = 1; // L: 36
- } // L: 37
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "1619915993"
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "-18"
)
@Export("readUpdate")
final void readUpdate(Buffer var1, int var2) {
this.friendsList.read(var1, var2); // L: 40
- this.field803 = 2; // L: 41
+ this.field802 = 2; // L: 41
for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43
Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44
@@ -82,27 +88,27 @@ public class FriendSystem {
var6.clearIsFromFriend(); // L: 51
}
- if (PcmPlayer.friendsChat != null) { // L: 55
- PcmPlayer.friendsChat.clearFriends(); // L: 56
+ if (Huffman.friendsChat != null) { // L: 55
+ Huffman.friendsChat.clearFriends(); // L: 56
}
} // L: 59
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-29"
+ descriptor = "(I)V",
+ garbageValue = "-1539962262"
)
@Export("processFriendUpdates")
final void processFriendUpdates() {
for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 62
- if ((long)var1.field4314 < class113.method2624() / 1000L - 5L) { // L: 63
+ if ((long)var1.field4300 < class115.method2692() / 1000L - 5L) { // L: 63
if (var1.world > 0) {
- WorldMapEvent.addGameMessage(5, "", var1.username + " has logged in."); // L: 64
+ class290.addGameMessage(5, "", var1.username + " has logged in."); // L: 64
}
if (var1.world == 0) { // L: 65
- WorldMapEvent.addGameMessage(5, "", var1.username + " has logged out.");
+ class290.addGameMessage(5, "", var1.username + " has logged out.");
}
var1.remove(); // L: 66
@@ -111,38 +117,38 @@ public class FriendSystem {
} // L: 69
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-1844"
+ descriptor = "(I)V",
+ garbageValue = "1212770605"
)
@Export("clear")
final void clear() {
- this.field803 = 0; // L: 72
+ this.field802 = 0; // L: 72
this.friendsList.clear(); // L: 73
this.ignoreList.clear(); // L: 74
} // L: 75
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lqv;ZS)Z",
- garbageValue = "753"
+ descriptor = "(Lqa;ZI)Z",
+ garbageValue = "883394648"
)
@Export("isFriended")
final boolean isFriended(Username var1, boolean var2) {
if (var1 == null) { // L: 78
return false;
- } else if (var1.equals(ModelData0.localPlayer.username)) { // L: 79
+ } else if (var1.equals(class101.localPlayer.username)) { // L: 79
return true;
} else {
return this.friendsList.isFriended(var1, var2); // L: 80
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Z",
- garbageValue = "1274631135"
+ descriptor = "(Lqa;I)Z",
+ garbageValue = "1096678749"
)
@Export("isIgnored")
final boolean isIgnored(Username var1) {
@@ -153,151 +159,176 @@ public class FriendSystem {
}
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "-35"
+ garbageValue = "-108"
)
@Export("addFriend")
final void addFriend(String var1) {
if (var1 != null) { // L: 91
Username var2 = new Username(var1, this.loginType); // L: 92
if (var2.hasCleanName()) { // L: 93
+ StringBuilder var10000;
+ String var4;
if (this.friendsListIsFull()) { // L: 94
- Tiles.method2017(); // L: 95
- } else if (ModelData0.localPlayer.username.equals(var2)) { // L: 98
- InterfaceParent.method2067("You can't add yourself to your own friend list"); // L: 100
- } else if (this.isFriended(var2, false)) { // L: 104
- InterfaceParent.method2067(var1 + " is already on your friend list"); // L: 106
- } else if (this.isIgnored(var2)) { // L: 110
- InterfaceParent.method2067("Please remove " + var1 + " from your ignore list first"); // L: 112
+ var10000 = null; // L: 96
+ var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
+ class290.addGameMessage(30, "", var4); // L: 98
+ } else if (class101.localPlayer.username.equals(var2)) { // L: 103
+ var10000 = null; // L: 105
+ var4 = "You can't add yourself to your own friend list";
+ class290.addGameMessage(30, "", var4); // L: 107
+ } else if (this.isFriended(var2, false)) { // L: 112
+ FriendLoginUpdate.method6632(var1); // L: 113
+ } else if (this.isIgnored(var2)) { // L: 116
+ var10000 = new StringBuilder();
+ Object var10001 = null; // L: 118
+ var10000 = var10000.append("Please remove ").append(var1);
+ var10001 = null;
+ var4 = var10000.append(" from your ignore list first").toString();
+ class290.addGameMessage(30, "", var4); // L: 120
} else {
- PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 118
- var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 119
- var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 120
- Client.packetWriter.addNode(var3); // L: 121
+ PacketBufferNode var3 = EnumComposition.getPacketBufferNode(ClientPacket.field2964, Client.packetWriter.isaacCipher); // L: 127
+ var3.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var1)); // L: 128
+ var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 129
+ Client.packetWriter.addNode(var3); // L: 130
}
}
}
- } // L: 96 102 108 114 123
+ } // L: 101 110 114 123 132
- @ObfuscatedName("y")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "731924017"
+ garbageValue = "-2036548455"
)
@Export("friendsListIsFull")
final boolean friendsListIsFull() {
- return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field610 != 1; // L: 134
+ return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field601 != 1; // L: 142
}
- @ObfuscatedName("c")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-1674532630"
+ descriptor = "(Ljava/lang/String;B)V",
+ garbageValue = "87"
)
@Export("addIgnore")
final void addIgnore(String var1) {
- if (var1 != null) { // L: 141
- Username var2 = new Username(var1, this.loginType); // L: 142
- if (var2.hasCleanName()) { // L: 143
- if (this.canAddIgnore()) { // L: 144
- InterfaceParent.method2067("Your ignore list is full. Max of 100 for free users, and 400 for members"); // L: 146
- } else if (ModelData0.localPlayer.username.equals(var2)) { // L: 150
- UserComparator9.method2601(); // L: 151
- } else if (this.isIgnored(var2)) { // L: 154
- class230.method4731(var1); // L: 155
- } else if (this.isFriended(var2, false)) { // L: 158
- InterfaceParent.method2067("Please remove " + var1 + " from your friend list first"); // L: 160
+ if (var1 != null) { // L: 149
+ Username var2 = new Username(var1, this.loginType); // L: 150
+ if (var2.hasCleanName()) { // L: 151
+ if (this.canAddIgnore()) { // L: 152
+ GrandExchangeOfferOwnWorldComparator.method1095(); // L: 153
} else {
- PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2959, Client.packetWriter.isaacCipher); // L: 166
- var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 167
- var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 168
- Client.packetWriter.addNode(var3); // L: 169
+ StringBuilder var10000;
+ String var3;
+ if (class101.localPlayer.username.equals(var2)) { // L: 156
+ var10000 = null; // L: 158
+ var3 = "You can't add yourself to your own ignore list";
+ class290.addGameMessage(30, "", var3); // L: 160
+ } else {
+ Object var10001;
+ if (this.isIgnored(var2)) { // L: 165
+ var10000 = (new StringBuilder()).append(var1); // L: 167
+ var10001 = null;
+ var3 = var10000.append(" is already on your ignore list").toString();
+ class290.addGameMessage(30, "", var3); // L: 169
+ } else if (this.isFriended(var2, false)) { // L: 174
+ var10000 = new StringBuilder();
+ var10001 = null; // L: 176
+ var10000 = var10000.append("Please remove ").append(var1);
+ var10001 = null;
+ var3 = var10000.append(" from your friend list first").toString();
+ class290.addGameMessage(30, "", var3); // L: 178
+ } else {
+ class113.method2632(var1); // L: 183
+ }
+ }
}
}
}
- } // L: 148 152 156 162 171
+ } // L: 154 163 172 181 184
- @ObfuscatedName("t")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-799291101"
+ garbageValue = "2051401607"
)
@Export("canAddIgnore")
final boolean canAddIgnore() {
- return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field610 != 1; // L: 182
+ return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field601 != 1; // L: 202
}
- @ObfuscatedName("g")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-1784311825"
+ garbageValue = "1055399844"
)
@Export("removeFriend")
final void removeFriend(String var1) {
- if (var1 != null) { // L: 189
- Username var2 = new Username(var1, this.loginType); // L: 190
- if (var2.hasCleanName()) { // L: 191
- if (this.friendsList.removeByUsername(var2)) { // L: 192
- Renderable.method4210(); // L: 193
- PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 195
- var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 196
- var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 197
- Client.packetWriter.addNode(var3); // L: 198
+ if (var1 != null) { // L: 209
+ Username var2 = new Username(var1, this.loginType); // L: 210
+ if (var2.hasCleanName()) { // L: 211
+ if (this.friendsList.removeByUsername(var2)) { // L: 212
+ Client.field689 = Client.cycleCntr; // L: 214
+ PacketBufferNode var3 = EnumComposition.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 217
+ var3.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var1)); // L: 218
+ var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 219
+ Client.packetWriter.addNode(var3); // L: 220
}
- for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 201
- Player var4 = Client.players[Players.Players_indices[var5]]; // L: 202
- var4.clearIsFriend(); // L: 203
+ for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 223
+ Player var4 = Client.players[Players.Players_indices[var5]]; // L: 224
+ var4.clearIsFriend(); // L: 225
}
- Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 206
+ Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 228
while (var6.hasNext()) {
- Message var7 = (Message)var6.next(); // L: 207
- var7.clearIsFromFriend(); // L: 209
+ Message var7 = (Message)var6.next(); // L: 229
+ var7.clearIsFromFriend(); // L: 231
}
- if (PcmPlayer.friendsChat != null) { // L: 213
- PcmPlayer.friendsChat.clearFriends(); // L: 214
+ if (Huffman.friendsChat != null) { // L: 235
+ Huffman.friendsChat.clearFriends(); // L: 236
}
}
}
- } // L: 217
+ } // L: 239
- @ObfuscatedName("x")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "516139495"
+ garbageValue = "-1243393303"
)
@Export("removeIgnore")
final void removeIgnore(String var1) {
- if (var1 != null) { // L: 220
- Username var2 = new Username(var1, this.loginType); // L: 221
- if (var2.hasCleanName()) { // L: 222
- if (this.ignoreList.removeByUsername(var2)) { // L: 223
- Renderable.method4210(); // L: 224
- PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field3034, Client.packetWriter.isaacCipher); // L: 226
- var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 227
- var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 228
- Client.packetWriter.addNode(var3); // L: 229
+ if (var1 != null) { // L: 242
+ Username var2 = new Username(var1, this.loginType); // L: 243
+ if (var2.hasCleanName()) { // L: 244
+ if (this.ignoreList.removeByUsername(var2)) { // L: 245
+ Client.field689 = Client.cycleCntr; // L: 247
+ PacketBufferNode var3 = EnumComposition.getPacketBufferNode(ClientPacket.field2921, Client.packetWriter.isaacCipher); // L: 250
+ var3.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var1)); // L: 251
+ var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 252
+ Client.packetWriter.addNode(var3); // L: 253
}
- class121.FriendSystem_invalidateIgnoreds(); // L: 231
+ class126.FriendSystem_invalidateIgnoreds(); // L: 255
}
}
- } // L: 232
+ } // L: 256
- @ObfuscatedName("e")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Z",
- garbageValue = "723636782"
+ descriptor = "(Lqa;I)Z",
+ garbageValue = "-2000641193"
)
@Export("isFriendAndHasWorld")
final boolean isFriendAndHasWorld(Username var1) {
- Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 244
- return var2 != null && var2.hasWorld(); // L: 245
+ Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 268
+ return var2 != null && var2.hasWorld(); // L: 269
}
}
diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java
index 5639ca2812..ae54353fca 100644
--- a/runescape-client/src/main/java/FriendsChat.java
+++ b/runescape-client/src/main/java/FriendsChat.java
@@ -4,209 +4,236 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nx")
+@ObfuscatedName("no")
@Implements("FriendsChat")
public class FriendsChat extends UserList {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
@Export("loginType")
final LoginType loginType;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lnj;"
+ descriptor = "Lnv;"
)
@Export("localUser")
final Usernamed localUser;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("name")
public String name;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("owner")
public String owner;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("minKick")
public byte minKick;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -546532963
+ intValue = -1691262047
)
@Export("rank")
public int rank;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -335963343
+ intValue = 860712691
)
- int field4309;
+ int field4297;
@ObfuscatedSignature(
- descriptor = "(Lpj;Lnj;)V"
+ descriptor = "(Lpe;Lnv;)V"
)
public FriendsChat(LoginType var1, Usernamed var2) {
- super(100); // L: 19
+ super(500); // L: 19
this.name = null; // L: 12
this.owner = null; // L: 13
- this.field4309 = 1; // L: 16
+ this.field4297 = 1; // L: 16
this.loginType = var1; // L: 20
this.localUser = var2; // L: 21
} // L: 22
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lnb;",
- garbageValue = "-1695844600"
+ descriptor = "(S)Lne;",
+ garbageValue = "-7122"
)
@Export("newInstance")
User newInstance() {
return new ClanMate(); // L: 26
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)[Lnb;",
- garbageValue = "1788836658"
+ descriptor = "(II)[Lne;",
+ garbageValue = "77510907"
)
@Export("newTypedArray")
User[] newTypedArray(int var1) {
return new ClanMate[var1]; // L: 31
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "1717144210"
+ descriptor = "(Ljava/lang/String;B)V",
+ garbageValue = "-82"
)
- @Export("readName")
- final void readName(String var1) {
- String var3 = class263.base37DecodeLong(class114.method2626(var1)); // L: 37
- if (var3 == null) {
- var3 = ""; // L: 38
+ final void method6590(String var1) {
+ this.name = TaskHandler.method3240(var1); // L: 35
+ } // L: 36
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;B)V",
+ garbageValue = "1"
+ )
+ final void method6591(String var1) {
+ this.owner = TaskHandler.method3240(var1); // L: 39
+ } // L: 40
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-1186116576"
+ )
+ public final void method6592(Buffer var1, int var2) {
+ this.method6591(var1.readStringCp1252NullTerminated()); // L: 43
+ long var3 = var1.readLong(); // L: 44
+ long var6 = var3; // L: 46
+ String var5;
+ int var8;
+ if (var3 > 0L && var3 < 6582952005840035281L) { // L: 48
+ if (var3 % 37L == 0L) { // L: 52
+ var5 = null; // L: 53
+ } else {
+ var8 = 0; // L: 56
+
+ for (long var9 = var3; var9 != 0L; var9 /= 37L) { // L: 57 58 60
+ ++var8; // L: 59
+ }
+
+ StringBuilder var11 = new StringBuilder(var8); // L: 62
+
+ while (0L != var6) { // L: 63
+ long var12 = var6; // L: 64
+ var6 /= 37L; // L: 65
+ var11.append(class344.base37Table[(int)(var12 - 37L * var6)]); // L: 66
+ }
+
+ var5 = var11.reverse().toString(); // L: 68
+ }
+ } else {
+ var5 = null; // L: 49
}
- this.name = var3; // L: 41
- } // L: 42
+ this.method6590(var5); // L: 70
+ this.minKick = var1.readByte(); // L: 71
+ short var14;
+ if (var2 == 1) { // L: 74
+ var8 = var1.readUnsignedByte(); // L: 75
+ var14 = 255; // L: 76
+ } else {
+ if (var2 != 2) { // L: 78
+ throw new IllegalArgumentException("Invalid friend chat full update version: " + var2); // L: 83
+ }
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-1165437728"
- )
- @Export("setOwner")
- final void setOwner(String var1) {
- String var3 = class263.base37DecodeLong(class114.method2626(var1)); // L: 47
- if (var3 == null) {
- var3 = ""; // L: 48
+ var8 = var1.method7749(); // L: 79
+ var14 = -1; // L: 80
}
- this.owner = var3; // L: 51
- } // L: 52
+ if (var14 != var8) { // L: 85
+ int var10 = var8; // L: 88
+ this.clear(); // L: 89
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-38"
- )
- @Export("readUpdate")
- public final void readUpdate(Buffer var1) {
- this.setOwner(var1.readStringCp1252NullTerminated()); // L: 55
- long var2 = var1.readLong(); // L: 56
- this.readName(class293.method5431(var2)); // L: 57
- this.minKick = var1.readByte(); // L: 58
- int var4 = var1.readUnsignedByte(); // L: 59
- if (var4 != 255) { // L: 60
- this.clear(); // L: 61
-
- for (int var5 = 0; var5 < var4; ++var5) { // L: 62
- ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 63
- int var7 = var1.readUnsignedShort(); // L: 64
- var6.set(var7, ++this.field4309 - 1); // L: 65
- var6.rank = var1.readByte(); // L: 66
- var1.readStringCp1252NullTerminated(); // L: 67
- this.isLocalPlayer(var6); // L: 68
+ for (int var15 = 0; var15 < var10; ++var15) { // L: 90
+ ClanMate var16 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 91
+ int var13 = var1.readUnsignedShort(); // L: 92
+ var16.set(var13, ++this.field4297 - 1); // L: 93
+ var16.rank = var1.readByte(); // L: 94
+ var1.readStringCp1252NullTerminated(); // L: 95
+ this.isLocalPlayer(var16); // L: 96
}
}
- } // L: 70
+ } // L: 86 98
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "2"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "123"
)
- public final void method6463(Buffer var1) {
- Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 73
- int var3 = var1.readUnsignedShort(); // L: 74
- byte var4 = var1.readByte(); // L: 75
- boolean var5 = false; // L: 76
- if (var4 == -128) { // L: 77
+ public final void method6612(Buffer var1) {
+ Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 101
+ int var3 = var1.readUnsignedShort(); // L: 102
+ byte var4 = var1.readByte(); // L: 103
+ boolean var5 = false; // L: 104
+ if (var4 == -128) { // L: 105
var5 = true;
}
ClanMate var6;
- if (var5) { // L: 78
- if (this.getSize() == 0) { // L: 79
+ if (var5) { // L: 106
+ if (this.getSize() == 0) { // L: 107
return;
}
- var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 80
- if (var6 != null && var6.getWorld() == var3) { // L: 81
- this.remove(var6); // L: 82
+ var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 108
+ if (var6 != null && var6.getWorld() == var3) { // L: 109
+ this.remove(var6); // L: 110
}
} else {
- var1.readStringCp1252NullTerminated(); // L: 86
- var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 87
- if (var6 == null) { // L: 88
- if (this.getSize() > super.capacity) { // L: 89
+ var1.readStringCp1252NullTerminated(); // L: 114
+ var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 115
+ if (var6 == null) { // L: 116
+ if (this.getSize() > super.capacity) { // L: 117
return;
}
- var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 90
+ var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 118
}
- var6.set(var3, ++this.field4309 - 1); // L: 92
- var6.rank = var4; // L: 93
- this.isLocalPlayer(var6); // L: 94
+ var6.set(var3, ++this.field4297 - 1); // L: 120
+ var6.rank = var4; // L: 121
+ this.isLocalPlayer(var6); // L: 122
}
- } // L: 96
+ } // L: 124
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-570861245"
+ garbageValue = "679696158"
)
@Export("clearFriends")
public final void clearFriends() {
- for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 99
- ((ClanMate)this.get(var1)).clearIsFriend(); // L: 100
+ for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 127
+ ((ClanMate)this.get(var1)).clearIsFriend(); // L: 128
}
- } // L: 102
+ } // L: 130
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-295246975"
+ garbageValue = "-1412688360"
)
@Export("invalidateIgnoreds")
public final void invalidateIgnoreds() {
- for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 105
- ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 106
+ for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 133
+ ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 134
}
- } // L: 108
+ } // L: 136
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(Lnm;I)V",
- garbageValue = "402509546"
+ descriptor = "(Lnj;I)V",
+ garbageValue = "2099019894"
)
@Export("isLocalPlayer")
final void isLocalPlayer(ClanMate var1) {
- if (var1.getUsername().equals(this.localUser.username())) { // L: 111
+ if (var1.getUsername().equals(this.localUser.username())) { // L: 139
this.rank = var1.rank;
}
- } // L: 112
+ } // L: 140
}
diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java
index 4ca338429a..e13ec0c7e2 100644
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/runescape-client/src/main/java/FriendsList.java
@@ -3,69 +3,62 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("na")
+@ObfuscatedName("ng")
@Implements("FriendsList")
public class FriendsList extends UserList {
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = -1971678933
- )
- @Export("musicTrackFileId")
- public static int musicTrackFileId;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
@Export("loginType")
final LoginType loginType;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1205835661
+ intValue = -1848201845
)
- int field4299;
- @ObfuscatedName("a")
+ int field4286;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Llm;"
+ descriptor = "Lli;"
)
@Export("friendLoginUpdates")
public LinkDeque friendLoginUpdates;
@ObfuscatedSignature(
- descriptor = "(Lpj;)V"
+ descriptor = "(Lpe;)V"
)
public FriendsList(LoginType var1) {
super(400); // L: 18
- this.field4299 = 1; // L: 14
+ this.field4286 = 1; // L: 14
this.friendLoginUpdates = new LinkDeque(); // L: 15
this.loginType = var1; // L: 19
} // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lnb;",
- garbageValue = "-1695844600"
+ descriptor = "(S)Lne;",
+ garbageValue = "-7122"
)
@Export("newInstance")
User newInstance() {
return new Friend(); // L: 24
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)[Lnb;",
- garbageValue = "1788836658"
+ descriptor = "(II)[Lne;",
+ garbageValue = "77510907"
)
@Export("newTypedArray")
User[] newTypedArray(int var1) {
return new Friend[var1]; // L: 29
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lqv;ZB)Z",
- garbageValue = "-17"
+ descriptor = "(Lqa;ZB)Z",
+ garbageValue = "-49"
)
@Export("isFriended")
public boolean isFriended(Username var1, boolean var2) {
@@ -77,10 +70,10 @@ public class FriendsList extends UserList {
}
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "78"
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "1"
)
@Export("read")
public void read(Buffer var1, int var2) {
@@ -144,17 +137,17 @@ public class FriendsList extends UserList {
}
if (var6 != var11.world) { // L: 91
- var11.int2 = ++this.field4299 - 1; // L: 92
+ var11.int2 = ++this.field4286 - 1; // L: 92
if (var11.world == -1 && var6 == 0) { // L: 93
- var11.int2 = -(var11.int2 * -1393296031) * 960063137;
+ var11.int2 = -(var11.int2 * -1691529257) * 1716524007;
}
var11.world = var6; // L: 94
}
var11.rank = var7; // L: 96
- var11.field4311 = var9; // L: 97
- var11.field4312 = var10; // L: 98
+ var11.field4299 = var9; // L: 97
+ var11.field4298 = var10; // L: 98
continue; // L: 99
}
@@ -166,47 +159,788 @@ public class FriendsList extends UserList {
}
}
- @ObfuscatedName("w")
+ @ObfuscatedName("iw")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "8"
+ descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V",
+ garbageValue = "1"
)
- static int method6454(int var0, Script var1, boolean var2) {
- Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1101
- if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.x; // L: 1103
- return 1; // L: 1104
- } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.y; // L: 1107
- return 1; // L: 1108
- } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.width; // L: 1111
- return 1; // L: 1112
- } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.height; // L: 1115
- return 1; // L: 1116
- } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119
- return 1; // L: 1120
- } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123
- return 1; // L: 1124
- } else {
- return 2; // L: 1126
+ @Export("menuAction")
+ static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
+ if (var2 >= 2000) { // L: 8710
+ var2 -= 2000;
}
- }
- @ObfuscatedName("br")
- @ObfuscatedSignature(
- descriptor = "(ILkd;ZB)V",
- garbageValue = "20"
- )
- static void method6449(int var0, Coord var1, boolean var2) {
- WorldMapArea var3 = MilliClock.getWorldMap().getMapArea(var0); // L: 4737
- int var4 = ModelData0.localPlayer.plane; // L: 4738
- int var5 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 4739
- int var6 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 4740
- Coord var7 = new Coord(var4, var5, var6); // L: 4741
- MilliClock.getWorldMap().method7039(var3, var7, var1, var2); // L: 4742
- } // L: 4743
+ PacketBufferNode var8;
+ if (var2 == 1) { // L: 8711
+ Client.mouseCrossX = var6; // L: 8837
+ Client.mouseCrossY = var7; // L: 8838
+ Client.mouseCrossColor = 2; // L: 8839
+ Client.mouseCrossState = 0; // L: 8840
+ Client.destinationX = var0; // L: 8841
+ Client.destinationY = var1; // L: 8842
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2979, Client.packetWriter.isaacCipher); // L: 8844
+ var8.packetBuffer.method7863(EnumComposition.selectedItemSlot); // L: 8845
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 8846
+ var8.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8847
+ var8.packetBuffer.writeIntME(var3); // L: 8848
+ var8.packetBuffer.writeShort(WorldMapIcon_0.selectedItemId); // L: 8849
+ var8.packetBuffer.method7784(ModeWhere.selectedItemWidget); // L: 8850
+ var8.packetBuffer.writeShort(var0 + class28.baseX); // L: 8851
+ Client.packetWriter.addNode(var8); // L: 8852
+ } else if (var2 == 2) {
+ Client.mouseCrossX = var6; // L: 8930
+ Client.mouseCrossY = var7; // L: 8931
+ Client.mouseCrossColor = 2; // L: 8932
+ Client.mouseCrossState = 0; // L: 8933
+ Client.destinationX = var0; // L: 8934
+ Client.destinationY = var1; // L: 8935
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 8936
+ var8.packetBuffer.writeIntME(WorldMapLabelSize.baseY + var1); // L: 8937
+ var8.packetBuffer.writeShort(var3); // L: 8938
+ var8.packetBuffer.method7929(var0 + class28.baseX); // L: 8939
+ var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); // L: 8940
+ var8.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8941
+ var8.packetBuffer.method7784(NetCache.selectedSpellWidget); // L: 8942
+ var8.packetBuffer.method7863(Client.selectedSpellItemId); // L: 8943
+ Client.packetWriter.addNode(var8); // L: 8944
+ } else if (var2 == 3) {
+ Client.mouseCrossX = var6; // L: 8971
+ Client.mouseCrossY = var7; // L: 8972
+ Client.mouseCrossColor = 2; // L: 8973
+ Client.mouseCrossState = 0; // L: 8974
+ Client.destinationX = var0; // L: 8975
+ Client.destinationY = var1; // L: 8976
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field3005, Client.packetWriter.isaacCipher); // L: 8978
+ var8.packetBuffer.method7929(WorldMapLabelSize.baseY + var1); // L: 8979
+ var8.packetBuffer.method7929(var0 + class28.baseX); // L: 8980
+ var8.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8981
+ var8.packetBuffer.writeIntME(var3); // L: 8982
+ Client.packetWriter.addNode(var8); // L: 8983
+ } else if (var2 == 4) {
+ Client.mouseCrossX = var6; // L: 9076
+ Client.mouseCrossY = var7; // L: 9077
+ Client.mouseCrossColor = 2; // L: 9078
+ Client.mouseCrossState = 0; // L: 9079
+ Client.destinationX = var0; // L: 9080
+ Client.destinationY = var1; // L: 9081
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field3003, Client.packetWriter.isaacCipher); // L: 9083
+ var8.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9084
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 9085
+ var8.packetBuffer.writeShort(var0 + class28.baseX); // L: 9086
+ var8.packetBuffer.method7929(var3); // L: 9087
+ Client.packetWriter.addNode(var8); // L: 9088
+ } else if (var2 == 5) {
+ Client.mouseCrossX = var6; // L: 8870
+ Client.mouseCrossY = var7; // L: 8871
+ Client.mouseCrossColor = 2; // L: 8872
+ Client.mouseCrossState = 0; // L: 8873
+ Client.destinationX = var0; // L: 8874
+ Client.destinationY = var1; // L: 8875
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field3009, Client.packetWriter.isaacCipher); // L: 8877
+ var8.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8878
+ var8.packetBuffer.method7863(var0 + class28.baseX); // L: 8879
+ var8.packetBuffer.method7863(WorldMapLabelSize.baseY + var1); // L: 8880
+ var8.packetBuffer.writeShort(var3); // L: 8881
+ Client.packetWriter.addNode(var8); // L: 8882
+ } else if (var2 == 6) {
+ Client.mouseCrossX = var6; // L: 9323
+ Client.mouseCrossY = var7; // L: 9324
+ Client.mouseCrossColor = 2; // L: 9325
+ Client.mouseCrossState = 0; // L: 9326
+ Client.destinationX = var0; // L: 9327
+ Client.destinationY = var1; // L: 9328
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2936, Client.packetWriter.isaacCipher); // L: 9330
+ var8.packetBuffer.method7929(WorldMapLabelSize.baseY + var1); // L: 9331
+ var8.packetBuffer.writeShort(var0 + class28.baseX); // L: 9332
+ var8.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9333
+ var8.packetBuffer.method7863(var3); // L: 9334
+ Client.packetWriter.addNode(var8); // L: 9335
+ } else {
+ PacketBufferNode var9;
+ NPC var13;
+ if (var2 == 7) {
+ var13 = Client.npcs[var3]; // L: 9444
+ if (var13 != null) { // L: 9445
+ Client.mouseCrossX = var6; // L: 9446
+ Client.mouseCrossY = var7; // L: 9447
+ Client.mouseCrossColor = 2; // L: 9448
+ Client.mouseCrossState = 0; // L: 9449
+ Client.destinationX = var0; // L: 9450
+ Client.destinationY = var1; // L: 9451
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2910, Client.packetWriter.isaacCipher); // L: 9453
+ var9.packetBuffer.writeInt(ModeWhere.selectedItemWidget); // L: 9454
+ var9.packetBuffer.writeIntME(EnumComposition.selectedItemSlot); // L: 9455
+ var9.packetBuffer.method7929(var3); // L: 9456
+ var9.packetBuffer.writeIntME(WorldMapIcon_0.selectedItemId); // L: 9457
+ var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9458
+ Client.packetWriter.addNode(var9); // L: 9459
+ }
+ } else if (var2 == 8) {
+ var13 = Client.npcs[var3]; // L: 9005
+ if (var13 != null) { // L: 9006
+ Client.mouseCrossX = var6; // L: 9007
+ Client.mouseCrossY = var7; // L: 9008
+ Client.mouseCrossColor = 2; // L: 9009
+ Client.mouseCrossState = 0; // L: 9010
+ Client.destinationX = var0; // L: 9011
+ Client.destinationY = var1; // L: 9012
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2911, Client.packetWriter.isaacCipher); // L: 9013
+ var9.packetBuffer.method7760(NetCache.selectedSpellWidget); // L: 9014
+ var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9015
+ var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9016
+ var9.packetBuffer.method7929(var3); // L: 9017
+ var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9018
+ Client.packetWriter.addNode(var9); // L: 9019
+ }
+ } else if (var2 == 9) {
+ var13 = Client.npcs[var3]; // L: 9275
+ if (var13 != null) { // L: 9276
+ Client.mouseCrossX = var6; // L: 9277
+ Client.mouseCrossY = var7; // L: 9278
+ Client.mouseCrossColor = 2; // L: 9279
+ Client.mouseCrossState = 0; // L: 9280
+ Client.destinationX = var0; // L: 9281
+ Client.destinationY = var1; // L: 9282
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2939, Client.packetWriter.isaacCipher); // L: 9284
+ var9.packetBuffer.method7863(var3); // L: 9285
+ var9.packetBuffer.method7764(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9286
+ Client.packetWriter.addNode(var9); // L: 9287
+ }
+ } else if (var2 == 10) {
+ var13 = Client.npcs[var3]; // L: 8712
+ if (var13 != null) { // L: 8713
+ Client.mouseCrossX = var6; // L: 8714
+ Client.mouseCrossY = var7; // L: 8715
+ Client.mouseCrossColor = 2; // L: 8716
+ Client.mouseCrossState = 0; // L: 8717
+ Client.destinationX = var0; // L: 8718
+ Client.destinationY = var1; // L: 8719
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 8721
+ var9.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8722
+ var9.packetBuffer.writeIntME(var3); // L: 8723
+ Client.packetWriter.addNode(var9); // L: 8724
+ }
+ } else if (var2 == 11) {
+ var13 = Client.npcs[var3]; // L: 9463
+ if (var13 != null) { // L: 9464
+ Client.mouseCrossX = var6; // L: 9465
+ Client.mouseCrossY = var7; // L: 9466
+ Client.mouseCrossColor = 2; // L: 9467
+ Client.mouseCrossState = 0; // L: 9468
+ Client.destinationX = var0; // L: 9469
+ Client.destinationY = var1; // L: 9470
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 9472
+ var9.packetBuffer.method7863(var3); // L: 9473
+ var9.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9474
+ Client.packetWriter.addNode(var9); // L: 9475
+ }
+ } else if (var2 == 12) {
+ var13 = Client.npcs[var3]; // L: 9045
+ if (var13 != null) { // L: 9046
+ Client.mouseCrossX = var6; // L: 9047
+ Client.mouseCrossY = var7; // L: 9048
+ Client.mouseCrossColor = 2; // L: 9049
+ Client.mouseCrossState = 0; // L: 9050
+ Client.destinationX = var0; // L: 9051
+ Client.destinationY = var1; // L: 9052
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2940, Client.packetWriter.isaacCipher); // L: 9054
+ var9.packetBuffer.writeShort(var3); // L: 9055
+ var9.packetBuffer.method7764(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9056
+ Client.packetWriter.addNode(var9); // L: 9057
+ }
+ } else if (var2 == 13) {
+ var13 = Client.npcs[var3]; // L: 8752
+ if (var13 != null) { // L: 8753
+ Client.mouseCrossX = var6; // L: 8754
+ Client.mouseCrossY = var7; // L: 8755
+ Client.mouseCrossColor = 2; // L: 8756
+ Client.mouseCrossState = 0; // L: 8757
+ Client.destinationX = var0; // L: 8758
+ Client.destinationY = var1; // L: 8759
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2907, Client.packetWriter.isaacCipher); // L: 8761
+ var9.packetBuffer.method7929(var3); // L: 8762
+ var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8763
+ Client.packetWriter.addNode(var9); // L: 8764
+ }
+ } else {
+ Player var15;
+ if (var2 == 14) {
+ var15 = Client.players[var3]; // L: 8768
+ if (var15 != null) { // L: 8769
+ Client.mouseCrossX = var6; // L: 8770
+ Client.mouseCrossY = var7; // L: 8771
+ Client.mouseCrossColor = 2; // L: 8772
+ Client.mouseCrossState = 0; // L: 8773
+ Client.destinationX = var0; // L: 8774
+ Client.destinationY = var1; // L: 8775
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2908, Client.packetWriter.isaacCipher); // L: 8777
+ var9.packetBuffer.method7863(var3); // L: 8778
+ var9.packetBuffer.method7863(WorldMapIcon_0.selectedItemId); // L: 8779
+ var9.packetBuffer.method7764(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8780
+ var9.packetBuffer.method7863(EnumComposition.selectedItemSlot); // L: 8781
+ var9.packetBuffer.writeInt(ModeWhere.selectedItemWidget); // L: 8782
+ Client.packetWriter.addNode(var9); // L: 8783
+ }
+ } else if (var2 == 15) {
+ var15 = Client.players[var3]; // L: 9184
+ if (var15 != null) { // L: 9185
+ Client.mouseCrossX = var6; // L: 9186
+ Client.mouseCrossY = var7; // L: 9187
+ Client.mouseCrossColor = 2; // L: 9188
+ Client.mouseCrossState = 0; // L: 9189
+ Client.destinationX = var0; // L: 9190
+ Client.destinationY = var1; // L: 9191
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2924, Client.packetWriter.isaacCipher); // L: 9192
+ var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9193
+ var9.packetBuffer.method7929(var3); // L: 9194
+ var9.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9195
+ var9.packetBuffer.writeInt(NetCache.selectedSpellWidget); // L: 9196
+ var9.packetBuffer.writeIntME(Client.selectedSpellItemId); // L: 9197
+ Client.packetWriter.addNode(var9); // L: 9198
+ }
+ } else if (var2 == 16) {
+ Client.mouseCrossX = var6; // L: 8900
+ Client.mouseCrossY = var7; // L: 8901
+ Client.mouseCrossColor = 2; // L: 8902
+ Client.mouseCrossState = 0; // L: 8903
+ Client.destinationX = var0; // L: 8904
+ Client.destinationY = var1; // L: 8905
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 8907
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 8908
+ var8.packetBuffer.writeInt(ModeWhere.selectedItemWidget); // L: 8909
+ var8.packetBuffer.method7929(EnumComposition.selectedItemSlot); // L: 8910
+ var8.packetBuffer.method7863(WorldMapIcon_0.selectedItemId); // L: 8911
+ var8.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8912
+ var8.packetBuffer.method7863(var3); // L: 8913
+ var8.packetBuffer.writeShort(var0 + class28.baseX); // L: 8914
+ Client.packetWriter.addNode(var8); // L: 8915
+ } else if (var2 == 17) {
+ Client.mouseCrossX = var6; // L: 9479
+ Client.mouseCrossY = var7; // L: 9480
+ Client.mouseCrossColor = 2; // L: 9481
+ Client.mouseCrossState = 0; // L: 9482
+ Client.destinationX = var0; // L: 9483
+ Client.destinationY = var1; // L: 9484
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9485
+ var8.packetBuffer.writeIntME(var3); // L: 9486
+ var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9487
+ var8.packetBuffer.method7863(var0 + class28.baseX); // L: 9488
+ var8.packetBuffer.method7929(Client.selectedSpellChildIndex); // L: 9489
+ var8.packetBuffer.writeIntME(Client.selectedSpellItemId); // L: 9490
+ var8.packetBuffer.method7863(WorldMapLabelSize.baseY + var1); // L: 9491
+ var8.packetBuffer.method7760(NetCache.selectedSpellWidget); // L: 9492
+ Client.packetWriter.addNode(var8); // L: 9493
+ } else if (var2 == 18) {
+ Client.mouseCrossX = var6; // L: 9061
+ Client.mouseCrossY = var7; // L: 9062
+ Client.mouseCrossColor = 2; // L: 9063
+ Client.mouseCrossState = 0; // L: 9064
+ Client.destinationX = var0; // L: 9065
+ Client.destinationY = var1; // L: 9066
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2909, Client.packetWriter.isaacCipher); // L: 9068
+ var8.packetBuffer.method7929(var0 + class28.baseX); // L: 9069
+ var8.packetBuffer.method7863(var3); // L: 9070
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 9071
+ var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9072
+ Client.packetWriter.addNode(var8); // L: 9073
+ } else if (var2 == 19) {
+ Client.mouseCrossX = var6; // L: 8885
+ Client.mouseCrossY = var7; // L: 8886
+ Client.mouseCrossColor = 2; // L: 8887
+ Client.mouseCrossState = 0; // L: 8888
+ Client.destinationX = var0; // L: 8889
+ Client.destinationY = var1; // L: 8890
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2919, Client.packetWriter.isaacCipher); // L: 8892
+ var8.packetBuffer.method7929(WorldMapLabelSize.baseY + var1); // L: 8893
+ var8.packetBuffer.method7929(var3); // L: 8894
+ var8.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8895
+ var8.packetBuffer.method7929(var0 + class28.baseX); // L: 8896
+ Client.packetWriter.addNode(var8); // L: 8897
+ } else if (var2 == 20) {
+ Client.mouseCrossX = var6; // L: 9247
+ Client.mouseCrossY = var7; // L: 9248
+ Client.mouseCrossColor = 2; // L: 9249
+ Client.mouseCrossState = 0; // L: 9250
+ Client.destinationX = var0; // L: 9251
+ Client.destinationY = var1; // L: 9252
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2920, Client.packetWriter.isaacCipher); // L: 9254
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 9255
+ var8.packetBuffer.method7764(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9256
+ var8.packetBuffer.method7863(var3); // L: 9257
+ var8.packetBuffer.writeIntME(var0 + class28.baseX); // L: 9258
+ Client.packetWriter.addNode(var8); // L: 9259
+ } else if (var2 == 21) {
+ Client.mouseCrossX = var6; // L: 8855
+ Client.mouseCrossY = var7; // L: 8856
+ Client.mouseCrossColor = 2; // L: 8857
+ Client.mouseCrossState = 0; // L: 8858
+ Client.destinationX = var0; // L: 8859
+ Client.destinationY = var1; // L: 8860
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2955, Client.packetWriter.isaacCipher); // L: 8862
+ var8.packetBuffer.method7863(var0 + class28.baseX); // L: 8863
+ var8.packetBuffer.method7929(var3); // L: 8864
+ var8.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8865
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 8866
+ Client.packetWriter.addNode(var8); // L: 8867
+ } else if (var2 == 22) {
+ Client.mouseCrossX = var6; // L: 9169
+ Client.mouseCrossY = var7; // L: 9170
+ Client.mouseCrossColor = 2; // L: 9171
+ Client.mouseCrossState = 0; // L: 9172
+ Client.destinationX = var0; // L: 9173
+ Client.destinationY = var1; // L: 9174
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 9176
+ var8.packetBuffer.method7863(var0 + class28.baseX); // L: 9177
+ var8.packetBuffer.method7764(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9178
+ var8.packetBuffer.method7929(var3); // L: 9179
+ var8.packetBuffer.writeShort(WorldMapLabelSize.baseY + var1); // L: 9180
+ Client.packetWriter.addNode(var8); // L: 9181
+ } else if (var2 == 23) {
+ if (Client.isMenuOpen) { // L: 8744
+ class356.scene.setViewportWalking(); // L: 8745
+ } else {
+ class356.scene.menuOpen(PacketWriter.Client_plane, var0, var1, true); // L: 8748
+ }
+ } else {
+ PacketBufferNode var12;
+ Widget var16;
+ if (var2 == 24) {
+ var16 = class140.getWidget(var1); // L: 8947
+ if (var16 != null) { // L: 8948
+ boolean var11 = true; // L: 8949
+ if (var16.contentType > 0) { // L: 8950
+ var11 = Message.method1065(var16);
+ }
+
+ if (var11) { // L: 8951
+ var12 = EnumComposition.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 8953
+ var12.packetBuffer.writeInt(var1); // L: 8954
+ Client.packetWriter.addNode(var12); // L: 8955
+ }
+ }
+ } else {
+ if (var2 == 25) {
+ var16 = ScriptFrame.getWidgetChild(var1, var0); // L: 9262
+ if (var16 != null) { // L: 9263
+ WorldMapDecoration.Widget_runOnTargetLeave(); // L: 9264
+ GrandExchangeOfferAgeComparator.selectSpell(var1, var0, WorldMapID.Widget_unpackTargetMask(class124.getWidgetFlags(var16)), var16.itemId); // L: 9265
+ Client.isItemSelected = 0; // L: 9266
+ Client.selectedSpellActionName = WorldMapIcon_0.Widget_getSpellActionName(var16); // L: 9267
+ if (Client.selectedSpellActionName == null) { // L: 9268
+ Client.selectedSpellActionName = "null";
+ }
+
+ if (var16.isIf3) { // L: 9269
+ Client.selectedSpellName = var16.dataText + class122.colorStartTag(16777215);
+ } else {
+ Client.selectedSpellName = class122.colorStartTag(65280) + var16.spellName + class122.colorStartTag(16777215); // L: 9270
+ }
+ }
+
+ return; // L: 9272
+ }
+
+ if (var2 == 26) {
+ Occluder.method4354(); // L: 9002
+ } else {
+ int var10;
+ Widget var14;
+ if (var2 == 28) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 8919
+ var8.packetBuffer.writeInt(var1); // L: 8920
+ Client.packetWriter.addNode(var8); // L: 8921
+ var14 = class140.getWidget(var1); // L: 8922
+ if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8923
+ var10 = var14.cs1Instructions[0][1]; // L: 8924
+ Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8925
+ class306.changeGameOptions(var10); // L: 8926
+ }
+ } else if (var2 == 29) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 9417
+ var8.packetBuffer.writeInt(var1); // L: 9418
+ Client.packetWriter.addNode(var8); // L: 9419
+ var14 = class140.getWidget(var1); // L: 9420
+ if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9421
+ var10 = var14.cs1Instructions[0][1]; // L: 9422
+ if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 9423
+ Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 9424
+ class306.changeGameOptions(var10); // L: 9425
+ }
+ }
+ } else if (var2 == 30) {
+ if (Client.meslayerContinueWidget == null) { // L: 9213
+ class362.resumePauseWidget(var1, var0); // L: 9214
+ Client.meslayerContinueWidget = ScriptFrame.getWidgetChild(var1, var0); // L: 9215
+ ChatChannel.invalidateWidget(Client.meslayerContinueWidget); // L: 9216
+ }
+ } else if (var2 == 31) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 9431
+ var8.packetBuffer.method7929(EnumComposition.selectedItemSlot); // L: 9432
+ var8.packetBuffer.method7784(var1); // L: 9433
+ var8.packetBuffer.method7783(ModeWhere.selectedItemWidget); // L: 9434
+ var8.packetBuffer.method7929(var0); // L: 9435
+ var8.packetBuffer.method7863(WorldMapIcon_0.selectedItemId); // L: 9436
+ var8.packetBuffer.writeIntME(var3); // L: 9437
+ Client.packetWriter.addNode(var8); // L: 9438
+ Client.field599 = 0; // L: 9439
+ class1.field4 = class140.getWidget(var1); // L: 9440
+ Client.field600 = var0; // L: 9441
+ } else if (var2 == 32) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2933, Client.packetWriter.isaacCipher); // L: 9298
+ var8.packetBuffer.writeInt(var1); // L: 9299
+ var8.packetBuffer.writeShort(var3); // L: 9300
+ var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); // L: 9301
+ var8.packetBuffer.method7760(NetCache.selectedSpellWidget); // L: 9302
+ var8.packetBuffer.method7929(var0); // L: 9303
+ Client.packetWriter.addNode(var8); // L: 9304
+ Client.field599 = 0; // L: 9305
+ class1.field4 = class140.getWidget(var1); // L: 9306
+ Client.field600 = var0; // L: 9307
+ } else if (var2 == 33) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 9203
+ var8.packetBuffer.method7760(var1); // L: 9204
+ var8.packetBuffer.writeIntME(var0); // L: 9205
+ var8.packetBuffer.method7929(var3); // L: 9206
+ Client.packetWriter.addNode(var8); // L: 9207
+ Client.field599 = 0; // L: 9208
+ class1.field4 = class140.getWidget(var1); // L: 9209
+ Client.field600 = var0; // L: 9210
+ } else if (var2 == 34) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9221
+ var8.packetBuffer.method7929(var0); // L: 9222
+ var8.packetBuffer.method7784(var1); // L: 9223
+ var8.packetBuffer.method7863(var3); // L: 9224
+ Client.packetWriter.addNode(var8); // L: 9225
+ Client.field599 = 0; // L: 9226
+ class1.field4 = class140.getWidget(var1); // L: 9227
+ Client.field600 = var0; // L: 9228
+ } else if (var2 == 35) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 9108
+ var8.packetBuffer.method7863(var3); // L: 9109
+ var8.packetBuffer.method7760(var1); // L: 9110
+ var8.packetBuffer.writeIntME(var0); // L: 9111
+ Client.packetWriter.addNode(var8); // L: 9112
+ Client.field599 = 0; // L: 9113
+ class1.field4 = class140.getWidget(var1); // L: 9114
+ Client.field600 = var0; // L: 9115
+ } else if (var2 == 36) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2975, Client.packetWriter.isaacCipher); // L: 8816
+ var8.packetBuffer.writeShort(var3); // L: 8817
+ var8.packetBuffer.method7929(var0); // L: 8818
+ var8.packetBuffer.method7783(var1); // L: 8819
+ Client.packetWriter.addNode(var8); // L: 8820
+ Client.field599 = 0; // L: 8821
+ class1.field4 = class140.getWidget(var1); // L: 8822
+ Client.field600 = var0; // L: 8823
+ } else if (var2 == 37) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2968, Client.packetWriter.isaacCipher); // L: 9024
+ var8.packetBuffer.writeInt(var1); // L: 9025
+ var8.packetBuffer.writeIntME(var0); // L: 9026
+ var8.packetBuffer.method7863(var3); // L: 9027
+ Client.packetWriter.addNode(var8); // L: 9028
+ Client.field599 = 0; // L: 9029
+ class1.field4 = class140.getWidget(var1); // L: 9030
+ Client.field600 = var0; // L: 9031
+ } else {
+ if (var2 == 38) {
+ WorldMapDecoration.Widget_runOnTargetLeave(); // L: 8787
+ var16 = class140.getWidget(var1); // L: 8788
+ Client.isItemSelected = 1; // L: 8789
+ EnumComposition.selectedItemSlot = var0; // L: 8790
+ ModeWhere.selectedItemWidget = var1; // L: 8791
+ WorldMapIcon_0.selectedItemId = var3; // L: 8792
+ ChatChannel.invalidateWidget(var16); // L: 8793
+ Client.selectedItemName = class122.colorStartTag(16748608) + EnumComposition.ItemDefinition_get(var3).name + class122.colorStartTag(16777215); // L: 8794
+ if (Client.selectedItemName == null) { // L: 8795
+ Client.selectedItemName = "null";
+ }
+
+ return; // L: 8796
+ }
+
+ if (var2 == 39) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2938, Client.packetWriter.isaacCipher); // L: 9035
+ var8.packetBuffer.method7760(var1); // L: 9036
+ var8.packetBuffer.method7929(var0); // L: 9037
+ var8.packetBuffer.writeShort(var3); // L: 9038
+ Client.packetWriter.addNode(var8); // L: 9039
+ Client.field599 = 0; // L: 9040
+ class1.field4 = class140.getWidget(var1); // L: 9041
+ Client.field600 = var0; // L: 9042
+ } else if (var2 == 40) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2978, Client.packetWriter.isaacCipher); // L: 9129
+ var8.packetBuffer.method7783(var1); // L: 9130
+ var8.packetBuffer.method7863(var0); // L: 9131
+ var8.packetBuffer.writeIntME(var3); // L: 9132
+ Client.packetWriter.addNode(var8); // L: 9133
+ Client.field599 = 0; // L: 9134
+ class1.field4 = class140.getWidget(var1); // L: 9135
+ Client.field600 = var0; // L: 9136
+ } else if (var2 == 41) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 9355
+ var8.packetBuffer.method7863(var3); // L: 9356
+ var8.packetBuffer.method7784(var1); // L: 9357
+ var8.packetBuffer.writeShort(var0); // L: 9358
+ Client.packetWriter.addNode(var8); // L: 9359
+ Client.field599 = 0; // L: 9360
+ class1.field4 = class140.getWidget(var1); // L: 9361
+ Client.field600 = var0; // L: 9362
+ } else if (var2 == 42) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 8827
+ var8.packetBuffer.method7863(var0); // L: 8828
+ var8.packetBuffer.writeShort(var3); // L: 8829
+ var8.packetBuffer.method7783(var1); // L: 8830
+ Client.packetWriter.addNode(var8); // L: 8831
+ Client.field599 = 0; // L: 8832
+ class1.field4 = class140.getWidget(var1); // L: 8833
+ Client.field600 = var0; // L: 8834
+ } else if (var2 == 43) {
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2935, Client.packetWriter.isaacCipher); // L: 8961
+ var8.packetBuffer.method7929(var0); // L: 8962
+ var8.packetBuffer.method7783(var1); // L: 8963
+ var8.packetBuffer.method7929(var3); // L: 8964
+ Client.packetWriter.addNode(var8); // L: 8965
+ Client.field599 = 0; // L: 8966
+ class1.field4 = class140.getWidget(var1); // L: 8967
+ Client.field600 = var0; // L: 8968
+ } else if (var2 == 44) {
+ var15 = Client.players[var3]; // L: 9091
+ if (var15 != null) { // L: 9092
+ Client.mouseCrossX = var6; // L: 9093
+ Client.mouseCrossY = var7; // L: 9094
+ Client.mouseCrossColor = 2; // L: 9095
+ Client.mouseCrossState = 0; // L: 9096
+ Client.destinationX = var0; // L: 9097
+ Client.destinationY = var1; // L: 9098
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 9100
+ var9.packetBuffer.writeShort(var3); // L: 9101
+ var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9102
+ Client.packetWriter.addNode(var9); // L: 9103
+ }
+ } else if (var2 == 45) {
+ var15 = Client.players[var3]; // L: 8986
+ if (var15 != null) { // L: 8987
+ Client.mouseCrossX = var6; // L: 8988
+ Client.mouseCrossY = var7; // L: 8989
+ Client.mouseCrossColor = 2; // L: 8990
+ Client.mouseCrossState = 0; // L: 8991
+ Client.destinationX = var0; // L: 8992
+ Client.destinationY = var1; // L: 8993
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 8995
+ var9.packetBuffer.method7863(var3); // L: 8996
+ var9.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8997
+ Client.packetWriter.addNode(var9); // L: 8998
+ }
+ } else if (var2 == 46) {
+ var15 = Client.players[var3]; // L: 8728
+ if (var15 != null) { // L: 8729
+ Client.mouseCrossX = var6; // L: 8730
+ Client.mouseCrossY = var7; // L: 8731
+ Client.mouseCrossColor = 2; // L: 8732
+ Client.mouseCrossState = 0; // L: 8733
+ Client.destinationX = var0; // L: 8734
+ Client.destinationY = var1; // L: 8735
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 8737
+ var9.packetBuffer.method7929(var3); // L: 8738
+ var9.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8739
+ Client.packetWriter.addNode(var9); // L: 8740
+ }
+ } else if (var2 == 47) {
+ var15 = Client.players[var3]; // L: 8799
+ if (var15 != null) { // L: 8800
+ Client.mouseCrossX = var6; // L: 8801
+ Client.mouseCrossY = var7; // L: 8802
+ Client.mouseCrossColor = 2; // L: 8803
+ Client.mouseCrossState = 0; // L: 8804
+ Client.destinationX = var0; // L: 8805
+ Client.destinationY = var1; // L: 8806
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 8808
+ var9.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8809
+ var9.packetBuffer.method7863(var3); // L: 8810
+ Client.packetWriter.addNode(var9); // L: 8811
+ }
+ } else if (var2 == 48) {
+ var15 = Client.players[var3]; // L: 9139
+ if (var15 != null) { // L: 9140
+ Client.mouseCrossX = var6; // L: 9141
+ Client.mouseCrossY = var7; // L: 9142
+ Client.mouseCrossColor = 2; // L: 9143
+ Client.mouseCrossState = 0; // L: 9144
+ Client.destinationX = var0; // L: 9145
+ Client.destinationY = var1; // L: 9146
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 9148
+ var9.packetBuffer.writeIntME(var3); // L: 9149
+ var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9150
+ Client.packetWriter.addNode(var9); // L: 9151
+ }
+ } else if (var2 == 49) {
+ var15 = Client.players[var3]; // L: 9338
+ if (var15 != null) { // L: 9339
+ Client.mouseCrossX = var6; // L: 9340
+ Client.mouseCrossY = var7; // L: 9341
+ Client.mouseCrossColor = 2; // L: 9342
+ Client.mouseCrossState = 0; // L: 9343
+ Client.destinationX = var0; // L: 9344
+ Client.destinationY = var1; // L: 9345
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9347
+ var9.packetBuffer.writeIntME(var3); // L: 9348
+ var9.packetBuffer.method7762(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9349
+ Client.packetWriter.addNode(var9); // L: 9350
+ }
+ } else if (var2 == 50) {
+ var15 = Client.players[var3]; // L: 9231
+ if (var15 != null) { // L: 9232
+ Client.mouseCrossX = var6; // L: 9233
+ Client.mouseCrossY = var7; // L: 9234
+ Client.mouseCrossColor = 2; // L: 9235
+ Client.mouseCrossState = 0; // L: 9236
+ Client.destinationX = var0; // L: 9237
+ Client.destinationY = var1; // L: 9238
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2947, Client.packetWriter.isaacCipher); // L: 9240
+ var9.packetBuffer.writeShort(var3); // L: 9241
+ var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9242
+ Client.packetWriter.addNode(var9); // L: 9243
+ }
+ } else if (var2 == 51) {
+ var15 = Client.players[var3]; // L: 9380
+ if (var15 != null) { // L: 9381
+ Client.mouseCrossX = var6; // L: 9382
+ Client.mouseCrossY = var7; // L: 9383
+ Client.mouseCrossColor = 2; // L: 9384
+ Client.mouseCrossState = 0; // L: 9385
+ Client.destinationX = var0; // L: 9386
+ Client.destinationY = var1; // L: 9387
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2959, Client.packetWriter.isaacCipher); // L: 9389
+ var9.packetBuffer.method7763(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9390
+ var9.packetBuffer.writeShort(var3); // L: 9391
+ Client.packetWriter.addNode(var9); // L: 9392
+ }
+ } else {
+ label654: {
+ if (var2 != 57) {
+ if (var2 == 58) {
+ var16 = ScriptFrame.getWidgetChild(var1, var0); // L: 9155
+ if (var16 != null) { // L: 9156
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field2925, Client.packetWriter.isaacCipher); // L: 9158
+ var9.packetBuffer.method7929(Client.selectedSpellItemId); // L: 9159
+ var9.packetBuffer.method7863(Client.selectedSpellChildIndex); // L: 9160
+ var9.packetBuffer.method7760(NetCache.selectedSpellWidget); // L: 9161
+ var9.packetBuffer.method7929(var16.itemId); // L: 9162
+ var9.packetBuffer.writeShort(var0); // L: 9163
+ var9.packetBuffer.method7783(var1); // L: 9164
+ Client.packetWriter.addNode(var9); // L: 9165
+ }
+ break label654;
+ }
+
+ if (var2 == 1001) {
+ Client.mouseCrossX = var6; // L: 9365
+ Client.mouseCrossY = var7; // L: 9366
+ Client.mouseCrossColor = 2; // L: 9367
+ Client.mouseCrossState = 0; // L: 9368
+ Client.destinationX = var0; // L: 9369
+ Client.destinationY = var1; // L: 9370
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2937, Client.packetWriter.isaacCipher); // L: 9372
+ var8.packetBuffer.method7929(var0 + class28.baseX); // L: 9373
+ var8.packetBuffer.method7863(var3); // L: 9374
+ var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9375
+ var8.packetBuffer.method7929(WorldMapLabelSize.baseY + var1); // L: 9376
+ Client.packetWriter.addNode(var8); // L: 9377
+ break label654;
+ }
+
+ if (var2 == 1002) {
+ Client.mouseCrossX = var6; // L: 9118
+ Client.mouseCrossY = var7; // L: 9119
+ Client.mouseCrossColor = 2; // L: 9120
+ Client.mouseCrossState = 0; // L: 9121
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field2976, Client.packetWriter.isaacCipher); // L: 9123
+ var8.packetBuffer.method7863(var3); // L: 9124
+ Client.packetWriter.addNode(var8); // L: 9125
+ break label654;
+ }
+
+ if (var2 == 1003) {
+ Client.mouseCrossX = var6; // L: 9396
+ Client.mouseCrossY = var7; // L: 9397
+ Client.mouseCrossColor = 2; // L: 9398
+ Client.mouseCrossState = 0; // L: 9399
+ var13 = Client.npcs[var3]; // L: 9400
+ if (var13 != null) { // L: 9401
+ NPCComposition var17 = var13.definition; // L: 9402
+ if (var17.transforms != null) { // L: 9403
+ var17 = var17.transform();
+ }
+
+ if (var17 != null) { // L: 9404
+ var12 = EnumComposition.getPacketBufferNode(ClientPacket.field2941, Client.packetWriter.isaacCipher); // L: 9406
+ var12.packetBuffer.writeIntME(var17.id); // L: 9407
+ Client.packetWriter.addNode(var12); // L: 9408
+ }
+ }
+ break label654;
+ }
+
+ if (var2 == 1004) {
+ Client.mouseCrossX = var6; // L: 9496
+ Client.mouseCrossY = var7; // L: 9497
+ Client.mouseCrossColor = 2; // L: 9498
+ Client.mouseCrossState = 0; // L: 9499
+ var8 = EnumComposition.getPacketBufferNode(ClientPacket.field3004, Client.packetWriter.isaacCipher); // L: 9501
+ var8.packetBuffer.method7929(var3); // L: 9502
+ Client.packetWriter.addNode(var8); // L: 9503
+ break label654;
+ }
+
+ if (var2 == 1005) {
+ var16 = class140.getWidget(var1); // L: 9310
+ if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 9311
+ class290.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + EnumComposition.ItemDefinition_get(var3).name);
+ } else {
+ var9 = EnumComposition.getPacketBufferNode(ClientPacket.field3004, Client.packetWriter.isaacCipher); // L: 9314
+ var9.packetBuffer.method7929(var3); // L: 9315
+ Client.packetWriter.addNode(var9); // L: 9316
+ }
+
+ Client.field599 = 0; // L: 9318
+ class1.field4 = class140.getWidget(var1); // L: 9319
+ Client.field600 = var0; // L: 9320
+ break label654;
+ }
+
+ if (var2 != 1007) {
+ if (var2 == 1009 || var2 == 1008 || var2 == 1010 || var2 == 1011 || var2 == 1012) {
+ class121.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9413
+ }
+ break label654;
+ }
+ }
+
+ var16 = ScriptFrame.getWidgetChild(var1, var0); // L: 9291
+ if (var16 != null) { // L: 9292
+ TextureProvider.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9293
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (Client.isItemSelected != 0) { // L: 9505
+ Client.isItemSelected = 0; // L: 9506
+ ChatChannel.invalidateWidget(class140.getWidget(ModeWhere.selectedItemWidget)); // L: 9507
+ }
+
+ if (Client.isSpellSelected) { // L: 9509
+ WorldMapDecoration.Widget_runOnTargetLeave();
+ }
+
+ if (class1.field4 != null && Client.field599 == 0) { // L: 9510
+ ChatChannel.invalidateWidget(class1.field4);
+ }
+
+ } // L: 9511
}
diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java
index 1dd1f4d386..ea29b2d95f 100644
--- a/runescape-client/src/main/java/GZipDecompressor.java
+++ b/runescape-client/src/main/java/GZipDecompressor.java
@@ -1,13 +1,19 @@
import java.util.zip.Inflater;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("qj")
@Implements("GZipDecompressor")
public class GZipDecompressor {
- @ObfuscatedName("o")
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = 1978275225
+ )
+ static int field4821;
+ @ObfuscatedName("c")
@Export("inflater")
Inflater inflater;
@@ -22,16 +28,16 @@ public class GZipDecompressor {
this(-1, 1000000, 1000000); // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;[BI)V",
- garbageValue = "-621970666"
+ descriptor = "(Lqt;[BI)V",
+ garbageValue = "-1849709887"
)
@Export("decompress")
public void decompress(Buffer var1, byte[] var2) {
if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16
- if (this.inflater == null) { // L: 17
- this.inflater = new Inflater(true);
+ if (this.inflater == null) {
+ this.inflater = new Inflater(true); // L: 17
}
try {
@@ -47,4 +53,13 @@ public class GZipDecompressor {
throw new RuntimeException("");
}
} // L: 27
+
+ @ObfuscatedName("fn")
+ @ObfuscatedSignature(
+ descriptor = "(IB)I",
+ garbageValue = "102"
+ )
+ static int method8314(int var0) {
+ return var0 * 3 + 600; // L: 1653
+ }
}
diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java
index 1bd3c2308b..dc473a44fa 100644
--- a/runescape-client/src/main/java/GameBuild.java
+++ b/runescape-client/src/main/java/GameBuild.java
@@ -4,42 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kt")
+@ObfuscatedName("ka")
@Implements("GameBuild")
public class GameBuild {
- @ObfuscatedName("o")
+ @ObfuscatedName("to")
+ @ObfuscatedGetter(
+ intValue = 688457543
+ )
+ static int field3588;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lkt;"
+ descriptor = "Lka;"
)
@Export("LIVE")
static final GameBuild LIVE;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lkt;"
+ descriptor = "Lka;"
)
@Export("BUILDLIVE")
static final GameBuild BUILDLIVE;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lkt;"
+ descriptor = "Lka;"
)
@Export("RC")
static final GameBuild RC;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lkt;"
+ descriptor = "Lka;"
)
@Export("WIP")
static final GameBuild WIP;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("name")
public final String name;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1924800269
+ intValue = 413873867
)
@Export("buildId")
- final int buildId;
+ public final int buildId;
static {
LIVE = new GameBuild("LIVE", 0); // L: 5
@@ -49,17 +54,7 @@ public class GameBuild {
}
GameBuild(String var1, int var2) {
- this.name = var1; // L: 13
- this.buildId = var2; // L: 14
- } // L: 15
-
- @ObfuscatedName("kp")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "206667436"
- )
- static final int method5586() {
- float var0 = 200.0F * ((float)class12.clientPreferences.method2225() - 0.5F); // L: 12049
- return 100 - Math.round(var0); // L: 12050
- }
+ this.name = var1; // L: 17
+ this.buildId = var2; // L: 18
+ } // L: 19
}
diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java
index 91b59f8f6b..bcfdfe7dc3 100644
--- a/runescape-client/src/main/java/GameEngine.java
+++ b/runescape-client/src/main/java/GameEngine.java
@@ -4,7 +4,6 @@ import java.awt.Container;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Graphics;
-import java.awt.Image;
import java.awt.Insets;
import java.awt.LayoutManager;
import java.awt.Rectangle;
@@ -18,6 +17,8 @@ import java.awt.event.FocusListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.awt.image.ImageObserver;
+import java.io.File;
+import java.io.RandomAccessFile;
import java.net.URL;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
@@ -25,195 +26,178 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("aj")
+@ObfuscatedName("ap")
@Implements("GameEngine")
public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lfs;"
+ descriptor = "Lfr;"
)
@Export("taskHandler")
protected static TaskHandler taskHandler;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Laj;"
+ descriptor = "Lap;"
)
@Export("gameEngine")
static GameEngine gameEngine;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1340668149
+ intValue = 230880625
)
@Export("GameEngine_redundantStartThreadCount")
static int GameEngine_redundantStartThreadCount;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- longValue = 5444631392140601951L
+ longValue = 4471126598307559601L
)
@Export("stopTimeMs")
static long stopTimeMs;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("isKilled")
static boolean isKilled;
- @ObfuscatedName("p")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1364048335
- )
- @Export("gameCyclesToDo")
- static int gameCyclesToDo;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = -443642851
+ intValue = 122633451
)
@Export("cycleDurationMillis")
static int cycleDurationMillis;
- @ObfuscatedName("r")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -266522013
+ intValue = 600236541
)
@Export("fiveOrOne")
static int fiveOrOne;
- @ObfuscatedName("v")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 2010044877
+ intValue = 632095801
)
@Export("fps")
protected static int fps;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("graphicsTickTimes")
static long[] graphicsTickTimes;
- @ObfuscatedName("n")
+ @ObfuscatedName("h")
@Export("clientTickTimes")
static long[] clientTickTimes;
- @ObfuscatedName("ap")
- static Image field201;
- @ObfuscatedName("as")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 1165072175
+ intValue = -1680088159
)
- static int field202;
- @ObfuscatedName("al")
- protected static String field206;
- @ObfuscatedName("ah")
+ static int field209;
+ @ObfuscatedName("am")
+ @ObfuscatedGetter(
+ intValue = 962598391
+ )
+ static int field199;
+ @ObfuscatedName("ai")
@Export("volatileFocus")
static volatile boolean volatileFocus;
- @ObfuscatedName("ai")
+ @ObfuscatedName("aw")
@ObfuscatedGetter(
- longValue = -2931367862207381165L
+ longValue = 2698055439581478877L
)
@Export("garbageCollectorLastCollectionTime")
static long garbageCollectorLastCollectionTime;
- @ObfuscatedName("ay")
+ @ObfuscatedName("au")
@ObfuscatedGetter(
- longValue = -8675189738146457979L
+ longValue = 2171634668724389491L
)
@Export("garbageCollectorLastCheckTimeMs")
static long garbageCollectorLastCheckTimeMs;
- @ObfuscatedName("cr")
- @ObfuscatedSignature(
- descriptor = "[Lqr;"
- )
- @Export("worldSelectBackSprites")
- static SpritePixels[] worldSelectBackSprites;
- @ObfuscatedName("jn")
- @ObfuscatedGetter(
- intValue = -154619629
- )
- @Export("cameraPitch")
- static int cameraPitch;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("hasErrored")
boolean hasErrored;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 1099544145
+ intValue = 1031196877
)
@Export("contentWidth")
protected int contentWidth;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = -1288492019
+ intValue = -1354234301
)
@Export("contentHeight")
protected int contentHeight;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = -278167239
+ intValue = 266716801
)
@Export("canvasX")
int canvasX;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedGetter(
- intValue = 1947120919
+ intValue = -159679161
)
@Export("canvasY")
int canvasY;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = 1170303839
+ intValue = 1936598847
)
- int field194;
- @ObfuscatedName("ag")
+ int field210;
+ @ObfuscatedName("ad")
@ObfuscatedGetter(
- intValue = 184457781
+ intValue = 1703466295
)
- int field195;
- @ObfuscatedName("ar")
+ int field193;
+ @ObfuscatedName("ak")
@ObfuscatedGetter(
- intValue = -1623859667
+ intValue = -206719703
)
@Export("maxCanvasWidth")
int maxCanvasWidth;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@ObfuscatedGetter(
- intValue = 597778211
+ intValue = -1670280347
)
@Export("maxCanvasHeight")
int maxCanvasHeight;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@Export("frame")
Frame frame;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("canvas")
java.awt.Canvas canvas;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("fullRedraw")
volatile boolean fullRedraw;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@Export("resizeCanvasNextFrame")
boolean resizeCanvasNextFrame;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@Export("isCanvasInvalid")
volatile boolean isCanvasInvalid;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- longValue = 4087711299063743833L
+ longValue = -9120615609352465965L
)
- volatile long field205;
- @ObfuscatedName("ad")
+ volatile long field185;
+ @ObfuscatedName("ag")
@ObfuscatedSignature(
- descriptor = "Lj;"
+ descriptor = "Ln;"
)
@Export("mouseWheelHandler")
MouseWheelHandler mouseWheelHandler;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@Export("clipboard")
Clipboard clipboard;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@Export("eventQueue")
final EventQueue eventQueue;
static {
- gameEngine = null; // L: 41
- GameEngine_redundantStartThreadCount = 0; // L: 43
+ gameEngine = null;
+ GameEngine_redundantStartThreadCount = 0;
stopTimeMs = 0L; // L: 44
isKilled = false; // L: 45
cycleDurationMillis = 20;
- fiveOrOne = 1;
+ fiveOrOne = 1; // L: 49
fps = 0; // L: 50
graphicsTickTimes = new long[32]; // L: 53
clientTickTimes = new long[32]; // L: 55
- field202 = 500; // L: 73
+ field199 = 500; // L: 73
volatileFocus = true; // L: 82
garbageCollectorLastCollectionTime = -1L; // L: 85
garbageCollectorLastCheckTimeMs = -1L; // L: 86
@@ -226,7 +210,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
this.fullRedraw = true; // L: 71
this.resizeCanvasNextFrame = false; // L: 74
this.isCanvasInvalid = false; // L: 75
- this.field205 = 0L; // L: 76
+ this.field185 = 0L; // L: 76
EventQueue var1 = null; // L: 89
try {
@@ -235,356 +219,330 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
}
this.eventQueue = var1; // L: 94
- DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95
- PcmPlayer.pcmPlayerProvider = var2; // L: 97
- } // L: 99
+ class132.method2885(new DevicePcmPlayerProvider()); // L: 95
+ } // L: 96
- @ObfuscatedName("m")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-2144318891"
+ descriptor = "(IIB)V",
+ garbageValue = "0"
)
@Export("setMaxCanvasSize")
protected final void setMaxCanvasSize(int var1, int var2) {
- if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102
- this.method425();
+ if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99
+ this.method477();
}
- this.maxCanvasWidth = var1; // L: 103
- this.maxCanvasHeight = var2; // L: 104
- } // L: 105
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;B)V",
- garbageValue = "-75"
- )
- @Export("post")
- final void post(Object var1) {
- if (this.eventQueue != null) { // L: 108
- for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109
- class241.method4815(1L);
- }
-
- if (var1 != null) {
- this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110
- }
-
- }
- } // L: 111
+ this.maxCanvasWidth = var1; // L: 100
+ this.maxCanvasHeight = var2; // L: 101
+ } // L: 102
@ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(I)Lfy;",
- garbageValue = "709191033"
+ descriptor = "(Ljava/lang/Object;I)V",
+ garbageValue = "-1780495724"
+ )
+ @Export("post")
+ final void post(Object var1) {
+ if (this.eventQueue != null) { // L: 105
+ for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 106
+ DynamicObject.method1991(1L);
+ }
+
+ if (var1 != null) {
+ this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107
+ }
+
+ }
+ } // L: 108
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lfh;",
+ garbageValue = "-1640531527"
)
@Export("mouseWheel")
protected class158 mouseWheel() {
- if (this.mouseWheelHandler == null) { // L: 114
- this.mouseWheelHandler = new MouseWheelHandler(); // L: 115
- this.mouseWheelHandler.addTo(this.canvas); // L: 116
+ if (this.mouseWheelHandler == null) { // L: 111
+ this.mouseWheelHandler = new MouseWheelHandler(); // L: 112
+ this.mouseWheelHandler.addTo(this.canvas); // L: 113
}
- return this.mouseWheelHandler; // L: 118
+ return this.mouseWheelHandler; // L: 115
}
- @ObfuscatedName("r")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2000416889"
+ descriptor = "(B)V",
+ garbageValue = "-117"
)
@Export("setUpClipboard")
protected void setUpClipboard() {
- this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122
- } // L: 123
+ this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119
+ } // L: 120
- @ObfuscatedName("v")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "103"
+ garbageValue = "0"
)
- protected void method429(String var1) {
- this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126
- } // L: 127
+ protected void method385(String var1) {
+ this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123
+ } // L: 124
- @ObfuscatedName("y")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-80802515"
+ descriptor = "(B)V",
+ garbageValue = "7"
)
@Export("setUpKeyboard")
protected final void setUpKeyboard() {
- if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 131
- KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 132
- KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 133
- KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 134
- KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 135
- KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 136
- KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 137
- KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 138
- KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 139
- KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 140
- KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 141
- KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 142
- KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 143
- } else {
- KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 146
- KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 147
- KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 148
- KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 149
- KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 150
- KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 151
- KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 152
- KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 153
- KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 154
- KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 155
- KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 156
- KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 157
- }
+ class432.method7572(); // L: 127
+ ClientPreferences.method2344(this.canvas); // L: 128
+ } // L: 129
- java.awt.Canvas var1 = this.canvas; // L: 160
- var1.setFocusTraversalKeysEnabled(false); // L: 162
- var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 163
- var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 164
- } // L: 166
-
- @ObfuscatedName("c")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-89"
+ garbageValue = "40"
)
- protected final void method415() {
- InvDefinition.method3264(this.canvas); // L: 169
- } // L: 170
+ protected final void method387() {
+ java.awt.Canvas var1 = this.canvas; // L: 132
+ var1.addMouseListener(MouseHandler.MouseHandler_instance); // L: 134
+ var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 135
+ var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 136
+ } // L: 138
- @ObfuscatedName("w")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-62"
+ descriptor = "(I)V",
+ garbageValue = "1294986808"
)
@Export("resizeCanvas")
final void resizeCanvas() {
- Container var1 = this.container(); // L: 173
- if (var1 != null) { // L: 174
- Bounds var2 = this.getFrameContentBounds(); // L: 175
- this.contentWidth = Math.max(var2.highX, this.field194); // L: 176
- this.contentHeight = Math.max(var2.highY, this.field195); // L: 177
- if (this.contentWidth <= 0) { // L: 178
+ Container var1 = this.container(); // L: 141
+ if (var1 != null) { // L: 142
+ Bounds var2 = this.getFrameContentBounds(); // L: 143
+ this.contentWidth = Math.max(var2.highX, this.field210); // L: 144
+ this.contentHeight = Math.max(var2.highY, this.field193); // L: 145
+ if (this.contentWidth <= 0) { // L: 146
this.contentWidth = 1;
}
- if (this.contentHeight <= 0) { // L: 179
+ if (this.contentHeight <= 0) { // L: 147
this.contentHeight = 1;
}
- GraphicsObject.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 180
- class433.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 181
- this.canvasX = (this.contentWidth - GraphicsObject.canvasWidth) / 2; // L: 182
- this.canvasY = 0; // L: 183
- this.canvas.setSize(GraphicsObject.canvasWidth, class433.canvasHeight); // L: 184
- DevicePcmPlayerProvider.rasterProvider = new RasterProvider(GraphicsObject.canvasWidth, class433.canvasHeight, this.canvas); // L: 185
- if (var1 == this.frame) { // L: 186
- Insets var3 = this.frame.getInsets(); // L: 187
- this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); // L: 188
+ Script.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 148
+ class78.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 149
+ this.canvasX = (this.contentWidth - Script.canvasWidth) / 2; // L: 150
+ this.canvasY = 0; // L: 151
+ this.canvas.setSize(Script.canvasWidth, class78.canvasHeight); // L: 152
+ Message.rasterProvider = new RasterProvider(Script.canvasWidth, class78.canvasHeight, this.canvas); // L: 153
+ if (var1 == this.frame) { // L: 154
+ Insets var3 = this.frame.getInsets(); // L: 155
+ this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); // L: 156
} else {
- this.canvas.setLocation(this.canvasX, this.canvasY); // L: 190
+ this.canvas.setLocation(this.canvasX, this.canvasY); // L: 158
}
- this.fullRedraw = true; // L: 191
- this.resizeGame(); // L: 192
+ this.fullRedraw = true; // L: 159
+ this.resizeGame(); // L: 160
}
- } // L: 193
+ } // L: 161
- @ObfuscatedName("b")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1437501286"
+ garbageValue = "1807518530"
)
@Export("resizeGame")
protected abstract void resizeGame();
- @ObfuscatedName("t")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1331148766"
+ garbageValue = "1100660124"
)
@Export("clearBackground")
void clearBackground() {
- int var1 = this.canvasX; // L: 198
- int var2 = this.canvasY; // L: 199
- int var3 = this.contentWidth - GraphicsObject.canvasWidth - var1; // L: 200
- int var4 = this.contentHeight - class433.canvasHeight - var2; // L: 201
- if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 202
+ int var1 = this.canvasX; // L: 166
+ int var2 = this.canvasY; // L: 167
+ int var3 = this.contentWidth - Script.canvasWidth - var1; // L: 168
+ int var4 = this.contentHeight - class78.canvasHeight - var2; // L: 169
+ if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 170
try {
- Container var5 = this.container(); // L: 204
- int var6 = 0; // L: 205
- int var7 = 0; // L: 206
- if (var5 == this.frame) { // L: 207
- Insets var8 = this.frame.getInsets(); // L: 208
- var6 = var8.left; // L: 209
- var7 = var8.top; // L: 210
+ Container var5 = this.container(); // L: 172
+ int var6 = 0; // L: 173
+ int var7 = 0; // L: 174
+ if (var5 == this.frame) { // L: 175
+ Insets var8 = this.frame.getInsets(); // L: 176
+ var6 = var8.left; // L: 177
+ var7 = var8.top; // L: 178
}
- Graphics var10 = var5.getGraphics(); // L: 212
- var10.setColor(Color.black); // L: 213
+ Graphics var10 = var5.getGraphics(); // L: 180
+ var10.setColor(Color.black); // L: 181
if (var1 > 0) {
- var10.fillRect(var6, var7, var1, this.contentHeight); // L: 214
+ var10.fillRect(var6, var7, var1, this.contentHeight); // L: 182
}
- if (var2 > 0) { // L: 215
+ if (var2 > 0) { // L: 183
var10.fillRect(var6, var7, this.contentWidth, var2);
}
- if (var3 > 0) { // L: 216
+ if (var3 > 0) { // L: 184
var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight);
}
- if (var4 > 0) { // L: 217
+ if (var4 > 0) { // L: 185
var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4);
}
- } catch (Exception var9) { // L: 219
+ } catch (Exception var9) { // L: 187
}
}
- } // L: 221
+ } // L: 189
- @ObfuscatedName("g")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "11"
+ garbageValue = "102"
)
@Export("replaceCanvas")
final void replaceCanvas() {
- java.awt.Canvas var1 = this.canvas; // L: 224
- var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 226
- var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 227
- KeyHandler.field135 = -1; // L: 228
- UserList.method6543(this.canvas); // L: 230
- if (this.mouseWheelHandler != null) { // L: 231
+ ObjectComposition.method3709(this.canvas); // L: 192
+ java.awt.Canvas var1 = this.canvas; // L: 193
+ var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 195
+ var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 196
+ var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 197
+ MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 198
+ if (this.mouseWheelHandler != null) { // L: 200
this.mouseWheelHandler.removeFrom(this.canvas);
}
- this.addCanvas(); // L: 232
- java.awt.Canvas var2 = this.canvas; // L: 233
- var2.setFocusTraversalKeysEnabled(false); // L: 235
- var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 236
- var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 237
- InvDefinition.method3264(this.canvas); // L: 239
- if (this.mouseWheelHandler != null) { // L: 240
+ this.addCanvas(); // L: 201
+ ClientPreferences.method2344(this.canvas); // L: 202
+ java.awt.Canvas var2 = this.canvas; // L: 203
+ var2.addMouseListener(MouseHandler.MouseHandler_instance); // L: 205
+ var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 206
+ var2.addFocusListener(MouseHandler.MouseHandler_instance); // L: 207
+ if (this.mouseWheelHandler != null) { // L: 209
this.mouseWheelHandler.addTo(this.canvas);
}
- this.method425(); // L: 241
- } // L: 242
+ this.method477(); // L: 210
+ } // L: 211
- @ObfuscatedName("x")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "-1913355803"
+ descriptor = "(IIIII)V",
+ garbageValue = "-1937564144"
)
@Export("startThread")
- protected final void startThread(int var1, int var2, int var3) {
+ protected final void startThread(int var1, int var2, int var3, int var4) {
try {
- if (gameEngine != null) { // L: 246
- ++GameEngine_redundantStartThreadCount; // L: 247
- if (GameEngine_redundantStartThreadCount >= 3) { // L: 248
- this.error("alreadyloaded"); // L: 249
- return; // L: 250
+ if (gameEngine != null) { // L: 215
+ ++GameEngine_redundantStartThreadCount; // L: 216
+ if (GameEngine_redundantStartThreadCount >= 3) { // L: 217
+ this.error("alreadyloaded"); // L: 218
+ return; // L: 219
}
- this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 252
- return; // L: 253
+ this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 221
+ return; // L: 222
}
- gameEngine = this; // L: 255
- GraphicsObject.canvasWidth = var1; // L: 256
- class433.canvasHeight = var2; // L: 257
- class385.RunException_revision = var3; // L: 258
- RunException.RunException_applet = this; // L: 259
- if (taskHandler == null) { // L: 260
+ gameEngine = this; // L: 224
+ Script.canvasWidth = var1; // L: 225
+ class78.canvasHeight = var2; // L: 226
+ RunException.field4838 = var3; // L: 227
+ RunException.field4839 = var4; // L: 228
+ RunException.RunException_applet = this; // L: 229
+ if (taskHandler == null) { // L: 230
taskHandler = new TaskHandler();
}
- taskHandler.newThreadTask(this, 1); // L: 261
- } catch (Exception var5) { // L: 263
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var5); // L: 264
- this.error("crash"); // L: 265
+ taskHandler.newThreadTask(this, 1); // L: 231
+ } catch (Exception var6) { // L: 233
+ class249.RunException_sendStackTrace((String)null, var6); // L: 234
+ this.error("crash"); // L: 235
}
- } // L: 267
+ } // L: 237
- @ObfuscatedName("n")
+ @ObfuscatedName("b")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1076329535"
+ garbageValue = "1260783779"
)
@Export("addCanvas")
final synchronized void addCanvas() {
- Container var1 = this.container(); // L: 270
- if (this.canvas != null) { // L: 271
- this.canvas.removeFocusListener(this); // L: 272
- var1.remove(this.canvas); // L: 273
+ Container var1 = this.container(); // L: 240
+ if (this.canvas != null) { // L: 241
+ this.canvas.removeFocusListener(this); // L: 242
+ var1.remove(this.canvas); // L: 243
}
- GraphicsObject.canvasWidth = Math.max(var1.getWidth(), this.field194); // L: 275
- class433.canvasHeight = Math.max(var1.getHeight(), this.field195); // L: 276
+ Script.canvasWidth = Math.max(var1.getWidth(), this.field210); // L: 245
+ class78.canvasHeight = Math.max(var1.getHeight(), this.field193); // L: 246
Insets var2;
- if (this.frame != null) { // L: 277
- var2 = this.frame.getInsets(); // L: 278
- GraphicsObject.canvasWidth -= var2.left + var2.right; // L: 279
- class433.canvasHeight -= var2.bottom + var2.top; // L: 280
+ if (this.frame != null) { // L: 247
+ var2 = this.frame.getInsets(); // L: 248
+ Script.canvasWidth -= var2.left + var2.right; // L: 249
+ class78.canvasHeight -= var2.bottom + var2.top; // L: 250
}
- this.canvas = new Canvas(this); // L: 282
- var1.setBackground(Color.BLACK); // L: 283
- var1.setLayout((LayoutManager)null); // L: 284
- var1.add(this.canvas); // L: 285
- this.canvas.setSize(GraphicsObject.canvasWidth, class433.canvasHeight); // L: 286
- this.canvas.setVisible(true); // L: 287
- this.canvas.setBackground(Color.BLACK); // L: 288
- if (var1 == this.frame) { // L: 289
- var2 = this.frame.getInsets(); // L: 290
- this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 291
+ this.canvas = new Canvas(this); // L: 252
+ var1.setBackground(Color.BLACK); // L: 253
+ var1.setLayout((LayoutManager)null); // L: 254
+ var1.add(this.canvas); // L: 255
+ this.canvas.setSize(Script.canvasWidth, class78.canvasHeight); // L: 256
+ this.canvas.setVisible(true); // L: 257
+ this.canvas.setBackground(Color.BLACK); // L: 258
+ if (var1 == this.frame) { // L: 259
+ var2 = this.frame.getInsets(); // L: 260
+ this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); // L: 261
} else {
- this.canvas.setLocation(this.canvasX, this.canvasY); // L: 293
+ this.canvas.setLocation(this.canvasX, this.canvasY); // L: 263
}
- this.canvas.addFocusListener(this); // L: 294
- this.canvas.requestFocus(); // L: 295
- this.fullRedraw = true; // L: 296
- if (DevicePcmPlayerProvider.rasterProvider != null && GraphicsObject.canvasWidth == DevicePcmPlayerProvider.rasterProvider.width && class433.canvasHeight == DevicePcmPlayerProvider.rasterProvider.height) { // L: 297
- ((RasterProvider)DevicePcmPlayerProvider.rasterProvider).setComponent(this.canvas); // L: 298
- DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 299
+ this.canvas.addFocusListener(this); // L: 264
+ this.canvas.requestFocus(); // L: 265
+ this.fullRedraw = true; // L: 266
+ if (Message.rasterProvider != null && Script.canvasWidth == Message.rasterProvider.width && class78.canvasHeight == Message.rasterProvider.height) { // L: 267
+ ((RasterProvider)Message.rasterProvider).setComponent(this.canvas); // L: 268
+ Message.rasterProvider.drawFull(0, 0); // L: 269
} else {
- DevicePcmPlayerProvider.rasterProvider = new RasterProvider(GraphicsObject.canvasWidth, class433.canvasHeight, this.canvas); // L: 302
+ Message.rasterProvider = new RasterProvider(Script.canvasWidth, class78.canvasHeight, this.canvas); // L: 272
}
- this.isCanvasInvalid = false; // L: 304
- this.field205 = class113.method2624(); // L: 305
- } // L: 306
+ this.isCanvasInvalid = false; // L: 274
+ this.field185 = class115.method2692(); // L: 275
+ } // L: 276
- @ObfuscatedName("e")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-35604355"
+ garbageValue = "-309516342"
)
@Export("checkHost")
protected final boolean checkHost() {
- String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 309
- if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 310
- if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 311
- if (var1.endsWith("127.0.0.1")) { // L: 312
+ String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 279
+ if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 280
+ if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 281
+ if (var1.endsWith("127.0.0.1")) { // L: 282
return true;
} else {
while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
- var1 = var1.substring(0, var1.length() - 1); // L: 313
+ var1 = var1.substring(0, var1.length() - 1); // L: 283
}
- if (var1.endsWith("192.168.1.")) { // L: 314
+ if (var1.endsWith("192.168.1.")) { // L: 284
return true;
} else {
- this.error("invalidhost"); // L: 315
- return false; // L: 316
+ this.error("invalidhost"); // L: 285
+ return false; // L: 286
}
}
} else {
@@ -595,432 +553,458 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
}
}
- @ObfuscatedName("h")
+ @ObfuscatedName("o")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1177653109"
+ garbageValue = "-1424742256"
)
@Export("clientTick")
void clientTick() {
- long var1 = class113.method2624(); // L: 360
- long var3 = clientTickTimes[PlayerType.field3985]; // L: 361
- clientTickTimes[PlayerType.field3985] = var1; // L: 362
- PlayerType.field3985 = PlayerType.field3985 + 1 & 31; // L: 363
- if (0L != var3 && var1 > var3) { // L: 364
+ long var1 = class115.method2692(); // L: 330
+ long var3 = clientTickTimes[field209]; // L: 331
+ clientTickTimes[field209] = var1; // L: 332
+ field209 = field209 + 1 & 31; // L: 333
+ if (var3 != 0L && var1 > var3) { // L: 334
}
- synchronized(this) { // L: 365
- WorldMapArea.hasFocus = volatileFocus; // L: 366
- } // L: 367
+ synchronized(this) { // L: 335
+ ModelData0.hasFocus = volatileFocus; // L: 336
+ } // L: 337
- this.doCycle(); // L: 368
- } // L: 369
+ this.doCycle(); // L: 338
+ } // L: 339
- @ObfuscatedName("f")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1883267877"
+ garbageValue = "-97569955"
)
@Export("graphicsTick")
void graphicsTick() {
- Container var1 = this.container(); // L: 372
- long var2 = class113.method2624(); // L: 373
- long var4 = graphicsTickTimes[ScriptFrame.field449]; // L: 374
- graphicsTickTimes[ScriptFrame.field449] = var2; // L: 375
- ScriptFrame.field449 = ScriptFrame.field449 + 1 & 31; // L: 376
- if (0L != var4 && var2 > var4) { // L: 377
- int var6 = (int)(var2 - var4); // L: 378
- fps = ((var6 >> 1) + 32000) / var6; // L: 379
+ Container var1 = this.container(); // L: 342
+ long var2 = class115.method2692(); // L: 343
+ long var4 = graphicsTickTimes[UserList.field4319]; // L: 344
+ graphicsTickTimes[UserList.field4319] = var2; // L: 345
+ UserList.field4319 = UserList.field4319 + 1 & 31; // L: 346
+ if (var4 != 0L && var2 > var4) { // L: 347
+ int var6 = (int)(var2 - var4); // L: 348
+ fps = ((var6 >> 1) + 32000) / var6; // L: 349
}
- if (++field202 - 1 > 50) { // L: 381
- field202 -= 50; // L: 382
- this.fullRedraw = true; // L: 383
- this.canvas.setSize(GraphicsObject.canvasWidth, class433.canvasHeight); // L: 384
- this.canvas.setVisible(true); // L: 385
- if (var1 == this.frame) { // L: 386
- Insets var7 = this.frame.getInsets(); // L: 387
- this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 388
+ if (++field199 - 1 > 50) { // L: 351
+ field199 -= 50; // L: 352
+ this.fullRedraw = true; // L: 353
+ this.canvas.setSize(Script.canvasWidth, class78.canvasHeight); // L: 354
+ this.canvas.setVisible(true); // L: 355
+ if (var1 == this.frame) { // L: 356
+ Insets var7 = this.frame.getInsets(); // L: 357
+ this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); // L: 358
} else {
- this.canvas.setLocation(this.canvasX, this.canvasY); // L: 390
+ this.canvas.setLocation(this.canvasX, this.canvasY); // L: 360
}
}
- if (this.isCanvasInvalid) { // L: 392
+ if (this.isCanvasInvalid) { // L: 362
this.replaceCanvas();
}
- this.method424(); // L: 393
- this.draw(this.fullRedraw); // L: 394
- if (this.fullRedraw) { // L: 395
+ this.method397(); // L: 363
+ this.draw(this.fullRedraw); // L: 364
+ if (this.fullRedraw) { // L: 365
this.clearBackground();
}
- this.fullRedraw = false; // L: 396
- } // L: 397
+ this.fullRedraw = false; // L: 366
+ } // L: 367
@ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "33"
+ descriptor = "(I)V",
+ garbageValue = "1863381045"
)
- final void method424() {
- Bounds var1 = this.getFrameContentBounds(); // L: 400
- if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 401
- this.resizeCanvas(); // L: 402
- this.resizeCanvasNextFrame = false; // L: 403
+ final void method397() {
+ Bounds var1 = this.getFrameContentBounds(); // L: 370
+ if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 371
+ this.resizeCanvas(); // L: 372
+ this.resizeCanvasNextFrame = false; // L: 373
}
- } // L: 405
+ } // L: 375
- @ObfuscatedName("j")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1201403905"
+ garbageValue = "-1552775883"
)
- final void method425() {
- this.resizeCanvasNextFrame = true; // L: 408
- } // L: 409
+ final void method477() {
+ this.resizeCanvasNextFrame = true; // L: 378
+ } // L: 379
- @ObfuscatedName("z")
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "8"
+ descriptor = "(I)V",
+ garbageValue = "1520335833"
)
@Export("kill")
final synchronized void kill() {
- if (!isKilled) { // L: 412
- isKilled = true; // L: 413
+ if (!isKilled) { // L: 382
+ isKilled = true; // L: 383
try {
- this.canvas.removeFocusListener(this); // L: 415
- } catch (Exception var5) { // L: 417
+ this.canvas.removeFocusListener(this); // L: 385
+ } catch (Exception var5) { // L: 387
}
try {
- this.kill0(); // L: 419
- } catch (Exception var4) { // L: 421
+ this.kill0(); // L: 389
+ } catch (Exception var4) { // L: 391
}
- if (this.frame != null) { // L: 422
+ if (this.frame != null) { // L: 392
try {
- System.exit(0); // L: 424
- } catch (Throwable var3) { // L: 426
+ System.exit(0); // L: 394
+ } catch (Throwable var3) { // L: 396
}
}
- if (taskHandler != null) { // L: 428
+ if (taskHandler != null) { // L: 398
try {
- taskHandler.close(); // L: 430
- } catch (Exception var2) { // L: 432
+ taskHandler.close(); // L: 400
+ } catch (Exception var2) { // L: 402
}
}
- this.vmethod1448(); // L: 434
+ this.vmethod1099(); // L: 404
}
- } // L: 435
+ } // L: 405
- @ObfuscatedName("u")
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-1311"
+ descriptor = "(I)V",
+ garbageValue = "-1208160772"
)
@Export("setUp")
protected abstract void setUp();
- @ObfuscatedName("ag")
+ @ObfuscatedName("ab")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-772264838"
+ garbageValue = "-1160439504"
)
@Export("doCycle")
protected abstract void doCycle();
- @ObfuscatedName("ar")
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
descriptor = "(ZI)V",
- garbageValue = "-375798495"
+ garbageValue = "-2097579655"
)
@Export("draw")
protected abstract void draw(boolean var1);
@ObfuscatedName("am")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-31"
+ descriptor = "(I)V",
+ garbageValue = "853101705"
)
@Export("kill0")
protected abstract void kill0();
- @ObfuscatedName("ac")
+ @ObfuscatedName("an")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;ZB)V",
- garbageValue = "30"
+ garbageValue = "89"
)
@Export("drawInitial")
protected final void drawInitial(int var1, String var2, boolean var3) {
try {
- Graphics var4 = this.canvas.getGraphics(); // L: 521
- if (class119.fontHelvetica13 == null) { // L: 522
- class119.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 523
- class135.loginScreenFontMetrics = this.canvas.getFontMetrics(class119.fontHelvetica13); // L: 524
+ Graphics var4 = this.canvas.getGraphics(); // L: 491
+ if (class192.fontHelvetica13 == null) { // L: 492
+ class192.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 493
+ class11.loginScreenFontMetrics = this.canvas.getFontMetrics(class192.fontHelvetica13); // L: 494
}
- if (var3) { // L: 526
- var4.setColor(Color.black); // L: 527
- var4.fillRect(0, 0, GraphicsObject.canvasWidth, class433.canvasHeight); // L: 528
+ if (var3) { // L: 496
+ var4.setColor(Color.black); // L: 497
+ var4.fillRect(0, 0, Script.canvasWidth, class78.canvasHeight); // L: 498
}
- Color var5 = new Color(140, 17, 17); // L: 530
+ Color var5 = new Color(140, 17, 17); // L: 500
try {
- if (field201 == null) { // L: 532
- field201 = this.canvas.createImage(304, 34);
+ if (class162.field1781 == null) { // L: 502
+ class162.field1781 = this.canvas.createImage(304, 34);
}
- Graphics var6 = field201.getGraphics(); // L: 533
- var6.setColor(var5); // L: 534
- var6.drawRect(0, 0, 303, 33); // L: 535
- var6.fillRect(2, 2, var1 * 3, 30); // L: 536
- var6.setColor(Color.black); // L: 537
- var6.drawRect(1, 1, 301, 31); // L: 538
- var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 539
- var6.setFont(class119.fontHelvetica13); // L: 540
- var6.setColor(Color.white); // L: 541
- var6.drawString(var2, (304 - class135.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 542
- var4.drawImage(field201, GraphicsObject.canvasWidth / 2 - 152, class433.canvasHeight / 2 - 18, (ImageObserver)null); // L: 543
- } catch (Exception var9) { // L: 545
- int var7 = GraphicsObject.canvasWidth / 2 - 152; // L: 546
- int var8 = class433.canvasHeight / 2 - 18; // L: 547
- var4.setColor(var5); // L: 548
- var4.drawRect(var7, var8, 303, 33); // L: 549
- var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 550
- var4.setColor(Color.black); // L: 551
- var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 552
- var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 553
- var4.setFont(class119.fontHelvetica13); // L: 554
- var4.setColor(Color.white); // L: 555
- var4.drawString(var2, var7 + (304 - class135.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 556
+ Graphics var6 = class162.field1781.getGraphics(); // L: 503
+ var6.setColor(var5); // L: 504
+ var6.drawRect(0, 0, 303, 33); // L: 505
+ var6.fillRect(2, 2, var1 * 3, 30); // L: 506
+ var6.setColor(Color.black); // L: 507
+ var6.drawRect(1, 1, 301, 31); // L: 508
+ var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 509
+ var6.setFont(class192.fontHelvetica13); // L: 510
+ var6.setColor(Color.white); // L: 511
+ var6.drawString(var2, (304 - class11.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 512
+ var4.drawImage(class162.field1781, Script.canvasWidth / 2 - 152, class78.canvasHeight / 2 - 18, (ImageObserver)null); // L: 513
+ } catch (Exception var9) { // L: 515
+ int var7 = Script.canvasWidth / 2 - 152; // L: 516
+ int var8 = class78.canvasHeight / 2 - 18; // L: 517
+ var4.setColor(var5); // L: 518
+ var4.drawRect(var7, var8, 303, 33); // L: 519
+ var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 520
+ var4.setColor(Color.black); // L: 521
+ var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 522
+ var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 523
+ var4.setFont(class192.fontHelvetica13); // L: 524
+ var4.setColor(Color.white); // L: 525
+ var4.drawString(var2, var7 + (304 - class11.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 526
}
- } catch (Exception var10) { // L: 559
- this.canvas.repaint(); // L: 560
+ } catch (Exception var10) { // L: 529
+ this.canvas.repaint(); // L: 530
}
- } // L: 562
+ } // L: 532
- @ObfuscatedName("ab")
+ @ObfuscatedName("af")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "109"
+ descriptor = "(I)V",
+ garbageValue = "-195360691"
)
- protected final void method438() {
- field201 = null; // L: 565
- class119.fontHelvetica13 = null; // L: 566
- class135.loginScreenFontMetrics = null; // L: 567
- } // L: 568
+ protected final void method410() {
+ class162.field1781 = null; // L: 535
+ class192.fontHelvetica13 = null; // L: 536
+ class11.loginScreenFontMetrics = null; // L: 537
+ } // L: 538
- @ObfuscatedName("aj")
+ @ObfuscatedName("ax")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "1946007584"
+ garbageValue = "-1654563788"
)
@Export("error")
protected void error(String var1) {
- if (!this.hasErrored) { // L: 571
- this.hasErrored = true; // L: 572
- System.out.println("error_game_" + var1); // L: 573
+ if (!this.hasErrored) { // L: 541
+ this.hasErrored = true; // L: 542
+ System.out.println("error_game_" + var1); // L: 543
try {
- this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 575
- } catch (Exception var3) { // L: 577
+ this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 545
+ } catch (Exception var3) { // L: 547
}
}
- } // L: 578
+ } // L: 548
- @ObfuscatedName("ae")
+ @ObfuscatedName("ar")
@ObfuscatedSignature(
descriptor = "(B)Ljava/awt/Container;",
- garbageValue = "116"
+ garbageValue = "35"
)
@Export("container")
Container container() {
- return (Container)(this.frame != null ? this.frame : this); // L: 581
+ return (Container)(this.frame != null ? this.frame : this); // L: 551
}
- @ObfuscatedName("az")
+ @ObfuscatedName("at")
@ObfuscatedSignature(
- descriptor = "(I)Lne;",
- garbageValue = "-836413334"
+ descriptor = "(B)Lns;",
+ garbageValue = "1"
)
@Export("getFrameContentBounds")
Bounds getFrameContentBounds() {
- Container var1 = this.container(); // L: 586
- int var2 = Math.max(var1.getWidth(), this.field194); // L: 587
- int var3 = Math.max(var1.getHeight(), this.field195); // L: 588
- if (this.frame != null) { // L: 589
- Insets var4 = this.frame.getInsets(); // L: 590
- var2 -= var4.right + var4.left; // L: 591
- var3 -= var4.bottom + var4.top; // L: 592
+ Container var1 = this.container(); // L: 556
+ int var2 = Math.max(var1.getWidth(), this.field210); // L: 557
+ int var3 = Math.max(var1.getHeight(), this.field193); // L: 558
+ if (this.frame != null) { // L: 559
+ Insets var4 = this.frame.getInsets(); // L: 560
+ var2 -= var4.left + var4.right; // L: 561
+ var3 -= var4.top + var4.bottom; // L: 562
}
- return new Bounds(var2, var3); // L: 594
+ return new Bounds(var2, var3); // L: 564
}
- @ObfuscatedName("ap")
+ @ObfuscatedName("ag")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-2076672136"
+ descriptor = "(B)Z",
+ garbageValue = "1"
)
@Export("hasFrame")
protected final boolean hasFrame() {
- return this.frame != null; // L: 598
+ return this.frame != null; // L: 568
}
- @ObfuscatedName("au")
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-9"
+ garbageValue = "2"
)
- protected abstract void vmethod1448();
+ protected abstract void vmethod1099();
public final void destroy() {
- if (this == gameEngine && !isKilled) { // L: 458
- stopTimeMs = class113.method2624(); // L: 459
- class241.method4815(5000L); // L: 460
- this.kill(); // L: 461
+ if (this == gameEngine && !isKilled) { // L: 428
+ stopTimeMs = class115.method2692(); // L: 429
+ DynamicObject.method1991(5000L); // L: 430
+ this.kill(); // L: 431
}
- } // L: 462
+ } // L: 432
public final synchronized void paint(Graphics var1) {
- if (this == gameEngine && !isKilled) { // L: 471
- this.fullRedraw = true; // L: 472
- if (class113.method2624() - this.field205 > 1000L) { // L: 473
- Rectangle var2 = var1.getClipBounds(); // L: 474
- if (var2 == null || var2.width >= GraphicsObject.canvasWidth && var2.height >= class433.canvasHeight) {
- this.isCanvasInvalid = true; // L: 475
+ if (this == gameEngine && !isKilled) { // L: 441
+ this.fullRedraw = true; // L: 442
+ if (class115.method2692() - this.field185 > 1000L) { // L: 443
+ Rectangle var2 = var1.getClipBounds(); // L: 444
+ if (var2 == null || var2.width >= Script.canvasWidth && var2.height >= class78.canvasHeight) {
+ this.isCanvasInvalid = true; // L: 445
}
}
}
- } // L: 477
-
- public final void windowActivated(WindowEvent var1) {
- } // L: 491
+ } // L: 447
public void run() {
try {
- if (TaskHandler.javaVendor != null) { // L: 321
- String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 322
- if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 323
- String var2 = TaskHandler.javaVersion; // L: 324
- if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 325
- this.error("wrongjava"); // L: 326
- return; // L: 327
+ if (class360.javaVendor != null) { // L: 291
+ String var1 = class360.javaVendor.toLowerCase(); // L: 292
+ if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 293
+ String var2 = TaskHandler.javaVersion; // L: 294
+ if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 295
+ this.error("wrongjava"); // L: 296
+ return; // L: 297
}
- if (var2.startsWith("1.6.0_")) { // L: 329
+ if (var2.startsWith("1.6.0_")) { // L: 299
int var3;
- for (var3 = 6; var3 < var2.length() && Coord.isDigit(var2.charAt(var3)); ++var3) { // L: 330 331
+ for (var3 = 6; var3 < var2.length() && class83.isDigit(var2.charAt(var3)); ++var3) { // L: 300 301
}
- String var4 = var2.substring(6, var3); // L: 332
- if (NetFileRequest.isNumber(var4) && class92.method2373(var4) < 10) { // L: 333
- this.error("wrongjava"); // L: 334
- return; // L: 335
+ String var4 = var2.substring(6, var3); // L: 302
+ if (class114.isNumber(var4) && FaceNormal.method4344(var4) < 10) { // L: 303
+ this.error("wrongjava"); // L: 304
+ return; // L: 305
}
}
- fiveOrOne = 5; // L: 338
+ fiveOrOne = 5; // L: 308
}
}
- this.setFocusCycleRoot(true); // L: 341
- this.addCanvas(); // L: 342
- this.setUp(); // L: 343
- UserComparator5.clock = class221.method4408(); // L: 344
+ this.setFocusCycleRoot(true); // L: 311
+ this.addCanvas(); // L: 312
+ this.setUp(); // L: 313
+ class10.clock = World.method1601(); // L: 314
- while (stopTimeMs == 0L || class113.method2624() < stopTimeMs) { // L: 345
- gameCyclesToDo = UserComparator5.clock.wait(cycleDurationMillis, fiveOrOne); // L: 346
+ while (0L == stopTimeMs || class115.method2692() < stopTimeMs) { // L: 315
+ Messages.gameCyclesToDo = class10.clock.wait(cycleDurationMillis, fiveOrOne); // L: 316
- for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 347
+ for (int var5 = 0; var5 < Messages.gameCyclesToDo; ++var5) { // L: 317
this.clientTick();
}
- this.graphicsTick(); // L: 348
- this.post(this.canvas); // L: 349
+ this.graphicsTick(); // L: 318
+ this.post(this.canvas); // L: 319
}
- } catch (Exception var6) { // L: 352
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var6); // L: 353
- this.error("crash"); // L: 354
+ } catch (Exception var6) { // L: 322
+ class249.RunException_sendStackTrace((String)null, var6); // L: 323
+ this.error("crash"); // L: 324
}
- this.kill(); // L: 356
- } // L: 357
-
- public final void stop() {
- if (this == gameEngine && !isKilled) { // L: 452
- stopTimeMs = class113.method2624() + 4000L; // L: 453
- }
- } // L: 454
-
- public final void update(Graphics var1) {
- this.paint(var1); // L: 466
- } // L: 467
-
- public final void focusGained(FocusEvent var1) {
- volatileFocus = true; // L: 481
- this.fullRedraw = true; // L: 482
- } // L: 483
-
- public final void windowClosing(WindowEvent var1) {
- this.destroy(); // L: 498
- } // L: 499
-
- public final void windowDeactivated(WindowEvent var1) {
- } // L: 502
-
- public final void windowDeiconified(WindowEvent var1) {
- } // L: 505
-
- public final void windowOpened(WindowEvent var1) {
- } // L: 511
-
- public final void focusLost(FocusEvent var1) {
- volatileFocus = false; // L: 487
- } // L: 488
-
- public final void windowClosed(WindowEvent var1) {
- } // L: 494
+ this.kill(); // L: 326
+ } // L: 327
public final void start() {
- if (this == gameEngine && !isKilled) { // L: 446
- stopTimeMs = 0L; // L: 447
+ if (this == gameEngine && !isKilled) { // L: 416
+ stopTimeMs = 0L; // L: 417
}
- } // L: 448
+ } // L: 418
- public final void windowIconified(WindowEvent var1) {
- } // L: 508
+ public final void focusGained(FocusEvent var1) {
+ volatileFocus = true; // L: 451
+ this.fullRedraw = true; // L: 452
+ } // L: 453
+
+ public final void focusLost(FocusEvent var1) {
+ volatileFocus = false; // L: 457
+ } // L: 458
+
+ public final void windowActivated(WindowEvent var1) {
+ } // L: 461
+
+ public final void windowDeactivated(WindowEvent var1) {
+ } // L: 472
+
+ public final void windowDeiconified(WindowEvent var1) {
+ } // L: 475
+
+ public final void windowOpened(WindowEvent var1) {
+ } // L: 481
public abstract void init();
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Llp;Llp;Llp;I)V",
- garbageValue = "-1740830707"
- )
- public static void method505(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
- HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46
- ModelData0.field2654 = var1; // L: 47
- class1.HitSplatDefinition_fontsArchive = var2; // L: 48
- } // L: 49
+ public final void stop() {
+ if (this == gameEngine && !isKilled) { // L: 422
+ stopTimeMs = class115.method2692() + 4000L; // L: 423
+ }
+ } // L: 424
- @ObfuscatedName("l")
+ public final void windowIconified(WindowEvent var1) {
+ } // L: 478
+
+ public final void windowClosed(WindowEvent var1) {
+ } // L: 464
+
+ public final void windowClosing(WindowEvent var1) {
+ this.destroy(); // L: 468
+ } // L: 469
+
+ public final void update(Graphics var1) {
+ this.paint(var1); // L: 436
+ } // L: 437
+
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-24396542"
+ descriptor = "(Ljava/lang/String;I)Ljava/io/File;",
+ garbageValue = "-2119363364"
)
- public static int method555(int var0) {
- return class402.field4444[var0 & 16383]; // L: 33
+ @Export("getFile")
+ static File getFile(String var0) {
+ if (!FileSystem.FileSystem_hasPermissions) { // L: 22
+ throw new RuntimeException("");
+ } else {
+ File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23
+ if (var1 != null) { // L: 24
+ return var1;
+ } else {
+ File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25
+ RandomAccessFile var3 = null; // L: 26
+
+ try {
+ File var4 = new File(var2.getParent()); // L: 28
+ if (!var4.exists()) { // L: 29
+ throw new RuntimeException("");
+ } else {
+ var3 = new RandomAccessFile(var2, "rw"); // L: 30
+ int var5 = var3.read(); // L: 31
+ var3.seek(0L); // L: 32
+ var3.write(var5); // L: 33
+ var3.seek(0L); // L: 34
+ var3.close(); // L: 35
+ FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36
+ return var2; // L: 37
+ }
+ } catch (Exception var8) {
+ try {
+ if (var3 != null) { // L: 41
+ var3.close(); // L: 42
+ var3 = null; // L: 43
+ }
+ } catch (Exception var7) { // L: 46
+ }
+
+ throw new RuntimeException(); // L: 48
+ }
+ }
+ }
}
}
diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java
index 8597edcfdd..507fdad5dc 100644
--- a/runescape-client/src/main/java/GameObject.java
+++ b/runescape-client/src/main/java/GameObject.java
@@ -1,92 +1,97 @@
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("hx")
+@ObfuscatedName("hb")
@Implements("GameObject")
public final class GameObject {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -942035955
+ intValue = 555755513
)
@Export("plane")
int plane;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -97756121
+ intValue = 1199180827
)
@Export("z")
int z;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 174940337
+ intValue = 1171704683
)
@Export("centerX")
int centerX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 474371985
+ intValue = -1998426191
)
@Export("centerY")
int centerY;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("renderable")
public Renderable renderable;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -178209059
+ intValue = 2060742587
)
@Export("orientation")
int orientation;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1571383405
+ intValue = 780367115
)
@Export("startX")
int startX;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1260565151
+ intValue = -16124731
)
@Export("endX")
int endX;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 1892090883
+ intValue = 1663298221
)
@Export("startY")
int startY;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1693444283
+ intValue = -2083887369
)
@Export("endY")
int endY;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -986708627
+ intValue = -1662545459
)
- int field2697;
- @ObfuscatedName("c")
+ int field2655;
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -24170279
+ intValue = 1055321127
)
@Export("lastDrawn")
int lastDrawn;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- longValue = 9002525375587932575L
+ longValue = -5445393225516942137L
)
@Export("tag")
public long tag;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = -304681645
+ intValue = -1409812671
)
@Export("flags")
int flags;
@@ -96,79 +101,59 @@ public final class GameObject {
this.flags = 0; // L: 17
} // L: 19
- @ObfuscatedName("q")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(IIIB)Lbb;",
- garbageValue = "1"
+ descriptor = "(S)Ljava/util/Date;",
+ garbageValue = "206"
)
- @Export("getWorldMapScript")
- static Script getWorldMapScript(int var0, int var1, int var2) {
- int var3 = PcmPlayer.method744(var1, var0); // L: 38
- Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41
- Script var4;
- if (var5 != null) { // L: 42
- var4 = var5; // L: 43
- } else {
- String var6 = String.valueOf(var3); // L: 46
- int var7 = class115.archive12.getGroupId(var6); // L: 47
- if (var7 == -1) { // L: 48
- var4 = null; // L: 49
- } else {
- label59: {
- byte[] var8 = class115.archive12.takeFileFlat(var7); // L: 52
- if (var8 != null) { // L: 53
- if (var8.length <= 1) { // L: 54
- var4 = null; // L: 55
- break label59; // L: 56
- }
+ static Date method4552() throws ParseException {
+ SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1132
+ var0.setLenient(false); // L: 1133
+ StringBuilder var1 = new StringBuilder(); // L: 1134
+ String[] var2 = Login.field911; // L: 1136
- var5 = PcmPlayer.newScript(var8); // L: 58
- if (var5 != null) { // L: 59
- Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60
- var4 = var5; // L: 61
- break label59; // L: 62
- }
- }
-
- var4 = null; // L: 65
- }
+ for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1137
+ String var4 = var2[var3]; // L: 1138
+ if (var4 == null) { // L: 1140
+ GraphicsObject.method1877("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1141
+ return null; // L: 1142
}
+
+ var1.append(var4); // L: 1144
}
- if (var4 != null) { // L: 68
- return var4; // L: 69
- } else {
- int var12 = (-3 - var2 << 8) + var0; // L: 73
- Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 78
- Script var13;
- if (var14 != null) { // L: 79
- var13 = var14; // L: 80
+ var1.append("12"); // L: 1148
+ return var0.parse(var1.toString()); // L: 1149
+ }
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-1762087173"
+ )
+ static int method4553(int var0, Script var1, boolean var2) {
+ Widget var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1209
+ if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1210
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.itemId; // L: 1211
+ return 1; // L: 1212
+ } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1214
+ if (var3.itemId != -1) { // L: 1215
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.itemQuantity;
} else {
- String var9 = String.valueOf(var12); // L: 83
- int var10 = class115.archive12.getGroupId(var9); // L: 84
- if (var10 == -1) { // L: 85
- var13 = null; // L: 86
- } else {
- byte[] var11 = class115.archive12.takeFileFlat(var10); // L: 89
- if (var11 != null) { // L: 90
- if (var11.length <= 1) { // L: 91
- var13 = null; // L: 92
- return var13 != null ? var13 : null; // L: 105 108
- }
-
- var14 = PcmPlayer.newScript(var11); // L: 95
- if (var14 != null) { // L: 96
- Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 97
- var13 = var14; // L: 98
- return var13 != null ? var13 : null;
- }
- }
-
- var13 = null; // L: 102
- }
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1216
}
- return var13 != null ? var13 : null;
+ return 1; // L: 1217
+ } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1219
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1220
+ return 1; // L: 1221
+ } else if (var0 == 1707) { // L: 1223
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.method5680() ? 1 : 0; // L: 1224
+ return 1; // L: 1225
+ } else if (var0 == 1708) { // L: 1227
+ return class29.method363(var3); // L: 1228
+ } else {
+ return var0 == 1709 ? WorldMapSection0.method4947(var3) : 2; // L: 1230 1231 1233
}
}
}
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index a79347382c..a888bd73aa 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -4,48 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ln")
+@Deprecated
+@ObfuscatedName("lj")
@Implements("GrandExchangeEvent")
public class GrandExchangeEvent {
- @ObfuscatedName("v")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1128323951
- )
- @Export("pcmSampleLength")
- public static int pcmSampleLength;
- @ObfuscatedName("ff")
- @ObfuscatedGetter(
- intValue = 1608944815
- )
- @Export("js5Port")
- static int js5Port;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 1027306067
+ intValue = -719999359
)
@Export("world")
public final int world;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- longValue = -6905147980507584697L
+ longValue = 2849565838648166291L
)
@Export("age")
public final long age;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lly;"
+ descriptor = "Llu;"
)
@Export("grandExchangeOffer")
public final GrandExchangeOffer grandExchangeOffer;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("offerName")
String offerName;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("previousOfferName")
String previousOfferName;
@ObfuscatedSignature(
- descriptor = "(Lpx;BI)V"
+ descriptor = "(Lqt;BI)V"
)
GrandExchangeEvent(Buffer var1, byte var2, int var3) {
this.offerName = var1.readStringCp1252NullTerminated(); // L: 111
@@ -55,8 +44,8 @@ public class GrandExchangeEvent {
int var4 = var1.readInt(); // L: 115
int var5 = var1.readInt(); // L: 116
this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117
- this.grandExchangeOffer.method5823(2); // L: 118
- this.grandExchangeOffer.method5826(var2); // L: 119
+ this.grandExchangeOffer.method6007(2); // L: 118
+ this.grandExchangeOffer.method6005(var2); // L: 119
this.grandExchangeOffer.unitPrice = var4; // L: 120
this.grandExchangeOffer.totalQuantity = var5; // L: 121
this.grandExchangeOffer.currentQuantity = 0; // L: 122
@@ -64,20 +53,20 @@ public class GrandExchangeEvent {
this.grandExchangeOffer.id = var3; // L: 124
} // L: 125
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "123"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-143150705"
)
@Export("getOfferName")
public String getOfferName() {
return this.offerName; // L: 128
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-744625642"
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "36"
)
@Export("getPreviousOfferName")
public String getPreviousOfferName() {
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index 9bfe5d7658..633b40ae39 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -7,25 +7,22 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lb")
+@ObfuscatedName("ls")
@Implements("GrandExchangeEvents")
public class GrandExchangeEvents {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("GrandExchangeEvents_ageComparator")
public static Comparator GrandExchangeEvents_ageComparator;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("GrandExchangeEvents_priceComparator")
public static Comparator GrandExchangeEvents_priceComparator;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("GrandExchangeEvents_nameComparator")
public static Comparator GrandExchangeEvents_nameComparator;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("GrandExchangeEvents_quantityComparator")
public static Comparator GrandExchangeEvents_quantityComparator;
- @ObfuscatedName("n")
- @Export("ByteArrayPool_altSizeArrayCounts")
- static int[] ByteArrayPool_altSizeArrayCounts;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("events")
public final List events;
@@ -38,7 +35,7 @@ public class GrandExchangeEvents {
} // L: 67
@ObfuscatedSignature(
- descriptor = "(Lpx;Z)V",
+ descriptor = "(Lqt;Z)V",
garbageValue = "1"
)
public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -60,10 +57,10 @@ public class GrandExchangeEvents {
} // L: 92
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/util/Comparator;ZI)V",
- garbageValue = "1290370117"
+ descriptor = "(Ljava/util/Comparator;ZS)V",
+ garbageValue = "-32109"
)
@Export("sort")
public void sort(Comparator var1, boolean var2) {
diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java
index 5d9df08f8f..23dff76f41 100644
--- a/runescape-client/src/main/java/GrandExchangeOffer.java
+++ b/runescape-client/src/main/java/GrandExchangeOffer.java
@@ -4,39 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ly")
+@ObfuscatedName("lu")
@Implements("GrandExchangeOffer")
public class GrandExchangeOffer {
- @ObfuscatedName("o")
+ @ObfuscatedName("hq")
+ @ObfuscatedGetter(
+ intValue = 274941287
+ )
+ static int field4070;
+ @ObfuscatedName("c")
@Export("state")
byte state;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1429288873
+ intValue = -63078935
)
@Export("id")
public int id;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 708150215
+ intValue = -1780299269
)
@Export("unitPrice")
public int unitPrice;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1969215889
+ intValue = 859663365
)
@Export("totalQuantity")
public int totalQuantity;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1702065649
+ intValue = -505288903
)
@Export("currentQuantity")
public int currentQuantity;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 2023629729
+ intValue = 1209134593
)
@Export("currentPrice")
public int currentPrice;
@@ -45,7 +50,7 @@ public class GrandExchangeOffer {
} // L: 13
@ObfuscatedSignature(
- descriptor = "(Lpx;Z)V",
+ descriptor = "(Lqt;Z)V",
garbageValue = "0"
)
public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -57,42 +62,42 @@ public class GrandExchangeOffer {
this.currentPrice = var1.readInt(); // L: 21
} // L: 22
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "284680094"
+ garbageValue = "132429413"
)
@Export("status")
public int status() {
return this.state & 7; // L: 50
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "17"
+ descriptor = "(I)I",
+ garbageValue = "-535852504"
)
@Export("type")
public int type() {
return (this.state & 8) == 8 ? 1 : 0; // L: 54
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "585573305"
+ garbageValue = "1607092749"
)
- void method5823(int var1) {
+ void method6007(int var1) {
this.state &= -8; // L: 58
this.state = (byte)(this.state | var1 & 7); // L: 59
} // L: 60
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "-1891202738"
+ garbageValue = "1011493078"
)
- void method5826(int var1) {
+ void method6005(int var1) {
this.state &= -9; // L: 63
if (var1 == 1) {
this.state = (byte)(this.state | 8); // L: 64
diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
index 1cc3bb450b..5e0658bbaf 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
@@ -1,143 +1,69 @@
import java.util.Comparator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lw")
+@ObfuscatedName("lq")
@Implements("GrandExchangeOfferAgeComparator")
final class GrandExchangeOfferAgeComparator implements Comparator {
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = -569064403
- )
- static int field4072;
-
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lln;Lln;I)I",
- garbageValue = "1626653530"
+ descriptor = "(Llj;Llj;B)I",
+ garbageValue = "-38"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
- return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13
- }
-
- public boolean equals(Object var1) {
- return super.equals(var1);
+ return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); // L: 13
}
public int compare(Object var1, Object var2) {
- return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+ return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17
}
- @ObfuscatedName("o")
+ public boolean equals(Object var1) {
+ return super.equals(var1); // L: 21
+ }
+
+ @ObfuscatedName("v")
+ static final void method5989(long var0) {
+ try {
+ Thread.sleep(var0); // L: 30
+ } catch (InterruptedException var3) { // L: 32
+ }
+
+ } // L: 33
+
+ @ObfuscatedName("em")
@ObfuscatedSignature(
- descriptor = "([FIFZFZ[FI)I",
- garbageValue = "-1890109041"
+ descriptor = "(I)Loe;",
+ garbageValue = "439042509"
)
- public static int method5798(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) {
- float var7 = 0.0F; // L: 15
-
- for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16
- var7 += Math.abs(var0[var8]); // L: 17
- }
-
- float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1435; // L: 19
- if (var7 <= var24) { // L: 20
- return -1; // L: 21
- } else {
- float[] var9 = new float[var1 + 1]; // L: 23
-
- int var10;
- for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24
- var9[var10] = 1.0F / var7 * var0[var10]; // L: 25
- }
-
- while (Math.abs(var9[var1]) < var24) { // L: 27
- --var1; // L: 28
- }
-
- var10 = 0; // L: 30
- if (var1 == 0) { // L: 31
- return var10; // L: 32
- } else if (var1 == 1) { // L: 34
- var6[0] = -var9[0] / var9[1]; // L: 35
- boolean var22 = var3 ? var2 < var24 + var6[0] : var2 < var6[0] - var24; // L: 36
- boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37
- var10 = var22 && var23 ? 1 : 0; // L: 38
- if (var10 > 0) { // L: 39
- if (var3 && var6[0] < var2) { // L: 40
- var6[0] = var2; // L: 41
- } else if (var5 && var6[0] > var4) { // L: 43
- var6[0] = var4; // L: 44
- }
- }
-
- return var10; // L: 47
- } else {
- class390 var11 = new class390(var9, var1); // L: 50
- float[] var12 = new float[var1 + 1]; // L: 51
-
- for (int var13 = 1; var13 <= var1; ++var13) { // L: 52
- var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53
- }
-
- float[] var21 = new float[var1 + 1]; // L: 55
- int var14 = method5798(var12, var1 - 1, var2, false, var4, false, var21); // L: 56
- if (var14 == -1) { // L: 57
- return 0; // L: 58
- } else {
- boolean var15 = false; // L: 60
- float var17 = 0.0F; // L: 62
- float var18 = 0.0F; // L: 63
- float var19 = 0.0F; // L: 64
-
- for (int var20 = 0; var20 <= var14; ++var20) { // L: 65
- if (var10 > var1) { // L: 66
- return var10;
- }
-
- float var16;
- if (var20 == 0) { // L: 67
- var16 = var2; // L: 68
- var18 = Ignored.method6616(var9, var1, var2); // L: 69
- if (Math.abs(var18) <= var24 && var3) { // L: 70
- var6[var10++] = var2;
- }
- } else {
- var16 = var19; // L: 73
- var18 = var17; // L: 74
- }
-
- if (var20 == var14) { // L: 76
- var19 = var4; // L: 77
- var15 = false; // L: 78
- } else {
- var19 = var21[var20]; // L: 81
- }
-
- var17 = Ignored.method6616(var9, var1, var19); // L: 83
- if (var15) { // L: 84
- var15 = false; // L: 85
- } else if (Math.abs(var17) < var24) { // L: 88
- if (var20 != var14 || var5) { // L: 89
- var6[var10++] = var19; // L: 90
- var15 = true; // L: 91
- }
- } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94
- var6[var10++] = ReflectionCheck.method601(var11, var16, var19, 0.0F); // L: 95
- if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96
- var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; // L: 97
- --var10; // L: 98
- }
- }
- }
-
- return var10; // L: 104
- }
- }
- }
+ @Export("getWorldMap")
+ static WorldMap getWorldMap() {
+ return class121.worldMap; // L: 729
}
+
+ @ObfuscatedName("iq")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIB)V",
+ garbageValue = "47"
+ )
+ @Export("selectSpell")
+ static void selectSpell(int var0, int var1, int var2, int var3) {
+ Widget var4 = ScriptFrame.getWidgetChild(var0, var1); // L: 9557
+ if (var4 != null && var4.onTargetEnter != null) { // L: 9558
+ ScriptEvent var5 = new ScriptEvent(); // L: 9559
+ var5.widget = var4; // L: 9560
+ var5.args = var4.onTargetEnter; // L: 9561
+ BoundaryObject.runScriptEvent(var5); // L: 9562
+ }
+
+ Client.selectedSpellItemId = var3; // L: 9564
+ Client.isSpellSelected = true; // L: 9565
+ NetCache.selectedSpellWidget = var0; // L: 9566
+ Client.selectedSpellChildIndex = var1; // L: 9567
+ HealthBar.selectedSpellFlags = var2; // L: 9568
+ ChatChannel.invalidateWidget(var4); // L: 9569
+ } // L: 9570
}
diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
index 4806530cda..b3a645b132 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
@@ -3,460 +3,34 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("la")
+@ObfuscatedName("lw")
@Implements("GrandExchangeOfferNameComparator")
final class GrandExchangeOfferNameComparator implements Comparator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lln;Lln;I)I",
- garbageValue = "-271291039"
+ descriptor = "(Llj;Llj;I)I",
+ garbageValue = "-2002809758"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
- return var1.getOfferName().compareTo(var2.getOfferName());
+ return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56
}
public int compare(Object var1, Object var2) {
- return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+ return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60
}
public boolean equals(Object var1) {
- return super.equals(var1);
+ return super.equals(var1); // L: 64
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;Llq;II)Ljm;",
- garbageValue = "-1715525516"
+ descriptor = "(Llh;I)V",
+ garbageValue = "-1233510501"
)
- public static PacketBufferNode method5784(int var0, String var1, Language var2, int var3) {
- PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 17
- var4.packetBuffer.writeByte(0); // L: 18
- int var5 = var4.packetBuffer.offset; // L: 19
- var4.packetBuffer.writeByte(var0); // L: 20
- String var6 = var1.toLowerCase(); // L: 21
- byte var7 = 0; // L: 22
- if (var6.startsWith("yellow:")) { // L: 23
- var7 = 0; // L: 24
- var1 = var1.substring("yellow:".length()); // L: 25
- } else if (var6.startsWith("red:")) { // L: 27
- var7 = 1; // L: 28
- var1 = var1.substring("red:".length()); // L: 29
- } else if (var6.startsWith("green:")) { // L: 31
- var7 = 2; // L: 32
- var1 = var1.substring("green:".length()); // L: 33
- } else if (var6.startsWith("cyan:")) { // L: 35
- var7 = 3; // L: 36
- var1 = var1.substring("cyan:".length()); // L: 37
- } else if (var6.startsWith("purple:")) { // L: 39
- var7 = 4; // L: 40
- var1 = var1.substring("purple:".length()); // L: 41
- } else if (var6.startsWith("white:")) { // L: 43
- var7 = 5; // L: 44
- var1 = var1.substring("white:".length()); // L: 45
- } else if (var6.startsWith("flash1:")) { // L: 47
- var7 = 6; // L: 48
- var1 = var1.substring("flash1:".length()); // L: 49
- } else if (var6.startsWith("flash2:")) { // L: 51
- var7 = 7; // L: 52
- var1 = var1.substring("flash2:".length()); // L: 53
- } else if (var6.startsWith("flash3:")) { // L: 55
- var7 = 8; // L: 56
- var1 = var1.substring("flash3:".length()); // L: 57
- } else if (var6.startsWith("glow1:")) { // L: 59
- var7 = 9; // L: 60
- var1 = var1.substring("glow1:".length()); // L: 61
- } else if (var6.startsWith("glow2:")) { // L: 63
- var7 = 10; // L: 64
- var1 = var1.substring("glow2:".length()); // L: 65
- } else if (var6.startsWith("glow3:")) { // L: 67
- var7 = 11; // L: 68
- var1 = var1.substring("glow3:".length()); // L: 69
- } else if (var2 != Language.Language_EN) { // L: 71
- if (var6.startsWith("yellow:")) {
- var7 = 0; // L: 73
- var1 = var1.substring("yellow:".length()); // L: 74
- } else if (var6.startsWith("red:")) { // L: 76
- var7 = 1; // L: 77
- var1 = var1.substring("red:".length()); // L: 78
- } else if (var6.startsWith("green:")) { // L: 80
- var7 = 2; // L: 81
- var1 = var1.substring("green:".length()); // L: 82
- } else if (var6.startsWith("cyan:")) { // L: 84
- var7 = 3; // L: 85
- var1 = var1.substring("cyan:".length()); // L: 86
- } else if (var6.startsWith("purple:")) { // L: 88
- var7 = 4; // L: 89
- var1 = var1.substring("purple:".length()); // L: 90
- } else if (var6.startsWith("white:")) { // L: 92
- var7 = 5; // L: 93
- var1 = var1.substring("white:".length()); // L: 94
- } else if (var6.startsWith("flash1:")) { // L: 96
- var7 = 6; // L: 97
- var1 = var1.substring("flash1:".length()); // L: 98
- } else if (var6.startsWith("flash2:")) { // L: 100
- var7 = 7; // L: 101
- var1 = var1.substring("flash2:".length()); // L: 102
- } else if (var6.startsWith("flash3:")) { // L: 104
- var7 = 8; // L: 105
- var1 = var1.substring("flash3:".length()); // L: 106
- } else if (var6.startsWith("glow1:")) { // L: 108
- var7 = 9; // L: 109
- var1 = var1.substring("glow1:".length()); // L: 110
- } else if (var6.startsWith("glow2:")) { // L: 112
- var7 = 10; // L: 113
- var1 = var1.substring("glow2:".length()); // L: 114
- } else if (var6.startsWith("glow3:")) { // L: 116
- var7 = 11; // L: 117
- var1 = var1.substring("glow3:".length()); // L: 118
- }
- }
-
- var6 = var1.toLowerCase(); // L: 121
- byte var8 = 0; // L: 122
- if (var6.startsWith("wave:")) { // L: 123
- var8 = 1; // L: 124
- var1 = var1.substring("wave:".length()); // L: 125
- } else if (var6.startsWith("wave2:")) { // L: 127
- var8 = 2; // L: 128
- var1 = var1.substring("wave2:".length()); // L: 129
- } else if (var6.startsWith("shake:")) { // L: 131
- var8 = 3; // L: 132
- var1 = var1.substring("shake:".length()); // L: 133
- } else if (var6.startsWith("scroll:")) { // L: 135
- var8 = 4; // L: 136
- var1 = var1.substring("scroll:".length()); // L: 137
- } else if (var6.startsWith("slide:")) { // L: 139
- var8 = 5; // L: 140
- var1 = var1.substring("slide:".length()); // L: 141
- } else if (var2 != Language.Language_EN) { // L: 143
- if (var6.startsWith("wave:")) { // L: 144
- var8 = 1; // L: 145
- var1 = var1.substring("wave:".length()); // L: 146
- } else if (var6.startsWith("wave2:")) { // L: 148
- var8 = 2; // L: 149
- var1 = var1.substring("wave2:".length()); // L: 150
- } else if (var6.startsWith("shake:")) { // L: 152
- var8 = 3; // L: 153
- var1 = var1.substring("shake:".length()); // L: 154
- } else if (var6.startsWith("scroll:")) { // L: 156
- var8 = 4; // L: 157
- var1 = var1.substring("scroll:".length()); // L: 158
- } else if (var6.startsWith("slide:")) { // L: 160
- var8 = 5; // L: 161
- var1 = var1.substring("slide:".length()); // L: 162
- }
- }
-
- var4.packetBuffer.writeByte(var7); // L: 165
- var4.packetBuffer.writeByte(var8); // L: 166
- User.method6525(var4.packetBuffer, var1); // L: 167
- if (var0 == class296.field3552.rsOrdinal()) { // L: 168
- var4.packetBuffer.writeByte(var3); // L: 169
- }
-
- var4.packetBuffer.method7740(var4.packetBuffer.offset - var5); // L: 171
- return var4; // L: 172
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "2032747937"
- )
- static int method5782(int var0, Script var1, boolean var2) {
- int var3 = -1; // L: 561
- Widget var4;
- if (var0 >= 2000) {
- var0 -= 1000;
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize];
- var4 = class92.getWidget(var3); // L: 566
- } else {
- var4 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget;
- }
-
- if (var0 == ScriptOpcodes.CC_SETPOSITION) {
- class12.Interpreter_intStackSize -= 4;
- var4.rawX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize];
- var4.rawY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1];
- var4.xAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2];
- var4.yAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3];
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4);
- class82.client.alignWidget(var4); // L: 576
- if (var3 != -1 && var4.type == 0) {
- UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var3 >> 16], var4, false);
- }
-
- return 1;
- } else if (var0 == ScriptOpcodes.CC_SETSIZE) {
- class12.Interpreter_intStackSize -= 4;
- var4.rawWidth = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize];
- var4.rawHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 583
- var4.widthAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 584
- var4.heightAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3];
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4);
- class82.client.alignWidget(var4);
- if (var3 != -1 && var4.type == 0) {
- UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var3 >> 16], var4, false);
- }
-
- return 1;
- } else if (var0 == ScriptOpcodes.CC_SETHIDE) {
- boolean var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1;
- if (var5 != var4.isHidden) {
- var4.isHidden = var5;
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 595
- }
-
- return 1; // L: 597
- } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599
- var4.noClickThrough = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1;
- return 1;
- } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
- var4.noScrollThrough = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1;
- return 1;
- } else {
- return 2;
- }
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Lpc;ILca;IB)V",
- garbageValue = "98"
- )
- static final void method5786(PacketBuffer var0, int var1, Player var2, int var3) {
- byte var4 = class193.field2250.field2252; // L: 451
- int var5;
- int var8;
- int var9;
- int var12;
- if ((var3 & 1) != 0) { // L: 452
- var5 = var0.method7576(); // L: 453
- PlayerType var6 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var0.readUnsignedByte()); // L: 454
- boolean var7 = var0.method7593() == 1; // L: 455
- var8 = var0.method7545(); // L: 456
- var9 = var0.offset; // L: 457
- if (var2.username != null && var2.appearance != null) { // L: 458
- boolean var10 = false; // L: 459
- if (var6.isUser && BufferedSource.friendSystem.isIgnored(var2.username)) { // L: 460 461
- var10 = true;
- }
-
- if (!var10 && Client.field606 == 0 && !var2.isHidden) { // L: 463
- Players.field1306.offset = 0; // L: 464
- var0.method7569(Players.field1306.array, 0, var8); // L: 465
- Players.field1306.offset = 0; // L: 466
- String var11 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(Players.field1306))); // L: 467
- var2.overheadText = var11.trim(); // L: 468
- var2.overheadTextColor = var5 >> 8; // L: 469
- var2.overheadTextEffect = var5 & 255; // L: 470
- var2.overheadTextCyclesRemaining = 150; // L: 471
- var2.isAutoChatting = var7; // L: 472
- var2.field1198 = var2 != ModelData0.localPlayer && var6.isUser && "" != Client.field549 && var11.toLowerCase().indexOf(Client.field549) == -1; // L: 473
- if (var6.isPrivileged) { // L: 475
- var12 = var7 ? 91 : 1;
- } else {
- var12 = var7 ? 90 : 2; // L: 476
- }
-
- if (var6.modIcon != -1) { // L: 477
- WorldMapEvent.addGameMessage(var12, StudioGame.method5590(var6.modIcon) + var2.username.getName(), var11);
- } else {
- WorldMapEvent.addGameMessage(var12, var2.username.getName(), var11); // L: 478
- }
- }
- }
-
- var0.offset = var9 + var8; // L: 481
- }
-
- if ((var3 & 4) != 0) { // L: 483
- var2.field1172 = var0.method7576(); // L: 484
- if (var2.pathLength == 0) { // L: 485
- var2.orientation = var2.field1172; // L: 486
- var2.field1172 = -1; // L: 487
- }
- }
-
- if ((var3 & 16) != 0) { // L: 490
- var5 = var0.method7593(); // L: 491
- byte[] var17 = new byte[var5]; // L: 492
- Buffer var13 = new Buffer(var17); // L: 493
- var0.method7569(var17, 0, var5); // L: 494
- Players.field1307[var1] = var13; // L: 495
- var2.read(var13); // L: 496
- }
-
- if ((var3 & 4096) != 0) { // L: 498
- var2.spotAnimation = var0.method7576(); // L: 499
- var5 = var0.method7567(); // L: 500
- var2.spotAnimationHeight = var5 >> 16; // L: 501
- var2.field1185 = (var5 & 65535) + Client.cycle; // L: 502
- var2.spotAnimationFrame = 0; // L: 503
- var2.spotAnimationFrameCycle = 0; // L: 504
- if (var2.field1185 > Client.cycle) { // L: 505
- var2.spotAnimationFrame = -1;
- }
-
- if (var2.spotAnimation == 65535) { // L: 506
- var2.spotAnimation = -1;
- }
- }
-
- if ((var3 & 2048) != 0) { // L: 508
- class193[] var14 = Players.field1302; // L: 509
- class193[] var21 = new class193[]{class193.field2248, class193.field2250, class193.field2249, class193.field2251}; // L: 513
- var14[var1] = (class193)class291.findEnumerated(var21, var0.method7549()); // L: 515
- }
-
- if ((var3 & 16384) != 0) { // L: 517
- var2.field1187 = var0.method7547(); // L: 518
- var2.field1189 = var0.method7548(); // L: 519
- var2.field1188 = var0.method7548(); // L: 520
- var2.field1190 = var0.method7549(); // L: 521
- var2.field1191 = var0.readUnsignedShort() + Client.cycle; // L: 522
- var2.field1192 = var0.method7554() + Client.cycle; // L: 523
- var2.field1139 = var0.readUnsignedShort(); // L: 524
- if (var2.field1095) { // L: 525
- var2.field1187 += var2.tileX; // L: 526
- var2.field1189 += var2.tileY; // L: 527
- var2.field1188 += var2.tileX; // L: 528
- var2.field1190 += var2.tileY; // L: 529
- var2.pathLength = 0; // L: 530
- } else {
- var2.field1187 += var2.pathX[0]; // L: 533
- var2.field1189 += var2.pathY[0]; // L: 534
- var2.field1188 += var2.pathX[0]; // L: 535
- var2.field1190 += var2.pathY[0]; // L: 536
- var2.pathLength = 1; // L: 537
- }
-
- var2.field1200 = 0; // L: 539
- }
-
- if ((var3 & 1024) != 0) { // L: 541
- var2.field1196 = Client.cycle + var0.method7576(); // L: 542
- var2.field1197 = Client.cycle + var0.readUnsignedShort(); // L: 543
- var2.field1143 = var0.method7547(); // L: 544
- var2.field1199 = var0.method7549(); // L: 545
- var2.field1153 = var0.method7548(); // L: 546
- var2.field1140 = (byte)var0.readUnsignedByte(); // L: 547
- }
-
- int var15;
- if ((var3 & 32) != 0) { // L: 549
- var5 = var0.method7554(); // L: 550
- if (var5 == 65535) { // L: 551
- var5 = -1;
- }
-
- var15 = var0.method7593(); // L: 552
- JagexCache.performPlayerAnimation(var2, var5, var15); // L: 553
- }
-
- if ((var3 & 256) != 0) { // L: 555
- var4 = var0.method7549(); // L: 556
- }
-
- if ((var3 & 128) != 0) { // L: 558
- var2.targetIndex = var0.method7554(); // L: 559
- if (var2.targetIndex == 65535) { // L: 560
- var2.targetIndex = -1;
- }
- }
-
- if ((var3 & 64) != 0) { // L: 562
- var5 = var0.readUnsignedByte(); // L: 563
- int var16;
- int var19;
- int var20;
- if (var5 > 0) { // L: 564
- for (var15 = 0; var15 < var5; ++var15) { // L: 565
- var8 = -1; // L: 567
- var9 = -1; // L: 568
- var20 = -1; // L: 569
- var19 = var0.readUShortSmart(); // L: 570
- if (var19 == 32767) { // L: 571
- var19 = var0.readUShortSmart(); // L: 572
- var9 = var0.readUShortSmart(); // L: 573
- var8 = var0.readUShortSmart(); // L: 574
- var20 = var0.readUShortSmart(); // L: 575
- } else if (var19 != 32766) { // L: 577
- var9 = var0.readUShortSmart(); // L: 578
- } else {
- var19 = -1; // L: 580
- }
-
- var16 = var0.readUShortSmart(); // L: 581
- var2.addHitSplat(var19, var9, var8, var20, Client.cycle, var16); // L: 582
- }
- }
-
- var15 = var0.method7546(); // L: 585
- if (var15 > 0) { // L: 586
- for (var19 = 0; var19 < var15; ++var19) { // L: 587
- var8 = var0.readUShortSmart(); // L: 588
- var9 = var0.readUShortSmart(); // L: 589
- if (var9 != 32767) { // L: 590
- var20 = var0.readUShortSmart(); // L: 591
- var16 = var0.readUnsignedByte(); // L: 592
- var12 = var9 > 0 ? var0.method7593() : var16; // L: 593
- var2.addHealthBar(var8, Client.cycle, var9, var20, var16, var12); // L: 594
- } else {
- var2.removeHealthBar(var8); // L: 596
- }
- }
- }
- }
-
- if ((var3 & 8192) != 0) { // L: 600
- for (var5 = 0; var5 < 3; ++var5) { // L: 601
- var2.actions[var5] = var0.readStringCp1252NullTerminated();
- }
- }
-
- if ((var3 & 8) != 0) { // L: 603
- var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 604
- if (var2.overheadText.charAt(0) == '~') { // L: 605
- var2.overheadText = var2.overheadText.substring(1); // L: 606
- WorldMapEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 607
- } else if (var2 == ModelData0.localPlayer) { // L: 609
- WorldMapEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 610
- }
-
- var2.isAutoChatting = false; // L: 612
- var2.overheadTextColor = 0; // L: 613
- var2.overheadTextEffect = 0; // L: 614
- var2.overheadTextCyclesRemaining = 150; // L: 615
- }
-
- if (var2.field1095) { // L: 617
- if (var4 == 127) { // L: 618
- var2.resetPath(var2.tileX, var2.tileY);
- } else {
- class193 var22;
- if (var4 != class193.field2250.field2252) { // L: 621
- class193[] var18 = new class193[]{class193.field2248, class193.field2250, class193.field2249, class193.field2251}; // L: 624
- var22 = (class193)class291.findEnumerated(var18, var4); // L: 626
- } else {
- var22 = Players.field1302[var1]; // L: 628
- }
-
- var2.method2117(var2.tileX, var2.tileY, var22); // L: 629
- }
- }
-
- } // L: 633
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "1233324510"
- )
- public static int method5790(int var0) {
- return class357.method6392(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72
- }
+ public static void method5979(AbstractArchive var0) {
+ StructComposition.StructDefinition_archive = var0; // L: 19
+ } // L: 20
}
diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
index c2c2eceb1f..6dab9ac246 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
@@ -1,258 +1,117 @@
import java.util.Comparator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("bs")
+@ObfuscatedName("bq")
@Implements("GrandExchangeOfferOwnWorldComparator")
public class GrandExchangeOfferOwnWorldComparator implements Comparator {
- @ObfuscatedName("hz")
- @ObfuscatedGetter(
- intValue = -990800587
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "Lkb;"
)
- @Export("baseY")
- static int baseY;
- @ObfuscatedName("o")
+ @Export("scriptActiveWidget")
+ static Widget scriptActiveWidget;
+ @ObfuscatedName("c")
@Export("filterWorlds")
boolean filterWorlds;
GrandExchangeOfferOwnWorldComparator() {
- } // L: 12755
+ } // L: 12530
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lln;Lln;I)I",
- garbageValue = "1102099344"
+ descriptor = "(Llj;Llj;B)I",
+ garbageValue = "-46"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
- if (var2.world == var1.world) { // L: 12758
+ if (var2.world == var1.world) { // L: 12533
return 0;
} else {
- if (this.filterWorlds) { // L: 12759
- if (Client.worldId == var1.world) { // L: 12760
+ if (this.filterWorlds) { // L: 12534
+ if (Client.worldId == var1.world) { // L: 12535
return -1;
}
- if (var2.world == Client.worldId) { // L: 12761
+ if (var2.world == Client.worldId) { // L: 12536
return 1;
}
}
- return var1.world < var2.world ? -1 : 1; // L: 12763
+ return var1.world < var2.world ? -1 : 1; // L: 12538
}
}
- public int compare(Object var1, Object var2) {
- return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12767
- }
-
public boolean equals(Object var1) {
- return super.equals(var1); // L: 12771
+ return super.equals(var1); // L: 12546
}
- @ObfuscatedName("ap")
+ public int compare(Object var1, Object var2) {
+ return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12542
+ }
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "106"
+ descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+ garbageValue = "-1404651697"
)
- static int method1120(int var0, Script var1, boolean var2) {
- int var3;
- if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3429
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FileSystem.ItemDefinition_get(var3).name; // L: 3430
- return 1; // L: 3431
- } else {
- int var4;
- ItemComposition var5;
- if (var0 == ScriptOpcodes.OC_OP) { // L: 3433
- class12.Interpreter_intStackSize -= 2; // L: 3434
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3435
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3436
- var5 = FileSystem.ItemDefinition_get(var3); // L: 3437
- if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3439
- }
+ public static String method1097(CharSequence var0) {
+ int var1 = var0.length(); // L: 11
+ StringBuilder var2 = new StringBuilder(var1); // L: 12
- return 1; // L: 3440
- } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442
- class12.Interpreter_intStackSize -= 2; // L: 3443
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3444
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3445
- var5 = FileSystem.ItemDefinition_get(var3); // L: 3446
- if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
+ for (int var3 = 0; var3 < var1; ++var3) { // L: 13
+ char var4 = var0.charAt(var3); // L: 14
+ if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15
+ if (var4 == ' ') { // L: 16
+ var2.append('+');
} else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3448
- }
+ byte var5 = class295.charToByteCp1252(var4); // L: 18
+ var2.append('%'); // L: 19
+ int var6 = var5 >> 4 & 15; // L: 20
+ if (var6 >= 10) { // L: 21
+ var2.append((char)(var6 + 55));
+ } else {
+ var2.append((char)(var6 + 48)); // L: 22
+ }
- return 1; // L: 3449
- } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3452
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).price; // L: 3453
- return 1; // L: 3454
- } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3457
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458
- return 1; // L: 3459
+ var6 = var5 & 15; // L: 23
+ if (var6 >= 10) { // L: 24
+ var2.append((char)(var6 + 55));
+ } else {
+ var2.append((char)(var6 + 48));
+ }
+ }
} else {
- ItemComposition var7;
- if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3462
- var7 = FileSystem.ItemDefinition_get(var3); // L: 3463
- if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.note;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3465
- }
-
- return 1; // L: 3466
- } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3469
- var7 = FileSystem.ItemDefinition_get(var3); // L: 3470
- if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.note;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3472
- }
-
- return 1; // L: 3473
- } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3476
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477
- return 1; // L: 3478
- } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3481
- var7 = FileSystem.ItemDefinition_get(var3); // L: 3482
- if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.placeholder;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3484
- }
-
- return 1; // L: 3485
- } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3488
- var7 = FileSystem.ItemDefinition_get(var3); // L: 3489
- if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.placeholder;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3491
- }
-
- return 1; // L: 3492
- } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494
- String var6 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3495
- var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3496
- class28.findItemDefinitions(var6, var4 == 1); // L: 3497
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator9.foundItemIdCount; // L: 3498
- return 1; // L: 3499
- } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501
- if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506
- Coord.foundItemIndex = 0; // L: 3507
- return 1; // L: 3508
- } else if (var0 == 4213) { // L: 3510
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3511
- var4 = FileSystem.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512
- if (var4 == -1) { // L: 3513
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4; // L: 3514
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517
- }
-
- return 1; // L: 3519
- } else {
- return 2; // L: 3521
- }
- } else {
- if (class182.foundItemIds != null && Coord.foundItemIndex < UserComparator9.foundItemIdCount) { // L: 3502
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class182.foundItemIds[++Coord.foundItemIndex - 1] & '\uffff'; // L: 3503
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1;
- }
-
- return 1; // L: 3504
- }
+ var2.append(var4); // L: 25
}
}
+
+ return var2.toString(); // L: 28
}
- @ObfuscatedName("gr")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(IIIIZI)V",
- garbageValue = "1542062611"
+ descriptor = "(B)V",
+ garbageValue = "112"
)
- @Export("setViewportShape")
- static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
- if (var2 < 1) { // L: 4896
- var2 = 1;
+ static final void method1095() {
+ Object var10000 = null; // L: 187
+ String var0 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
+ class290.addGameMessage(30, "", var0); // L: 189
+ } // L: 191
+
+ @ObfuscatedName("n")
+ @ObfuscatedSignature(
+ descriptor = "(ZB)V",
+ garbageValue = "7"
+ )
+ public static void method1096(boolean var0) {
+ if (var0 != DevicePcmPlayerProvider.ItemDefinition_inMembersWorld) { // L: 573
+ ObjectSound.method1702(); // L: 574
+ DevicePcmPlayerProvider.ItemDefinition_inMembersWorld = var0; // L: 575
}
- if (var3 < 1) { // L: 4897
- var3 = 1;
- }
-
- int var5 = var3 - 334; // L: 4898
- int var6;
- if (var5 < 0) { // L: 4900
- var6 = Client.field748;
- } else if (var5 >= 100) { // L: 4901
- var6 = Client.field749;
- } else {
- var6 = (Client.field749 - Client.field748) * var5 / 100 + Client.field748; // L: 4902
- }
-
- int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4903
- int var8;
- int var9;
- short var10;
- if (var7 < Client.field656) { // L: 4904
- var10 = Client.field656; // L: 4905
- var6 = var10 * var2 * 334 / (var3 * 512); // L: 4906
- if (var6 > Client.field753) { // L: 4907
- var6 = Client.field753; // L: 4908
- var8 = var3 * var6 * 512 / (var10 * 334); // L: 4909
- var9 = (var2 - var8) / 2; // L: 4910
- if (var4) { // L: 4911
- Rasterizer2D.Rasterizer2D_resetClip(); // L: 4912
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4913
- Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4914
- }
-
- var0 += var9; // L: 4916
- var2 -= var9 * 2; // L: 4917
- }
- } else if (var7 > Client.field755) { // L: 4920
- var10 = Client.field755; // L: 4921
- var6 = var10 * var2 * 334 / (var3 * 512); // L: 4922
- if (var6 < Client.field752) { // L: 4923
- var6 = Client.field752; // L: 4924
- var8 = var10 * var2 * 334 / (var6 * 512); // L: 4925
- var9 = (var3 - var8) / 2; // L: 4926
- if (var4) { // L: 4927
- Rasterizer2D.Rasterizer2D_resetClip(); // L: 4928
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4929
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4930
- }
-
- var1 += var9; // L: 4932
- var3 -= var9 * 2; // L: 4933
- }
- }
-
- Client.viewportZoom = var3 * var6 / 334; // L: 4936
- if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4937
- WorldMapArea.method4514(var2, var3); // L: 4938
- }
-
- Client.viewportOffsetX = var0; // L: 4940
- Client.viewportOffsetY = var1; // L: 4941
- Client.viewportWidth = var2; // L: 4942
- Client.viewportHeight = var3; // L: 4943
- } // L: 4944
+ } // L: 577
}
diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
index da6c6dabf4..5c967b5af0 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
@@ -1,23 +1,19 @@
import java.util.Comparator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ld")
+@ObfuscatedName("lv")
@Implements("GrandExchangeOfferTotalQuantityComparator")
final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 1165862303
- )
- static int field4069;
+ @ObfuscatedName("bv")
+ static String field4045;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lln;Lln;B)I",
- garbageValue = "127"
+ descriptor = "(Llj;Llj;I)I",
+ garbageValue = "1878854014"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -29,19 +25,33 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
}
public int compare(Object var1, Object var2) {
- return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73
+ return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
}
- @ObfuscatedName("kf")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lki;I)V",
- garbageValue = "-842316290"
+ descriptor = "(II)V",
+ garbageValue = "285627704"
)
- @Export("invalidateWidget")
- static void invalidateWidget(Widget var0) {
- if (var0 != null && var0.cycle == Client.field694) { // L: 11919
- Client.field652[var0.rootIndex] = true; // L: 11920
+ static void method5969(int var0) {
+ ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72
+ if (var1 != null) {
+ var1.remove(); // L: 74
}
+ } // L: 73 75
- } // L: 11922
+ @ObfuscatedName("gu")
+ @ObfuscatedSignature(
+ descriptor = "(Lcj;I)V",
+ garbageValue = "-1624008508"
+ )
+ static final void method5970(Actor var0) {
+ int var1 = Math.max(1, var0.field1184 - Client.cycle); // L: 4162
+ int var2 = var0.field1205 * 64 + var0.field1140 * 128; // L: 4163
+ int var3 = var0.field1205 * 64 + var0.field1182 * 128; // L: 4164
+ var0.x += (var2 - var0.x) / var1; // L: 4165
+ var0.y += (var3 - var0.y) / var1; // L: 4166
+ var0.field1202 = 0; // L: 4167
+ var0.orientation = var0.field1186; // L: 4168
+ } // L: 4169
}
diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
index 402b7f4796..32e228b7de 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
@@ -1,16 +1,18 @@
+import java.text.ParseException;
import java.util.Comparator;
+import java.util.Date;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lt")
+@ObfuscatedName("ly")
@Implements("GrandExchangeOfferUnitPriceComparator")
final class GrandExchangeOfferUnitPriceComparator implements Comparator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lln;Lln;B)I",
- garbageValue = "88"
+ descriptor = "(Llj;Llj;I)I",
+ garbageValue = "-2004855128"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -25,20 +27,119 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
return super.equals(var1); // L: 51
}
- @ObfuscatedName("b")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "-602449729"
+ descriptor = "(B)Z",
+ garbageValue = "-118"
)
- static final int method5846(int var0, int var1) {
- int var2 = InterfaceParent.method2070(45365 + var0, 91923 + var1, 4) - 128 + (InterfaceParent.method2070(10294 + var0, var1 + 37821, 2) - 128 >> 1) + (InterfaceParent.method2070(var0, var1, 1) - 128 >> 2); // L: 918
- var2 = (int)(0.3D * (double)var2) + 35; // L: 919
- if (var2 < 10) { // L: 920
- var2 = 10;
- } else if (var2 > 60) { // L: 921
- var2 = 60;
+ static boolean method6031() {
+ Date var0;
+ try {
+ var0 = GameObject.method4552(); // L: 1077
+ } catch (ParseException var9) { // L: 1079
+ GraphicsObject.method1877("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1080
+ return false; // L: 1081
}
- return var2; // L: 922
+ if (var0 == null) { // L: 1083
+ return false; // L: 1084
+ } else {
+ java.util.Calendar var2 = java.util.Calendar.getInstance(); // L: 1088
+ var2.set(1, var2.get(1) - 13); // L: 1089
+ var2.set(5, var2.get(5) + 1); // L: 1090
+ var2.set(11, 0); // L: 1091
+ var2.set(12, 0); // L: 1092
+ var2.set(13, 0); // L: 1093
+ var2.set(14, 0); // L: 1094
+ Date var3 = var2.getTime(); // L: 1095
+ boolean var5 = var0.before(var3); // L: 1096
+ Date var4 = BufferedNetSocket.method6835(); // L: 1101
+ boolean var7 = var0.after(var4); // L: 1102
+ if (!var7) { // L: 1105
+ GraphicsObject.method1877("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 1106
+ return false; // L: 1107
+ } else {
+ if (!var5) { // L: 1109
+ class174.field1891 = 8388607; // L: 1110
+ } else {
+ class174.field1891 = (int)(var0.getTime() / 86400000L - 11745L); // L: 1113
+ }
+
+ return true; // L: 1115
+ }
+ }
}
+
+ @ObfuscatedName("ij")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1960096370"
+ )
+ static final void method6024() {
+ PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 8009
+ var0.importIndex(); // L: 8010
+ int var1 = var0.readBits(8); // L: 8011
+ int var2;
+ if (var1 < Client.npcCount) { // L: 8012
+ for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 8013
+ Client.field616[++Client.field615 - 1] = Client.npcIndices[var2];
+ }
+ }
+
+ if (var1 > Client.npcCount) { // L: 8015
+ throw new RuntimeException("");
+ } else {
+ Client.npcCount = 0; // L: 8016
+
+ for (var2 = 0; var2 < var1; ++var2) { // L: 8017
+ int var3 = Client.npcIndices[var2]; // L: 8018
+ NPC var4 = Client.npcs[var3]; // L: 8019
+ int var5 = var0.readBits(1); // L: 8020
+ if (var5 == 0) { // L: 8021
+ Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8022
+ var4.npcCycle = Client.cycle; // L: 8023
+ } else {
+ int var6 = var0.readBits(2); // L: 8026
+ if (var6 == 0) { // L: 8027
+ Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8028
+ var4.npcCycle = Client.cycle; // L: 8029
+ Client.field539[++Client.field538 - 1] = var3; // L: 8030
+ } else {
+ int var7;
+ int var8;
+ if (var6 == 1) { // L: 8033
+ Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8034
+ var4.npcCycle = Client.cycle; // L: 8035
+ var7 = var0.readBits(3); // L: 8036
+ var4.method2361(var7, class192.field2212); // L: 8037
+ var8 = var0.readBits(1); // L: 8038
+ if (var8 == 1) { // L: 8039
+ Client.field539[++Client.field538 - 1] = var3;
+ }
+ } else if (var6 == 2) { // L: 8042
+ Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8043
+ var4.npcCycle = Client.cycle; // L: 8044
+ if (var0.readBits(1) == 1) { // L: 8045
+ var7 = var0.readBits(3); // L: 8046
+ var4.method2361(var7, class192.field2211); // L: 8047
+ var8 = var0.readBits(3); // L: 8048
+ var4.method2361(var8, class192.field2211); // L: 8049
+ } else {
+ var7 = var0.readBits(3); // L: 8052
+ var4.method2361(var7, class192.field2209); // L: 8053
+ }
+
+ var7 = var0.readBits(1); // L: 8055
+ if (var7 == 1) { // L: 8056
+ Client.field539[++Client.field538 - 1] = var3;
+ }
+ } else if (var6 == 3) { // L: 8059
+ Client.field616[++Client.field615 - 1] = var3; // L: 8060
+ }
+ }
+ }
+ }
+
+ }
+ } // L: 8064
}
diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
index e4c78b6018..43da910fcd 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
@@ -4,20 +4,13 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lj")
+@ObfuscatedName("lm")
@Implements("GrandExchangeOfferWorldComparator")
final class GrandExchangeOfferWorldComparator implements Comparator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("WorldMapElement_archive")
- static AbstractArchive WorldMapElement_archive;
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lln;Lln;I)I",
- garbageValue = "1939073970"
+ descriptor = "(Llj;Llj;B)I",
+ garbageValue = "90"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -32,14 +25,30 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
return super.equals(var1); // L: 36
}
- @ObfuscatedName("p")
+ @ObfuscatedName("fj")
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;Ljava/lang/String;Ljava/lang/String;I)Lmx;",
- garbageValue = "2088711199"
+ descriptor = "(Lgc;IIIB)V",
+ garbageValue = "7"
)
- public static Font method5808(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
- int var4 = var0.getGroupId(var2); // L: 124
- int var5 = var0.getFileId(var4, var3); // L: 125
- return class387.method6781(var0, var1, var4, var5); // L: 126
- }
+ static void method5997(SequenceDefinition var0, int var1, int var2, int var3) {
+ if (Client.soundEffectCount < 50 && class19.clientPreferences.method2262() != 0) { // L: 3725
+ if (var0.field2172 != null && var0.field2172.containsKey(var1)) { // L: 3726
+ int var4 = (Integer)var0.field2172.get(var1); // L: 3727
+ if (var4 != 0) { // L: 3731
+ int var7 = var4 >> 8; // L: 3732
+ int var8 = var4 >> 4 & 7; // L: 3733
+ int var9 = var4 & 15; // L: 3734
+ Client.soundEffectIds[Client.soundEffectCount] = var7; // L: 3735
+ Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 3736
+ Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3737
+ Client.soundEffects[Client.soundEffectCount] = null; // L: 3738
+ int var10 = (var2 - 64) / 128; // L: 3739
+ int var11 = (var3 - 64) / 128; // L: 3740
+ Client.soundLocations[Client.soundEffectCount] = var9 + (var11 << 8) + (var10 << 16); // L: 3741
+ ++Client.soundEffectCount; // L: 3742
+ }
+
+ }
+ }
+ } // L: 3744
}
diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java
index 506d7c6c99..4aa30f5d23 100644
--- a/runescape-client/src/main/java/GraphicsDefaults.java
+++ b/runescape-client/src/main/java/GraphicsDefaults.java
@@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nu")
+@ObfuscatedName("nz")
@Implements("GraphicsDefaults")
public class GraphicsDefaults {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1168914555
+ intValue = -2113066493
)
@Export("compass")
public int compass;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 468395929
+ )
+ public int field4367;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -153891603
- )
- public int field4373;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 889630627
+ intValue = -2011214473
)
@Export("mapScenes")
public int mapScenes;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -214563943
+ intValue = 1296513059
)
@Export("headIconsPk")
public int headIconsPk;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 2847389
- )
- public int field4376;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 1531771617
- )
- public int field4377;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 822510473
- )
- public int field4378;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = -1018736855
+ intValue = -420476393
)
public int field4374;
- @ObfuscatedName("r")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1369265667
+ intValue = 727709081
)
- public int field4375;
- @ObfuscatedName("v")
+ public int field4373;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -2053526401
- )
- public int field4381;
- @ObfuscatedName("y")
- @ObfuscatedGetter(
- intValue = 1936619473
+ intValue = -279446943
)
public int field4372;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = 1485733839
+ )
+ public int field4368;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 1703298747
+ )
+ public int field4371;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = -1305431603
+ )
+ public int field4375;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = -1099516571
+ )
+ public int field4376;
public GraphicsDefaults() {
this.compass = -1; // L: 7
- this.field4373 = -1; // L: 8
+ this.field4367 = -1; // L: 8
this.mapScenes = -1; // L: 9
this.headIconsPk = -1; // L: 10
- this.field4376 = -1; // L: 11
- this.field4377 = -1; // L: 12
- this.field4378 = -1; // L: 13
- this.field4374 = -1; // L: 14
- this.field4375 = -1; // L: 15
- this.field4381 = -1; // L: 16
- this.field4372 = -1; // L: 17
+ this.field4374 = -1; // L: 11
+ this.field4373 = -1; // L: 12
+ this.field4372 = -1; // L: 13
+ this.field4368 = -1; // L: 14
+ this.field4371 = -1; // L: 15
+ this.field4375 = -1; // L: 16
+ this.field4376 = -1; // L: 17
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;I)V",
- garbageValue = "-901187341"
+ descriptor = "(Llh;I)V",
+ garbageValue = "-1672776628"
)
@Export("decode")
public void decode(AbstractArchive var1) {
- byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4370.group); // L: 20
+ byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4363.group); // L: 20
Buffer var3 = new Buffer(var2); // L: 21
while (true) {
@@ -98,125 +98,21 @@ public class GraphicsDefaults {
switch(var4) { // L: 25
case 1:
- var3.readMedium(); // L: 28
+ var3.readMedium(); // L: 46
break;
case 2:
- this.compass = var3.method7532(); // L: 33
- this.field4373 = var3.method7532(); // L: 34
- this.mapScenes = var3.method7532(); // L: 35
- this.headIconsPk = var3.method7532(); // L: 36
- this.field4376 = var3.method7532(); // L: 37
- this.field4377 = var3.method7532(); // L: 38
- this.field4378 = var3.method7532(); // L: 39
- this.field4374 = var3.method7532(); // L: 40
- this.field4375 = var3.method7532(); // L: 41
- this.field4381 = var3.method7532(); // L: 42
- this.field4372 = var3.method7532(); // L: 43
+ this.compass = var3.method7752(); // L: 31
+ this.field4367 = var3.method7752(); // L: 32
+ this.mapScenes = var3.method7752(); // L: 33
+ this.headIconsPk = var3.method7752(); // L: 34
+ this.field4374 = var3.method7752(); // L: 35
+ this.field4373 = var3.method7752(); // L: 36
+ this.field4372 = var3.method7752(); // L: 37
+ this.field4368 = var3.method7752(); // L: 38
+ this.field4371 = var3.method7752(); // L: 39
+ this.field4375 = var3.method7752(); // L: 40
+ this.field4376 = var3.method7752(); // L: 41
}
}
}
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(IZIZB)V",
- garbageValue = "-62"
- )
- @Export("sortWorldList")
- static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
- if (World.World_worlds != null) { // L: 171
- VarcInt.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
- }
-
- } // L: 174
-
- @ObfuscatedName("hz")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "-128"
- )
- static final void method6732(int var0) {
- int[] var1 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5947
- int var2 = var1.length; // L: 5948
-
- int var3;
- for (var3 = 0; var3 < var2; ++var3) { // L: 5949
- var1[var3] = 0;
- }
-
- int var4;
- int var5;
- for (var3 = 1; var3 < 103; ++var3) { // L: 5950
- var4 = (103 - var3) * 2048 + 24628; // L: 5951
-
- for (var5 = 1; var5 < 103; ++var5) { // L: 5952
- if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5953
- class175.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
- }
-
- if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5954
- class175.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
- }
-
- var4 += 4; // L: 5955
- }
- }
-
- var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5958
- var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5959
- InterfaceParent.sceneMinimapSprite.setRaster(); // L: 5960
-
- int var6;
- for (var5 = 1; var5 < 103; ++var5) { // L: 5961
- for (var6 = 1; var6 < 103; ++var6) { // L: 5962
- if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5963
- WorldMapEvent.drawObject(var0, var6, var5, var3, var4);
- }
-
- if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5964
- WorldMapEvent.drawObject(var0 + 1, var6, var5, var3, var4);
- }
- }
- }
-
- Client.mapIconCount = 0; // L: 5967
-
- for (var5 = 0; var5 < 104; ++var5) { // L: 5968
- for (var6 = 0; var6 < 104; ++var6) { // L: 5969
- long var7 = class175.scene.getFloorDecorationTag(class128.Client_plane, var5, var6); // L: 5970
- if (var7 != 0L) { // L: 5971
- int var9 = NetSocket.Entity_unpackID(var7); // L: 5972
- int var10 = class82.getObjectDefinition(var9).mapIconId; // L: 5973
- if (var10 >= 0 && class120.WorldMapElement_get(var10).field1874) { // L: 5974 5975
- Client.mapIcons[Client.mapIconCount] = class120.WorldMapElement_get(var10).getSpriteBool(false); // L: 5978
- Client.mapIconXs[Client.mapIconCount] = var5; // L: 5979
- Client.mapIconYs[Client.mapIconCount] = var6; // L: 5980
- ++Client.mapIconCount; // L: 5981
- }
- }
- }
- }
-
- DevicePcmPlayerProvider.rasterProvider.apply(); // L: 5986
- } // L: 5987
-
- @ObfuscatedName("kd")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1911416331"
- )
- @Export("Widget_resetModelFrames")
- static final void Widget_resetModelFrames(int var0) {
- if (WorldMapDecoration.loadInterface(var0)) { // L: 11974
- Widget[] var1 = NetSocket.Widget_interfaceComponents[var0]; // L: 11975
-
- for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11976
- Widget var3 = var1[var2]; // L: 11977
- if (var3 != null) { // L: 11978
- var3.modelFrame = 0; // L: 11979
- var3.modelFrameCycle = 0; // L: 11980
- }
- }
-
- }
- } // L: 11982
}
diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java
index 8de9372fed..c8d6d11865 100644
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -1,75 +1,67 @@
-import java.text.ParseException;
-import java.util.Date;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bf")
+@ObfuscatedName("bh")
@Implements("GraphicsObject")
public class GraphicsObject extends Renderable {
- @ObfuscatedName("z")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 772916355
- )
- @Export("canvasWidth")
- public static int canvasWidth;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -1248002899
+ intValue = 630502901
)
@Export("id")
int id;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1478722299
+ intValue = -1889786839
)
@Export("cycleStart")
int cycleStart;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 118002909
+ intValue = 844498895
)
@Export("plane")
int plane;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 800105373
+ intValue = 1978807023
)
@Export("x")
int x;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -738623243
+ intValue = 926391019
)
@Export("y")
int y;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1237979949
+ intValue = 574718691
)
@Export("z")
int z;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lgq;"
+ descriptor = "Lgc;"
)
@Export("sequenceDefinition")
SequenceDefinition sequenceDefinition;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 657870691
+ intValue = -1310150497
)
@Export("frame")
int frame;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 1465530257
+ intValue = 426269681
)
@Export("frameCycle")
int frameCycle;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("isFinished")
boolean isFinished;
@@ -83,20 +75,20 @@ public class GraphicsObject extends Renderable {
this.y = var4; // L: 24
this.z = var5; // L: 25
this.cycleStart = var7 + var6; // L: 26
- int var8 = class136.SpotAnimationDefinition_get(this.id).sequence; // L: 27
+ int var8 = ObjectSound.SpotAnimationDefinition_get(this.id).sequence; // L: 27
if (var8 != -1) { // L: 28
this.isFinished = false; // L: 29
- this.sequenceDefinition = class114.SequenceDefinition_get(var8); // L: 30
+ this.sequenceDefinition = ScriptFrame.SequenceDefinition_get(var8); // L: 30
} else {
this.isFinished = true; // L: 32
}
} // L: 33
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "115"
+ descriptor = "(II)V",
+ garbageValue = "-1454918275"
)
@Export("advance")
final void advance(int var1) {
@@ -113,7 +105,7 @@ public class GraphicsObject extends Renderable {
}
} else {
this.frame += var1; // L: 49
- if (this.frame >= this.sequenceDefinition.method3729()) { // L: 50
+ if (this.frame >= this.sequenceDefinition.method3835()) { // L: 50
this.isFinished = true;
}
}
@@ -121,14 +113,14 @@ public class GraphicsObject extends Renderable {
}
} // L: 52
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected final Model getModel() {
- SpotAnimationDefinition var1 = class136.SpotAnimationDefinition_get(this.id); // L: 55
+ SpotAnimationDefinition var1 = ObjectSound.SpotAnimationDefinition_get(this.id); // L: 55
Model var2;
if (!this.isFinished) { // L: 57
var2 = var1.getModel(this.frame);
@@ -139,64 +131,47 @@ public class GraphicsObject extends Renderable {
return var2 == null ? null : var2; // L: 59
}
- @ObfuscatedName("o")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(Ljx;B)V",
- garbageValue = "-3"
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+ garbageValue = "337794204"
)
- public static void method1870(Huffman var0) {
- class282.huffman = var0; // L: 14
- } // L: 15
+ static void method1877(String var0, String var1, String var2) {
+ WorldMapData_1.method4872(7); // L: 1127
+ class101.setLoginResponseString(var0, var1, var2); // L: 1128
+ } // L: 1129
- @ObfuscatedName("a")
+ @ObfuscatedName("ki")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-2116498850"
+ descriptor = "(I)V",
+ garbageValue = "2056411217"
)
- static boolean method1867() {
- Date var0;
- try {
- var0 = class115.method2679(); // L: 955
- } catch (ParseException var7) { // L: 957
- class126.method2799(7); // L: 959
- class345.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 960
- return false; // L: 962
- }
+ static void method1870() {
+ for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11739
+ int var1 = var0.group; // L: 11740
+ if (WorldMapSection2.loadInterface(var1)) { // L: 11741
+ boolean var2 = true; // L: 11742
+ Widget[] var3 = SoundCache.Widget_interfaceComponents[var1]; // L: 11743
- if (var0 == null) { // L: 964
- return false; // L: 965
- } else {
- boolean var5 = class268.method5028(var0); // L: 967
- java.util.Calendar var4 = java.util.Calendar.getInstance(); // L: 972
- var4.set(2, 0); // L: 973
- var4.set(5, 1); // L: 974
- var4.set(1, 1900); // L: 975
- Date var3 = var4.getTime(); // L: 976
- boolean var2 = var0.after(var3); // L: 979
- if (!var2) { // L: 982
- class126.method2799(7); // L: 984
- class345.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 985
- return false; // L: 987
- } else {
- if (!var5) { // L: 989
- class7.field26 = 8388607; // L: 990
- } else {
- class7.field26 = (int)(var0.getTime() / 86400000L - 11745L); // L: 993
+ int var4;
+ for (var4 = 0; var4 < var3.length; ++var4) { // L: 11744
+ if (var3[var4] != null) { // L: 11745
+ var2 = var3[var4].isIf3; // L: 11746
+ break;
+ }
}
- return true; // L: 995
+ if (!var2) { // L: 11750
+ var4 = (int)var0.key; // L: 11751
+ Widget var5 = class140.getWidget(var4); // L: 11752
+ if (var5 != null) { // L: 11753
+ ChatChannel.invalidateWidget(var5);
+ }
+ }
}
}
- }
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "19136992"
- )
- public static boolean method1868(int var0) {
- return var0 == WorldMapDecorationType.field3578.id; // L: 51
- }
+ } // L: 11757
public GraphicsObject() {
}
diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java
index 3c50e34845..3a2f3b159f 100644
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -1,36 +1,51 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ct")
+@ObfuscatedName("cn")
@Implements("HealthBar")
public class HealthBar extends Node {
- @ObfuscatedName("l")
+ @ObfuscatedName("ri")
@ObfuscatedSignature(
- descriptor = "Lfr;"
+ descriptor = "Len;"
+ )
+ @Export("guestClanSettings")
+ static ClanSettings guestClanSettings;
+ @ObfuscatedName("cn")
+ public static char field1258;
+ @ObfuscatedName("nf")
+ @ObfuscatedGetter(
+ intValue = 1249602607
+ )
+ @Export("selectedSpellFlags")
+ static int selectedSpellFlags;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lfe;"
)
@Export("definition")
HealthBarDefinition definition;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "Llk;"
)
@Export("updates")
IterableNodeDeque updates;
@ObfuscatedSignature(
- descriptor = "(Lfr;)V"
+ descriptor = "(Lfe;)V"
)
HealthBar(HealthBarDefinition var1) {
this.updates = new IterableNodeDeque(); // L: 12
this.definition = var1; // L: 15
} // L: 16
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(IIIII)V",
- garbageValue = "-1281629783"
+ garbageValue = "1392818075"
)
@Export("put")
void put(int var1, int var2, int var3, int var4) {
@@ -41,7 +56,7 @@ public class HealthBar extends Node {
++var6; // L: 22
if (var7.cycle == var1) { // L: 23
var7.set(var1, var2, var3, var4); // L: 24
- return;
+ return; // L: 25
}
if (var7.cycle <= var1) {
@@ -63,10 +78,10 @@ public class HealthBar extends Node {
}
} // L: 31 35
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IB)Lcn;",
- garbageValue = "79"
+ descriptor = "(IB)Lcp;",
+ garbageValue = "14"
)
@Export("get")
HealthBarUpdate get(int var1) {
@@ -88,60 +103,119 @@ public class HealthBar extends Node {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "127"
+ descriptor = "(I)Z",
+ garbageValue = "-1385237709"
)
@Export("isEmpty")
boolean isEmpty() {
- return this.updates.method5986(); // L: 55
+ return this.updates.method6147(); // L: 55
}
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)[Ldl;",
- garbageValue = "-95794784"
+ descriptor = "(Ldo;[F[FI)V",
+ garbageValue = "-1662385101"
)
- static class118[] method2333() {
- return new class118[]{class118.field1498, class118.field1491, class118.field1492, class118.field1499, class118.field1490, class118.field1495}; // L: 25
- }
-
- @ObfuscatedName("fv")
- @ObfuscatedSignature(
- descriptor = "(Lle;Ljava/lang/String;I)V",
- garbageValue = "757631192"
- )
- static void method2335(Archive var0, String var1) {
- ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1475
- Client.archiveLoaders.add(var2); // L: 1476
- Client.field770 += var2.groupCount; // L: 1477
- } // L: 1478
-
- @ObfuscatedName("gp")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "85"
- )
- static final void method2334() {
- if (Tiles.field997) { // L: 3842
- for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3844
- Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3845
- var1.method2114(); // L: 3846
+ static void method2355(class117 var0, float[] var1, float[] var2) {
+ if (var0 != null) { // L: 273
+ var0.field1464 = var1[0]; // L: 276
+ float var3 = var1[3] - var1[0]; // L: 277
+ float var4 = var2[3] - var2[0]; // L: 278
+ float var5 = var1[1] - var1[0]; // L: 279
+ float var6 = 0.0F; // L: 280
+ float var7 = 0.0F; // L: 281
+ if (0.0D != (double)var5) { // L: 282
+ var6 = (var2[1] - var2[0]) / var5; // L: 283
}
- Tiles.field997 = false; // L: 3849
+ var5 = var1[3] - var1[2]; // L: 285
+ if ((double)var5 != 0.0D) { // L: 286
+ var7 = (var2[3] - var2[2]) / var5; // L: 287
+ }
+
+ float var8 = 1.0F / (var3 * var3); // L: 289
+ float var9 = var3 * var6; // L: 290
+ float var10 = var3 * var7; // L: 291
+ var0.field1465[0] = (var10 + var9 - var4 - var4) * var8 / var3; // L: 292
+ var0.field1465[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; // L: 293
+ var0.field1465[2] = var6; // L: 294
+ var0.field1465[3] = var2[0]; // L: 295
}
+ } // L: 274 296
- } // L: 3851
-
- @ObfuscatedName("ig")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2108689548"
+ descriptor = "(Ljava/lang/CharSequence;IZB)I",
+ garbageValue = "9"
)
- static void method2336() {
- Client.menuOptionsCount = 0; // L: 8697
- Client.isMenuOpen = false; // L: 8698
- } // L: 8699
+ static int method2356(CharSequence var0, int var1, boolean var2) {
+ if (var1 >= 2 && var1 <= 36) { // L: 85
+ boolean var3 = false; // L: 86
+ boolean var4 = false; // L: 87
+ int var5 = 0; // L: 88
+ int var6 = var0.length(); // L: 89
+
+ for (int var7 = 0; var7 < var6; ++var7) { // L: 90
+ char var8 = var0.charAt(var7); // L: 91
+ if (var7 == 0) { // L: 92
+ if (var8 == '-') { // L: 93
+ var3 = true; // L: 94
+ continue;
+ }
+
+ if (var8 == '+') { // L: 97
+ continue;
+ }
+ }
+
+ int var10;
+ if (var8 >= '0' && var8 <= '9') {
+ var10 = var8 - '0'; // L: 99
+ } else if (var8 >= 'A' && var8 <= 'Z') { // L: 100
+ var10 = var8 - '7';
+ } else {
+ if (var8 < 'a' || var8 > 'z') { // L: 101
+ throw new NumberFormatException(); // L: 102
+ }
+
+ var10 = var8 - 'W';
+ }
+
+ if (var10 >= var1) { // L: 103
+ throw new NumberFormatException();
+ }
+
+ if (var3) { // L: 104
+ var10 = -var10;
+ }
+
+ int var9 = var10 + var5 * var1; // L: 105
+ if (var9 / var1 != var5) { // L: 106
+ throw new NumberFormatException();
+ }
+
+ var5 = var9; // L: 107
+ var4 = true; // L: 108
+ }
+
+ if (!var4) { // L: 110
+ throw new NumberFormatException();
+ } else {
+ return var5; // L: 111
+ }
+ } else {
+ throw new IllegalArgumentException("" + var1);
+ }
+ }
+
+ @ObfuscatedName("hi")
+ @ObfuscatedSignature(
+ descriptor = "(IIIII)V",
+ garbageValue = "1947801286"
+ )
+ static final void method2349(int var0, int var1, int var2, int var3) {
+ WorldMap.method7376(); // L: 5428
+ } // L: 5429
}
diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java
index 3ad0b5a2bf..3e74bc3a51 100644
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/runescape-client/src/main/java/HealthBarDefinition.java
@@ -4,289 +4,214 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fr")
+@ObfuscatedName("fe")
@Implements("HealthBarDefinition")
public class HealthBarDefinition extends DualNode {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("HealthBarDefinition_archive")
+ public static AbstractArchive HealthBarDefinition_archive;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ public static AbstractArchive field1877;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Llp;"
- )
- public static AbstractArchive field1911;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("HealthBarDefinition_cached")
- public static EvictingDualNodeHashTable HealthBarDefinition_cached;
- @ObfuscatedName("k")
+ static EvictingDualNodeHashTable HealthBarDefinition_cached;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("HealthBarDefinition_cachedSprites")
static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = -1302897985
+ @ObfuscatedName("br")
+ @ObfuscatedSignature(
+ descriptor = "Lpe;"
)
- public int field1908;
- @ObfuscatedName("s")
+ @Export("loginType")
+ static LoginType loginType;
+ @ObfuscatedName("fp")
@ObfuscatedGetter(
- intValue = 202730899
+ intValue = 693787955
+ )
+ static int field1888;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1094973945
+ )
+ public int field1876;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = -2143269191
)
@Export("int1")
public int int1;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 2090616095
+ intValue = -131797823
)
@Export("int2")
public int int2;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -952719889
+ intValue = 546193187
)
@Export("int3")
public int int3;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -1042912721
+ intValue = 701454719
)
- public int field1915;
- @ObfuscatedName("c")
+ public int field1881;
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 1843319957
+ intValue = 1633864587
)
@Export("int5")
public int int5;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 1895414675
+ intValue = -1383515023
)
@Export("frontSpriteID")
int frontSpriteID;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = -608989391
+ intValue = 534190147
)
@Export("backSpriteID")
int backSpriteID;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = 1407123339
+ intValue = 1354984089
)
@Export("width")
public int width;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 675668437
+ intValue = -548301543
)
@Export("widthPadding")
public int widthPadding;
static {
- HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
- HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
+ HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14
+ HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15
}
- public HealthBarDefinition() {
- this.int1 = 255;
- this.int2 = 255;
+ HealthBarDefinition() {
+ this.int1 = 255; // L: 19
+ this.int2 = 255; // L: 20
this.int3 = -1; // L: 21
- this.field1915 = 1; // L: 22
- this.int5 = 70;
- this.frontSpriteID = -1;
- this.backSpriteID = -1;
+ this.field1881 = 1; // L: 22
+ this.int5 = 70; // L: 23
+ this.frontSpriteID = -1; // L: 24
+ this.backSpriteID = -1; // L: 25
this.width = 30; // L: 26
- this.widthPadding = 0;
- }
+ this.widthPadding = 0; // L: 27
+ } // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-819365300"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "2126050734"
)
@Export("decode")
- public void decode(Buffer var1) {
+ void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 31
- if (var2 == 0) {
- return;
+ int var2 = var1.readUnsignedByte(); // L: 43
+ if (var2 == 0) { // L: 44
+ return; // L: 47
}
- this.decodeNext(var1, var2);
+ this.decodeNext(var1, var2); // L: 45
}
}
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "22"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "442152840"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 1) {
- var1.readUnsignedShort();
- } else if (var2 == 2) { // L: 41
+ if (var2 == 1) { // L: 50
+ var1.readUnsignedShort(); // L: 51
+ } else if (var2 == 2) { // L: 53
this.int1 = var1.readUnsignedByte();
- } else if (var2 == 3) { // L: 42
+ } else if (var2 == 3) { // L: 54
this.int2 = var1.readUnsignedByte();
- } else if (var2 == 4) {
+ } else if (var2 == 4) { // L: 55
this.int3 = 0;
- } else if (var2 == 5) {
+ } else if (var2 == 5) { // L: 56
this.int5 = var1.readUnsignedShort();
- } else if (var2 == 6) {
- var1.readUnsignedByte();
- } else if (var2 == 7) { // L: 48
- this.frontSpriteID = var1.method7532();
- } else if (var2 == 8) {
- this.backSpriteID = var1.method7532();
- } else if (var2 == 11) {
+ } else if (var2 == 6) { // L: 57
+ var1.readUnsignedByte(); // L: 58
+ } else if (var2 == 7) { // L: 60
+ this.frontSpriteID = var1.method7752();
+ } else if (var2 == 8) { // L: 61
+ this.backSpriteID = var1.method7752();
+ } else if (var2 == 11) { // L: 62
this.int3 = var1.readUnsignedShort();
- } else if (var2 == 14) {
+ } else if (var2 == 14) { // L: 63
this.width = var1.readUnsignedByte();
- } else if (var2 == 15) {
+ } else if (var2 == 15) { // L: 64
this.widthPadding = var1.readUnsignedByte();
}
- }
+ } // L: 66
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I)Lqr;",
- garbageValue = "1767705109"
+ descriptor = "(B)Lqe;",
+ garbageValue = "-83"
)
@Export("getFrontSprite")
public SpritePixels getFrontSprite() {
- if (this.frontSpriteID < 0) { // L: 57
+ if (this.frontSpriteID < 0) { // L: 69
return null;
} else {
- SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
+ SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70
if (var1 != null) {
- return var1;
+ return var1; // L: 71
} else {
- var1 = StructComposition.SpriteBuffer_getSprite(field1911, this.frontSpriteID, 0);
- if (var1 != null) {
+ var1 = class7.SpriteBuffer_getSprite(field1877, this.frontSpriteID, 0); // L: 72
+ if (var1 != null) { // L: 73
HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
}
- return var1;
+ return var1; // L: 75
}
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)Lqr;",
- garbageValue = "2134989657"
+ descriptor = "(I)Lqe;",
+ garbageValue = "-1408497685"
)
@Export("getBackSprite")
public SpritePixels getBackSprite() {
- if (this.backSpriteID < 0) { // L: 67
+ if (this.backSpriteID < 0) { // L: 79
return null;
} else {
- SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 68
+ SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80
if (var1 != null) {
- return var1; // L: 69
+ return var1; // L: 81
} else {
- var1 = StructComposition.SpriteBuffer_getSprite(field1911, this.backSpriteID, 0); // L: 70
+ var1 = class7.SpriteBuffer_getSprite(field1877, this.backSpriteID, 0); // L: 82
if (var1 != null) {
- HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 71
+ HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 83
}
- return var1; // L: 73
+ return var1; // L: 85
}
}
}
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llq;I)I",
- garbageValue = "-857969129"
- )
- @Export("compareStrings")
- public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
- int var3 = var0.length(); // L: 11
- int var4 = var1.length(); // L: 12
- int var5 = 0; // L: 13
- int var6 = 0; // L: 14
- char var7 = 0; // L: 15
- char var8 = 0; // L: 16
-
- while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18
- if (var5 - var7 >= var3) { // L: 19
- return -1;
- }
-
- if (var6 - var8 >= var4) { // L: 20
- return 1;
- }
-
- char var9;
- if (var7 != 0) { // L: 23
- var9 = var7; // L: 24
- boolean var14 = false; // L: 25
- } else {
- var9 = var0.charAt(var5++); // L: 27
- }
-
- char var10;
- if (var8 != 0) { // L: 28
- var10 = var8; // L: 29
- boolean var15 = false; // L: 30
- } else {
- var10 = var1.charAt(var6++); // L: 32
- }
-
- var7 = RouteStrategy.method3795(var9); // L: 33
- var8 = RouteStrategy.method3795(var10); // L: 34
- var9 = class343.standardizeChar(var9, var2); // L: 35
- var10 = class343.standardizeChar(var10, var2); // L: 36
- if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37
- var9 = Character.toLowerCase(var9); // L: 38
- var10 = Character.toLowerCase(var10); // L: 39
- if (var10 != var9) { // L: 40
- return class282.lowercaseChar(var9, var2) - class282.lowercaseChar(var10, var2);
- }
- }
- }
-
- int var16 = Math.min(var3, var4); // L: 43
-
- char var12;
- int var17;
- for (var17 = 0; var17 < var16; ++var17) { // L: 44
- if (var2 == Language.Language_FR) { // L: 45
- var5 = var3 - 1 - var17; // L: 46
- var6 = var4 - 1 - var17; // L: 47
- } else {
- var6 = var17; // L: 49
- var5 = var17;
- }
-
- char var11 = var0.charAt(var5); // L: 50
- var12 = var1.charAt(var6); // L: 51
- if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52
- var11 = Character.toLowerCase(var11); // L: 53
- var12 = Character.toLowerCase(var12); // L: 54
- if (var11 != var12) {
- return class282.lowercaseChar(var11, var2) - class282.lowercaseChar(var12, var2); // L: 55
- }
- }
- }
-
- var17 = var3 - var4; // L: 58
- if (var17 != 0) { // L: 59
- return var17;
- } else {
- for (int var18 = 0; var18 < var16; ++var18) { // L: 60
- var12 = var0.charAt(var18); // L: 61
- char var13 = var1.charAt(var18); // L: 62
- if (var12 != var13) { // L: 63
- return class282.lowercaseChar(var12, var2) - class282.lowercaseChar(var13, var2);
- }
- }
-
- return 0; // L: 65
- }
- }
}
diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java
index e7f2c49e15..2bd4c8a8b2 100644
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -4,30 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cn")
+@ObfuscatedName("cp")
@Implements("HealthBarUpdate")
public class HealthBarUpdate extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("vu")
@ObfuscatedGetter(
- intValue = 1515089
+ intValue = 793464983
+ )
+ @Export("foundItemIdCount")
+ static int foundItemIdCount;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 834997317
+ )
+ static int field1212;
+ @ObfuscatedName("fv")
+ @ObfuscatedGetter(
+ intValue = 1144016037
+ )
+ static int field1206;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = -1062197261
)
@Export("cycle")
int cycle;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 58622393
+ intValue = -1440518285
)
@Export("health")
int health;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 609346869
+ intValue = 878626357
)
@Export("health2")
int health2;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1802686675
+ intValue = -1008759007
)
@Export("cycleOffset")
int cycleOffset;
@@ -39,44 +55,168 @@ public class HealthBarUpdate extends Node {
this.cycleOffset = var4; // L: 15
} // L: 16
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(IIIII)V",
- garbageValue = "-115890137"
+ garbageValue = "-384341292"
)
@Export("set")
void set(int var1, int var2, int var3, int var4) {
this.cycle = var1; // L: 19
this.health = var2; // L: 20
this.health2 = var3; // L: 21
- this.cycleOffset = var4; // L: 22
+ this.cycleOffset = var4;
} // L: 23
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqy;"
+ descriptor = "(Llh;Llh;B)I",
+ garbageValue = "-1"
)
- @Export("newRunException")
- public static RunException newRunException(Throwable var0, String var1) {
- RunException var2;
- if (var0 instanceof RunException) { // L: 57
- var2 = (RunException)var0; // L: 58
- var2.message = var2.message + ' ' + var1; // L: 59
- } else {
- var2 = new RunException(var0, var1); // L: 61
+ static int method2203(AbstractArchive var0, AbstractArchive var1) {
+ int var2 = 0; // L: 159
+ String[] var3 = Login.field924; // L: 161
+
+ int var4;
+ String var5;
+ for (var4 = 0; var4 < var3.length; ++var4) { // L: 162
+ var5 = var3[var4]; // L: 163
+ if (var0.tryLoadFileByNames(var5, "")) { // L: 165
+ ++var2;
+ }
}
- return var2; // L: 62
+ var3 = Login.field916; // L: 170
+
+ for (var4 = 0; var4 < var3.length; ++var4) { // L: 171
+ var5 = var3[var4]; // L: 172
+ if (var1.tryLoadFileByNames(var5, "")) { // L: 174
+ ++var2;
+ }
+ }
+
+ return var2; // L: 178
}
- @ObfuscatedName("p")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(ZZB)I",
- garbageValue = "-11"
+ descriptor = "(II)I",
+ garbageValue = "329398587"
)
- public static int method2181(boolean var0, boolean var1) {
- byte var2 = 0; // L: 170
- int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 171
- return var3; // L: 172
+ public static int method2199(int var0) {
+ return var0 >>> 4 & class438.field4683; // L: 22
}
+
+ @ObfuscatedName("et")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1918682655"
+ )
+ @Export("updateGameState")
+ static void updateGameState(int var0) {
+ if (var0 != Client.gameState) { // L: 1248
+ if (Client.gameState == 0) { // L: 1249
+ class353.client.method410();
+ }
+
+ if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1250
+ HitSplatDefinition.method3624(0); // L: 1251
+ Client.field512 = 0; // L: 1252
+ Client.field609 = 0; // L: 1253
+ Client.timer.method6528(var0); // L: 1254
+ if (var0 != 20) { // L: 1255
+ TriBool.method6791(false);
+ }
+ }
+
+ if (var0 != 20 && var0 != 40 && Message.field461 != null) { // L: 1257 1258
+ Message.field461.close(); // L: 1259
+ Message.field461 = null; // L: 1260
+ }
+
+ if (Client.gameState == 25) { // L: 1263
+ Client.field549 = 0; // L: 1264
+ Client.field694 = 0; // L: 1265
+ Client.field546 = 1; // L: 1266
+ Client.field547 = 0; // L: 1267
+ Client.field548 = 1; // L: 1268
+ }
+
+ if (var0 != 5 && var0 != 10) { // L: 1270
+ if (var0 == 20) { // L: 1278
+ int var3 = Client.gameState == 11 ? 4 : 0; // L: 1279
+ ClanSettings.method3020(ApproximateRouteStrategy.archive10, class304.archive8, false, var3); // L: 1280
+ } else if (var0 == 11) { // L: 1282
+ ClanSettings.method3020(ApproximateRouteStrategy.archive10, class304.archive8, false, 4); // L: 1283
+ } else if (var0 == 50) { // L: 1285
+ class101.setLoginResponseString("", "Updating date of birth...", ""); // L: 1286
+ ClanSettings.method3020(ApproximateRouteStrategy.archive10, class304.archive8, false, 7); // L: 1287
+ } else if (Login.clearLoginScreen) { // L: 1290
+ class4.titleboxSprite = null; // L: 1291
+ class6.titlebuttonSprite = null; // L: 1292
+ AbstractByteArrayCopier.runesSprite = null; // L: 1293
+ class16.leftTitleSprite = null; // L: 1294
+ Login.rightTitleSprite = null; // L: 1295
+ Login.logoSprite = null; // L: 1296
+ class145.title_muteSprite = null; // L: 1297
+ class345.options_buttons_0Sprite = null; // L: 1298
+ class228.options_buttons_2Sprite = null; // L: 1299
+ ScriptFrame.worldSelectBackSprites = null; // L: 1300
+ class126.worldSelectFlagSprites = null; // L: 1301
+ FriendSystem.worldSelectArrows = null; // L: 1302
+ class220.worldSelectStars = null; // L: 1303
+ UserComparator5.field1385 = null; // L: 1304
+ Login.loginScreenRunesAnimation.method2209(); // L: 1305
+ class272.musicPlayerStatus = 1; // L: 1307
+ class272.musicTrackArchive = null; // L: 1308
+ class272.musicTrackGroupId = -1; // L: 1309
+ class151.musicTrackFileId = -1; // L: 1310
+ class272.musicTrackVolume = 0; // L: 1311
+ class11.musicTrackBoolean = false; // L: 1312
+ class272.pcmSampleLength = 2; // L: 1313
+ class115.method2693(true); // L: 1315
+ Login.clearLoginScreen = false; // L: 1316
+ }
+ } else {
+ boolean var1 = class19.clientPreferences.method2266() >= Client.field482; // L: 1273
+ int var2 = var1 ? 0 : 12; // L: 1275
+ ClanSettings.method3020(ApproximateRouteStrategy.archive10, class304.archive8, true, var2); // L: 1276
+ }
+
+ Client.gameState = var0; // L: 1318
+ }
+ } // L: 1319
+
+ @ObfuscatedName("fh")
+ @ObfuscatedSignature(
+ descriptor = "(Llc;Ljava/lang/String;I)V",
+ garbageValue = "1432577615"
+ )
+ static void method2202(Archive var0, String var1) {
+ ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1628
+ Client.archiveLoaders.add(var2); // L: 1629
+ Client.field626 += var2.groupCount; // L: 1630
+ } // L: 1631
+
+ @ObfuscatedName("gj")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1636421425"
+ )
+ static void method2204() {
+ if (Client.renderSelf) { // L: 4787
+ ByteArrayPool.addPlayerToScene(class101.localPlayer, false); // L: 4788
+ }
+
+ } // L: 4790
+
+ @ObfuscatedName("lb")
+ @ObfuscatedSignature(
+ descriptor = "(S)V",
+ garbageValue = "-12087"
+ )
+ static void method2205() {
+ Client.packetWriter.addNode(EnumComposition.getPacketBufferNode(ClientPacket.field2945, Client.packetWriter.isaacCipher)); // L: 12418
+ Client.oculusOrbState = 0; // L: 12419
+ } // L: 12420
}
diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java
index e542cd3b51..dc7931de45 100644
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -4,114 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gk")
+@ObfuscatedName("gr")
@Implements("HitSplatDefinition")
public class HitSplatDefinition extends DualNode {
- @ObfuscatedName("tb")
- @ObfuscatedGetter(
- intValue = 2130203017
- )
- static int field2077;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("HitSplatDefinition_archive")
- static AbstractArchive HitSplatDefinition_archive;
- @ObfuscatedName("k")
+ public static AbstractArchive HitSplatDefinition_archive;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Llh;"
+ )
+ public static AbstractArchive field2017;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
)
@Export("HitSplatDefinition_cached")
- static EvictingDualNodeHashTable HitSplatDefinition_cached;
- @ObfuscatedName("a")
+ public static EvictingDualNodeHashTable HitSplatDefinition_cached;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("HitSplatDefinition_cachedSprites")
- static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
- @ObfuscatedName("m")
+ public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("HitSplatDefinition_cachedFonts")
- static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
- @ObfuscatedName("c")
+ public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 1395317347
+ intValue = -592555797
)
@Export("fontId")
int fontId;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 1417482049
+ intValue = -1722715223
)
@Export("textColor")
public int textColor;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 1131373797
+ intValue = 860140195
)
- public int field2071;
- @ObfuscatedName("t")
- @ObfuscatedGetter(
- intValue = 1501343813
- )
- int field2062;
- @ObfuscatedName("g")
- @ObfuscatedGetter(
- intValue = -63093085
- )
- int field2067;
- @ObfuscatedName("x")
- @ObfuscatedGetter(
- intValue = -580949191
- )
- int field2064;
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = 269659311
- )
- int field2054;
- @ObfuscatedName("e")
- @ObfuscatedGetter(
- intValue = 254386385
- )
- public int field2055;
- @ObfuscatedName("h")
- @ObfuscatedGetter(
- intValue = -825953789
- )
- public int field2074;
- @ObfuscatedName("f")
- @ObfuscatedGetter(
- intValue = -801066855
- )
- public int field2072;
- @ObfuscatedName("d")
- String field2069;
- @ObfuscatedName("j")
- @ObfuscatedGetter(
- intValue = 1961631307
- )
- public int field2070;
- @ObfuscatedName("z")
- @ObfuscatedGetter(
- intValue = -474593523
- )
- public int field2068;
- @ObfuscatedName("i")
- @Export("transforms")
- public int[] transforms;
+ public int field2026;
@ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = -901285467
+ intValue = 332626063
+ )
+ int field2021;
+ @ObfuscatedName("k")
+ @ObfuscatedGetter(
+ intValue = -161678465
+ )
+ int field2016;
+ @ObfuscatedName("h")
+ @ObfuscatedGetter(
+ intValue = -1426101485
+ )
+ int field2029;
+ @ObfuscatedName("x")
+ @ObfuscatedGetter(
+ intValue = 195385179
+ )
+ int field2027;
+ @ObfuscatedName("l")
+ @ObfuscatedGetter(
+ intValue = 1489450415
+ )
+ public int field2031;
+ @ObfuscatedName("a")
+ @ObfuscatedGetter(
+ intValue = -2109795173
+ )
+ public int field2032;
+ @ObfuscatedName("p")
+ @ObfuscatedGetter(
+ intValue = 247260053
+ )
+ public int field2030;
+ @ObfuscatedName("b")
+ String field2034;
+ @ObfuscatedName("n")
+ @ObfuscatedGetter(
+ intValue = 242554481
+ )
+ public int field2035;
+ @ObfuscatedName("o")
+ @ObfuscatedGetter(
+ intValue = 1781397165
+ )
+ public int field2019;
+ @ObfuscatedName("m")
+ @Export("transforms")
+ public int[] transforms;
+ @ObfuscatedName("d")
+ @ObfuscatedGetter(
+ intValue = -1586306339
)
@Export("transformVarbit")
int transformVarbit;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@ObfuscatedGetter(
- intValue = -895793349
+ intValue = 837589615
)
@Export("transformVarp")
int transformVarp;
@@ -125,263 +125,1005 @@ public class HitSplatDefinition extends DualNode {
HitSplatDefinition() {
this.fontId = -1; // L: 26
this.textColor = 16777215; // L: 27
- this.field2071 = 70; // L: 28
- this.field2062 = -1; // L: 29
- this.field2067 = -1; // L: 30
- this.field2064 = -1; // L: 31
- this.field2054 = -1; // L: 32
- this.field2055 = 0; // L: 33
- this.field2074 = 0; // L: 34
- this.field2072 = -1; // L: 35
- this.field2069 = ""; // L: 36
- this.field2070 = -1; // L: 37
- this.field2068 = 0; // L: 38
+ this.field2026 = 70; // L: 28
+ this.field2021 = -1; // L: 29
+ this.field2016 = -1; // L: 30
+ this.field2029 = -1; // L: 31
+ this.field2027 = -1; // L: 32
+ this.field2031 = 0; // L: 33
+ this.field2032 = 0; // L: 34
+ this.field2030 = -1; // L: 35
+ this.field2034 = ""; // L: 36
+ this.field2035 = -1; // L: 37
+ this.field2019 = 0; // L: 38
this.transformVarbit = -1; // L: 40
this.transformVarp = -1; // L: 41
} // L: 43
- @ObfuscatedName("l")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "507933572"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-905711242"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 63
- if (var2 == 0) { // L: 64
- return; // L: 67
+ int var2 = var1.readUnsignedByte(); // L: 57
+ if (var2 == 0) { // L: 58
+ return; // L: 61
}
- this.decodeNext(var1, var2); // L: 65
+ this.decodeNext(var1, var2); // L: 59
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "1744488048"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "1685495726"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 1) { // L: 70
- this.fontId = var1.method7532();
- } else if (var2 == 2) { // L: 71
+ if (var2 == 1) { // L: 64
+ this.fontId = var1.method7752();
+ } else if (var2 == 2) { // L: 65
this.textColor = var1.readMedium();
- } else if (var2 == 3) { // L: 72
- this.field2062 = var1.method7532();
- } else if (var2 == 4) { // L: 73
- this.field2064 = var1.method7532();
- } else if (var2 == 5) { // L: 74
- this.field2067 = var1.method7532();
- } else if (var2 == 6) { // L: 75
- this.field2054 = var1.method7532();
- } else if (var2 == 7) { // L: 76
- this.field2055 = var1.readShort();
- } else if (var2 == 8) { // L: 77
- this.field2069 = var1.readStringCp1252NullCircumfixed();
- } else if (var2 == 9) { // L: 78
- this.field2071 = var1.readUnsignedShort();
- } else if (var2 == 10) { // L: 79
- this.field2074 = var1.readShort();
- } else if (var2 == 11) { // L: 80
- this.field2072 = 0;
- } else if (var2 == 12) { // L: 81
- this.field2070 = var1.readUnsignedByte();
- } else if (var2 == 13) { // L: 82
- this.field2068 = var1.readShort();
+ } else if (var2 == 3) { // L: 66
+ this.field2021 = var1.method7752();
+ } else if (var2 == 4) { // L: 67
+ this.field2029 = var1.method7752();
+ } else if (var2 == 5) { // L: 68
+ this.field2016 = var1.method7752();
+ } else if (var2 == 6) { // L: 69
+ this.field2027 = var1.method7752();
+ } else if (var2 == 7) { // L: 70
+ this.field2031 = var1.readShort();
+ } else if (var2 == 8) { // L: 71
+ this.field2034 = var1.readStringCp1252NullCircumfixed();
+ } else if (var2 == 9) { // L: 72
+ this.field2026 = var1.readUnsignedShort();
+ } else if (var2 == 10) { // L: 73
+ this.field2032 = var1.readShort();
+ } else if (var2 == 11) { // L: 74
+ this.field2030 = 0;
+ } else if (var2 == 12) { // L: 75
+ this.field2035 = var1.readUnsignedByte();
+ } else if (var2 == 13) { // L: 76
+ this.field2019 = var1.readShort();
} else if (var2 == 14) {
- this.field2072 = var1.readUnsignedShort(); // L: 83
- } else if (var2 == 17 || var2 == 18) { // L: 84
- this.transformVarbit = var1.readUnsignedShort(); // L: 85
- if (this.transformVarbit == 65535) { // L: 86
+ this.field2030 = var1.readUnsignedShort(); // L: 77
+ } else if (var2 == 17 || var2 == 18) { // L: 78
+ this.transformVarbit = var1.readUnsignedShort(); // L: 79
+ if (this.transformVarbit == 65535) { // L: 80
this.transformVarbit = -1;
}
- this.transformVarp = var1.readUnsignedShort(); // L: 87
- if (this.transformVarp == 65535) { // L: 88
+ this.transformVarp = var1.readUnsignedShort(); // L: 81
+ if (this.transformVarp == 65535) { // L: 82
this.transformVarp = -1;
}
- int var3 = -1; // L: 89
- if (var2 == 18) { // L: 90
- var3 = var1.readUnsignedShort(); // L: 91
- if (var3 == 65535) { // L: 92
+ int var3 = -1; // L: 83
+ if (var2 == 18) { // L: 84
+ var3 = var1.readUnsignedShort(); // L: 85
+ if (var3 == 65535) { // L: 86
var3 = -1;
}
}
- int var4 = var1.readUnsignedByte(); // L: 94
- this.transforms = new int[var4 + 2]; // L: 95
+ int var4 = var1.readUnsignedByte(); // L: 88
+ this.transforms = new int[var4 + 2]; // L: 89
- for (int var5 = 0; var5 <= var4; ++var5) { // L: 96
- this.transforms[var5] = var1.readUnsignedShort(); // L: 97
- if (this.transforms[var5] == 65535) { // L: 98
+ for (int var5 = 0; var5 <= var4; ++var5) { // L: 90
+ this.transforms[var5] = var1.readUnsignedShort(); // L: 91
+ if (this.transforms[var5] == 65535) { // L: 92
this.transforms[var5] = -1;
}
}
- this.transforms[var4 + 1] = var3; // L: 100
+ this.transforms[var4 + 1] = var3; // L: 94
}
- } // L: 103
+ } // L: 97
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I)Lgk;",
- garbageValue = "1570100163"
+ descriptor = "(I)Lgr;",
+ garbageValue = "-303621175"
)
@Export("transform")
public final HitSplatDefinition transform() {
- int var1 = -1; // L: 106
- if (this.transformVarbit != -1) { // L: 107
- var1 = class18.getVarbit(this.transformVarbit);
- } else if (this.transformVarp != -1) { // L: 108
+ int var1 = -1; // L: 100
+ if (this.transformVarbit != -1) { // L: 101
+ var1 = class388.getVarbit(this.transformVarbit);
+ } else if (this.transformVarp != -1) { // L: 102
var1 = Varps.Varps_main[this.transformVarp];
}
int var2;
- if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 110
- var2 = this.transforms[var1]; // L: 111
+ if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 104
+ var2 = this.transforms[var1]; // L: 105
} else {
var2 = this.transforms[this.transforms.length - 1];
}
- return var2 != -1 ? UserComparator4.method2567(var2) : null; // L: 112 113
+ return var2 != -1 ? class122.method2800(var2) : null; // L: 106 107
}
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(II)Ljava/lang/String;",
- garbageValue = "1649280427"
+ garbageValue = "1527850435"
)
@Export("getString")
public String getString(int var1) {
- String var2 = this.field2069; // L: 117
+ String var2 = this.field2034; // L: 111
while (true) {
- int var3 = var2.indexOf("%1"); // L: 119
- if (var3 < 0) { // L: 120
- return var2; // L: 123
+ int var3 = var2.indexOf("%1"); // L: 113
+ if (var3 < 0) { // L: 114
+ return var2; // L: 117
}
- var2 = var2.substring(0, var3) + Message.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
+ var2 = var2.substring(0, var3) + Tile.intToString(var1, false) + var2.substring(var3 + 2); // L: 115
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(B)Lqr;",
- garbageValue = "-97"
+ descriptor = "(I)Lqe;",
+ garbageValue = "-2128633016"
)
- public SpritePixels method3531() {
- if (this.field2062 < 0) { // L: 127
+ public SpritePixels method3623() {
+ if (this.field2021 < 0) { // L: 121
return null;
} else {
- SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2062); // L: 128
- if (var1 != null) {
- return var1; // L: 129
+ SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2021); // L: 122
+ if (var1 != null) { // L: 123
+ return var1;
} else {
- var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2062, 0); // L: 130
- if (var1 != null) { // L: 131
- HitSplatDefinition_cachedSprites.put(var1, (long)this.field2062);
+ var1 = class7.SpriteBuffer_getSprite(field2017, this.field2021, 0); // L: 124
+ if (var1 != null) {
+ HitSplatDefinition_cachedSprites.put(var1, (long)this.field2021); // L: 125
}
+ return var1; // L: 127
+ }
+ }
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(B)Lqe;",
+ garbageValue = "10"
+ )
+ public SpritePixels method3643() {
+ if (this.field2016 < 0) { // L: 131
+ return null;
+ } else {
+ SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2016); // L: 132
+ if (var1 != null) {
return var1; // L: 133
+ } else {
+ var1 = class7.SpriteBuffer_getSprite(field2017, this.field2016, 0); // L: 134
+ if (var1 != null) { // L: 135
+ HitSplatDefinition_cachedSprites.put(var1, (long)this.field2016);
+ }
+
+ return var1; // L: 137
}
}
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(I)Lqr;",
- garbageValue = "-1422876623"
+ descriptor = "(B)Lqe;",
+ garbageValue = "33"
)
- public SpritePixels method3534() {
- if (this.field2067 < 0) { // L: 137
+ public SpritePixels method3625() {
+ if (this.field2029 < 0) { // L: 141
return null;
} else {
- SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2067); // L: 138
+ SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2029); // L: 142
if (var1 != null) {
- return var1; // L: 139
- } else {
- var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2067, 0); // L: 140
- if (var1 != null) { // L: 141
- HitSplatDefinition_cachedSprites.put(var1, (long)this.field2067);
- }
-
return var1; // L: 143
- }
- }
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(B)Lqr;",
- garbageValue = "23"
- )
- public SpritePixels method3533() {
- if (this.field2064 < 0) { // L: 147
- return null;
- } else {
- SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2064); // L: 148
- if (var1 != null) {
- return var1; // L: 149
} else {
- var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2064, 0); // L: 150
+ var1 = class7.SpriteBuffer_getSprite(field2017, this.field2029, 0); // L: 144
if (var1 != null) {
- HitSplatDefinition_cachedSprites.put(var1, (long)this.field2064); // L: 151
+ HitSplatDefinition_cachedSprites.put(var1, (long)this.field2029); // L: 145
}
- return var1; // L: 153
- }
- }
- }
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(I)Lqr;",
- garbageValue = "-554047425"
- )
- public SpritePixels method3559() {
- if (this.field2054 < 0) { // L: 157
- return null;
- } else {
- SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2054); // L: 158
- if (var1 != null) {
- return var1; // L: 159
- } else {
- var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2054, 0); // L: 160
- if (var1 != null) {
- HitSplatDefinition_cachedSprites.put(var1, (long)this.field2054); // L: 161
- }
-
- return var1; // L: 163
+ return var1; // L: 147
}
}
}
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(I)Lmx;",
- garbageValue = "287302031"
+ descriptor = "(B)Lqe;",
+ garbageValue = "1"
)
- @Export("getFont")
- public Font getFont() {
- if (this.fontId == -1) { // L: 167
+ public SpritePixels method3626() {
+ if (this.field2027 < 0) { // L: 151
return null;
} else {
- Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168
- if (var1 != null) { // L: 169
+ SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2027); // L: 152
+ if (var1 != null) { // L: 153
return var1;
} else {
- var1 = class387.method6781(ModelData0.field2654, class1.HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170
+ var1 = class7.SpriteBuffer_getSprite(field2017, this.field2027, 0); // L: 154
if (var1 != null) {
- HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171
+ HitSplatDefinition_cachedSprites.put(var1, (long)this.field2027); // L: 155
}
- return var1; // L: 173
+ return var1; // L: 157
}
}
}
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(S)Lmt;",
+ garbageValue = "9601"
+ )
+ @Export("getFont")
+ public Font getFont() {
+ if (this.fontId == -1) { // L: 161
+ return null;
+ } else {
+ Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 162
+ if (var1 != null) { // L: 163
+ return var1;
+ } else {
+ AbstractArchive var3 = field2017; // L: 165
+ AbstractArchive var4 = class4.HitSplatDefinition_fontsArchive; // L: 166
+ int var5 = this.fontId; // L: 167
+ Font var2;
+ if (!Ignored.method6774(var3, var5, 0)) { // L: 169
+ var2 = null; // L: 170
+ } else {
+ byte[] var7 = var4.takeFile(var5, 0); // L: 174
+ Font var6;
+ if (var7 == null) { // L: 176
+ var6 = null; // L: 177
+ } else {
+ Font var8 = new Font(var7, class426.SpriteBuffer_xOffsets, class142.SpriteBuffer_yOffsets, class359.SpriteBuffer_spriteWidths, class456.SpriteBuffer_spriteHeights, class13.SpriteBuffer_spritePalette, class421.SpriteBuffer_pixels); // L: 180
+ class426.SpriteBuffer_xOffsets = null; // L: 182
+ class142.SpriteBuffer_yOffsets = null; // L: 183
+ class359.SpriteBuffer_spriteWidths = null; // L: 184
+ class456.SpriteBuffer_spriteHeights = null; // L: 185
+ class13.SpriteBuffer_spritePalette = null; // L: 186
+ class421.SpriteBuffer_pixels = null; // L: 187
+ var6 = var8; // L: 189
+ }
+
+ var2 = var6; // L: 191
+ }
+
+ if (var2 != null) { // L: 194
+ HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
+ }
+
+ return var2; // L: 196
+ }
+ }
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Ljava/lang/String;",
+ garbageValue = "44"
+ )
+ static final String method3632(int var0) {
+ if (var0 < 100000) { // L: 433
+ return "" + var0 + "";
+ } else {
+ return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 434 435
+ }
+ }
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(Lmt;Lmt;Lmt;I)V",
+ garbageValue = "1695432560"
+ )
+ @Export("drawTitle")
+ static void drawTitle(Font var0, Font var1, Font var2) {
+ Login.xPadding = (Script.canvasWidth - 765) / 2; // L: 1201
+ Login.loginBoxX = Login.xPadding + 202; // L: 1202
+ Canvas.loginBoxCenter = Login.loginBoxX + 180; // L: 1203
+ byte var3;
+ int var4;
+ int var7;
+ int var25;
+ int var32;
+ int var45;
+ if (Login.worldSelectOpen) { // L: 1204
+ Archive var46;
+ if (ScriptFrame.worldSelectBackSprites == null) { // L: 1206
+ var46 = class304.archive8; // L: 1208
+ var45 = var46.getGroupId("sl_back"); // L: 1210
+ var25 = var46.getFileId(var45, ""); // L: 1211
+ SpritePixels[] var50 = class430.method7547(var46, var45, var25); // L: 1212
+ ScriptFrame.worldSelectBackSprites = var50; // L: 1214
+ }
+
+ IndexedSprite[] var51;
+ if (class126.worldSelectFlagSprites == null) { // L: 1216
+ var46 = class304.archive8; // L: 1218
+ var45 = var46.getGroupId("sl_flags"); // L: 1220
+ var25 = var46.getFileId(var45, ""); // L: 1221
+ var51 = ClanChannelMember.method2867(var46, var45, var25); // L: 1222
+ class126.worldSelectFlagSprites = var51; // L: 1224
+ }
+
+ if (FriendSystem.worldSelectArrows == null) { // L: 1226
+ var46 = class304.archive8; // L: 1228
+ var45 = var46.getGroupId("sl_arrows"); // L: 1230
+ var25 = var46.getFileId(var45, ""); // L: 1231
+ var51 = ClanChannelMember.method2867(var46, var45, var25); // L: 1232
+ FriendSystem.worldSelectArrows = var51; // L: 1234
+ }
+
+ if (class220.worldSelectStars == null) { // L: 1236
+ var46 = class304.archive8; // L: 1238
+ var45 = var46.getGroupId("sl_stars"); // L: 1240
+ var25 = var46.getFileId(var45, ""); // L: 1241
+ var51 = ClanChannelMember.method2867(var46, var45, var25); // L: 1242
+ class220.worldSelectStars = var51; // L: 1244
+ }
+
+ if (class266.worldSelectLeftSprite == null) { // L: 1246
+ class266.worldSelectLeftSprite = class421.SpriteBuffer_getIndexedSpriteByName(class304.archive8, "leftarrow", "");
+ }
+
+ if (SceneTilePaint.worldSelectRightSprite == null) { // L: 1247
+ SceneTilePaint.worldSelectRightSprite = class421.SpriteBuffer_getIndexedSpriteByName(class304.archive8, "rightarrow", "");
+ }
+
+ Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1248
+ Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1249
+ Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1250
+ var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1251
+ if (class220.worldSelectStars != null) { // L: 1252
+ class220.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1253
+ var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1254
+ class220.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1255
+ var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1256
+ }
+
+ if (FriendSystem.worldSelectArrows != null) { // L: 1258
+ var32 = Login.xPadding + 280; // L: 1259
+ if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1260
+ FriendSystem.worldSelectArrows[2].drawAt(var32, 4);
+ } else {
+ FriendSystem.worldSelectArrows[0].drawAt(var32, 4); // L: 1261
+ }
+
+ if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1262
+ FriendSystem.worldSelectArrows[3].drawAt(var32 + 15, 4);
+ } else {
+ FriendSystem.worldSelectArrows[1].drawAt(var32 + 15, 4); // L: 1263
+ }
+
+ var0.draw("World", var32 + 32, 17, 16777215, -1); // L: 1264
+ var4 = Login.xPadding + 390; // L: 1265
+ if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1266
+ FriendSystem.worldSelectArrows[2].drawAt(var4, 4);
+ } else {
+ FriendSystem.worldSelectArrows[0].drawAt(var4, 4); // L: 1267
+ }
+
+ if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1268
+ FriendSystem.worldSelectArrows[3].drawAt(var4 + 15, 4);
+ } else {
+ FriendSystem.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1269
+ }
+
+ var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1270
+ var45 = Login.xPadding + 500; // L: 1271
+ if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1272
+ FriendSystem.worldSelectArrows[2].drawAt(var45, 4);
+ } else {
+ FriendSystem.worldSelectArrows[0].drawAt(var45, 4); // L: 1273
+ }
+
+ if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1274
+ FriendSystem.worldSelectArrows[3].drawAt(var45 + 15, 4);
+ } else {
+ FriendSystem.worldSelectArrows[1].drawAt(var45 + 15, 4); // L: 1275
+ }
+
+ var0.draw("Location", var45 + 32, 17, 16777215, -1); // L: 1276
+ var25 = Login.xPadding + 610; // L: 1277
+ if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1278
+ FriendSystem.worldSelectArrows[2].drawAt(var25, 4);
+ } else {
+ FriendSystem.worldSelectArrows[0].drawAt(var25, 4); // L: 1279
+ }
+
+ if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1280
+ FriendSystem.worldSelectArrows[3].drawAt(var25 + 15, 4);
+ } else {
+ FriendSystem.worldSelectArrows[1].drawAt(var25 + 15, 4); // L: 1281
+ }
+
+ var0.draw("Type", var25 + 32, 17, 16777215, -1); // L: 1282
+ }
+
+ Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1284
+ var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1285
+ Login.hoveredWorldIndex = -1; // L: 1286
+ if (ScriptFrame.worldSelectBackSprites != null) { // L: 1287
+ var3 = 88; // L: 1288
+ byte var41 = 19; // L: 1289
+ var45 = 765 / (var3 + 1) - 1; // L: 1290
+ var25 = 480 / (var41 + 1); // L: 1291
+
+ int var35;
+ do {
+ var7 = var25; // L: 1293
+ var35 = var45; // L: 1294
+ if (var25 * (var45 - 1) >= World.World_count) { // L: 1295
+ --var45;
+ }
+
+ if (var45 * (var25 - 1) >= World.World_count) { // L: 1296
+ --var25;
+ }
+
+ if (var45 * (var25 - 1) >= World.World_count) { // L: 1297
+ --var25;
+ }
+ } while(var25 != var7 || var45 != var35); // L: 1298
+
+ var7 = (765 - var3 * var45) / (var45 + 1); // L: 1300
+ if (var7 > 5) { // L: 1301
+ var7 = 5;
+ }
+
+ var35 = (480 - var25 * var41) / (var25 + 1); // L: 1302
+ if (var35 > 5) { // L: 1303
+ var35 = 5;
+ }
+
+ int var37 = (765 - var3 * var45 - var7 * (var45 - 1)) / 2; // L: 1304
+ int var38 = (480 - var25 * var41 - var35 * (var25 - 1)) / 2; // L: 1305
+ int var28 = (var25 + World.World_count - 1) / var25; // L: 1306
+ Login.worldSelectPagesCount = var28 - var45; // L: 1307
+ if (class266.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1308
+ class266.worldSelectLeftSprite.drawAt(8, class78.canvasHeight / 2 - class266.worldSelectLeftSprite.subHeight / 2); // L: 1309
+ }
+
+ if (SceneTilePaint.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1311
+ SceneTilePaint.worldSelectRightSprite.drawAt(Script.canvasWidth - SceneTilePaint.worldSelectRightSprite.subWidth - 8, class78.canvasHeight / 2 - SceneTilePaint.worldSelectRightSprite.subHeight / 2); // L: 1312
+ }
+
+ int var29 = var38 + 23; // L: 1314
+ int var39 = var37 + Login.xPadding; // L: 1315
+ int var40 = 0; // L: 1316
+ boolean var42 = false; // L: 1317
+ int var43 = Login.worldSelectPage; // L: 1318
+
+ int var17;
+ for (var17 = var25 * var43; var17 < World.World_count && var43 - Login.worldSelectPage < var45; ++var17) { // L: 1319 1320
+ World var18 = class362.World_worlds[var17]; // L: 1323
+ boolean var19 = true; // L: 1324
+ String var20 = Integer.toString(var18.population); // L: 1325
+ if (var18.population == -1) { // L: 1326
+ var20 = "OFF"; // L: 1327
+ var19 = false; // L: 1328
+ } else if (var18.population > 1980) { // L: 1330
+ var20 = "FULL"; // L: 1331
+ var19 = false; // L: 1332
+ }
+
+ int var22 = 0; // L: 1335
+ byte var21;
+ if (var18.isBeta()) { // L: 1336
+ if (var18.isMembersOnly()) { // L: 1337
+ var21 = 7;
+ } else {
+ var21 = 6; // L: 1338
+ }
+ } else if (var18.isDeadman()) { // L: 1340
+ var22 = 16711680; // L: 1341
+ if (var18.isMembersOnly()) { // L: 1342
+ var21 = 5;
+ } else {
+ var21 = 4; // L: 1343
+ }
+ } else if (var18.method1597()) { // L: 1345
+ if (var18.isMembersOnly()) { // L: 1346
+ var21 = 9;
+ } else {
+ var21 = 8; // L: 1347
+ }
+ } else if (var18.isPvp()) { // L: 1349
+ if (var18.isMembersOnly()) { // L: 1350
+ var21 = 3;
+ } else {
+ var21 = 2; // L: 1351
+ }
+ } else if (var18.isMembersOnly()) { // L: 1354
+ var21 = 1;
+ } else {
+ var21 = 0; // L: 1355
+ }
+
+ if (MouseHandler.MouseHandler_x >= var39 && MouseHandler.MouseHandler_y >= var29 && MouseHandler.MouseHandler_x < var3 + var39 && MouseHandler.MouseHandler_y < var41 + var29 && var19) { // L: 1357
+ Login.hoveredWorldIndex = var17; // L: 1358
+ ScriptFrame.worldSelectBackSprites[var21].drawTransOverlayAt(var39, var29, 128, 16777215); // L: 1359
+ var42 = true; // L: 1360
+ } else {
+ ScriptFrame.worldSelectBackSprites[var21].drawAt(var39, var29); // L: 1362
+ }
+
+ if (class126.worldSelectFlagSprites != null) { // L: 1363
+ class126.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var39 + 29, var29);
+ }
+
+ var0.drawCentered(Integer.toString(var18.id), var39 + 15, var41 / 2 + var29 + 5, var22, -1); // L: 1364
+ var1.drawCentered(var20, var39 + 60, var41 / 2 + var29 + 5, 268435455, -1); // L: 1365
+ var29 = var29 + var41 + var35; // L: 1366
+ ++var40; // L: 1367
+ if (var40 >= var25) {
+ var29 = var38 + 23; // L: 1368
+ var39 = var39 + var7 + var3; // L: 1369
+ var40 = 0; // L: 1370
+ ++var43; // L: 1371
+ }
+ }
+
+ if (var42) { // L: 1374
+ var17 = var1.stringWidth(class362.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1375
+ int var30 = var1.ascent + 8; // L: 1376
+ int var44 = MouseHandler.MouseHandler_y + 25; // L: 1377
+ if (var30 + var44 > 480) { // L: 1378
+ var44 = MouseHandler.MouseHandler_y - 25 - var30; // L: 1379
+ }
+
+ Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var30, 16777120); // L: 1381
+ Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var30, 0); // L: 1382
+ var1.drawCentered(class362.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var44 + var1.ascent + 4, 0, -1); // L: 1383
+ }
+ }
+
+ Message.rasterProvider.drawFull(0, 0); // L: 1386
+ } else {
+ class16.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1390
+ Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1391
+ Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 1392
+ if (Client.gameState == 0 || Client.gameState == 5) { // L: 1393
+ var3 = 20; // L: 1394
+ var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1395
+ var4 = 253 - var3; // L: 1396
+ Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1397
+ Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1398
+ Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1399
+ Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1400
+ var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1401
+ }
+
+ String var5;
+ String var6;
+ short var31;
+ short var33;
+ if (Client.gameState == 20) { // L: 1403
+ class4.titleboxSprite.drawAt(Login.loginBoxX + 180 - class4.titleboxSprite.subWidth / 2, 271 - class4.titleboxSprite.subHeight / 2); // L: 1404
+ var31 = 201; // L: 1405
+ var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1406
+ var32 = var31 + 15; // L: 1407
+ var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1408
+ var32 += 15; // L: 1409
+ var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1410
+ var32 += 15; // L: 1411
+ var32 += 7; // L: 1412
+ if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1413
+ var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0); // L: 1414
+ var33 = 200; // L: 1415
+
+ for (var5 = class125.method2829(); var0.stringWidth(var5) > var33; var5 = var5.substring(0, var5.length() - 1)) { // L: 1416 1417 1418
+ }
+
+ var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var32, 16777215, 0); // L: 1420
+ var32 += 15; // L: 1421
+
+ for (var6 = NetCache.method5952(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) { // L: 1422 1423 1424
+ }
+
+ var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1426
+ var32 += 15; // L: 1427
+ }
+ }
+
+ if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1430
+ class4.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1431
+ short var23;
+ if (Login.loginIndex == 0) { // L: 1432
+ var31 = 251; // L: 1433
+ var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1434
+ var32 = var31 + 30; // L: 1435
+ var4 = Login.loginBoxX + 180 - 80; // L: 1436
+ var23 = 291; // L: 1437
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1438
+ var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1439
+ var4 = Login.loginBoxX + 180 + 80; // L: 1440
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1441
+ var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1442
+ } else if (Login.loginIndex == 1) { // L: 1444
+ var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1445
+ var31 = 236; // L: 1446
+ var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1447
+ var32 = var31 + 15; // L: 1448
+ var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1449
+ var32 += 15; // L: 1450
+ var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1451
+ var32 += 15; // L: 1452
+ var4 = Login.loginBoxX + 180 - 80; // L: 1453
+ var23 = 321; // L: 1454
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1455
+ var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1456
+ var4 = Login.loginBoxX + 180 + 80; // L: 1457
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1458
+ var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1459
+ } else if (Login.loginIndex == 2) { // L: 1461
+ var31 = 201; // L: 1462
+ var0.drawCentered(Login.Login_response1, Canvas.loginBoxCenter, var31, 16776960, 0); // L: 1463
+ var32 = var31 + 15; // L: 1464
+ var0.drawCentered(Login.Login_response2, Canvas.loginBoxCenter, var32, 16776960, 0); // L: 1465
+ var32 += 15; // L: 1466
+ var0.drawCentered(Login.Login_response3, Canvas.loginBoxCenter, var32, 16776960, 0); // L: 1467
+ var32 += 15; // L: 1468
+ var32 += 7; // L: 1469
+ var0.draw("Login: ", Canvas.loginBoxCenter - 110, var32, 16777215, 0); // L: 1470
+ var33 = 200; // L: 1471
+
+ for (var5 = class125.method2829(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1472 1473 1474
+ }
+
+ var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class122.colorStartTag(16776960) + "|" : ""), Canvas.loginBoxCenter - 70, var32, 16777215, 0); // L: 1476
+ var32 += 15; // L: 1477
+
+ for (var6 = NetCache.method5952(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) { // L: 1478 1479 1480
+ }
+
+ var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class122.colorStartTag(16776960) + "|" : ""), Canvas.loginBoxCenter - 108, var32, 16777215, 0); // L: 1482
+ var32 += 15; // L: 1483
+ var31 = 277; // L: 1484
+ var7 = Canvas.loginBoxCenter + -117; // L: 1485
+ boolean var9 = Client.Login_isUsernameRemembered; // L: 1487
+ boolean var10 = Login.field912; // L: 1488
+ IndexedSprite var26 = var9 ? (var10 ? DynamicObject.field979 : class228.options_buttons_2Sprite) : (var10 ? class113.field1427 : class345.options_buttons_0Sprite); // L: 1490
+ var26.drawAt(var7, var31); // L: 1493
+ var7 = var7 + var26.subWidth + 5; // L: 1494
+ var1.draw("Remember username", var7, var31 + 13, 16776960, 0); // L: 1495
+ var7 = Canvas.loginBoxCenter + 24; // L: 1496
+ boolean var13 = class19.clientPreferences.method2247(); // L: 1498
+ boolean var14 = Login.field913; // L: 1499
+ IndexedSprite var12 = var13 ? (var14 ? DynamicObject.field979 : class228.options_buttons_2Sprite) : (var14 ? class113.field1427 : class345.options_buttons_0Sprite); // L: 1501
+ var12.drawAt(var7, var31); // L: 1504
+ var7 = var7 + var12.subWidth + 5; // L: 1505
+ var1.draw("Hide username", var7, var31 + 13, 16776960, 0); // L: 1506
+ var32 = var31 + 15; // L: 1507
+ int var15 = Canvas.loginBoxCenter - 80; // L: 1508
+ short var16 = 321; // L: 1509
+ class6.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); // L: 1510
+ var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); // L: 1511
+ var15 = Canvas.loginBoxCenter + 80; // L: 1512
+ class6.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); // L: 1513
+ var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); // L: 1514
+ var31 = 357; // L: 1515
+ switch(Login.field902) { // L: 1516
+ case 2:
+ TileItem.field1299 = "Having trouble logging in?"; // L: 1521
+ break;
+ default:
+ TileItem.field1299 = "Can't login? Click here."; // L: 1518
+ }
+
+ ArchiveLoader.field1022 = new Bounds(Canvas.loginBoxCenter, var31, var1.stringWidth(TileItem.field1299), 11); // L: 1524
+ PcmPlayer.field294 = new Bounds(Canvas.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1525
+ var1.drawCentered(TileItem.field1299, Canvas.loginBoxCenter, var31, 16777215, 0); // L: 1526
+ } else if (Login.loginIndex == 3) { // L: 1528
+ var31 = 201; // L: 1529
+ var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1530
+ var32 = var31 + 20; // L: 1531
+ var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1532
+ var32 += 15; // L: 1533
+ var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1534
+ var32 += 15; // L: 1535
+ var4 = Login.loginBoxX + 180; // L: 1536
+ var23 = 276; // L: 1537
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1538
+ var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1539
+ var4 = Login.loginBoxX + 180; // L: 1540
+ var23 = 326; // L: 1541
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1542
+ var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1543
+ } else {
+ short var8;
+ if (Login.loginIndex == 4) { // L: 1545
+ var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1546
+ var31 = 236; // L: 1547
+ var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1548
+ var32 = var31 + 15; // L: 1549
+ var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1550
+ var32 += 15; // L: 1551
+ var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1552
+ var32 += 15; // L: 1553
+ var0.draw("PIN: " + NetCache.method5952(World.otp) + (Client.cycle % 40 < 20 ? class122.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1554
+ var32 -= 8; // L: 1555
+ var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1556
+ var32 += 15; // L: 1557
+ var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1558
+ var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1559
+ var45 = var32 - var0.ascent; // L: 1560
+ IndexedSprite var34;
+ if (Login.field895) { // L: 1562
+ var34 = class228.options_buttons_2Sprite; // L: 1563
+ } else {
+ var34 = class345.options_buttons_0Sprite; // L: 1566
+ }
+
+ var34.drawAt(var4, var45); // L: 1568
+ var32 += 15; // L: 1569
+ var7 = Login.loginBoxX + 180 - 80; // L: 1570
+ var8 = 321; // L: 1571
+ class6.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1572
+ var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); // L: 1573
+ var7 = Login.loginBoxX + 180 + 80; // L: 1574
+ class6.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1575
+ var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); // L: 1576
+ var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1577
+ } else if (Login.loginIndex == 5) { // L: 1579
+ var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1580
+ var31 = 221; // L: 1581
+ var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1582
+ var32 = var31 + 15; // L: 1583
+ var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1584
+ var32 += 15; // L: 1585
+ var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1586
+ var32 += 15; // L: 1587
+ var32 += 14; // L: 1588
+ var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0); // L: 1589
+ var33 = 174; // L: 1590
+
+ for (var5 = class125.method2829(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1591 1592 1593
+ }
+
+ var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class122.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0); // L: 1595
+ var32 += 15; // L: 1596
+ var25 = Login.loginBoxX + 180 - 80; // L: 1597
+ short var36 = 321; // L: 1598
+ class6.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1599
+ var0.drawCentered("Recover", var25, var36 + 5, 16777215, 0); // L: 1600
+ var25 = Login.loginBoxX + 180 + 80; // L: 1601
+ class6.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1602
+ var0.drawCentered("Back", var25, var36 + 5, 16777215, 0); // L: 1603
+ var36 = 356; // L: 1604
+ var1.drawCentered("Still having trouble logging in?", Canvas.loginBoxCenter, var36, 268435455, 0); // L: 1605
+ } else if (Login.loginIndex == 6) { // L: 1607
+ var31 = 201; // L: 1608
+ var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1609
+ var32 = var31 + 15; // L: 1610
+ var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1611
+ var32 += 15; // L: 1612
+ var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1613
+ var32 += 15; // L: 1614
+ var4 = Login.loginBoxX + 180; // L: 1615
+ var23 = 321; // L: 1616
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1617
+ var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1618
+ } else if (Login.loginIndex == 7) { // L: 1620
+ if (VarpDefinition.field1821 && !Client.onMobile) { // L: 1621
+ var31 = 201; // L: 1622
+ var0.drawCentered(Login.Login_response1, Canvas.loginBoxCenter, var31, 16776960, 0); // L: 1623
+ var32 = var31 + 15; // L: 1624
+ var0.drawCentered(Login.Login_response2, Canvas.loginBoxCenter, var32, 16776960, 0); // L: 1625
+ var32 += 15; // L: 1626
+ var0.drawCentered(Login.Login_response3, Canvas.loginBoxCenter, var32, 16776960, 0); // L: 1627
+ var4 = Canvas.loginBoxCenter - 150; // L: 1628
+ var32 += 10; // L: 1629
+
+ for (var45 = 0; var45 < 8; ++var45) { // L: 1630
+ class6.titlebuttonSprite.method8135(var4, var32, 30, 40); // L: 1631
+ boolean var47 = var45 == Login.field910 & Client.cycle % 40 < 20; // L: 1632
+ var0.draw((Login.field911[var45] == null ? "" : Login.field911[var45]) + (var47 ? class122.colorStartTag(16776960) + "|" : ""), var4 + 10, var32 + 27, 16777215, 0); // L: 1633
+ if (var45 != 1 && var45 != 3) { // L: 1634
+ var4 += 35; // L: 1639
+ } else {
+ var4 += 50; // L: 1635
+ var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var32 + 27, 16777215, 0); // L: 1636
+ }
+ }
+
+ var45 = Canvas.loginBoxCenter - 80; // L: 1642
+ short var48 = 321; // L: 1643
+ class6.titlebuttonSprite.drawAt(var45 - 73, var48 - 20); // L: 1644
+ var0.drawCentered("Submit", var45, var48 + 5, 16777215, 0); // L: 1645
+ var45 = Canvas.loginBoxCenter + 80; // L: 1646
+ class6.titlebuttonSprite.drawAt(var45 - 73, var48 - 20); // L: 1647
+ var0.drawCentered("Cancel", var45, var48 + 5, 16777215, 0); // L: 1648
+ } else {
+ var31 = 216; // L: 1651
+ var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1652
+ var32 = var31 + 15; // L: 1653
+ var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1654
+ var32 += 15; // L: 1655
+ var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1656
+ var32 += 15; // L: 1657
+ var4 = Login.loginBoxX + 180 - 80; // L: 1658
+ var23 = 321; // L: 1659
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1660
+ var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1661
+ var4 = Login.loginBoxX + 180 + 80; // L: 1662
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1663
+ var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1664
+ }
+ } else if (Login.loginIndex == 8) { // L: 1667
+ var31 = 216; // L: 1668
+ var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1669
+ var32 = var31 + 15; // L: 1670
+ var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1671
+ var32 += 15; // L: 1672
+ var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1673
+ var32 += 15; // L: 1674
+ var4 = Login.loginBoxX + 180 - 80; // L: 1675
+ var23 = 321; // L: 1676
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1677
+ var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1678
+ var4 = Login.loginBoxX + 180 + 80; // L: 1679
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1680
+ var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1681
+ } else if (Login.loginIndex == 9) { // L: 1683
+ var31 = 221; // L: 1684
+ var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1685
+ var32 = var31 + 25; // L: 1686
+ var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1687
+ var32 += 25; // L: 1688
+ var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1689
+ var4 = Login.loginBoxX + 180; // L: 1690
+ var23 = 311; // L: 1691
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1692
+ var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1693
+ } else if (Login.loginIndex == 10) { // L: 1695
+ var32 = Login.loginBoxX + 180; // L: 1696
+ var33 = 209; // L: 1697
+ var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1698
+ var4 = var33 + 20; // L: 1699
+ Login.field914.drawAt(var32 - 109, var4); // L: 1700
+ IgnoreList.field4284.drawAt(var32 - 48, var4 + 18); // L: 1701
+ } else if (Login.loginIndex == 12) { // L: 1703
+ var32 = Canvas.loginBoxCenter; // L: 1704
+ var33 = 216; // L: 1705
+ var2.drawCentered("Before using this app, please read and accept our", var32, var33, 16777215, 0); // L: 1706
+ var4 = var33 + 17; // L: 1707
+ var2.drawCentered("terms of use, privacy policy, and end user licence", var32, var4, 16777215, 0); // L: 1708
+ var4 += 17; // L: 1709
+ var2.drawCentered("agreement (EULA).", var32, var4, 16777215, 0); // L: 1710
+ var4 += 17; // L: 1711
+ var2.drawCentered("By accepting, you agree to these documents.", var32, var4, 16777215, 0); // L: 1712
+ var32 = Canvas.loginBoxCenter - 80; // L: 1713
+ var33 = 311; // L: 1714
+ class6.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); // L: 1715
+ var0.drawCentered("Accept", var32, var33 + 5, 16777215, 0); // L: 1716
+ var32 = Canvas.loginBoxCenter + 80; // L: 1717
+ class6.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); // L: 1718
+ var0.drawCentered("Decline", var32, var33 + 5, 16777215, 0); // L: 1719
+ } else if (Login.loginIndex == 13) { // L: 1721
+ var31 = 231; // L: 1722
+ var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var31, 16777215, 0); // L: 1723
+ var32 = var31 + 20; // L: 1724
+ var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var32, 16777215, 0); // L: 1725
+ var4 = Login.loginBoxX + 180; // L: 1726
+ var31 = 311; // L: 1727
+ class6.titlebuttonSprite.drawAt(var4 - 73, var31 - 20); // L: 1728
+ var0.drawCentered("Back", var4, var31 + 5, 16777215, 0); // L: 1729
+ } else if (Login.loginIndex == 14) { // L: 1731
+ var31 = 201; // L: 1732
+ String var24 = ""; // L: 1733
+ var5 = ""; // L: 1734
+ var6 = ""; // L: 1735
+ switch(Login.field897) { // L: 1736
+ case 0:
+ var24 = "Your account has been disabled."; // L: 1746
+ var5 = Strings.field3670; // L: 1747
+ var6 = ""; // L: 1748
+ break; // L: 1749
+ case 1:
+ var24 = "Account locked as we suspect it has been stolen."; // L: 1739
+ var5 = Strings.field3709; // L: 1740
+ var6 = ""; // L: 1741
+ break;
+ default:
+ class135.Login_promptCredentials(false); // L: 1753
+ }
+
+ var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1757
+ var32 = var31 + 15; // L: 1758
+ var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1759
+ var32 += 15; // L: 1760
+ var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1761
+ var32 += 15; // L: 1762
+ var7 = Login.loginBoxX + 180; // L: 1763
+ var8 = 276; // L: 1764
+ class6.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1765
+ var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); // L: 1766
+ var7 = Login.loginBoxX + 180; // L: 1767
+ var8 = 326; // L: 1768
+ class6.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1769
+ var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); // L: 1770
+ } else if (Login.loginIndex == 24) { // L: 1772
+ var31 = 221; // L: 1773
+ var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1774
+ var32 = var31 + 15; // L: 1775
+ var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1776
+ var32 += 15; // L: 1777
+ var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1778
+ var32 += 15; // L: 1779
+ var4 = Login.loginBoxX + 180; // L: 1780
+ var23 = 301; // L: 1781
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1782
+ var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1783
+ } else if (Login.loginIndex == 26) { // L: 1785
+ var31 = 216; // L: 1786
+ var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1787
+ var32 = var31 + 15; // L: 1788
+ var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1789
+ var32 += 15; // L: 1790
+ var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1791
+ var32 += 15; // L: 1792
+ var4 = Login.loginBoxX + 180 - 80; // L: 1793
+ var23 = 321; // L: 1794
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1795
+ var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1796
+ var4 = Login.loginBoxX + 180 + 80; // L: 1797
+ class6.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1798
+ var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1799
+ }
+ }
+ }
+
+ if (Client.gameState >= 10) { // L: 1802
+ int[] var27 = new int[4]; // L: 1803
+ Rasterizer2D.Rasterizer2D_getClipArray(var27); // L: 1804
+ Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class78.canvasHeight); // L: 1805
+ Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1806
+ Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1807
+ Rasterizer2D.Rasterizer2D_setClipArray(var27); // L: 1808
+ }
+
+ class145.title_muteSprite[class19.clientPreferences.method2317() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1810
+ if (Client.gameState > 5 && Language.Language_EN == class134.clientLanguage) { // L: 1811
+ if (UserComparator5.field1385 != null) { // L: 1812
+ var32 = Login.xPadding + 5; // L: 1813
+ var33 = 463; // L: 1814
+ byte var52 = 100; // L: 1815
+ byte var49 = 35; // L: 1816
+ UserComparator5.field1385.drawAt(var32, var33); // L: 1817
+ var0.drawCentered("World" + " " + Client.worldId, var52 / 2 + var32, var49 / 2 + var33 - 2, 16777215, 0); // L: 1818
+ if (class174.World_request != null) { // L: 1819
+ var1.drawCentered("Loading...", var52 / 2 + var32, var49 / 2 + var33 + 12, 16777215, 0);
+ } else {
+ var1.drawCentered("Click to switch", var52 / 2 + var32, var49 / 2 + var33 + 12, 16777215, 0); // L: 1820
+ }
+ } else {
+ UserComparator5.field1385 = class421.SpriteBuffer_getIndexedSpriteByName(class304.archive8, "sl_button", ""); // L: 1823
+ }
+ }
+
+ }
+ } // L: 1388 1826
+
+ @ObfuscatedName("lx")
+ @ObfuscatedSignature(
+ descriptor = "(IB)V",
+ garbageValue = "-17"
+ )
+ static void method3624(int var0) {
+ if (var0 != Client.loginState) { // L: 12472
+ Client.loginState = var0; // L: 12473
+ }
+ } // L: 12474
}
diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java
index 1923c41284..d17bc59bdf 100644
--- a/runescape-client/src/main/java/HorizontalAlignment.java
+++ b/runescape-client/src/main/java/HorizontalAlignment.java
@@ -4,155 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fj")
+@ObfuscatedName("fk")
@Implements("HorizontalAlignment")
public enum HorizontalAlignment implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lfj;"
+ descriptor = "Lfk;"
)
- field1938(2, 0),
- @ObfuscatedName("q")
+ field1910(1, 0),
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lfj;"
+ descriptor = "Lfk;"
)
@Export("HorizontalAlignment_centered")
- HorizontalAlignment_centered(0, 1),
- @ObfuscatedName("l")
+ HorizontalAlignment_centered(2, 1),
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lfj;"
+ descriptor = "Lfk;"
)
- field1937(1, 2);
+ field1905(0, 2);
- @ObfuscatedName("jt")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -88443571
- )
- @Export("oculusOrbFocalPointX")
- static int oculusOrbFocalPointX;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -150444483
+ intValue = -571312605
)
@Export("value")
public final int value;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -47587237
+ intValue = -279458597
)
@Export("id")
final int id;
HorizontalAlignment(int var3, int var4) {
- this.value = var3; // L: 14
- this.id = var4; // L: 15
- } // L: 16
+ this.value = var3; // L: 18
+ this.id = var4; // L: 19
+ } // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.id; // L: 20
+ return this.id; // L: 24
}
- @ObfuscatedName("hh")
+ @ObfuscatedName("jk")
@ObfuscatedSignature(
- descriptor = "(ZLpc;B)V",
- garbageValue = "-31"
+ descriptor = "(B)Z",
+ garbageValue = "20"
)
- @Export("updateNpcs")
- static final void updateNpcs(boolean var0, PacketBuffer var1) {
- Client.field621 = 0; // L: 8002
- Client.field565 = 0; // L: 8003
- PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8005
- var2.importIndex(); // L: 8006
- int var3 = var2.readBits(8); // L: 8007
- int var4;
- if (var3 < Client.npcCount) { // L: 8008
- for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8009
- Client.field616[++Client.field621 - 1] = Client.npcIndices[var4];
- }
- }
-
- if (var3 > Client.npcCount) { // L: 8011
- throw new RuntimeException("");
- } else {
- Client.npcCount = 0; // L: 8012
-
- for (var4 = 0; var4 < var3; ++var4) { // L: 8013
- int var5 = Client.npcIndices[var4]; // L: 8014
- NPC var6 = Client.npcs[var5]; // L: 8015
- int var7 = var2.readBits(1); // L: 8016
- if (var7 == 0) { // L: 8017
- Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8018
- var6.npcCycle = Client.cycle; // L: 8019
- } else {
- int var8 = var2.readBits(2); // L: 8022
- if (var8 == 0) { // L: 8023
- Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8024
- var6.npcCycle = Client.cycle; // L: 8025
- Client.field601[++Client.field565 - 1] = var5; // L: 8026
- } else {
- int var9;
- int var10;
- if (var8 == 1) { // L: 8029
- Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8030
- var6.npcCycle = Client.cycle; // L: 8031
- var9 = var2.readBits(3); // L: 8032
- var6.method2340(var9, class193.field2251); // L: 8033
- var10 = var2.readBits(1); // L: 8034
- if (var10 == 1) { // L: 8035
- Client.field601[++Client.field565 - 1] = var5;
- }
- } else if (var8 == 2) { // L: 8038
- Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8039
- var6.npcCycle = Client.cycle; // L: 8040
- if (var2.readBits(1) == 1) { // L: 8041
- var9 = var2.readBits(3); // L: 8042
- var6.method2340(var9, class193.field2248); // L: 8043
- var10 = var2.readBits(3); // L: 8044
- var6.method2340(var10, class193.field2248); // L: 8045
- } else {
- var9 = var2.readBits(3); // L: 8048
- var6.method2340(var9, class193.field2249); // L: 8049
- }
-
- var9 = var2.readBits(1); // L: 8051
- if (var9 == 1) {
- Client.field601[++Client.field565 - 1] = var5; // L: 8052
- }
- } else if (var8 == 3) { // L: 8055
- Client.field616[++Client.field621 - 1] = var5; // L: 8056
- }
- }
- }
- }
-
- class82.method2098(var0, var1); // L: 8061
- JagexCache.method3158(var1); // L: 8062
-
- int var11;
- for (var11 = 0; var11 < Client.field621; ++var11) { // L: 8063
- var3 = Client.field616[var11]; // L: 8064
- if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8065
- Client.npcs[var3].definition = null; // L: 8066
- Client.npcs[var3] = null; // L: 8067
- }
- }
-
- if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8070
- throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
- } else {
- for (var11 = 0; var11 < Client.npcCount; ++var11) { // L: 8071
- if (Client.npcs[Client.npcIndices[var11]] == null) { // L: 8072
- throw new RuntimeException(var11 + "," + Client.npcCount); // L: 8073
- }
- }
-
- }
- }
- } // L: 8076
+ @Export("getTapToDrop")
+ static boolean getTapToDrop() {
+ return Client.tapToDrop; // L: 11040
+ }
}
diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java
index 9e89164640..e1518277e6 100644
--- a/runescape-client/src/main/java/Huffman.java
+++ b/runescape-client/src/main/java/Huffman.java
@@ -3,16 +3,22 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jx")
+@ObfuscatedName("ji")
@Implements("Huffman")
public class Huffman {
- @ObfuscatedName("o")
+ @ObfuscatedName("ro")
+ @ObfuscatedSignature(
+ descriptor = "Lno;"
+ )
+ @Export("friendsChat")
+ static FriendsChat friendsChat;
+ @ObfuscatedName("c")
@Export("masks")
int[] masks;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("bits")
byte[] bits;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("keys")
int[] keys;
@@ -41,7 +47,7 @@ public class Huffman {
for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25
var11 = var3[var10]; // L: 26
- if (var11 != var8) { // L: 27
+ if (var8 != var11) { // L: 27
break;
}
@@ -97,35 +103,35 @@ public class Huffman {
}
}
- } // L: 60
+ }
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([BII[BII)I",
- garbageValue = "-1517056524"
+ descriptor = "([BII[BIB)I",
+ garbageValue = "-98"
)
@Export("compress")
int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
int var6 = 0; // L: 63
- int var7 = var5 << 3; // L: 64
+ int var7 = var5 << 3;
- for (var3 += var2; var2 < var3; ++var2) { // L: 65 66
- int var8 = var1[var2] & 255; // L: 67
+ for (var3 += var2; var2 < var3; ++var2) {
+ int var8 = var1[var2] & 255;
int var9 = this.masks[var8]; // L: 68
- byte var10 = this.bits[var8]; // L: 69
- if (var10 == 0) { // L: 70
+ byte var10 = this.bits[var8];
+ if (var10 == 0) {
throw new RuntimeException("" + var8);
}
- int var11 = var7 >> 3; // L: 71
- int var12 = var7 & 7; // L: 72
+ int var11 = var7 >> 3;
+ int var12 = var7 & 7;
var6 &= -var12 >> 31; // L: 73
- int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74
- var12 += 24; // L: 76
- var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77
+ int var13 = (var12 + var10 - 1 >> 3) + var11;
+ var12 += 24;
+ var4[var11] = (byte)(var6 |= var9 >>> var12);
if (var11 < var13) { // L: 78
++var11; // L: 79
- var12 -= 8; // L: 80
+ var12 -= 8;
var4[var11] = (byte)(var6 = var9 >>> var12); // L: 81
if (var11 < var13) { // L: 82
++var11; // L: 83
@@ -150,10 +156,10 @@ public class Huffman {
return (var7 + 7 >> 3) - var5; // L: 97
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "([BI[BIII)I",
- garbageValue = "-1136816719"
+ garbageValue = "669033826"
)
@Export("decompress")
int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -293,4 +299,50 @@ public class Huffman {
return var7 + 1 - var2; // L: 165
}
}
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(III)Lbi;",
+ garbageValue = "2027632889"
+ )
+ static Script method5480(int var0, int var1) {
+ Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 60
+ if (var2 != null) { // L: 61
+ return var2; // L: 62
+ } else {
+ String var3 = String.valueOf(var0); // L: 64
+ int var4 = class267.archive12.getGroupId(var3); // L: 65
+ if (var4 == -1) { // L: 66
+ return null; // L: 67
+ } else {
+ byte[] var5 = class267.archive12.takeFileFlat(var4); // L: 69
+ if (var5 != null) { // L: 70
+ if (var5.length <= 1) { // L: 71
+ return null; // L: 72
+ }
+
+ var2 = class344.newScript(var5); // L: 74
+ if (var2 != null) { // L: 75
+ Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 76
+ return var2; // L: 77
+ }
+ }
+
+ return null; // L: 80
+ }
+ }
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)I",
+ garbageValue = "-1058305132"
+ )
+ static int method5474(int var0, int var1, int var2) {
+ if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 867
+ return 0;
+ } else {
+ return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 868
+ }
+ }
}
diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java
index f7cbdb1e24..1ff2e57d25 100644
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -3,48 +3,53 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nd")
+@ObfuscatedName("mi")
@Implements("IgnoreList")
public class IgnoreList extends UserList {
- @ObfuscatedName("l")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lqu;"
+ )
+ static IndexedSprite field4284;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lpe;"
)
@Export("loginType")
final LoginType loginType;
@ObfuscatedSignature(
- descriptor = "(Lpj;)V"
+ descriptor = "(Lpe;)V"
)
public IgnoreList(LoginType var1) {
super(400); // L: 13
this.loginType = var1; // L: 14
} // L: 15
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lnb;",
- garbageValue = "-1695844600"
+ descriptor = "(S)Lne;",
+ garbageValue = "-7122"
)
@Export("newInstance")
User newInstance() {
return new Ignored(); // L: 19
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)[Lnb;",
- garbageValue = "1788836658"
+ descriptor = "(II)[Lne;",
+ garbageValue = "77510907"
)
@Export("newTypedArray")
User[] newTypedArray(int var1) {
return new Ignored[var1]; // L: 24
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "0"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "1241534529"
)
@Export("read")
public void read(Buffer var1, int var2) {
@@ -87,30 +92,4 @@ public class IgnoreList extends UserList {
return; // L: 57
}
}
-
- @ObfuscatedName("il")
- @ObfuscatedSignature(
- descriptor = "(III)Ljava/lang/String;",
- garbageValue = "1540266419"
- )
- static final String method6430(int var0, int var1) {
- int var2 = var1 - var0; // L: 10187
- if (var2 < -9) { // L: 10188
- return class166.colorStartTag(16711680);
- } else if (var2 < -6) { // L: 10189
- return class166.colorStartTag(16723968);
- } else if (var2 < -3) { // L: 10190
- return class166.colorStartTag(16740352);
- } else if (var2 < 0) { // L: 10191
- return class166.colorStartTag(16756736);
- } else if (var2 > 9) { // L: 10192
- return class166.colorStartTag(65280);
- } else if (var2 > 6) { // L: 10193
- return class166.colorStartTag(4259584);
- } else if (var2 > 3) { // L: 10194
- return class166.colorStartTag(8453888);
- } else {
- return var2 > 0 ? class166.colorStartTag(12648192) : class166.colorStartTag(16776960); // L: 10195 10196
- }
- }
}
diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java
index b5b7539b4e..1b6cc7e8cc 100644
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nz")
+@ObfuscatedName("nb")
@Implements("Ignored")
public class Ignored extends User {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 157062685
+ intValue = -1766830117
)
@Export("id")
int id;
@@ -17,20 +17,20 @@ public class Ignored extends User {
Ignored() {
} // L: 6
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lnz;B)I",
- garbageValue = "0"
+ descriptor = "(Lnb;I)I",
+ garbageValue = "-1083429285"
)
@Export("compareTo_ignored")
int compareTo_ignored(Ignored var1) {
return this.id - var1.id; // L: 9
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lnb;I)I",
- garbageValue = "434999779"
+ descriptor = "(Lne;B)I",
+ garbageValue = "-81"
)
@Export("compareTo_user")
public int compareTo_user(User var1) {
@@ -41,18 +41,37 @@ public class Ignored extends User {
return this.compareTo_ignored((Ignored)var1); // L: 17
}
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([FIFI)F",
- garbageValue = "-1881391939"
+ descriptor = "(IB)Lqg;",
+ garbageValue = "-15"
)
- static float method6616(float[] var0, int var1, float var2) {
- float var3 = var0[var1]; // L: 108
+ public static PrivateChatMode method6780(int var0) {
+ PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4818, PrivateChatMode.field4817, PrivateChatMode.field4819}; // L: 18
+ PrivateChatMode[] var2 = var1; // L: 20
- for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109
- var3 = var2 * var3 + var0[var4]; // L: 110
+ for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21
+ PrivateChatMode var4 = var2[var3]; // L: 22
+ if (var0 == var4.field4820) { // L: 24
+ return var4;
+ }
}
- return var3; // L: 112
+ return null; // L: 28
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;IIB)Z",
+ garbageValue = "-50"
+ )
+ public static boolean method6774(AbstractArchive var0, int var1, int var2) {
+ byte[] var3 = var0.takeFile(var1, var2); // L: 176
+ if (var3 == null) { // L: 177
+ return false;
+ } else {
+ ChatChannel.SpriteBuffer_decode(var3); // L: 178
+ return true; // L: 179
+ }
}
}
diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java
index 0bbe4c4d00..3307f73853 100644
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/runescape-client/src/main/java/IndexedSprite.java
@@ -2,38 +2,38 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("qd")
+@ObfuscatedName("qu")
@Implements("IndexedSprite")
public final class IndexedSprite extends Rasterizer2D {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("pixels")
public byte[] pixels;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("palette")
public int[] palette;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("subWidth")
public int subWidth;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("subHeight")
public int subHeight;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("xOffset")
public int xOffset;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("yOffset")
public int yOffset;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("width")
public int width;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("height")
public int height;
IndexedSprite() {
} // L: 15
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("normalize")
public void normalize() {
if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18
@@ -54,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D {
}
} // L: 31
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("shiftColors")
public void shiftColors(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34
@@ -87,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D {
} // L: 49
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("drawAt")
public void drawAt(int var1, int var2) {
var1 += this.xOffset; // L: 52
@@ -133,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D {
}
} // L: 85
- @ObfuscatedName("a")
- public void method7927(int var1, int var2, int var3, int var4) {
+ @ObfuscatedName("j")
+ public void method8135(int var1, int var2, int var3, int var4) {
int var5 = this.subWidth; // L: 116
int var6 = this.subHeight; // L: 117
int var7 = 0; // L: 118
@@ -195,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D {
IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157
} // L: 158
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("IndexedSprite_two")
static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) {
int var9 = -(var5 >> 2); // L: 88
@@ -249,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D {
} // L: 113
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("IndexedSprite_something")
static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
int var12 = var3; // L: 161
diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java
index 5294b7693e..194ef0006b 100644
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -4,112 +4,112 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bk")
+@ObfuscatedName("bp")
@Implements("Instrument")
public class Instrument {
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("Instrument_samples")
static int[] Instrument_samples;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("Instrument_noise")
static int[] Instrument_noise;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("Instrument_sine")
static int[] Instrument_sine;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("Instrument_phases")
static int[] Instrument_phases;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@Export("Instrument_delays")
static int[] Instrument_delays;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("Instrument_volumeSteps")
static int[] Instrument_volumeSteps;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@Export("Instrument_pitchSteps")
static int[] Instrument_pitchSteps;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@Export("Instrument_pitchBaseSteps")
static int[] Instrument_pitchBaseSteps;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("pitch")
SoundEnvelope pitch;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("volume")
SoundEnvelope volume;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("pitchModifier")
SoundEnvelope pitchModifier;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("pitchModifierAmplitude")
SoundEnvelope pitchModifierAmplitude;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("volumeMultiplier")
SoundEnvelope volumeMultiplier;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("volumeMultiplierAmplitude")
SoundEnvelope volumeMultiplierAmplitude;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("release")
SoundEnvelope release;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("attack")
SoundEnvelope attack;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("oscillatorVolume")
int[] oscillatorVolume;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("oscillatorPitch")
int[] oscillatorPitch;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("oscillatorDelays")
int[] oscillatorDelays;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("delayTime")
int delayTime;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("delayDecay")
int delayDecay;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Lba;"
+ descriptor = "Lbz;"
)
@Export("filter")
AudioFilter filter;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Laq;"
+ descriptor = "Lat;"
)
@Export("filterEnvelope")
SoundEnvelope filterEnvelope;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("duration")
int duration;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("offset")
int offset;
@@ -146,10 +146,10 @@ public class Instrument {
this.offset = 0; // L: 25
} // L: 50
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("synthesize")
final int[] synthesize(int var1, int var2) {
- class351.clearIntArray(Instrument_samples, 0, var1); // L: 53
+ class350.clearIntArray(Instrument_samples, 0, var1); // L: 53
if (var2 < 10) { // L: 54
return Instrument_samples;
} else {
@@ -354,7 +354,7 @@ public class Instrument {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("evaluateWave")
final int evaluateWave(int var1, int var2, int var3) {
if (var3 == 1) { // L: 179
@@ -368,9 +368,9 @@ public class Instrument {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
@Export("decode")
final void decode(Buffer var1) {
@@ -422,6 +422,6 @@ public class Instrument {
this.offset = var1.readUnsignedShort(); // L: 228
this.filter = new AudioFilter(); // L: 229
this.filterEnvelope = new SoundEnvelope(); // L: 230
- this.filter.method1044(var1, this.filterEnvelope); // L: 231
+ this.filter.method1025(var1, this.filterEnvelope); // L: 231
} // L: 232
}
diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java
index 1945f20dca..db46e52f7f 100644
--- a/runescape-client/src/main/java/IntHashTable.java
+++ b/runescape-client/src/main/java/IntHashTable.java
@@ -1,4 +1,3 @@
-import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
@@ -7,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("qz")
@Implements("IntHashTable")
public class IntHashTable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("array")
int[] array;
@@ -33,10 +32,10 @@ public class IntHashTable {
} // L: 17
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IS)I",
- garbageValue = "-5470"
+ descriptor = "(II)I",
+ garbageValue = "-1743119884"
)
@Export("get")
public int get(int var1) {
@@ -56,36 +55,4 @@ public class IntHashTable {
var3 = var3 + 1 & var2; // L: 26
}
}
-
- @ObfuscatedName("ly")
- @ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "20"
- )
- static void method8124(Buffer var0) {
- if (Client.randomDatData != null) { // L: 12625
- var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 12626
- } else {
- byte[] var2 = new byte[24]; // L: 12631
-
- try {
- JagexCache.JagexCache_randomDat.seek(0L); // L: 12633
- JagexCache.JagexCache_randomDat.readFully(var2); // L: 12634
-
- int var3;
- for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { // L: 12635 12636 12637
- }
-
- if (var3 >= 24) { // L: 12639
- throw new IOException();
- }
- } catch (Exception var6) {
- for (int var4 = 0; var4 < 24; ++var4) { // L: 12642
- var2[var4] = -1;
- }
- }
-
- var0.writeBytes(var2, 0, var2.length); // L: 12647
- }
- } // L: 12627 12648
}
diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java
index 8a2fed9213..3454b7d642 100644
--- a/runescape-client/src/main/java/IntegerNode.java
+++ b/runescape-client/src/main/java/IntegerNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("ok")
+@ObfuscatedName("oq")
@Implements("IntegerNode")
public class IntegerNode extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("integer")
public int integer;
diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java
index 9355e28779..91af790039 100644
--- a/runescape-client/src/main/java/InterfaceParent.java
+++ b/runescape-client/src/main/java/InterfaceParent.java
@@ -1,173 +1,89 @@
-import java.util.concurrent.ScheduledExecutorService;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ck")
+@ObfuscatedName("cq")
@Implements("InterfaceParent")
public class InterfaceParent extends Node {
- @ObfuscatedName("sx")
- @ObfuscatedSignature(
- descriptor = "Lqr;"
- )
- @Export("sceneMinimapSprite")
- static SpritePixels sceneMinimapSprite;
- @ObfuscatedName("s")
- @Export("soundSystemExecutor")
- static ScheduledExecutorService soundSystemExecutor;
- @ObfuscatedName("ed")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive7")
- static Archive archive7;
- @ObfuscatedName("ha")
- @Export("regionLandArchives")
- static byte[][] regionLandArchives;
- @ObfuscatedName("o")
+ @ObfuscatedName("sm")
@ObfuscatedGetter(
- intValue = -1909605869
+ intValue = -1985635931
+ )
+ static int field1043;
+ @ObfuscatedName("jy")
+ @ObfuscatedGetter(
+ intValue = -1949636447
+ )
+ @Export("oculusOrbFocalPointX")
+ static int oculusOrbFocalPointX;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 315980607
)
@Export("group")
int group;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -116763185
+ intValue = 1762148949
)
@Export("type")
int type;
- @ObfuscatedName("l")
- boolean field1034;
+ @ObfuscatedName("q")
+ boolean field1040;
InterfaceParent() {
- this.field1034 = false; // L: 8
+ this.field1040 = false; // L: 8
} // L: 10
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "([Ljava/lang/String;[IIII)V",
- garbageValue = "1544258939"
+ descriptor = "(II)I",
+ garbageValue = "896944894"
)
- static void method2072(String[] var0, int[] var1, int var2, int var3) {
- if (var2 < var3) { // L: 43
- int var4 = (var3 + var2) / 2; // L: 44
- int var5 = var2; // L: 45
- String var6 = var0[var4]; // L: 46
- var0[var4] = var0[var3]; // L: 47
- var0[var3] = var6; // L: 48
- int var7 = var1[var4]; // L: 49
- var1[var4] = var1[var3]; // L: 50
- var1[var3] = var7; // L: 51
+ public static int method2095(int var0) {
+ long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 65
+ int var1 = (int)(var2 >>> 7 & 127L); // L: 67
+ return var1; // L: 69
+ }
- for (int var8 = var2; var8 < var3; ++var8) { // L: 52
- if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53
- String var9 = var0[var8]; // L: 54
- var0[var8] = var0[var5]; // L: 55
- var0[var5] = var9; // L: 56
- int var10 = var1[var8]; // L: 57
- var1[var8] = var1[var5]; // L: 58
- var1[var5++] = var10; // L: 59
- }
- }
-
- var0[var3] = var0[var5]; // L: 63
- var0[var5] = var6; // L: 64
- var1[var3] = var1[var5]; // L: 65
- var1[var5] = var7; // L: 66
- method2072(var0, var1, var2, var5 - 1); // L: 67
- method2072(var0, var1, var5 + 1, var3); // L: 68
+ @ObfuscatedName("ak")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1938605488"
+ )
+ static int method2097(int var0, Script var1, boolean var2) {
+ int var3;
+ if (var0 == 3500) { // L: 2332
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2333
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = SoundCache.method764(var3) ? 1 : 0; // L: 2334
+ return 1; // L: 2335
+ } else if (var0 == 3501) { // L: 2337
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2338
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = VertexNormal.method4528(var3) ? 1 : 0; // L: 2339
+ return 1; // L: 2340
+ } else if (var0 == 3502) { // L: 2342
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2343
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = SoundCache.method753(var3) ? 1 : 0; // L: 2344
+ return 1; // L: 2345
+ } else {
+ return 2; // L: 2347
}
-
- } // L: 70
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(I)[I",
- garbageValue = "1735508491"
- )
- public static int[] method2071() {
- int[] var0 = new int[KeyHandler.field139]; // L: 242
-
- for (int var1 = 0; var1 < KeyHandler.field139; ++var1) { // L: 243
- var0[var1] = KeyHandler.field138[var1]; // L: 244
- }
-
- return var0; // L: 246
}
- @ObfuscatedName("r")
+ @ObfuscatedName("il")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "46"
+ descriptor = "(B)V",
+ garbageValue = "-62"
)
- static final void method2067(String var0) {
- WorldMapEvent.addGameMessage(30, "", var0); // L: 126
- } // L: 127
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(IIIB)I",
- garbageValue = "104"
- )
- static final int method2070(int var0, int var1, int var2) {
- int var3 = var0 / var2; // L: 926
- int var4 = var0 & var2 - 1; // L: 927
- int var5 = var1 / var2; // L: 928
- int var6 = var1 & var2 - 1; // L: 929
- int var7 = method2068(var3, var5); // L: 930
- int var8 = method2068(var3 + 1, var5); // L: 931
- int var9 = method2068(var3, var5 + 1); // L: 932
- int var10 = method2068(var3 + 1, var5 + 1); // L: 933
- int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 936
- int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 937
- int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 942
- int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 943
- int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 948
- int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); // L: 949
- return var15; // L: 951
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(IIS)I",
- garbageValue = "28815"
- )
- static final int method2068(int var0, int var1) {
- int var2 = class327.method5869(var0 - 1, var1 - 1) + class327.method5869(1 + var0, var1 - 1) + class327.method5869(var0 - 1, var1 + 1) + class327.method5869(1 + var0, 1 + var1); // L: 955
- int var3 = class327.method5869(var0 - 1, var1) + class327.method5869(1 + var0, var1) + class327.method5869(var0, var1 - 1) + class327.method5869(var0, var1 + 1); // L: 956
- int var4 = class327.method5869(var0, var1); // L: 957
- return var2 / 16 + var3 / 8 + var4 / 4; // L: 958
- }
-
- @ObfuscatedName("al")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "55"
- )
- static int method2066(int var0) {
- return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3837
- }
-
- @ObfuscatedName("le")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-1929019996"
- )
- static final void method2069(int var0, int var1) {
- ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : UserComparator10.guestClanChannel; // L: 12463
- if (var2 != null && var1 >= 0 && var1 < var2.method3005()) { // L: 12464
- ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12465
- if (var3.rank == -1) {
- String var4 = var3.username.getName(); // L: 12467
- PacketBufferNode var5 = WallDecoration.getPacketBufferNode(ClientPacket.field3040, Client.packetWriter.isaacCipher); // L: 12468
- var5.packetBuffer.writeByte(3 + class392.stringCp1252NullTerminatedByteSize(var4)); // L: 12469
- var5.packetBuffer.writeByte(var0); // L: 12470
- var5.packetBuffer.writeShort(var1); // L: 12471
- var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12472
- Client.packetWriter.addNode(var5); // L: 12473
- }
- }
- } // L: 12466 12474
+ @Export("addCancelMenuEntry")
+ static void addCancelMenuEntry() {
+ class125.method2824(); // L: 8428
+ Client.menuActions[0] = "Cancel"; // L: 8429
+ Client.menuTargets[0] = ""; // L: 8430
+ Client.menuOpcodes[0] = 1006; // L: 8431
+ Client.menuShiftClick[0] = false; // L: 8432
+ Client.menuOptionsCount = 1; // L: 8433
+ } // L: 8434
}
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index f6ebcf9645..66e70ffdd5 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -1,168 +1,123 @@
import java.util.ArrayList;
-import java.util.Collections;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("be")
+@ObfuscatedName("bt")
@Implements("Interpreter")
public class Interpreter {
- @ObfuscatedName("to")
+ @ObfuscatedName("tx")
@ObfuscatedGetter(
- intValue = -1644525113
+ intValue = -1240555931
)
- static int field838;
- @ObfuscatedName("m")
+ static int field846;
+ @ObfuscatedName("f")
+ @Export("Interpreter_intLocals")
+ static int[] Interpreter_intLocals;
+ @ObfuscatedName("e")
@Export("Interpreter_arrayLengths")
static int[] Interpreter_arrayLengths;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("Interpreter_arrays")
static int[][] Interpreter_arrays;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("Interpreter_intStack")
static int[] Interpreter_intStack;
- @ObfuscatedName("r")
- static int[][] field839;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("Interpreter_stringStack")
static String[] Interpreter_stringStack;
- @ObfuscatedName("c")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -2003285519
+ intValue = 183300013
+ )
+ @Export("Interpreter_stringStackSize")
+ static int Interpreter_stringStackSize;
+ @ObfuscatedName("t")
+ @ObfuscatedGetter(
+ intValue = -2041512145
)
@Export("Interpreter_frameDepth")
static int Interpreter_frameDepth;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "[Lbc;"
+ descriptor = "[Lbg;"
)
@Export("Interpreter_frames")
static ScriptFrame[] Interpreter_frames;
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "Lki;"
+ @ObfuscatedName("x")
+ @ObfuscatedGetter(
+ intValue = 987199293
)
- @Export("scriptDotWidget")
- static Widget scriptDotWidget;
- @ObfuscatedName("e")
+ static int field838;
+ @ObfuscatedName("l")
@Export("Interpreter_calendar")
static java.util.Calendar Interpreter_calendar;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("Interpreter_MONTHS")
static final String[] Interpreter_MONTHS;
- @ObfuscatedName("d")
- static boolean field835;
- @ObfuscatedName("j")
- static boolean field833;
- @ObfuscatedName("z")
- static ArrayList field821;
- @ObfuscatedName("i")
+ @ObfuscatedName("b")
+ static boolean field829;
+ @ObfuscatedName("n")
+ static boolean field842;
+ @ObfuscatedName("o")
+ static ArrayList field843;
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = -628954657
+ intValue = -186588537
)
- static int field823;
- @ObfuscatedName("am")
- static final double field837;
+ static int field850;
+ @ObfuscatedName("al")
+ static final double field845;
+ @ObfuscatedName("lc")
+ @ObfuscatedSignature(
+ descriptor = "Lkb;"
+ )
+ @Export("dragInventoryWidget")
+ static Widget dragInventoryWidget;
static {
- Interpreter_arrayLengths = new int[5]; // L: 75
- Interpreter_arrays = new int[5][5000]; // L: 76
- Interpreter_intStack = new int[1000]; // L: 77
- Interpreter_stringStack = new String[1000]; // L: 79
- Interpreter_frameDepth = 0; // L: 81
- Interpreter_frames = new ScriptFrame[50]; // L: 82
- Interpreter_calendar = java.util.Calendar.getInstance(); // L: 88
- Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 91
- field835 = false; // L: 94
- field833 = false; // L: 95
- field821 = new ArrayList(); // L: 96
- field823 = 0; // L: 97
- field837 = Math.log(2.0D); // L: 101
+ Interpreter_arrayLengths = new int[5]; // L: 83
+ Interpreter_arrays = new int[5][5000]; // L: 84
+ Interpreter_intStack = new int[1000]; // L: 85
+ Interpreter_stringStack = new String[1000]; // L: 87
+ Interpreter_frameDepth = 0; // L: 89
+ Interpreter_frames = new ScriptFrame[50]; // L: 90
+ Interpreter_calendar = java.util.Calendar.getInstance(); // L: 96
+ Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 99
+ field829 = false; // L: 102
+ field842 = false; // L: 103
+ field843 = new ArrayList(); // L: 104
+ field850 = 0; // L: 105
+ field845 = Math.log(2.0D); // L: 109
}
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "([I[II)V",
- garbageValue = "-1325635329"
+ descriptor = "(I)[Ldf;",
+ garbageValue = "1105102872"
)
- public static void method1866(int[] var0, int[] var1) {
- if (var0 != null && var1 != null) { // L: 43
- FileSystem.ByteArrayPool_alternativeSizes = var0; // L: 50
- GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51
- class131.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52
+ static class123[] method1866() {
+ return new class123[]{class123.field1535, class123.field1529, class123.field1542, class123.field1531, class123.field1536, class123.field1533, class123.field1534, class123.field1532, class123.field1528}; // L: 113
+ }
- for (int var2 = 0; var2 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53
- class131.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54
- ByteArrayPool.field4212.add(var0[var2]); // L: 55
- }
-
- Collections.sort(ByteArrayPool.field4212); // L: 57
- } else {
- FileSystem.ByteArrayPool_alternativeSizes = null; // L: 44
- GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts = null; // L: 45
- class131.ByteArrayPool_arrays = null; // L: 46
- LoginScreenAnimation.method2217(); // L: 47
- }
- } // L: 48 58
-
- @ObfuscatedName("p")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1050592537"
+ descriptor = "(I)V",
+ garbageValue = "1772742726"
)
- static int method1793(int var0, Script var1, boolean var2) {
- Widget var3;
- if (var0 >= 2000) { // L: 818
- var0 -= 1000; // L: 819
- var3 = class92.getWidget(Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 820
- } else {
- var3 = var2 ? scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 822
- }
+ public static void method1868() {
+ StructComposition.StructDefinition_cached.clear(); // L: 71
+ } // L: 72
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 823
- if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 824
- if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 844
- var3.modelType = 2; // L: 845
- var3.modelId = Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 846
- return 1; // L: 847
- } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 849
- var3.modelType = 3; // L: 850
- var3.modelId = ModelData0.localPlayer.appearance.getChatHeadId(); // L: 851
- return 1; // L: 852
- } else {
- return 2; // L: 854
- }
- } else {
- class12.Interpreter_intStackSize -= 2; // L: 825
- int var4 = Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 826
- int var5 = Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 827
- var3.itemId = var4; // L: 828
- var3.itemQuantity = var5; // L: 829
- ItemComposition var6 = FileSystem.ItemDefinition_get(var4); // L: 830
- var3.modelAngleX = var6.xan2d; // L: 831
- var3.modelAngleY = var6.yan2d; // L: 832
- var3.modelAngleZ = var6.zan2d; // L: 833
- var3.modelOffsetX = var6.offsetX2d; // L: 834
- var3.modelOffsetY = var6.offsetY2d; // L: 835
- var3.modelZoom = var6.zoom2d; // L: 836
- if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
- var3.itemQuantityMode = 0; // L: 837
- } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 838
- var3.itemQuantityMode = 1;
- } else {
- var3.itemQuantityMode = 2; // L: 839
- }
-
- if (var3.field3406 > 0) { // L: 840
- var3.modelZoom = var3.modelZoom * 32 / var3.field3406;
- } else if (var3.rawWidth > 0) { // L: 841
- var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
- }
-
- return 1; // L: 842
- }
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(B)Lbc;",
+ garbageValue = "1"
+ )
+ @Export("getNextWorldListWorld")
+ static World getNextWorldListWorld() {
+ return World.World_listCount < World.World_count ? class362.World_worlds[++World.World_listCount - 1] : null; // L: 242 243
}
}
diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java
index abd26ca169..069fc773e1 100644
--- a/runescape-client/src/main/java/InvDefinition.java
+++ b/runescape-client/src/main/java/InvDefinition.java
@@ -1,36 +1,27 @@
-import java.awt.Component;
-import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ft")
+@ObfuscatedName("fc")
@Implements("InvDefinition")
public class InvDefinition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("InvDefinition_archive")
- public static AbstractArchive InvDefinition_archive;
- @ObfuscatedName("q")
+ static AbstractArchive InvDefinition_archive;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("InvDefinition_cached")
static EvictingDualNodeHashTable InvDefinition_cached;
- @ObfuscatedName("p")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1275234055
- )
- static int field1853;
- @ObfuscatedName("ct")
- public static char field1850;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 1439045239
+ intValue = -698923257
)
@Export("size")
public int size;
@@ -45,138 +36,192 @@ public class InvDefinition extends DualNode {
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-22"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "23"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 28
- if (var2 == 0) { // L: 29
- return; // L: 32
+ int var2 = var1.readUnsignedByte(); // L: 32
+ if (var2 == 0) { // L: 33
+ return; // L: 36
}
- this.decodeNext(var1, var2); // L: 30
+ this.decodeNext(var1, var2); // L: 34
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "39742539"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-706548236"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 2) { // L: 35
+ if (var2 == 2) { // L: 39
this.size = var1.readUnsignedShort();
}
- }
+ } // L: 41
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ljava/awt/Component;I)V",
- garbageValue = "497001629"
+ descriptor = "(Ldo;FZI)F",
+ garbageValue = "21178512"
)
- static void method3264(Component var0) {
- var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37
- var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38
- var0.addFocusListener(MouseHandler.MouseHandler_instance);
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(IIIII)V",
- garbageValue = "-1661883390"
- )
- @Export("itemContainerSetItem")
- static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
- ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39
- if (var4 == null) { // L: 40
- var4 = new ItemContainer(); // L: 41
- ItemContainer.itemContainers.put(var4, (long)var0); // L: 42
- }
-
- if (var4.ids.length <= var1) { // L: 44
- int[] var5 = new int[var1 + 1]; // L: 45
- int[] var6 = new int[var1 + 1]; // L: 46
-
- int var7;
- for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
- var5[var7] = var4.ids[var7]; // L: 48
- var6[var7] = var4.quantities[var7]; // L: 49
- }
-
- for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
- var5[var7] = -1; // L: 52
- var6[var7] = 0; // L: 53
- }
-
- var4.ids = var5; // L: 55
- var4.quantities = var6; // L: 56
- }
-
- var4.ids[var1] = var2; // L: 58
- var4.quantities[var1] = var3; // L: 59
- } // L: 60
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(Lbx;I)V",
- garbageValue = "-420431954"
- )
- @Export("changeWorld")
- static void changeWorld(World var0) {
- if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1910
- Client.isMembersWorld = var0.isMembersOnly(); // L: 1911
- boolean var1 = var0.isMembersOnly(); // L: 1912
- if (var1 != class82.ItemDefinition_inMembersWorld) { // L: 1914
- class92.method2370(); // L: 1915
- class82.ItemDefinition_inMembersWorld = var1; // L: 1916
- }
- }
-
- if (var0.properties != Client.worldProperties) { // L: 1920
- Archive var3 = class305.archive8; // L: 1921
- int var2 = var0.properties; // L: 1922
- if ((var2 & 536870912) != 0) { // L: 1924
- Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); // L: 1925
- } else if ((var2 & 1073741824) != 0) { // L: 1927
- Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); // L: 1928
+ static float method3349(class117 var0, float var1, boolean var2) {
+ float var3 = 0.0F; // L: 187
+ if (var0 != null && var0.method2709() != 0) { // L: 188
+ float var4 = (float)var0.field1462[0].field1420; // L: 191
+ float var5 = (float)var0.field1462[var0.method2709() - 1].field1420; // L: 192
+ float var6 = var5 - var4; // L: 193
+ if ((double)var6 == 0.0D) { // L: 194
+ return var0.field1462[0].field1423; // L: 195
} else {
- Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); // L: 1931
- }
- }
-
- Timer.worldHost = var0.host; // L: 1935
- Client.worldId = var0.id; // L: 1936
- Client.worldProperties = var0.properties; // L: 1937
- Tiles.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1938
- GrandExchangeEvent.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1939
- WorldMapRegion.currentPort = Tiles.worldPort; // L: 1940
- } // L: 1941
-
- @ObfuscatedName("hf")
- @ObfuscatedSignature(
- descriptor = "(ZB)V",
- garbageValue = "4"
- )
- static final void method3268(boolean var0) {
- ArchiveLoader.playPcmPlayers(); // L: 5734
- ++Client.packetWriter.pendingWrites; // L: 5735
- if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5736
- Client.packetWriter.pendingWrites = 0; // L: 5737
- if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5738
- PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2982, Client.packetWriter.isaacCipher); // L: 5740
- Client.packetWriter.addNode(var1); // L: 5741
-
- try {
- Client.packetWriter.flush(); // L: 5743
- } catch (IOException var3) { // L: 5745
- Client.hadNetworkError = true; // L: 5746
+ float var7 = 0.0F; // L: 197
+ if (var1 > var5) { // L: 198
+ var7 = (var1 - var5) / var6; // L: 199
+ } else {
+ var7 = (var1 - var4) / var6; // L: 202
}
- }
+ double var8 = (double)((int)var7); // L: 204
+ float var10 = Math.abs((float)((double)var7 - var8)); // L: 205
+ float var11 = var10 * var6; // L: 206
+ var8 = Math.abs(var8 + 1.0D); // L: 207
+ double var12 = var8 / 2.0D; // L: 208
+ double var14 = (double)((int)var12); // L: 209
+ var10 = (float)(var12 - var14); // L: 210
+ float var16;
+ float var17;
+ if (var2) { // L: 213
+ if (var0.field1468 == class116.field1454) { // L: 214
+ if (0.0D != (double)var10) { // L: 215
+ var11 += var4; // L: 216
+ } else {
+ var11 = var5 - var11; // L: 219
+ }
+ } else if (var0.field1468 != class116.field1450 && var0.field1468 != class116.field1453) { // L: 222
+ if (var0.field1468 == class116.field1451) { // L: 225
+ var11 = var4 - var1; // L: 226
+ var16 = var0.field1462[0].field1421; // L: 227
+ var17 = var0.field1462[0].field1422; // L: 228
+ var3 = var0.field1462[0].field1423; // L: 229
+ if (0.0D != (double)var16) { // L: 230
+ var3 -= var17 * var11 / var16; // L: 231
+ }
+
+ return var3; // L: 233
+ }
+ } else {
+ var11 = var5 - var11; // L: 223
+ }
+ } else if (var0.field1461 == class116.field1454) { // L: 237
+ if (0.0D != (double)var10) { // L: 238
+ var11 = var5 - var11; // L: 239
+ } else {
+ var11 += var4; // L: 242
+ }
+ } else if (var0.field1461 != class116.field1450 && var0.field1461 != class116.field1453) { // L: 245
+ if (var0.field1461 == class116.field1451) { // L: 248
+ var11 = var1 - var5; // L: 249
+ var16 = var0.field1462[var0.method2709() - 1].field1419; // L: 250
+ var17 = var0.field1462[var0.method2709() - 1].field1425; // L: 251
+ var3 = var0.field1462[var0.method2709() - 1].field1423; // L: 252
+ if (0.0D != (double)var16) { // L: 253
+ var3 += var11 * var17 / var16; // L: 254
+ }
+
+ return var3; // L: 256
+ }
+ } else {
+ var11 += var4; // L: 246
+ }
+
+ var3 = WorldMapSection0.method4918(var0, var11); // L: 259
+ float var18;
+ if (var2 && var0.field1468 == class116.field1453) { // L: 261
+ var18 = var0.field1462[var0.method2709() - 1].field1423 - var0.field1462[0].field1423; // L: 262
+ var3 = (float)((double)var3 - var8 * (double)var18); // L: 263
+ } else if (!var2 && var0.field1461 == class116.field1453) { // L: 265
+ var18 = var0.field1462[var0.method2709() - 1].field1423 - var0.field1462[0].field1423; // L: 266
+ var3 = (float)((double)var3 + (double)var18 * var8); // L: 267
+ }
+
+ return var3; // L: 269
+ }
+ } else {
+ return var3; // L: 189
}
- } // L: 5749
+ }
+
+ @ObfuscatedName("bg")
+ @ObfuscatedSignature(
+ descriptor = "(Lpv;I)Ljava/lang/Object;",
+ garbageValue = "558019675"
+ )
+ static Object method3360(class432 var0) {
+ if (var0 == null) { // L: 4996
+ throw new IllegalStateException("popValueOfType() failure - null baseVarType"); // L: 4997
+ } else {
+ switch(var0.field4660) { // L: 4999
+ case 0:
+ return Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 5003
+ case 2:
+ return Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 5005
+ default:
+ throw new IllegalStateException("popValueOfType() failure - unsupported type"); // L: 5001
+ }
+ }
+ }
+
+ @ObfuscatedName("gs")
+ @ObfuscatedSignature(
+ descriptor = "(IIIB)V",
+ garbageValue = "2"
+ )
+ static final void method3358(int var0, int var1, int var2) {
+ if (class18.cameraX < var0) { // L: 3943
+ class18.cameraX = (var0 - class18.cameraX) * UserComparator3.field1391 / 1000 + class18.cameraX + PlayerComposition.field3346; // L: 3944
+ if (class18.cameraX > var0) { // L: 3945
+ class18.cameraX = var0;
+ }
+ }
+
+ if (class18.cameraX > var0) { // L: 3947
+ class18.cameraX -= (class18.cameraX - var0) * UserComparator3.field1391 / 1000 + PlayerComposition.field3346; // L: 3948
+ if (class18.cameraX < var0) { // L: 3949
+ class18.cameraX = var0;
+ }
+ }
+
+ if (class16.cameraY < var1) { // L: 3951
+ class16.cameraY = (var1 - class16.cameraY) * UserComparator3.field1391 / 1000 + class16.cameraY + PlayerComposition.field3346; // L: 3952
+ if (class16.cameraY > var1) { // L: 3953
+ class16.cameraY = var1;
+ }
+ }
+
+ if (class16.cameraY > var1) { // L: 3955
+ class16.cameraY -= (class16.cameraY - var1) * UserComparator3.field1391 / 1000 + PlayerComposition.field3346; // L: 3956
+ if (class16.cameraY < var1) { // L: 3957
+ class16.cameraY = var1;
+ }
+ }
+
+ if (class228.cameraZ < var2) { // L: 3959
+ class228.cameraZ = (var2 - class228.cameraZ) * UserComparator3.field1391 / 1000 + class228.cameraZ + PlayerComposition.field3346; // L: 3960
+ if (class228.cameraZ > var2) { // L: 3961
+ class228.cameraZ = var2;
+ }
+ }
+
+ if (class228.cameraZ > var2) { // L: 3963
+ class228.cameraZ -= (class228.cameraZ - var2) * UserComparator3.field1391 / 1000 + PlayerComposition.field3346; // L: 3964
+ if (class228.cameraZ < var2) { // L: 3965
+ class228.cameraZ = var2;
+ }
+ }
+
+ } // L: 3967
}
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index ac2ac7d398..54dc6e2e1b 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qh")
+@ObfuscatedName("qv")
@Implements("IsaacCipher")
public final class IsaacCipher {
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1057139383
+ intValue = -1143715371
)
@Export("valuesRemaining")
int valuesRemaining;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("results")
int[] results;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("mm")
int[] mm;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 557530107
+ intValue = 363014683
)
@Export("aa")
int aa;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 996236501
+ intValue = 1161882065
)
@Export("bb")
int bb;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -371692805
+ intValue = -404616681
)
@Export("cc")
int cc;
@@ -46,13 +46,13 @@ public final class IsaacCipher {
this.results[var2] = var1[var2]; // L: 18
}
- this.method8109(); // L: 20
+ this.method8302(); // L: 20
} // L: 21
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "992826753"
+ garbageValue = "548586429"
)
@Export("nextInt")
public final int nextInt() {
@@ -64,12 +64,12 @@ public final class IsaacCipher {
return this.results[--this.valuesRemaining]; // L: 28
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1526419551"
+ descriptor = "(B)I",
+ garbageValue = "31"
)
- public final int method8108() {
+ public final int method8300() {
if (this.valuesRemaining == 0) { // L: 32
this.generateMoreResults(); // L: 33
this.valuesRemaining = 256; // L: 34
@@ -78,10 +78,10 @@ public final class IsaacCipher {
return this.results[this.valuesRemaining - 1]; // L: 36
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1357126023"
+ garbageValue = "-921411096"
)
@Export("generateMoreResults")
final void generateMoreResults() {
@@ -109,12 +109,12 @@ public final class IsaacCipher {
} // L: 58
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1249714849"
+ garbageValue = "-746601437"
)
- final void method8109() {
+ final void method8302() {
int var9 = -1640531527; // L: 70
int var8 = -1640531527; // L: 71
int var7 = -1640531527; // L: 72
diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java
index 354fc21c76..8d754193a0 100644
--- a/runescape-client/src/main/java/ItemComposition.java
+++ b/runescape-client/src/main/java/ItemComposition.java
@@ -4,285 +4,290 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gl")
+@ObfuscatedName("gs")
@Implements("ItemComposition")
public class ItemComposition extends DualNode {
- @ObfuscatedName("m")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("ItemDefinition_archive")
- public static AbstractArchive ItemDefinition_archive;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("ItemDefinition_modelArchive")
- public static AbstractArchive ItemDefinition_modelArchive;
- @ObfuscatedName("v")
+ static AbstractArchive ItemDefinition_modelArchive;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 2108545751
+ )
+ static int field2148;
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ItemDefinition_cached")
static EvictingDualNodeHashTable ItemDefinition_cached;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ItemDefinition_cachedModels")
static EvictingDualNodeHashTable ItemDefinition_cachedModels;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ItemDefinition_cachedSprites")
static EvictingDualNodeHashTable ItemDefinition_cachedSprites;
- @ObfuscatedName("b")
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "Lmt;"
+ )
+ @Export("ItemDefinition_fontPlain11")
+ static Font ItemDefinition_fontPlain11;
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 1188742133
+ intValue = 142649669
)
@Export("id")
public int id;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = 1954098135
+ intValue = 553949055
)
@Export("model")
int model;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("name")
public String name;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("recolorFrom")
public short[] recolorFrom;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("recolorTo")
public short[] recolorTo;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("retextureFrom")
public short[] retextureFrom;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("retextureTo")
public short[] retextureTo;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = 368611487
+ intValue = 117034067
)
@Export("zoom2d")
public int zoom2d;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 1716239229
+ intValue = 1968958487
)
@Export("xan2d")
public int xan2d;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedGetter(
- intValue = 491486855
+ intValue = 497010155
)
@Export("yan2d")
public int yan2d;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = 487766987
+ intValue = 2142239479
)
@Export("zan2d")
public int zan2d;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = -1027973527
+ intValue = 1590307369
)
@Export("offsetX2d")
public int offsetX2d;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = -1363843995
+ intValue = 2110307741
)
@Export("offsetY2d")
public int offsetY2d;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@ObfuscatedGetter(
- intValue = -1771117007
+ intValue = 665211783
)
@Export("isStackable")
public int isStackable;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@ObfuscatedGetter(
- intValue = 472358963
+ intValue = 1270794781
)
@Export("price")
public int price;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("isMembersOnly")
public boolean isMembersOnly;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("groundActions")
public String[] groundActions;
@ObfuscatedName("ab")
@Export("inventoryActions")
public String[] inventoryActions;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@ObfuscatedGetter(
- intValue = -240268281
+ intValue = 659363445
)
@Export("shiftClickIndex")
int shiftClickIndex;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@ObfuscatedGetter(
- intValue = 1720153193
+ intValue = -1456247863
)
@Export("maleModel")
int maleModel;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = 314982159
+ intValue = -1755681103
)
@Export("maleModel1")
int maleModel1;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = -1129787177
+ intValue = -502498621
)
@Export("maleOffset")
int maleOffset;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = 1717071033
+ intValue = 1834954723
)
@Export("femaleModel")
int femaleModel;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@ObfuscatedGetter(
- intValue = -5500123
+ intValue = -815758567
)
@Export("femaleModel1")
int femaleModel1;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = -942281181
+ intValue = -1384966233
)
@Export("femaleOffset")
int femaleOffset;
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@ObfuscatedGetter(
- intValue = 1391389777
+ intValue = 1446242479
)
@Export("maleModel2")
int maleModel2;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@ObfuscatedGetter(
- intValue = 915648219
+ intValue = -1972184355
)
@Export("femaleModel2")
int femaleModel2;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@ObfuscatedGetter(
- intValue = -1950888251
+ intValue = 1072268467
)
@Export("maleHeadModel")
int maleHeadModel;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@ObfuscatedGetter(
- intValue = 1053389309
+ intValue = 2093699443
)
@Export("maleHeadModel2")
int maleHeadModel2;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@ObfuscatedGetter(
- intValue = 528440307
+ intValue = 774813039
)
@Export("femaleHeadModel")
int femaleHeadModel;
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@ObfuscatedGetter(
- intValue = 737797573
+ intValue = 164218125
)
@Export("femaleHeadModel2")
int femaleHeadModel2;
- @ObfuscatedName("ao")
+ @ObfuscatedName("az")
@Export("countobj")
int[] countobj;
@ObfuscatedName("av")
@Export("countco")
int[] countco;
- @ObfuscatedName("ai")
+ @ObfuscatedName("aw")
@ObfuscatedGetter(
- intValue = -266010117
+ intValue = -923940143
)
@Export("note")
public int note;
- @ObfuscatedName("ay")
+ @ObfuscatedName("au")
@ObfuscatedGetter(
- intValue = 1832426705
+ intValue = -1949641275
)
@Export("noteTemplate")
public int noteTemplate;
@ObfuscatedName("aa")
@ObfuscatedGetter(
- intValue = 1030665223
+ intValue = 1639689769
)
@Export("resizeX")
int resizeX;
- @ObfuscatedName("ax")
+ @ObfuscatedName("ay")
@ObfuscatedGetter(
- intValue = 1511070871
+ intValue = 50323611
)
@Export("resizeY")
int resizeY;
- @ObfuscatedName("at")
+ @ObfuscatedName("as")
@ObfuscatedGetter(
- intValue = 1052019651
+ intValue = 1107675065
)
@Export("resizeZ")
int resizeZ;
- @ObfuscatedName("br")
+ @ObfuscatedName("be")
@ObfuscatedGetter(
- intValue = 85687709
+ intValue = -776893781
)
@Export("ambient")
public int ambient;
- @ObfuscatedName("ba")
+ @ObfuscatedName("bz")
@ObfuscatedGetter(
- intValue = -708607869
+ intValue = 484513503
)
@Export("contrast")
public int contrast;
- @ObfuscatedName("bk")
+ @ObfuscatedName("bp")
@ObfuscatedGetter(
- intValue = -68016555
+ intValue = -1969616473
)
@Export("team")
public int team;
- @ObfuscatedName("bi")
+ @ObfuscatedName("bf")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("params")
IterableNodeHashTable params;
- @ObfuscatedName("bc")
+ @ObfuscatedName("bg")
@Export("isTradable")
public boolean isTradable;
- @ObfuscatedName("bo")
+ @ObfuscatedName("br")
@ObfuscatedGetter(
- intValue = 242888211
+ intValue = -1091413639
)
@Export("unnotedId")
int unnotedId;
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@ObfuscatedGetter(
- intValue = 1348681369
+ intValue = 1288624393
)
@Export("notedId")
int notedId;
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@ObfuscatedGetter(
- intValue = -438305337
+ intValue = 307308711
)
@Export("placeholder")
public int placeholder;
- @ObfuscatedName("bx")
+ @ObfuscatedName("bc")
@ObfuscatedGetter(
- intValue = 502078061
+ intValue = -1966743229
)
@Export("placeholderTemplate")
public int placeholderTemplate;
@@ -337,592 +342,605 @@ public class ItemComposition extends DualNode {
@ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "264401627"
+ garbageValue = "898206035"
)
@Export("post")
void post() {
- } // L: 121
+ } // L: 129
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-1278602927"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "1165172162"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 125
- if (var2 == 0) { // L: 126
- return; // L: 129
+ int var2 = var1.readUnsignedByte(); // L: 133
+ if (var2 == 0) { // L: 134
+ return; // L: 137
}
- this.decodeNext(var1, var2); // L: 127
+ this.decodeNext(var1, var2); // L: 135
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-849258207"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "987827879"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 1) { // L: 132
+ if (var2 == 1) { // L: 140
this.model = var1.readUnsignedShort();
- } else if (var2 == 2) { // L: 133
+ } else if (var2 == 2) { // L: 141
this.name = var1.readStringCp1252NullTerminated();
- } else if (var2 == 4) { // L: 134
+ } else if (var2 == 4) { // L: 142
this.zoom2d = var1.readUnsignedShort();
- } else if (var2 == 5) { // L: 135
+ } else if (var2 == 5) { // L: 143
this.xan2d = var1.readUnsignedShort();
- } else if (var2 == 6) { // L: 136
+ } else if (var2 == 6) { // L: 144
this.yan2d = var1.readUnsignedShort();
- } else if (var2 == 7) { // L: 137
- this.offsetX2d = var1.readUnsignedShort(); // L: 138
- if (this.offsetX2d > 32767) { // L: 139
+ } else if (var2 == 7) { // L: 145
+ this.offsetX2d = var1.readUnsignedShort(); // L: 146
+ if (this.offsetX2d > 32767) { // L: 147
this.offsetX2d -= 65536;
}
- } else if (var2 == 8) { // L: 141
- this.offsetY2d = var1.readUnsignedShort(); // L: 142
- if (this.offsetY2d > 32767) { // L: 143
+ } else if (var2 == 8) { // L: 149
+ this.offsetY2d = var1.readUnsignedShort(); // L: 150
+ if (this.offsetY2d > 32767) { // L: 151
this.offsetY2d -= 65536;
}
- } else if (var2 == 9) { // L: 145
- var1.readStringCp1252NullTerminated(); // L: 146
- } else if (var2 == 11) { // L: 148
+ } else if (var2 == 9) { // L: 153
+ var1.readStringCp1252NullTerminated(); // L: 154
+ } else if (var2 == 11) { // L: 156
this.isStackable = 1;
- } else if (var2 == 12) { // L: 149
+ } else if (var2 == 12) { // L: 157
this.price = var1.readInt();
- } else if (var2 == 16) { // L: 150
+ } else if (var2 == 16) { // L: 158
this.isMembersOnly = true;
- } else if (var2 == 23) { // L: 151
- this.maleModel = var1.readUnsignedShort(); // L: 152
- this.maleOffset = var1.readUnsignedByte(); // L: 153
- } else if (var2 == 24) { // L: 155
+ } else if (var2 == 23) { // L: 159
+ this.maleModel = var1.readUnsignedShort(); // L: 160
+ this.maleOffset = var1.readUnsignedByte(); // L: 161
+ } else if (var2 == 24) { // L: 163
this.maleModel1 = var1.readUnsignedShort();
- } else if (var2 == 25) { // L: 156
- this.femaleModel = var1.readUnsignedShort(); // L: 157
- this.femaleOffset = var1.readUnsignedByte(); // L: 158
- } else if (var2 == 26) { // L: 160
+ } else if (var2 == 25) { // L: 164
+ this.femaleModel = var1.readUnsignedShort(); // L: 165
+ this.femaleOffset = var1.readUnsignedByte(); // L: 166
+ } else if (var2 == 26) { // L: 168
this.femaleModel1 = var1.readUnsignedShort();
- } else if (var2 >= 30 && var2 < 35) { // L: 161
- this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 162
- if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 163
+ } else if (var2 >= 30 && var2 < 35) { // L: 169
+ this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 170
+ if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 171
this.groundActions[var2 - 30] = null;
}
- } else if (var2 >= 35 && var2 < 40) { // L: 165
+ } else if (var2 >= 35 && var2 < 40) { // L: 173
this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated();
} else {
int var3;
int var4;
- if (var2 == 40) { // L: 166
- var3 = var1.readUnsignedByte(); // L: 167
- this.recolorFrom = new short[var3]; // L: 168
- this.recolorTo = new short[var3]; // L: 169
+ if (var2 == 40) { // L: 174
+ var3 = var1.readUnsignedByte(); // L: 175
+ this.recolorFrom = new short[var3]; // L: 176
+ this.recolorTo = new short[var3]; // L: 177
- for (var4 = 0; var4 < var3; ++var4) { // L: 170
- this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171
- this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172
+ for (var4 = 0; var4 < var3; ++var4) { // L: 178
+ this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 179
+ this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 180
}
- } else if (var2 == 41) { // L: 175
- var3 = var1.readUnsignedByte(); // L: 176
- this.retextureFrom = new short[var3]; // L: 177
- this.retextureTo = new short[var3]; // L: 178
+ } else if (var2 == 41) { // L: 183
+ var3 = var1.readUnsignedByte(); // L: 184
+ this.retextureFrom = new short[var3]; // L: 185
+ this.retextureTo = new short[var3]; // L: 186
- for (var4 = 0; var4 < var3; ++var4) { // L: 179
- this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180
- this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181
+ for (var4 = 0; var4 < var3; ++var4) { // L: 187
+ this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 188
+ this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 189
}
- } else if (var2 == 42) { // L: 184
- this.shiftClickIndex = var1.readByte(); // L: 185
- } else if (var2 == 65) { // L: 187
+ } else if (var2 == 42) { // L: 192
+ this.shiftClickIndex = var1.readByte(); // L: 193
+ } else if (var2 == 65) { // L: 195
this.isTradable = true;
- } else if (var2 == 78) { // L: 188
+ } else if (var2 == 78) { // L: 196
this.maleModel2 = var1.readUnsignedShort();
- } else if (var2 == 79) { // L: 189
+ } else if (var2 == 79) { // L: 197
this.femaleModel2 = var1.readUnsignedShort();
- } else if (var2 == 90) { // L: 190
+ } else if (var2 == 90) { // L: 198
this.maleHeadModel = var1.readUnsignedShort();
- } else if (var2 == 91) { // L: 191
+ } else if (var2 == 91) { // L: 199
this.femaleHeadModel = var1.readUnsignedShort();
- } else if (var2 == 92) { // L: 192
+ } else if (var2 == 92) { // L: 200
this.maleHeadModel2 = var1.readUnsignedShort();
- } else if (var2 == 93) { // L: 193
+ } else if (var2 == 93) { // L: 201
this.femaleHeadModel2 = var1.readUnsignedShort();
- } else if (var2 == 94) { // L: 194
- var1.readUnsignedShort(); // L: 195
- } else if (var2 == 95) { // L: 197
+ } else if (var2 == 94) { // L: 202
+ var1.readUnsignedShort(); // L: 203
+ } else if (var2 == 95) { // L: 205
this.zan2d = var1.readUnsignedShort();
- } else if (var2 == 97) { // L: 198
+ } else if (var2 == 97) { // L: 206
this.note = var1.readUnsignedShort();
- } else if (var2 == 98) { // L: 199
+ } else if (var2 == 98) { // L: 207
this.noteTemplate = var1.readUnsignedShort();
- } else if (var2 >= 100 && var2 < 110) { // L: 200
- if (this.countobj == null) { // L: 201
- this.countobj = new int[10]; // L: 202
- this.countco = new int[10]; // L: 203
+ } else if (var2 >= 100 && var2 < 110) { // L: 208
+ if (this.countobj == null) { // L: 209
+ this.countobj = new int[10]; // L: 210
+ this.countco = new int[10]; // L: 211
}
- this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205
- this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206
- } else if (var2 == 110) { // L: 208
+ this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 213
+ this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 214
+ } else if (var2 == 110) { // L: 216
this.resizeX = var1.readUnsignedShort();
- } else if (var2 == 111) { // L: 209
+ } else if (var2 == 111) { // L: 217
this.resizeY = var1.readUnsignedShort();
- } else if (var2 == 112) { // L: 210
+ } else if (var2 == 112) { // L: 218
this.resizeZ = var1.readUnsignedShort();
- } else if (var2 == 113) { // L: 211
+ } else if (var2 == 113) { // L: 219
this.ambient = var1.readByte();
- } else if (var2 == 114) { // L: 212
+ } else if (var2 == 114) { // L: 220
this.contrast = var1.readByte() * 5;
- } else if (var2 == 115) { // L: 213
+ } else if (var2 == 115) { // L: 221
this.team = var1.readUnsignedByte();
- } else if (var2 == 139) { // L: 214
+ } else if (var2 == 139) { // L: 222
this.unnotedId = var1.readUnsignedShort();
- } else if (var2 == 140) { // L: 215
+ } else if (var2 == 140) { // L: 223
this.notedId = var1.readUnsignedShort();
- } else if (var2 == 148) { // L: 216
+ } else if (var2 == 148) { // L: 224
this.placeholder = var1.readUnsignedShort();
- } else if (var2 == 149) { // L: 217
+ } else if (var2 == 149) { // L: 225
this.placeholderTemplate = var1.readUnsignedShort();
- } else if (var2 == 249) { // L: 218
- this.params = JagexCache.readStringIntParameters(var1, this.params);
+ } else if (var2 == 249) { // L: 226
+ this.params = LoginScreenAnimation.readStringIntParameters(var1, this.params);
}
}
- } // L: 220
+ } // L: 228
- @ObfuscatedName("a")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lgl;Lgl;I)V",
- garbageValue = "-279950936"
+ descriptor = "(Lgs;Lgs;I)V",
+ garbageValue = "-1987499814"
)
@Export("genCert")
void genCert(ItemComposition var1, ItemComposition var2) {
- this.model = var1.model; // L: 223
- this.zoom2d = var1.zoom2d; // L: 224
- this.xan2d = var1.xan2d; // L: 225
- this.yan2d = var1.yan2d; // L: 226
- this.zan2d = var1.zan2d; // L: 227
- this.offsetX2d = var1.offsetX2d; // L: 228
- this.offsetY2d = var1.offsetY2d; // L: 229
- this.recolorFrom = var1.recolorFrom; // L: 230
- this.recolorTo = var1.recolorTo; // L: 231
- this.retextureFrom = var1.retextureFrom; // L: 232
- this.retextureTo = var1.retextureTo; // L: 233
- this.name = var2.name; // L: 234
- this.isMembersOnly = var2.isMembersOnly; // L: 235
- this.price = var2.price; // L: 236
- this.isStackable = 1; // L: 237
- } // L: 238
+ this.model = var1.model; // L: 231
+ this.zoom2d = var1.zoom2d; // L: 232
+ this.xan2d = var1.xan2d; // L: 233
+ this.yan2d = var1.yan2d; // L: 234
+ this.zan2d = var1.zan2d; // L: 235
+ this.offsetX2d = var1.offsetX2d; // L: 236
+ this.offsetY2d = var1.offsetY2d; // L: 237
+ this.recolorFrom = var1.recolorFrom; // L: 238
+ this.recolorTo = var1.recolorTo; // L: 239
+ this.retextureFrom = var1.retextureFrom; // L: 240
+ this.retextureTo = var1.retextureTo; // L: 241
+ this.name = var2.name; // L: 242
+ this.isMembersOnly = var2.isMembersOnly; // L: 243
+ this.price = var2.price; // L: 244
+ this.isStackable = 1; // L: 245
+ } // L: 246
- @ObfuscatedName("m")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Lgl;Lgl;I)V",
- garbageValue = "1099731661"
+ descriptor = "(Lgs;Lgs;B)V",
+ garbageValue = "-3"
)
@Export("genBought")
void genBought(ItemComposition var1, ItemComposition var2) {
- this.model = var1.model; // L: 241
- this.zoom2d = var1.zoom2d; // L: 242
- this.xan2d = var1.xan2d; // L: 243
- this.yan2d = var1.yan2d; // L: 244
- this.zan2d = var1.zan2d; // L: 245
- this.offsetX2d = var1.offsetX2d; // L: 246
- this.offsetY2d = var1.offsetY2d; // L: 247
- this.recolorFrom = var2.recolorFrom; // L: 248
- this.recolorTo = var2.recolorTo; // L: 249
- this.retextureFrom = var2.retextureFrom; // L: 250
- this.retextureTo = var2.retextureTo; // L: 251
- this.name = var2.name; // L: 252
- this.isMembersOnly = var2.isMembersOnly; // L: 253
- this.isStackable = var2.isStackable; // L: 254
- this.maleModel = var2.maleModel; // L: 255
- this.maleModel1 = var2.maleModel1; // L: 256
- this.maleModel2 = var2.maleModel2; // L: 257
- this.femaleModel = var2.femaleModel; // L: 258
- this.femaleModel1 = var2.femaleModel1; // L: 259
- this.femaleModel2 = var2.femaleModel2; // L: 260
- this.maleHeadModel = var2.maleHeadModel; // L: 261
- this.maleHeadModel2 = var2.maleHeadModel2; // L: 262
- this.femaleHeadModel = var2.femaleHeadModel; // L: 263
- this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 264
- this.team = var2.team; // L: 265
- this.groundActions = var2.groundActions; // L: 266
- this.inventoryActions = new String[5]; // L: 267
- if (var2.inventoryActions != null) { // L: 268
+ this.model = var1.model; // L: 249
+ this.zoom2d = var1.zoom2d; // L: 250
+ this.xan2d = var1.xan2d; // L: 251
+ this.yan2d = var1.yan2d; // L: 252
+ this.zan2d = var1.zan2d; // L: 253
+ this.offsetX2d = var1.offsetX2d; // L: 254
+ this.offsetY2d = var1.offsetY2d; // L: 255
+ this.recolorFrom = var2.recolorFrom; // L: 256
+ this.recolorTo = var2.recolorTo; // L: 257
+ this.retextureFrom = var2.retextureFrom; // L: 258
+ this.retextureTo = var2.retextureTo; // L: 259
+ this.name = var2.name; // L: 260
+ this.isMembersOnly = var2.isMembersOnly; // L: 261
+ this.isStackable = var2.isStackable; // L: 262
+ this.maleModel = var2.maleModel; // L: 263
+ this.maleModel1 = var2.maleModel1; // L: 264
+ this.maleModel2 = var2.maleModel2; // L: 265
+ this.femaleModel = var2.femaleModel; // L: 266
+ this.femaleModel1 = var2.femaleModel1; // L: 267
+ this.femaleModel2 = var2.femaleModel2; // L: 268
+ this.maleHeadModel = var2.maleHeadModel; // L: 269
+ this.maleHeadModel2 = var2.maleHeadModel2; // L: 270
+ this.femaleHeadModel = var2.femaleHeadModel; // L: 271
+ this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 272
+ this.team = var2.team; // L: 273
+ this.groundActions = var2.groundActions; // L: 274
+ this.inventoryActions = new String[5]; // L: 275
+ if (var2.inventoryActions != null) { // L: 276
for (int var3 = 0; var3 < 4; ++var3) {
this.inventoryActions[var3] = var2.inventoryActions[var3];
}
}
- this.inventoryActions[4] = "Discard"; // L: 269
- this.price = 0; // L: 270
- } // L: 271
+ this.inventoryActions[4] = "Discard"; // L: 277
+ this.price = 0; // L: 278
+ } // L: 279
- @ObfuscatedName("p")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Lgl;Lgl;I)V",
- garbageValue = "-1484534743"
+ descriptor = "(Lgs;Lgs;I)V",
+ garbageValue = "-791198801"
)
@Export("genPlaceholder")
void genPlaceholder(ItemComposition var1, ItemComposition var2) {
- this.model = var1.model; // L: 274
- this.zoom2d = var1.zoom2d; // L: 275
- this.xan2d = var1.xan2d; // L: 276
- this.yan2d = var1.yan2d; // L: 277
- this.zan2d = var1.zan2d; // L: 278
- this.offsetX2d = var1.offsetX2d; // L: 279
- this.offsetY2d = var1.offsetY2d; // L: 280
- this.recolorFrom = var1.recolorFrom; // L: 281
- this.recolorTo = var1.recolorTo; // L: 282
- this.retextureFrom = var1.retextureFrom; // L: 283
- this.retextureTo = var1.retextureTo; // L: 284
- this.isStackable = var1.isStackable; // L: 285
- this.name = var2.name; // L: 286
- this.price = 0; // L: 287
- this.isMembersOnly = false; // L: 288
- this.isTradable = false; // L: 289
- } // L: 290
+ this.model = var1.model; // L: 282
+ this.zoom2d = var1.zoom2d; // L: 283
+ this.xan2d = var1.xan2d; // L: 284
+ this.yan2d = var1.yan2d; // L: 285
+ this.zan2d = var1.zan2d; // L: 286
+ this.offsetX2d = var1.offsetX2d; // L: 287
+ this.offsetY2d = var1.offsetY2d; // L: 288
+ this.recolorFrom = var1.recolorFrom; // L: 289
+ this.recolorTo = var1.recolorTo; // L: 290
+ this.retextureFrom = var1.retextureFrom; // L: 291
+ this.retextureTo = var1.retextureTo; // L: 292
+ this.isStackable = var1.isStackable; // L: 293
+ this.name = var2.name; // L: 294
+ this.price = 0; // L: 295
+ this.isMembersOnly = false; // L: 296
+ this.isTradable = false; // L: 297
+ } // L: 298
- @ObfuscatedName("s")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(II)Lgs;",
- garbageValue = "101445561"
+ descriptor = "(II)Lgw;",
+ garbageValue = "1000978404"
)
@Export("getModelData")
public final ModelData getModelData(int var1) {
int var3;
- if (this.countobj != null && var1 > 1) { // L: 293
- int var2 = -1; // L: 294
+ if (this.countobj != null && var1 > 1) { // L: 301
+ int var2 = -1; // L: 302
- for (var3 = 0; var3 < 10; ++var3) { // L: 295
- if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296
+ for (var3 = 0; var3 < 10; ++var3) { // L: 303
+ if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 304
var2 = this.countobj[var3];
}
}
- if (var2 != -1) { // L: 298
- return FileSystem.ItemDefinition_get(var2).getModelData(1);
+ if (var2 != -1) { // L: 306
+ return EnumComposition.ItemDefinition_get(var2).getModelData(1);
}
}
- ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 300
- if (var4 == null) { // L: 301
+ ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 308
+ if (var4 == null) { // L: 309
return null;
} else {
- if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302
+ if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 310
var4.resize(this.resizeX, this.resizeY, this.resizeZ);
}
- if (this.recolorFrom != null) { // L: 303
- for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 304
- var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 305
+ if (this.recolorFrom != null) { // L: 311
+ for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 312
+ var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 313
}
}
- if (this.retextureFrom != null) { // L: 308
- for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 309
- var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 310
+ if (this.retextureFrom != null) { // L: 316
+ for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 317
+ var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 318
}
}
- return var4; // L: 313
+ return var4; // L: 321
}
}
- @ObfuscatedName("r")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(II)Lhv;",
- garbageValue = "-1179762647"
+ descriptor = "(IB)Lhy;",
+ garbageValue = "0"
)
@Export("getModel")
public final Model getModel(int var1) {
- if (this.countobj != null && var1 > 1) { // L: 317
- int var2 = -1; // L: 318
+ if (this.countobj != null && var1 > 1) { // L: 325
+ int var2 = -1; // L: 326
- for (int var3 = 0; var3 < 10; ++var3) { // L: 319
- if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320
+ for (int var3 = 0; var3 < 10; ++var3) { // L: 327
+ if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 328
var2 = this.countobj[var3];
}
}
- if (var2 != -1) { // L: 322
- return FileSystem.ItemDefinition_get(var2).getModel(1);
+ if (var2 != -1) { // L: 330
+ return EnumComposition.ItemDefinition_get(var2).getModel(1);
}
}
- Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324
- if (var5 != null) { // L: 325
+ Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 332
+ if (var5 != null) { // L: 333
return var5;
} else {
- ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 326
- if (var6 == null) { // L: 327
+ ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 334
+ if (var6 == null) { // L: 335
return null;
} else {
- if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328
+ if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 336
var6.resize(this.resizeX, this.resizeY, this.resizeZ);
}
int var4;
- if (this.recolorFrom != null) { // L: 329
- for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330
- var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331
+ if (this.recolorFrom != null) { // L: 337
+ for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 338
+ var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 339
}
}
- if (this.retextureFrom != null) { // L: 334
- for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335
- var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336
+ if (this.retextureFrom != null) { // L: 342
+ for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 343
+ var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 344
}
}
- var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339
- var5.isSingleTile = true; // L: 340
- ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341
- return var5; // L: 342
+ var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 347
+ var5.isSingleTile = true; // L: 348
+ ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 349
+ return var5; // L: 350
}
}
}
- @ObfuscatedName("v")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(II)Lgl;",
- garbageValue = "-1139182160"
+ descriptor = "(IS)Lgs;",
+ garbageValue = "5217"
)
@Export("getCountObj")
public ItemComposition getCountObj(int var1) {
- if (this.countobj != null && var1 > 1) { // L: 346
- int var2 = -1; // L: 347
+ if (this.countobj != null && var1 > 1) { // L: 354
+ int var2 = -1; // L: 355
- for (int var3 = 0; var3 < 10; ++var3) { // L: 348
+ for (int var3 = 0; var3 < 10; ++var3) { // L: 356
if (var1 >= this.countco[var3] && this.countco[var3] != 0) {
- var2 = this.countobj[var3]; // L: 349
+ var2 = this.countobj[var3]; // L: 357
}
}
- if (var2 != -1) { // L: 351
- return FileSystem.ItemDefinition_get(var2);
+ if (var2 != -1) { // L: 359
+ return EnumComposition.ItemDefinition_get(var2);
}
}
- return this; // L: 353
+ return this; // L: 361
}
- @ObfuscatedName("w")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(ZI)Z",
- garbageValue = "1443965547"
+ descriptor = "(ZB)Z",
+ garbageValue = "-52"
)
@Export("hasNoValidModel")
public final boolean hasNoValidModel(boolean var1) {
- int var2 = this.maleModel; // L: 431
- int var3 = this.maleModel1; // L: 432
- int var4 = this.maleModel2; // L: 433
- if (var1) { // L: 434
- var2 = this.femaleModel; // L: 435
- var3 = this.femaleModel1; // L: 436
- var4 = this.femaleModel2; // L: 437
+ int var2 = this.maleModel; // L: 439
+ int var3 = this.maleModel1; // L: 440
+ int var4 = this.maleModel2; // L: 441
+ if (var1) { // L: 442
+ var2 = this.femaleModel; // L: 443
+ var3 = this.femaleModel1; // L: 444
+ var4 = this.femaleModel2; // L: 445
}
- if (var2 == -1) { // L: 439
+ if (var2 == -1) { // L: 447
return true;
} else {
- boolean var5 = true; // L: 440
- if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 441
+ boolean var5 = true; // L: 448
+ if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 449
var5 = false;
}
- if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 442
+ if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 450
var5 = false;
}
- if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 443
+ if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 451
var5 = false;
}
- return var5; // L: 444
+ return var5; // L: 452
}
}
- @ObfuscatedName("b")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(ZI)Lgs;",
- garbageValue = "-1175782227"
+ descriptor = "(ZI)Lgw;",
+ garbageValue = "969758302"
)
- public final ModelData method3630(boolean var1) {
- int var2 = this.maleModel; // L: 448
- int var3 = this.maleModel1; // L: 449
- int var4 = this.maleModel2; // L: 450
- if (var1) { // L: 451
- var2 = this.femaleModel; // L: 452
- var3 = this.femaleModel1; // L: 453
- var4 = this.femaleModel2; // L: 454
+ public final ModelData method3721(boolean var1) {
+ int var2 = this.maleModel; // L: 456
+ int var3 = this.maleModel1; // L: 457
+ int var4 = this.maleModel2; // L: 458
+ if (var1) { // L: 459
+ var2 = this.femaleModel; // L: 460
+ var3 = this.femaleModel1; // L: 461
+ var4 = this.femaleModel2; // L: 462
}
- if (var2 == -1) { // L: 456
+ if (var2 == -1) { // L: 464
return null;
} else {
- ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 457
- if (var3 != -1) { // L: 458
- ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 459
- if (var4 != -1) { // L: 460
- ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 461
- ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 462
- var5 = new ModelData(var8, 3); // L: 463
+ ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 465
+ if (var3 != -1) { // L: 466
+ ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 467
+ if (var4 != -1) { // L: 468
+ ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 469
+ ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 470
+ var5 = new ModelData(var8, 3); // L: 471
} else {
- ModelData[] var10 = new ModelData[]{var5, var6}; // L: 466
- var5 = new ModelData(var10, 2); // L: 467
+ ModelData[] var10 = new ModelData[]{var5, var6}; // L: 474
+ var5 = new ModelData(var10, 2); // L: 475
}
}
- if (!var1 && this.maleOffset != 0) { // L: 470
+ if (!var1 && this.maleOffset != 0) { // L: 478
var5.changeOffset(0, this.maleOffset, 0);
}
- if (var1 && this.femaleOffset != 0) { // L: 471
+ if (var1 && this.femaleOffset != 0) { // L: 479
var5.changeOffset(0, this.femaleOffset, 0);
}
int var9;
- if (this.recolorFrom != null) { // L: 472
- for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 473
- var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 474
+ if (this.recolorFrom != null) { // L: 480
+ for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 481
+ var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 482
}
}
- if (this.retextureFrom != null) { // L: 477
- for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 478
- var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 479
+ if (this.retextureFrom != null) { // L: 485
+ for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 486
+ var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 487
}
}
- return var5; // L: 482
+ return var5; // L: 490
}
}
- @ObfuscatedName("t")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(ZI)Z",
- garbageValue = "1892090883"
+ descriptor = "(ZB)Z",
+ garbageValue = "-73"
)
- public final boolean method3631(boolean var1) {
- int var2 = this.maleHeadModel; // L: 486
- int var3 = this.maleHeadModel2; // L: 487
- if (var1) { // L: 488
- var2 = this.femaleHeadModel; // L: 489
- var3 = this.femaleHeadModel2; // L: 490
+ public final boolean method3746(boolean var1) {
+ int var2 = this.maleHeadModel; // L: 494
+ int var3 = this.maleHeadModel2; // L: 495
+ if (var1) { // L: 496
+ var2 = this.femaleHeadModel; // L: 497
+ var3 = this.femaleHeadModel2; // L: 498
}
- if (var2 == -1) { // L: 492
+ if (var2 == -1) { // L: 500
return true;
} else {
- boolean var4 = true; // L: 493
- if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 494
+ boolean var4 = true; // L: 501
+ if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 502
var4 = false;
}
- if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 495
+ if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 503
var4 = false;
}
- return var4; // L: 496
+ return var4; // L: 504
}
}
- @ObfuscatedName("g")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(ZI)Lgs;",
- garbageValue = "104327416"
+ descriptor = "(ZB)Lgw;",
+ garbageValue = "-29"
)
- public final ModelData method3632(boolean var1) {
- int var2 = this.maleHeadModel; // L: 500
- int var3 = this.maleHeadModel2; // L: 501
- if (var1) { // L: 502
- var2 = this.femaleHeadModel; // L: 503
- var3 = this.femaleHeadModel2; // L: 504
+ public final ModelData method3723(boolean var1) {
+ int var2 = this.maleHeadModel; // L: 508
+ int var3 = this.maleHeadModel2; // L: 509
+ if (var1) { // L: 510
+ var2 = this.femaleHeadModel; // L: 511
+ var3 = this.femaleHeadModel2; // L: 512
}
- if (var2 == -1) { // L: 506
+ if (var2 == -1) { // L: 514
return null;
} else {
- ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 507
- if (var3 != -1) { // L: 508
- ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 509
- ModelData[] var6 = new ModelData[]{var4, var5}; // L: 510
- var4 = new ModelData(var6, 2); // L: 511
+ ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 515
+ if (var3 != -1) { // L: 516
+ ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 517
+ ModelData[] var6 = new ModelData[]{var4, var5}; // L: 518
+ var4 = new ModelData(var6, 2); // L: 519
}
int var7;
- if (this.recolorFrom != null) { // L: 513
- for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 514
- var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 515
+ if (this.recolorFrom != null) { // L: 521
+ for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 522
+ var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 523
}
}
- if (this.retextureFrom != null) { // L: 518
- for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 519
- var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 520
+ if (this.retextureFrom != null) { // L: 526
+ for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 527
+ var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 528
}
}
- return var4; // L: 523
+ return var4; // L: 531
}
}
@ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "919318771"
+ descriptor = "(IIB)I",
+ garbageValue = "113"
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- return class154.method3061(this.params, var1, var2); // L: 527
+ return class124.method2818(this.params, var1, var2); // L: 535
}
- @ObfuscatedName("n")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
- garbageValue = "-1359471103"
+ garbageValue = "26512624"
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
- return AttackOption.method2393(this.params, var1, var2); // L: 531
+ IterableNodeHashTable var4 = this.params; // L: 540
+ String var3;
+ if (var4 == null) { // L: 542
+ var3 = var2; // L: 543
+ } else {
+ ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 546
+ if (var5 == null) { // L: 547
+ var3 = var2; // L: 548
+ } else {
+ var3 = (String)var5.obj; // L: 551
+ }
+ }
+
+ return var3; // L: 553
}
- @ObfuscatedName("e")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1911161314"
+ descriptor = "(B)I",
+ garbageValue = "-31"
)
@Export("getShiftClickIndex")
public int getShiftClickIndex() {
- if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 535
- if (this.shiftClickIndex >= 0) { // L: 536
- return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -240268281 * 1170727351 : -1;
+ if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 557
+ if (this.shiftClickIndex >= 0) { // L: 558
+ return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 869501405 * 659363445 : -1;
} else {
- return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 537
+ return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 559
}
} else {
return -1;
}
}
- @ObfuscatedName("d")
+ @ObfuscatedName("o")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-195951590"
+ garbageValue = "1639689769"
)
- boolean method3636() {
- return this.recolorTo != null; // L: 551
+ boolean method3737() {
+ return this.recolorTo != null; // L: 580
}
- @ObfuscatedName("j")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "27"
+ descriptor = "(I)Z",
+ garbageValue = "-124871566"
)
- boolean method3637() {
- return this.retextureTo != null; // L: 555
+ boolean method3728() {
+ return this.retextureTo != null; // L: 584
}
}
diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java
index 238555ff22..049931e2e9 100644
--- a/runescape-client/src/main/java/ItemContainer.java
+++ b/runescape-client/src/main/java/ItemContainer.java
@@ -1,34 +1,21 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bw")
+@ObfuscatedName("bd")
@Implements("ItemContainer")
public class ItemContainer extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("itemContainers")
static NodeHashTable itemContainers;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = 1933505575
- )
- @Export("ItemDefinition_fileCount")
- public static int ItemDefinition_fileCount;
- @ObfuscatedName("ey")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive20")
- static Archive archive20;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("ids")
int[] ids;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("quantities")
int[] quantities;
@@ -40,68 +27,4 @@ public class ItemContainer extends Node {
this.ids = new int[]{-1}; // L: 8
this.quantities = new int[]{0}; // L: 9
} // L: 11
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Llp;IIB)[Lqd;",
- garbageValue = "123"
- )
- public static IndexedSprite[] method2062(AbstractArchive var0, int var1, int var2) {
- if (!User.method6514(var0, var1, var2)) { // L: 23
- return null;
- } else {
- IndexedSprite[] var4 = new IndexedSprite[class453.SpriteBuffer_spriteCount]; // L: 26
-
- for (int var5 = 0; var5 < class453.SpriteBuffer_spriteCount; ++var5) { // L: 27
- IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28
- var6.width = class453.SpriteBuffer_spriteWidth; // L: 29
- var6.height = class453.SpriteBuffer_spriteHeight; // L: 30
- var6.xOffset = class453.SpriteBuffer_xOffsets[var5]; // L: 31
- var6.yOffset = class453.SpriteBuffer_yOffsets[var5]; // L: 32
- var6.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var5]; // L: 33
- var6.subHeight = class453.SpriteBuffer_spriteHeights[var5]; // L: 34
- var6.palette = Decimator.SpriteBuffer_spritePalette; // L: 35
- var6.pixels = class127.SpriteBuffer_pixels[var5]; // L: 36
- }
-
- VarcInt.method3325(); // L: 38
- return var4; // L: 41
- }
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)[Lda;",
- garbageValue = "-726850383"
- )
- static class119[] method2060() {
- return new class119[]{class119.field1508, class119.field1512, class119.field1502, class119.field1516, class119.field1518, class119.field1521, class119.field1506, class119.field1507, class119.field1500, class119.field1509, class119.field1510, class119.field1511, class119.field1503, class119.field1513, class119.field1514, class119.field1515, class119.field1504}; // L: 74
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-1192606922"
- )
- public static int method2059(int var0) {
- if (var0 > 0) { // L: 194
- return 1;
- } else {
- return var0 < 0 ? -1 : 0; // L: 195 196
- }
- }
-
- @ObfuscatedName("iz")
- @ObfuscatedSignature(
- descriptor = "(IIIII)V",
- garbageValue = "358850975"
- )
- static final void method2061(int var0, int var1, int var2, int var3) {
- for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8721
- if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8722
- Client.field704[var4] = true;
- }
- }
-
- } // L: 8724
}
diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java
index f49c9ac3dd..ee08cf6e1d 100644
--- a/runescape-client/src/main/java/ItemLayer.java
+++ b/runescape-client/src/main/java/ItemLayer.java
@@ -1,3 +1,8 @@
+import java.awt.image.BufferedImage;
+import java.awt.image.PixelGrabber;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
@@ -7,55 +12,88 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("gz")
@Implements("ItemLayer")
public final class ItemLayer {
- @ObfuscatedName("o")
+ @ObfuscatedName("dz")
+ @ObfuscatedSignature(
+ descriptor = "Lcx;"
+ )
+ @Export("mouseRecorder")
+ static MouseRecorder mouseRecorder;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 2143367533
+ intValue = 1594676669
)
@Export("z")
int z;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -832066785
+ intValue = -2089256137
)
@Export("x")
int x;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -677632279
+ intValue = 1339906741
)
@Export("y")
int y;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("first")
Renderable first;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("second")
Renderable second;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("third")
Renderable third;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- longValue = 2913572583481576221L
+ longValue = 8752765505702022363L
)
@Export("tag")
long tag;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 30907343
+ intValue = -228147233
)
@Export("height")
int height;
ItemLayer() {
} // L: 13
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "([BI)Lqe;",
+ garbageValue = "-730527050"
+ )
+ public static final SpritePixels method3920(byte[] var0) {
+ BufferedImage var1 = null; // L: 20
+
+ try {
+ Class var2 = ImageIO.class; // L: 22
+ synchronized(ImageIO.class) {
+ var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 23
+ } // L: 24
+
+ int var6 = var1.getWidth(); // L: 25
+ int var7 = var1.getHeight(); // L: 26
+ int[] var4 = new int[var6 * var7]; // L: 27
+ PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); // L: 28
+ var5.grabPixels(); // L: 29
+ return new SpritePixels(var4, var6, var7); // L: 30
+ } catch (IOException var9) { // L: 32
+ } catch (InterruptedException var10) { // L: 33
+ }
+
+ return new SpritePixels(0, 0); // L: 34
+ }
}
diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java
index ed6d43c73b..1611e8999e 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueue.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueue.java
@@ -4,18 +4,18 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ma")
+@ObfuscatedName("mh")
@Implements("IterableDualNodeQueue")
public class IterableDualNodeQueue implements Iterable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("sentinel")
public DualNode sentinel;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("head")
DualNode head;
@@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable {
this.sentinel.nextDual = this.sentinel; // L: 12
} // L: 13
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("clear")
public void clear() {
while (this.sentinel.previousDual != this.sentinel) { // L: 16
@@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable {
} // L: 19
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Loq;)V"
+ descriptor = "(Loo;)V"
)
@Export("add")
public void add(DualNode var1) {
@@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable {
var1.previousDual.nextDual = var1; // L: 26
} // L: 27
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "()Loq;"
+ descriptor = "()Loo;"
)
@Export("removeLast")
public DualNode removeLast() {
@@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable {
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "()Loq;"
+ descriptor = "()Loo;"
)
@Export("last")
public DualNode last() {
return this.previousOrLast((DualNode)null); // L: 46
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Loq;)Loq;"
+ descriptor = "(Loo;)Loo;"
)
@Export("previousOrLast")
DualNode previousOrLast(DualNode var1) {
@@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable {
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Loq;"
+ descriptor = "()Loo;"
)
@Export("previous")
public DualNode previous() {
@@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable {
return new IterableDualNodeQueueIterator(this); // L: 74
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Loq;Loq;)V"
+ descriptor = "(Loo;Loo;)V"
)
@Export("DualNodeDeque_addBefore")
public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) {
diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
index 9800bda6bb..fb15e72704 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mj")
+@ObfuscatedName("ld")
@Implements("IterableDualNodeQueueIterator")
public class IterableDualNodeQueueIterator implements Iterator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lma;"
+ descriptor = "Lmh;"
)
@Export("queue")
IterableDualNodeQueue queue;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("head")
DualNode head;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Loq;"
+ descriptor = "Loo;"
)
@Export("last")
DualNode last;
@ObfuscatedSignature(
- descriptor = "(Lma;)V"
+ descriptor = "(Lmh;)V"
)
IterableDualNodeQueueIterator(IterableDualNodeQueue var1) {
this.last = null; // L: 9
@@ -36,19 +36,6 @@ public class IterableDualNodeQueueIterator implements Iterator {
this.last = null; // L: 14
} // L: 15
- public void remove() {
- if (this.last == null) { // L: 34
- throw new IllegalStateException();
- } else {
- this.last.removeDual(); // L: 35
- this.last = null; // L: 36
- }
- } // L: 37
-
- public boolean hasNext() {
- return this.queue.sentinel != this.head; // L: 30
- }
-
public Object next() {
DualNode var1 = this.head; // L: 19
if (var1 == this.queue.sentinel) { // L: 20
@@ -61,4 +48,17 @@ public class IterableDualNodeQueueIterator implements Iterator {
this.last = var1; // L: 25
return var1; // L: 26
}
+
+ public boolean hasNext() {
+ return this.queue.sentinel != this.head; // L: 30
+ }
+
+ public void remove() {
+ if (this.last == null) { // L: 34
+ throw new IllegalStateException();
+ } else {
+ this.last.removeDual(); // L: 35
+ this.last = null; // L: 36
+ }
+ } // L: 37
}
diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java
index b166bcddb3..5bfd0d837b 100644
--- a/runescape-client/src/main/java/IterableNodeDeque.java
+++ b/runescape-client/src/main/java/IterableNodeDeque.java
@@ -5,20 +5,20 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lo")
+@ObfuscatedName("lk")
@Implements("IterableNodeDeque")
public class IterableNodeDeque implements Iterable, Collection {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("sentinel")
Node sentinel;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
- Node field4146;
+ Node field4128;
public IterableNodeDeque() {
this.sentinel = new Node(); // L: 7
@@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection {
this.sentinel.next = this.sentinel; // L: 12
} // L: 13
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("rsClear")
public void rsClear() {
while (this.sentinel.previous != this.sentinel) { // L: 16
@@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection {
} // L: 19
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Los;)V"
+ descriptor = "(Loh;)V"
)
@Export("addFirst")
public void addFirst(Node var1) {
@@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection {
var1.previous.next = var1; // L: 26
} // L: 27
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Los;)V"
+ descriptor = "(Loh;)V"
)
@Export("addLast")
public void addLast(Node var1) {
@@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection {
var1.previous.next = var1; // L: 34
} // L: 35
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("last")
public Node last() {
- return this.method5989((Node)null); // L: 46
+ return this.method6144((Node)null); // L: 46
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Los;)Los;"
+ descriptor = "(Loh;)Loh;"
)
- Node method5989(Node var1) {
+ Node method6144(Node var1) {
Node var2;
if (var1 == null) { // L: 52
var2 = this.sentinel.previous;
@@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection {
}
if (var2 == this.sentinel) { // L: 54
- this.field4146 = null; // L: 55
+ this.field4128 = null; // L: 55
return null; // L: 56
} else {
- this.field4146 = var2.previous; // L: 58
+ this.field4128 = var2.previous; // L: 58
return var2; // L: 59
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("previous")
public Node previous() {
- Node var1 = this.field4146; // L: 64
+ Node var1 = this.field4128; // L: 64
if (var1 == this.sentinel) { // L: 65
- this.field4146 = null; // L: 66
+ this.field4128 = null; // L: 66
return null; // L: 67
} else {
- this.field4146 = var1.previous; // L: 69
+ this.field4128 = var1.previous; // L: 69
return var1; // L: 70
}
}
- @ObfuscatedName("s")
- int method5967() {
+ @ObfuscatedName("w")
+ int method6197() {
int var1 = 0; // L: 74
for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78
@@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection {
return var1; // L: 80
}
- @ObfuscatedName("r")
- public boolean method5986() {
+ @ObfuscatedName("y")
+ public boolean method6147() {
return this.sentinel.previous == this.sentinel; // L: 84
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "()[Los;"
+ descriptor = "()[Loh;"
)
- Node[] method5997() {
- Node[] var1 = new Node[this.method5967()]; // L: 88
+ Node[] method6150() {
+ Node[] var1 = new Node[this.method6197()]; // L: 88
int var2 = 0; // L: 89
for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93
@@ -144,61 +144,25 @@ public class IterableNodeDeque implements Iterable, Collection {
return var1; // L: 95
}
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(Los;)Z"
+ descriptor = "(Loh;)Z"
)
- boolean method5973(Node var1) {
+ boolean method6152(Node var1) {
this.addFirst(var1); // L: 135
return true; // L: 136
}
- public int size() {
- return this.method5967(); // L: 104
- }
-
- public boolean isEmpty() {
- return this.method5986(); // L: 109
- }
-
public boolean contains(Object var1) {
throw new RuntimeException(); // L: 114
}
- public boolean containsAll(Collection var1) {
- throw new RuntimeException(); // L: 146
- }
-
- public boolean addAll(Collection var1) {
- throw new RuntimeException(); // L: 151
- }
-
- public boolean retainAll(Collection var1) {
- throw new RuntimeException(); // L: 161
- }
-
- public Object[] toArray() {
- return this.method5997(); // L: 119
- }
-
- public boolean add(Object var1) {
- return this.method5973((Node)var1); // L: 170
- }
-
public Iterator iterator() {
return new IterableNodeDequeDescendingIterator(this); // L: 99
}
- public boolean removeAll(Collection var1) {
- throw new RuntimeException(); // L: 156
- }
-
- public void clear() {
- this.rsClear(); // L: 166
- } // L: 167
-
- public int hashCode() {
- return super.hashCode(); // L: 178
+ public Object[] toArray() {
+ return this.method6150(); // L: 119
}
public Object[] toArray(Object[] var1) {
@@ -211,17 +175,53 @@ public class IterableNodeDeque implements Iterable, Collection {
return var1; // L: 131
}
- public boolean equals(Object var1) {
- return super.equals(var1); // L: 174
- }
-
public boolean remove(Object var1) {
throw new RuntimeException(); // L: 141
}
- @ObfuscatedName("k")
+ public boolean containsAll(Collection var1) {
+ throw new RuntimeException(); // L: 146
+ }
+
+ public boolean removeAll(Collection var1) {
+ throw new RuntimeException(); // L: 156
+ }
+
+ public boolean add(Object var1) {
+ return this.method6152((Node)var1); // L: 170
+ }
+
+ public int size() {
+ return this.method6197(); // L: 104
+ }
+
+ public int hashCode() {
+ return super.hashCode(); // L: 178
+ }
+
+ public boolean equals(Object var1) {
+ return super.equals(var1); // L: 174
+ }
+
+ public boolean addAll(Collection var1) {
+ throw new RuntimeException(); // L: 151
+ }
+
+ public boolean isEmpty() {
+ return this.method6147(); // L: 109
+ }
+
+ public void clear() {
+ this.rsClear(); // L: 166
+ } // L: 167
+
+ public boolean retainAll(Collection var1) {
+ throw new RuntimeException(); // L: 161
+ }
+
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Los;Los;)V"
+ descriptor = "(Loh;Loh;)V"
)
@Export("IterableNodeDeque_addBefore")
public static void IterableNodeDeque_addBefore(Node var0, Node var1) {
diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
index 5571710999..079c940e09 100644
--- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
+++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
@@ -4,38 +4,38 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ll")
+@ObfuscatedName("lx")
@Implements("IterableNodeDequeDescendingIterator")
public class IterableNodeDequeDescendingIterator implements Iterator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "Llk;"
)
@Export("deque")
IterableNodeDeque deque;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Loh;"
+ )
+ Node field4125;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Los;"
- )
- Node field4144;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("last")
Node last;
@ObfuscatedSignature(
- descriptor = "(Llo;)V"
+ descriptor = "(Llk;)V"
)
IterableNodeDequeDescendingIterator(IterableNodeDeque var1) {
this.last = null; // L: 9
this.setDeque(var1); // L: 12
} // L: 13
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llo;)V"
+ descriptor = "(Llk;)V"
)
@Export("setDeque")
void setDeque(IterableNodeDeque var1) {
@@ -43,15 +43,28 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
this.start(); // L: 17
} // L: 18
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("start")
void start() {
- this.field4144 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21
+ this.field4125 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21
this.last = null; // L: 22
} // L: 23
+ public Object next() {
+ Node var1 = this.field4125; // L: 27
+ if (var1 == this.deque.sentinel) { // L: 28
+ var1 = null; // L: 29
+ this.field4125 = null; // L: 30
+ } else {
+ this.field4125 = var1.previous; // L: 32
+ }
+
+ this.last = var1; // L: 33
+ return var1; // L: 34
+ }
+
public boolean hasNext() {
- return this.deque.sentinel != this.field4144 && this.field4144 != null; // L: 38
+ return this.deque.sentinel != this.field4125 && this.field4125 != null; // L: 38
}
public void remove() {
@@ -62,17 +75,4 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
this.last = null; // L: 44
}
} // L: 45
-
- public Object next() {
- Node var1 = this.field4144; // L: 27
- if (var1 == this.deque.sentinel) { // L: 28
- var1 = null; // L: 29
- this.field4144 = null; // L: 30
- } else {
- this.field4144 = var1.previous; // L: 32
- }
-
- this.last = var1; // L: 33
- return var1; // L: 34
- }
}
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index 8fb4b9c209..2619024880 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -4,31 +4,31 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pt")
+@ObfuscatedName("pb")
@Implements("IterableNodeHashTable")
public final class IterableNodeHashTable implements Iterable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("size")
int size;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "[Los;"
+ descriptor = "[Loh;"
)
@Export("buckets")
Node[] buckets;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("currentGet")
Node currentGet;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("current")
Node current;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("index")
int index;
@@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable {
} // L: 21
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(J)Los;"
+ descriptor = "(J)Loh;"
)
@Export("get")
public Node get(long var1) {
@@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable {
return null; // L: 36
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Los;J)V"
+ descriptor = "(Loh;J)V"
)
@Export("put")
public void put(Node var1, long var2) {
@@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable {
var1.key = var2; // L: 46
} // L: 47
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("clear")
public void clear() {
for (int var1 = 0; var1 < this.size; ++var1) { // L: 50
@@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable {
this.current = null; // L: 59
} // L: 60
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("first")
public Node first() {
@@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable {
return this.next(); // L: 64
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("next")
public Node next() {
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index e989908299..6fcd693212 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -4,33 +4,33 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pn")
+@ObfuscatedName("pw")
@Implements("IterableNodeHashTableIterator")
public class IterableNodeHashTableIterator implements Iterator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("hashTable")
IterableNodeHashTable hashTable;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("head")
Node head;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("index")
int index;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("last")
Node last;
@ObfuscatedSignature(
- descriptor = "(Lpt;)V"
+ descriptor = "(Lpb;)V"
)
IterableNodeHashTableIterator(IterableNodeHashTable var1) {
this.last = null; // L: 10
@@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator {
this.start(); // L: 14
} // L: 15
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("start")
void start() {
this.head = this.hashTable.buckets[0].previous; // L: 18
@@ -46,32 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator {
this.last = null; // L: 20
} // L: 21
- public void remove() {
- if (this.last == null) { // L: 57
- throw new IllegalStateException();
- } else {
- this.last.remove(); // L: 58
- this.last = null; // L: 59
- }
- } // L: 60
-
- public boolean hasNext() {
- if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43
- return true;
- } else {
- while (this.index < this.hashTable.size) { // L: 44
- if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 45
- this.head = this.hashTable.buckets[this.index - 1].previous; // L: 46
- return true; // L: 47
- }
-
- this.head = this.hashTable.buckets[this.index - 1]; // L: 50
- }
-
- return false; // L: 53
- }
- }
-
public Object next() {
Node var1;
if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 25
@@ -93,4 +67,26 @@ public class IterableNodeHashTableIterator implements Iterator {
return var1; // L: 36
}
}
+
+ public boolean hasNext() {
+ if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43
+ return true;
+ } else {
+ while (this.index < this.hashTable.size) { // L: 44
+ if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 45
+ this.head = this.hashTable.buckets[this.index - 1].previous; // L: 46
+ return true; // L: 47
+ }
+
+ this.head = this.hashTable.buckets[this.index - 1]; // L: 50
+ }
+
+ return false; // L: 53
+ }
+ }
+
+ public void remove() {
+ this.last.remove(); // L: 58
+ this.last = null; // L: 59
+ } // L: 60
}
diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java
index bbbab2bb04..4cad1c245e 100644
--- a/runescape-client/src/main/java/JagexCache.java
+++ b/runescape-client/src/main/java/JagexCache.java
@@ -3,441 +3,574 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("fp")
+@ObfuscatedName("fz")
@Implements("JagexCache")
public class JagexCache {
- @ObfuscatedName("k")
- @Export("JagexCache_locationFile")
- static File JagexCache_locationFile;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("cacheDir")
static File cacheDir;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Lpz;"
+ descriptor = "Lpa;"
)
@Export("JagexCache_randomDat")
public static BufferedFile JagexCache_randomDat;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Lpz;"
+ descriptor = "Lpa;"
)
@Export("JagexCache_dat2File")
public static BufferedFile JagexCache_dat2File;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Lpz;"
+ descriptor = "Lpa;"
)
@Export("JagexCache_idx255File")
public static BufferedFile JagexCache_idx255File;
- @ObfuscatedName("t")
+ @ObfuscatedName("x")
+ @Export("cacheSubPaths")
+ static String[] cacheSubPaths;
+ @ObfuscatedName("qd")
@ObfuscatedSignature(
- descriptor = "[Lpz;"
+ descriptor = "Lfh;"
)
- @Export("JagexCache_idxFiles")
- public static BufferedFile[] JagexCache_idxFiles;
- @ObfuscatedName("d")
- @Export("operatingSystemName")
- static String operatingSystemName;
+ @Export("mouseWheel")
+ static class158 mouseWheel;
static {
- JagexCache_randomDat = null;
- JagexCache_dat2File = null;
+ JagexCache_randomDat = null; // L: 22
+ JagexCache_dat2File = null; // L: 23
JagexCache_idx255File = null; // L: 24
}
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;Lpt;I)Lpt;",
- garbageValue = "-1071419975"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "2126958696"
)
- @Export("readStringIntParameters")
- static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
- int var2 = var0.readUnsignedByte(); // L: 16
- int var3;
- if (var1 == null) { // L: 17
- var3 = FontName.method7228(var2); // L: 18
- var1 = new IterableNodeHashTable(var3); // L: 19
- }
-
- for (var3 = 0; var3 < var2; ++var3) { // L: 21
- boolean var4 = var0.readUnsignedByte() == 1; // L: 22
- int var5 = var0.readMedium(); // L: 23
- Object var6;
- if (var4) {
- var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25
+ static int method3271(int var0, Script var1, boolean var2) {
+ int var4;
+ int var9;
+ if (var0 == ScriptOpcodes.CC_CREATE) { // L: 488
+ class446.Interpreter_intStackSize -= 3; // L: 489
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 490
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 491
+ int var11 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 492
+ if (var4 == 0) { // L: 493
+ throw new RuntimeException(); // L: 494
} else {
- var6 = new IntegerNode(var0.readInt()); // L: 26
- }
+ Widget var6 = class140.getWidget(var9); // L: 496
+ if (var6.children == null) { // L: 497
+ var6.children = new Widget[var11 + 1];
+ }
- var1.put((Node)var6, (long)var5);
- }
+ if (var6.children.length <= var11) { // L: 498
+ Widget[] var7 = new Widget[var11 + 1]; // L: 499
- return var1;
- }
+ for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 500
+ var7[var8] = var6.children[var8];
+ }
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Llp;Llp;B)V",
- garbageValue = "35"
- )
- public static void method3154(AbstractArchive var0, AbstractArchive var1) {
- class18.KitDefinition_archive = var0; // L: 27
- class361.KitDefinition_modelsArchive = var1; // L: 28
- class147.KitDefinition_fileCount = class18.KitDefinition_archive.getGroupFileCount(3); // L: 29
- } // L: 30
+ var6.children = var7; // L: 501
+ }
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Ldz;FZB)F",
- garbageValue = "-1"
- )
- static float method3159(class117 var0, float var1, boolean var2) {
- float var3 = 0.0F; // L: 209
- if (var0 != null && var0.method2695() != 0) { // L: 210
- float var4 = (float)var0.field1476[0].field1430; // L: 213
- float var5 = (float)var0.field1476[var0.method2695() - 1].field1430; // L: 214
- float var6 = var5 - var4; // L: 215
- if ((double)var6 == 0.0D) { // L: 216
- return var0.field1476[0].field1428; // L: 217
- } else {
- float var7 = 0.0F; // L: 219
- if (var1 > var5) { // L: 220
- var7 = (var1 - var5) / var6; // L: 221
+ if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 503
+ throw new RuntimeException("" + (var11 - 1));
} else {
- var7 = (var1 - var4) / var6; // L: 224
- }
-
- double var8 = (double)((int)var7); // L: 226
- float var10 = Math.abs((float)((double)var7 - var8)); // L: 227
- float var11 = var10 * var6; // L: 228
- var8 = Math.abs(var8 + 1.0D); // L: 229
- double var12 = var8 / 2.0D; // L: 230
- double var14 = (double)((int)var12); // L: 231
- var10 = (float)(var12 - var14); // L: 232
- float var16;
- float var17;
- if (var2) { // L: 235
- if (var0.field1472 == class116.field1468) { // L: 236
- if ((double)var10 != 0.0D) { // L: 237
- var11 += var4; // L: 238
- } else {
- var11 = var5 - var11; // L: 241
- }
- } else if (var0.field1472 != class116.field1464 && var0.field1472 != class116.field1466) { // L: 244
- if (var0.field1472 == class116.field1465) { // L: 247
- var11 = var4 - var1; // L: 248
- var16 = var0.field1476[0].field1423; // L: 249
- var17 = var0.field1476[0].field1424; // L: 250
- var3 = var0.field1476[0].field1428; // L: 251
- if (0.0D != (double)var16) { // L: 252
- var3 -= var17 * var11 / var16; // L: 253
- }
-
- return var3; // L: 255
- }
+ Widget var12 = new Widget(); // L: 504
+ var12.type = var4; // L: 505
+ var12.parentId = var12.id = var6.id; // L: 506
+ var12.childIndex = var11; // L: 507
+ var12.isIf3 = true; // L: 508
+ var6.children[var11] = var12; // L: 509
+ if (var2) { // L: 510
+ class124.scriptDotWidget = var12;
} else {
- var11 = var5 - var11; // L: 245
+ GrandExchangeOfferOwnWorldComparator.scriptActiveWidget = var12; // L: 511
}
- } else if (var0.field1475 == class116.field1468) { // L: 259
- if ((double)var10 != 0.0D) { // L: 260
- var11 = var5 - var11; // L: 261
- } else {
- var11 += var4; // L: 264
- }
- } else if (var0.field1475 != class116.field1464 && var0.field1475 != class116.field1466) { // L: 267
- if (var0.field1475 == class116.field1465) { // L: 270
- var11 = var1 - var5; // L: 271
- var16 = var0.field1476[var0.method2695() - 1].field1425; // L: 272
- var17 = var0.field1476[var0.method2695() - 1].field1426; // L: 273
- var3 = var0.field1476[var0.method2695() - 1].field1428; // L: 274
- if (0.0D != (double)var16) { // L: 275
- var3 += var17 * var11 / var16; // L: 276
- }
- return var3; // L: 278
- }
- } else {
- var11 += var4; // L: 268
+ ChatChannel.invalidateWidget(var6); // L: 512
+ return 1; // L: 513
}
-
- var3 = MusicPatchNode.method5315(var0, var11); // L: 281
- float var18;
- if (var2 && var0.field1472 == class116.field1466) { // L: 283
- var18 = var0.field1476[var0.method2695() - 1].field1428 - var0.field1476[0].field1428; // L: 284
- var3 = (float)((double)var3 - var8 * (double)var18); // L: 285
- } else if (!var2 && var0.field1475 == class116.field1466) { // L: 287
- var18 = var0.field1476[var0.method2695() - 1].field1428 - var0.field1476[0].field1428; // L: 288
- var3 = (float)((double)var3 + (double)var18 * var8); // L: 289
- }
-
- return var3; // L: 291
}
} else {
- return var3; // L: 211
+ Widget var3;
+ if (var0 == ScriptOpcodes.CC_DELETE) { // L: 515
+ var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 516
+ Widget var10 = class140.getWidget(var3.id); // L: 517
+ var10.children[var3.childIndex] = null; // L: 518
+ ChatChannel.invalidateWidget(var10); // L: 519
+ return 1; // L: 520
+ } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 522
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 523
+ var3.children = null; // L: 524
+ ChatChannel.invalidateWidget(var3); // L: 525
+ return 1; // L: 526
+ } else if (var0 == 103) { // L: 528
+ class446.Interpreter_intStackSize -= 3; // L: 529
+ return 1; // L: 530
+ } else if (var0 == 104) { // L: 532
+ --class446.Interpreter_intStackSize; // L: 533
+ return 1; // L: 534
+ } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 536
+ if (var0 == ScriptOpcodes.IF_FIND) { // L: 549
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 550
+ if (var3 != null) { // L: 551
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 552
+ if (var2) { // L: 553
+ class124.scriptDotWidget = var3;
+ } else {
+ GrandExchangeOfferOwnWorldComparator.scriptActiveWidget = var3; // L: 554
+ }
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 556
+ }
+
+ return 1; // L: 557
+ } else if (var0 == 202) { // L: 559
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1] = 0; // L: 560
+ return 1; // L: 561
+ } else if (var0 == 203) { // L: 563
+ Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize + 1] = 0; // L: 564
+ return 1; // L: 565
+ } else {
+ return 2; // L: 567
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 537
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 538
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 539
+ Widget var5 = ScriptFrame.getWidgetChild(var9, var4); // L: 540
+ if (var5 != null && var4 != -1) { // L: 541
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 542
+ if (var2) { // L: 543
+ class124.scriptDotWidget = var5;
+ } else {
+ GrandExchangeOfferOwnWorldComparator.scriptActiveWidget = var5; // L: 544
+ }
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 546
+ }
+
+ return 1; // L: 547
+ }
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;B)Lqd;",
- garbageValue = "-119"
+ descriptor = "(II)I",
+ garbageValue = "20332166"
)
- @Export("SpriteBuffer_getIndexedSpriteByName")
- public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
- int var3 = var0.getGroupId(var1); // L: 85
- int var4 = var0.getFileId(var3, var2); // L: 86
- return ViewportMouse.method4372(var0, var3, var4); // L: 87
+ public static int method3250(int var0) {
+ return Decimator.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 81
}
- @ObfuscatedName("eu")
+ @ObfuscatedName("al")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1667871503"
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "34"
)
- static final void method3155() {
- Scene.Scene_isLowDetail = false; // L: 817
- Client.isLowDetail = false; // L: 818
- } // L: 819
-
- @ObfuscatedName("gd")
- @ObfuscatedSignature(
- descriptor = "(Lca;III)V",
- garbageValue = "-1086335003"
- )
- @Export("performPlayerAnimation")
- static void performPlayerAnimation(Player var0, int var1, int var2) {
- if (var0.sequence == var1 && var1 != -1) { // L: 4318
- int var3 = class114.SequenceDefinition_get(var1).field2208; // L: 4319
- if (var3 == 1) { // L: 4320
- var0.sequenceFrame = 0; // L: 4321
- var0.sequenceFrameCycle = 0; // L: 4322
- var0.sequenceDelay = var2; // L: 4323
- var0.field1186 = 0; // L: 4324
+ static int method3249(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2351
+ if (Player.friendSystem.field802 == 0) { // L: 2352
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -2;
+ } else if (Player.friendSystem.field802 == 1) { // L: 2353
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Player.friendSystem.friendsList.getSize(); // L: 2354
}
- if (var3 == 2) { // L: 4326
- var0.field1186 = 0; // L: 4327
- }
- } else if (var1 == -1 || var0.sequence == -1 || class114.SequenceDefinition_get(var1).field2220 >= class114.SequenceDefinition_get(var0.sequence).field2220) { // L: 4330
- var0.sequence = var1; // L: 4331
- var0.sequenceFrame = 0; // L: 4332
- var0.sequenceFrameCycle = 0; // L: 4333
- var0.sequenceDelay = var2; // L: 4334
- var0.field1186 = 0; // L: 4335
- var0.field1200 = var0.pathLength; // L: 4336
- }
-
- } // L: 4338
-
- @ObfuscatedName("ha")
- @ObfuscatedSignature(
- descriptor = "(Lpc;I)V",
- garbageValue = "-1313288236"
- )
- static final void method3158(PacketBuffer var0) {
- for (int var1 = 0; var1 < Client.field565; ++var1) { // L: 8174
- int var2 = Client.field601[var1]; // L: 8175
- NPC var3 = Client.npcs[var2]; // L: 8176
- int var4 = var0.readUnsignedByte(); // L: 8177
- int var5;
- if (class393.field4428 && (var4 & 8) != 0) { // L: 8178
- var5 = var0.readUnsignedByte(); // L: 8179
- var4 += var5 << 8; // L: 8180
- }
-
- int var6;
- int var7;
- int var8;
- if ((var4 & 16) != 0) { // L: 8182
- var5 = var0.readUnsignedShort(); // L: 8183
- var6 = var0.method7716(); // L: 8184
- if (class393.field4428) { // L: 8185
- var3.field1173 = var0.method7546() == 1; // L: 8186
+ return 1; // L: 2355
+ } else {
+ int var3;
+ if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2358
+ if (Player.friendSystem.method1634() && var3 >= 0 && var3 < Player.friendSystem.friendsList.getSize()) { // L: 2359
+ Friend var8 = (Friend)Player.friendSystem.friendsList.get(var3); // L: 2360
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2361
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2362
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2365
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2366
}
- var7 = var3.x - (var5 - SecureRandomCallable.baseX - SecureRandomCallable.baseX) * 64; // L: 8188
- var8 = var3.y - (var6 - GrandExchangeOfferOwnWorldComparator.baseY - GrandExchangeOfferOwnWorldComparator.baseY) * 64; // L: 8189
- if (var7 != 0 || var8 != 0) { // L: 8190
- var3.field1172 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
- }
- }
-
- if ((var4 & 1024) != 0) { // L: 8192
- var3.field1210 = var0.method7568(); // L: 8193
- }
-
- if ((var4 & 2) != 0) { // L: 8195
- var3.targetIndex = var0.method7554(); // L: 8196
- if (var3.targetIndex == 65535) { // L: 8197
- var3.targetIndex = -1;
- }
- }
-
- if ((var4 & 32) != 0) { // L: 8199
- var5 = var0.method7716(); // L: 8200
- if (var5 == 65535) { // L: 8201
- var5 = -1; // L: 8202
+ return 1; // L: 2368
+ } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2371
+ if (Player.friendSystem.method1634() && var3 >= 0 && var3 < Player.friendSystem.friendsList.getSize()) { // L: 2372
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ((Buddy)Player.friendSystem.friendsList.get(var3)).world; // L: 2373
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2375
}
- var6 = var0.readUnsignedByte(); // L: 8204
- if (var5 == var3.sequence && var5 != -1) { // L: 8205
- var7 = class114.SequenceDefinition_get(var5).field2208; // L: 8206
- if (var7 == 1) { // L: 8207
- var3.sequenceFrame = 0; // L: 8208
- var3.sequenceFrameCycle = 0; // L: 8209
- var3.sequenceDelay = var6; // L: 8210
- var3.field1186 = 0; // L: 8211
+ return 1; // L: 2376
+ } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2379
+ if (Player.friendSystem.method1634() && var3 >= 0 && var3 < Player.friendSystem.friendsList.getSize()) { // L: 2380
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ((Buddy)Player.friendSystem.friendsList.get(var3)).rank; // L: 2381
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2383
+ }
+
+ return 1; // L: 2384
+ } else {
+ String var5;
+ if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2387
+ int var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2388
+ DevicePcmPlayerProvider.method309(var5, var6); // L: 2389
+ return 1; // L: 2390
+ } else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2393
+ Player.friendSystem.addFriend(var5); // L: 2394
+ return 1; // L: 2395
+ } else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2398
+ Player.friendSystem.removeFriend(var5); // L: 2399
+ return 1; // L: 2400
+ } else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2403
+ Player.friendSystem.addIgnore(var5); // L: 2404
+ return 1; // L: 2405
+ } else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2408
+ Player.friendSystem.removeIgnore(var5); // L: 2409
+ return 1; // L: 2410
+ } else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2413
+ var5 = class92.method2388(var5); // L: 2414
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Player.friendSystem.isFriended(new Username(var5, HealthBarDefinition.loginType), false) ? 1 : 0; // L: 2415
+ return 1; // L: 2416
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
+ if (Huffman.friendsChat != null) { // L: 2419
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Huffman.friendsChat.name; // L: 2420
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2422
}
- if (var7 == 2) { // L: 8213
- var3.field1186 = 0; // L: 8214
+ return 1; // L: 2423
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
+ if (Huffman.friendsChat != null) { // L: 2426
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Huffman.friendsChat.getSize(); // L: 2427
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2429
}
- } else if (var5 == -1 || var3.sequence == -1 || class114.SequenceDefinition_get(var5).field2220 >= class114.SequenceDefinition_get(var3.sequence).field2220) { // L: 8217
- var3.sequence = var5; // L: 8218
- var3.sequenceFrame = 0; // L: 8219
- var3.sequenceFrameCycle = 0; // L: 8220
- var3.sequenceDelay = var6; // L: 8221
- var3.field1186 = 0; // L: 8222
- var3.field1200 = var3.pathLength; // L: 8223
- }
- }
- if ((var4 & 512) != 0) { // L: 8227
- var3.field1196 = Client.cycle + var0.method7576(); // L: 8228
- var3.field1197 = Client.cycle + var0.method7576(); // L: 8229
- var3.field1143 = var0.readByte(); // L: 8230
- var3.field1199 = var0.method7548(); // L: 8231
- var3.field1153 = var0.method7548(); // L: 8232
- var3.field1140 = (byte)var0.readUnsignedByte(); // L: 8233
- }
+ return 1; // L: 2430
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2433
+ if (Huffman.friendsChat != null && var3 < Huffman.friendsChat.getSize()) { // L: 2434
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Huffman.friendsChat.get(var3).getUsername().getName(); // L: 2435
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2437
+ }
- if (class393.field4428 && (var4 & 256) != 0 || !class393.field4428 && (var4 & 8) != 0) { // L: 8235
- var3.field1187 = var0.method7548(); // L: 8236
- var3.field1189 = var0.method7549(); // L: 8237
- var3.field1188 = var0.method7548(); // L: 8238
- var3.field1190 = var0.method7547(); // L: 8239
- var3.field1191 = var0.method7716() + Client.cycle; // L: 8240
- var3.field1192 = var0.method7716() + Client.cycle; // L: 8241
- var3.field1139 = var0.readUnsignedShort(); // L: 8242
- var3.pathLength = 1; // L: 8243
- var3.field1200 = 0; // L: 8244
- var3.field1187 += var3.pathX[0]; // L: 8245
- var3.field1189 += var3.pathY[0]; // L: 8246
- var3.field1188 += var3.pathX[0]; // L: 8247
- var3.field1190 += var3.pathY[0]; // L: 8248
- }
+ return 1; // L: 2438
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2441
+ if (Huffman.friendsChat != null && var3 < Huffman.friendsChat.getSize()) { // L: 2442
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ((Buddy)Huffman.friendsChat.get(var3)).getWorld(); // L: 2443
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2445
+ }
- if ((var4 & 64) != 0) { // L: 8250
- var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 8251
- var3.overheadTextCyclesRemaining = 100; // L: 8252
- }
+ return 1; // L: 2446
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2449
+ if (Huffman.friendsChat != null && var3 < Huffman.friendsChat.getSize()) { // L: 2450
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ((Buddy)Huffman.friendsChat.get(var3)).rank; // L: 2451
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2453
+ }
- if ((var4 & 1) != 0) { // L: 8254
- var3.spotAnimation = var0.method7576(); // L: 8255
- var5 = var0.method7701(); // L: 8256
- var3.spotAnimationHeight = var5 >> 16; // L: 8257
- var3.field1185 = (var5 & 65535) + Client.cycle; // L: 8258
- var3.spotAnimationFrame = 0; // L: 8259
- var3.spotAnimationFrameCycle = 0; // L: 8260
- if (var3.field1185 > Client.cycle) { // L: 8261
- var3.spotAnimationFrame = -1;
- }
+ return 1; // L: 2454
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Huffman.friendsChat != null ? Huffman.friendsChat.minKick : 0; // L: 2457
+ return 1; // L: 2458
+ } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2461
+ ArchiveLoader.clanKickUser(var5); // L: 2462
+ return 1; // L: 2463
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Huffman.friendsChat != null ? Huffman.friendsChat.rank * -1691262047 * -1648279455 : 0; // L: 2466
+ return 1; // L: 2467
+ } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2470
+ Players.Clan_joinChat(var5); // L: 2471
+ return 1; // L: 2472
+ } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
+ UserComparator5.Clan_leaveChat(); // L: 2475
+ return 1; // L: 2476
+ } else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
+ if (!Player.friendSystem.method1634()) { // L: 2479
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Player.friendSystem.ignoreList.getSize(); // L: 2480
+ }
- if (var3.spotAnimation == 65535) { // L: 8262
- var3.spotAnimation = -1;
- }
- }
+ return 1; // L: 2481
+ } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2484
+ if (Player.friendSystem.method1634() && var3 >= 0 && var3 < Player.friendSystem.ignoreList.getSize()) { // L: 2485
+ Ignored var4 = (Ignored)Player.friendSystem.ignoreList.get(var3); // L: 2486
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2487
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2488
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2491
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2492
+ }
- if ((var4 & 4) != 0) { // L: 8264
- var5 = var0.readUnsignedByte(); // L: 8265
- int var9;
- int var10;
- int var11;
- if (var5 > 0) { // L: 8266
- for (var6 = 0; var6 < var5; ++var6) { // L: 8267
- var8 = -1; // L: 8269
- var9 = -1; // L: 8270
- var10 = -1; // L: 8271
- var7 = var0.readUShortSmart(); // L: 8272
- if (var7 == 32767) { // L: 8273
- var7 = var0.readUShortSmart(); // L: 8274
- var9 = var0.readUShortSmart(); // L: 8275
- var8 = var0.readUShortSmart(); // L: 8276
- var10 = var0.readUShortSmart(); // L: 8277
- } else if (var7 != 32766) { // L: 8279
- var9 = var0.readUShortSmart(); // L: 8280
+ return 1; // L: 2494
+ } else if (var0 == ScriptOpcodes.IGNORE_TEST) {
+ var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2497
+ var5 = class92.method2388(var5); // L: 2498
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Player.friendSystem.isIgnored(new Username(var5, HealthBarDefinition.loginType)) ? 1 : 0; // L: 2499
+ return 1; // L: 2500
+ } else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2503
+ if (Huffman.friendsChat != null && var3 < Huffman.friendsChat.getSize() && Huffman.friendsChat.get(var3).getUsername().equals(class101.localPlayer.username)) { // L: 2504
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2505
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2507
+ }
+
+ return 1; // L: 2508
+ } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
+ if (Huffman.friendsChat != null && Huffman.friendsChat.owner != null) { // L: 2511
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Huffman.friendsChat.owner; // L: 2512
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2514
+ }
+
+ return 1; // L: 2515
+ } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2518
+ if (Huffman.friendsChat != null && var3 < Huffman.friendsChat.getSize() && ((ClanMate)Huffman.friendsChat.get(var3)).isFriend()) { // L: 2519
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2520
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2522
+ }
+
+ return 1; // L: 2523
+ } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
+ if (var0 == 3628) {
+ Player.friendSystem.friendsList.removeComparator(); // L: 2534
+ return 1; // L: 2535
+ } else {
+ boolean var7;
+ if (var0 == 3629) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2538
+ Player.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2539
+ return 1; // L: 2540
+ } else if (var0 == 3630) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2543
+ Player.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2544
+ return 1; // L: 2545
+ } else if (var0 == 3631) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2548
+ Player.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2549
+ return 1; // L: 2550
+ } else if (var0 == 3632) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2553
+ Player.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2554
+ return 1; // L: 2555
+ } else if (var0 == 3633) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2558
+ Player.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2559
+ return 1; // L: 2560
+ } else if (var0 == 3634) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2563
+ Player.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2564
+ return 1; // L: 2565
+ } else if (var0 == 3635) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2568
+ Player.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2569
+ return 1; // L: 2570
+ } else if (var0 == 3636) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2573
+ Player.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2574
+ return 1; // L: 2575
+ } else if (var0 == 3637) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2578
+ Player.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2579
+ return 1; // L: 2580
+ } else if (var0 == 3638) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2583
+ Player.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2584
+ return 1; // L: 2585
+ } else if (var0 == 3639) {
+ Player.friendSystem.friendsList.sort(); // L: 2588
+ return 1; // L: 2589
+ } else if (var0 == 3640) {
+ Player.friendSystem.ignoreList.removeComparator(); // L: 2592
+ return 1; // L: 2593
+ } else if (var0 == 3641) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2596
+ Player.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2597
+ return 1; // L: 2598
+ } else if (var0 == 3642) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2601
+ Player.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2602
+ return 1; // L: 2603
+ } else if (var0 == 3643) {
+ Player.friendSystem.ignoreList.sort(); // L: 2606
+ return 1; // L: 2607
+ } else if (var0 == 3644) {
+ if (Huffman.friendsChat != null) { // L: 2610
+ Huffman.friendsChat.removeComparator(); // L: 2611
+ }
+
+ return 1; // L: 2613
+ } else if (var0 == 3645) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2616
+ if (Huffman.friendsChat != null) { // L: 2617
+ Huffman.friendsChat.addComparator(new UserComparator1(var7)); // L: 2618
+ }
+
+ return 1; // L: 2620
+ } else if (var0 == 3646) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2623
+ if (Huffman.friendsChat != null) { // L: 2624
+ Huffman.friendsChat.addComparator(new UserComparator2(var7)); // L: 2625
+ }
+
+ return 1; // L: 2627
+ } else if (var0 == 3647) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2630
+ if (Huffman.friendsChat != null) { // L: 2631
+ Huffman.friendsChat.addComparator(new UserComparator3(var7)); // L: 2632
+ }
+
+ return 1; // L: 2634
+ } else if (var0 == 3648) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2637
+ if (Huffman.friendsChat != null) { // L: 2638
+ Huffman.friendsChat.addComparator(new UserComparator4(var7)); // L: 2639
+ }
+
+ return 1; // L: 2641
+ } else if (var0 == 3649) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2644
+ if (Huffman.friendsChat != null) { // L: 2645
+ Huffman.friendsChat.addComparator(new UserComparator5(var7)); // L: 2646
+ }
+
+ return 1; // L: 2648
+ } else if (var0 == 3650) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2651
+ if (Huffman.friendsChat != null) { // L: 2652
+ Huffman.friendsChat.addComparator(new UserComparator6(var7)); // L: 2653
+ }
+
+ return 1; // L: 2655
+ } else if (var0 == 3651) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2658
+ if (Huffman.friendsChat != null) { // L: 2659
+ Huffman.friendsChat.addComparator(new UserComparator7(var7)); // L: 2660
+ }
+
+ return 1; // L: 2662
+ } else if (var0 == 3652) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2665
+ if (Huffman.friendsChat != null) { // L: 2666
+ Huffman.friendsChat.addComparator(new UserComparator8(var7)); // L: 2667
+ }
+
+ return 1; // L: 2669
+ } else if (var0 == 3653) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2672
+ if (Huffman.friendsChat != null) { // L: 2673
+ Huffman.friendsChat.addComparator(new UserComparator9(var7)); // L: 2674
+ }
+
+ return 1; // L: 2676
+ } else if (var0 == 3654) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2679
+ if (Huffman.friendsChat != null) { // L: 2680
+ Huffman.friendsChat.addComparator(new UserComparator10(var7)); // L: 2681
+ }
+
+ return 1; // L: 2683
+ } else if (var0 == 3655) {
+ if (Huffman.friendsChat != null) { // L: 2686
+ Huffman.friendsChat.sort(); // L: 2687
+ }
+
+ return 1; // L: 2689
+ } else if (var0 == 3656) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2692
+ Player.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2693
+ return 1; // L: 2694
+ } else if (var0 == 3657) {
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2697
+ if (Huffman.friendsChat != null) { // L: 2698
+ Huffman.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2699
+ }
+
+ return 1; // L: 2701
} else {
- var7 = -1; // L: 8282
- }
-
- var11 = var0.readUShortSmart(); // L: 8283
- var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 8284
- }
- }
-
- var6 = var0.method7546(); // L: 8287
- if (var6 > 0) { // L: 8288
- for (var7 = 0; var7 < var6; ++var7) { // L: 8289
- var8 = var0.readUShortSmart(); // L: 8290
- var9 = var0.readUShortSmart(); // L: 8291
- if (var9 != 32767) { // L: 8292
- var10 = var0.readUShortSmart(); // L: 8293
- var11 = var0.readUnsignedByte(); // L: 8294
- int var12 = var9 > 0 ? var0.method7546() : var11; // L: 8295
- var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 8296
- } else {
- var3.removeHealthBar(var8); // L: 8298
+ return 2; // L: 2703
}
}
+ } else {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2526
+ if (Huffman.friendsChat != null && var3 < Huffman.friendsChat.getSize() && ((ClanMate)Huffman.friendsChat.get(var3)).isIgnored()) { // L: 2527
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 2528
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2530
+ }
+
+ return 1; // L: 2531
}
}
-
- if ((var4 & 2048) != 0) { // L: 8302
- var3.method2338(var0.readStringCp1252NullTerminated()); // L: 8303
- }
-
- if ((var4 & 128) != 0) { // L: 8305
- var3.definition = WorldMapSectionType.getNpcDefinition(var0.method7554()); // L: 8306
- var3.field1167 = var3.definition.size; // L: 8307
- var3.field1204 = var3.definition.rotation; // L: 8308
- var3.walkSequence = var3.definition.walkSequence; // L: 8309
- var3.walkBackSequence = var3.definition.walkBackSequence; // L: 8310
- var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 8311
- var3.walkRightSequence = var3.definition.walkRightSequence; // L: 8312
- var3.idleSequence = var3.definition.idleSequence; // L: 8313
- var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 8314
- var3.turnRightSequence = var3.definition.turnRightSequence; // L: 8315
- }
}
+ }
- } // L: 8318
-
- @ObfuscatedName("jr")
+ @ObfuscatedName("jt")
@ObfuscatedSignature(
- descriptor = "(IIIIII)V",
- garbageValue = "-1222597684"
+ descriptor = "(IIIIIIB)V",
+ garbageValue = "-13"
)
- @Export("drawScrollBar")
- static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
- class127.scrollBarSprites[0].drawAt(var0, var1); // L: 10863
- class127.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10864
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field555); // L: 10865
- int var5 = var3 * (var3 - 32) / var4; // L: 10866
- if (var5 < 8) { // L: 10867
- var5 = 8;
+ static final void method3262(int var0, int var1, int var2, int var3, int var4, int var5) {
+ int var6 = var2 - var0; // L: 10562
+ int var7 = var3 - var1; // L: 10563
+ int var8 = var6 >= 0 ? var6 : -var6; // L: 10564
+ int var9 = var7 >= 0 ? var7 : -var7; // L: 10565
+ int var10 = var8; // L: 10566
+ if (var8 < var9) { // L: 10567
+ var10 = var9;
}
- int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10868
- Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field556); // L: 10869
- Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field483); // L: 10870
- Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field483); // L: 10871
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field483); // L: 10872
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field483); // L: 10873
- Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field640); // L: 10874
- Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field640); // L: 10875
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field640); // L: 10876
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field640); // L: 10877
- } // L: 10878
+ if (var10 != 0) { // L: 10568
+ int var11 = (var6 << 16) / var10; // L: 10569
+ int var12 = (var7 << 16) / var10; // L: 10570
+ if (var12 <= var11) { // L: 10571
+ var11 = -var11;
+ } else {
+ var12 = -var12; // L: 10572
+ }
+
+ int var13 = var5 * var12 >> 17; // L: 10573
+ int var14 = var5 * var12 + 1 >> 17; // L: 10574
+ int var15 = var5 * var11 >> 17; // L: 10575
+ int var16 = var5 * var11 + 1 >> 17; // L: 10576
+ var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10577
+ var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10578
+ int var17 = var0 + var13; // L: 10579
+ int var18 = var0 - var14; // L: 10580
+ int var19 = var0 + var6 - var14; // L: 10581
+ int var20 = var0 + var13 + var6; // L: 10582
+ int var21 = var15 + var1; // L: 10583
+ int var22 = var1 - var16; // L: 10584
+ int var23 = var7 + var1 - var16; // L: 10585
+ int var24 = var15 + var7 + var1; // L: 10586
+ Rasterizer3D.method4030(var17, var18, var19); // L: 10587
+ Rasterizer3D.method4116(var21, var22, var23, var17, var18, var19, var4); // L: 10588
+ Rasterizer3D.method4030(var17, var19, var20); // L: 10589
+ Rasterizer3D.method4116(var21, var23, var24, var17, var19, var20, var4); // L: 10590
+ }
+ } // L: 10591
}
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index a9642735c1..d322f77396 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -8,106 +8,94 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("z")
+@ObfuscatedName("o")
@Implements("KeyHandler")
public final class KeyHandler implements KeyListener, FocusListener {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lz;"
+ descriptor = "Lo;"
)
@Export("KeyHandler_instance")
public static KeyHandler KeyHandler_instance;
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "Lki;"
- )
- @Export("scriptActiveWidget")
- static Widget scriptActiveWidget;
- @ObfuscatedName("cn")
+ @ObfuscatedName("cp")
@Export("KeyHandler_pressedKeys")
public static boolean[] KeyHandler_pressedKeys;
- @ObfuscatedName("cc")
- public static boolean[] field120;
- @ObfuscatedName("cy")
- public static boolean[] field132;
- @ObfuscatedName("cw")
- public static int[] field133;
@ObfuscatedName("cf")
- @ObfuscatedGetter(
- intValue = 389412323
- )
- public static int field150;
- @ObfuscatedName("cq")
- @ObfuscatedGetter(
- intValue = -1808601055
- )
- public static int field135;
- @ObfuscatedName("cg")
- static char[] field136;
- @ObfuscatedName("cl")
- static int[] field122;
- @ObfuscatedName("cu")
+ public static boolean[] field136;
+ @ObfuscatedName("cv")
+ public static boolean[] field141;
+ @ObfuscatedName("cz")
public static int[] field138;
- @ObfuscatedName("ch")
+ @ObfuscatedName("cu")
@ObfuscatedGetter(
- intValue = 897973963
+ intValue = -1987409485
)
public static int field139;
- @ObfuscatedName("cz")
- public static int[] field140;
@ObfuscatedName("ce")
@ObfuscatedGetter(
- intValue = -1147676417
+ intValue = -21544437
)
- public static int field134;
- @ObfuscatedName("cj")
- @ObfuscatedGetter(
- intValue = 1995078643
- )
- public static int field142;
+ public static int field140;
+ @ObfuscatedName("cy")
+ static char[] field149;
+ @ObfuscatedName("ca")
+ static int[] field148;
+ @ObfuscatedName("ck")
+ public static int[] field134;
@ObfuscatedName("cb")
@ObfuscatedGetter(
- intValue = -1414175135
- )
- public static int field143;
- @ObfuscatedName("cp")
- @ObfuscatedGetter(
- intValue = 1395793263
+ intValue = 2113543409
)
public static int field144;
- @ObfuscatedName("dc")
+ @ObfuscatedName("cs")
+ public static int[] field142;
+ @ObfuscatedName("cd")
@ObfuscatedGetter(
- intValue = -2030198205
+ intValue = 245483503
+ )
+ public static int field146;
+ @ObfuscatedName("cl")
+ @ObfuscatedGetter(
+ intValue = 1050842761
+ )
+ public static int field147;
+ @ObfuscatedName("ct")
+ @ObfuscatedGetter(
+ intValue = 1124751465
+ )
+ public static int field143;
+ @ObfuscatedName("ch")
+ @ObfuscatedGetter(
+ intValue = -1769782215
+ )
+ public static int field127;
+ @ObfuscatedName("dm")
+ @ObfuscatedGetter(
+ intValue = -504992793
)
@Export("KeyHandler_idleCycles")
public static volatile int KeyHandler_idleCycles;
- @ObfuscatedName("dp")
+ @ObfuscatedName("dd")
@Export("KeyHandler_keyCodes")
static int[] KeyHandler_keyCodes;
- @ObfuscatedName("mn")
- @ObfuscatedGetter(
- intValue = -1725658923
- )
- @Export("menuWidth")
- static int menuWidth;
static {
KeyHandler_instance = new KeyHandler(); // L: 14
KeyHandler_pressedKeys = new boolean[112]; // L: 101
- field120 = new boolean[112]; // L: 102
- field132 = new boolean[112]; // L: 103
- field133 = new int[128]; // L: 106
- field150 = 0; // L: 107
- field135 = 0; // L: 108
- field136 = new char[128]; // L: 109
- field122 = new int[128]; // L: 110
- field138 = new int[128]; // L: 111
- field139 = 0; // L: 112
- field140 = new int[128]; // L: 113
- field134 = 0; // L: 114
- field142 = 0; // L: 115
+ field136 = new boolean[112]; // L: 102
+ field141 = new boolean[112]; // L: 103
+ field138 = new int[128]; // L: 106
+ field139 = 0; // L: 107
+ field140 = 0; // L: 108
+ field149 = new char[128]; // L: 109
+ field148 = new int[128]; // L: 110
+ field134 = new int[128]; // L: 111
+ field144 = 0; // L: 112
+ field142 = new int[128]; // L: 113
+ field146 = 0; // L: 114
+ field147 = 0; // L: 115
field143 = 0; // L: 116
- field144 = 0; // L: 117
+ field127 = 0; // L: 117
KeyHandler_idleCycles = 0; // L: 118
KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 119
}
@@ -115,262 +103,249 @@ public final class KeyHandler implements KeyListener, FocusListener {
KeyHandler() {
} // L: 121
- public final void keyTyped(KeyEvent var1) {
- if (KeyHandler_instance != null) { // L: 188
- char var2 = var1.getKeyChar(); // L: 189
- if (var2 != 0 && var2 != '\uffff') { // L: 190
- boolean var3;
- if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 193
- var3 = true; // L: 194
- } else {
- label58: {
- if (var2 != 0) { // L: 197
- char[] var4 = class341.cp1252AsciiExtension; // L: 199
-
- for (int var5 = 0; var5 < var4.length; ++var5) { // L: 200
- char var6 = var4[var5]; // L: 201
- if (var6 == var2) { // L: 203
- var3 = true; // L: 204
- break label58;
- }
- }
- }
-
- var3 = false; // L: 211
- }
- }
-
- if (var3) { // L: 213
- int var7 = field143 + 1 & 127; // L: 214
- if (var7 != field142) { // L: 215
- field122[field143] = -1; // L: 216
- field136[field143] = var2; // L: 217
- field143 = var7; // L: 218
- }
- }
- }
- }
-
- var1.consume();
- }
-
- public final void focusGained(FocusEvent var1) {
- } // L: 257
-
- public final synchronized void focusLost(FocusEvent var1) {
- if (KeyHandler_instance != null) { // L: 260
- field135 = -1; // L: 261
- }
-
- } // L: 263
-
public final synchronized void keyPressed(KeyEvent var1) {
- if (KeyHandler_instance != null) { // L: 146
- int var2 = var1.getKeyCode(); // L: 147
- if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 148
- var2 = KeyHandler_keyCodes[var2]; // L: 149
- if ((var2 & 128) != 0) { // L: 150
+ if (KeyHandler_instance != null) { // L: 185
+ int var2 = var1.getKeyCode(); // L: 186
+ if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 187
+ var2 = KeyHandler_keyCodes[var2]; // L: 188
+ if ((var2 & 128) != 0) { // L: 189
var2 = -1;
}
} else {
- var2 = -1; // L: 152
+ var2 = -1; // L: 191
}
- if (field135 >= 0 && var2 >= 0) { // L: 153
- field133[field135] = var2; // L: 154
- field135 = field135 + 1 & 127; // L: 155
- if (field135 == field150) { // L: 156
- field135 = -1;
+ if (field140 >= 0 && var2 >= 0) { // L: 192
+ field138[field140] = var2; // L: 193
+ field140 = field140 + 1 & 127; // L: 194
+ if (field139 == field140) { // L: 195
+ field140 = -1;
}
}
int var3;
- if (var2 >= 0) { // L: 158
- var3 = field143 + 1 & 127; // L: 159
- if (var3 != field142) { // L: 160
- field122[field143] = var2; // L: 161
- field136[field143] = 0; // L: 162
- field143 = var3; // L: 163
+ if (var2 >= 0) { // L: 197
+ var3 = field143 + 1 & 127; // L: 198
+ if (var3 != field147) { // L: 199
+ field148[field143] = var2; // L: 200
+ field149[field143] = 0; // L: 201
+ field143 = var3; // L: 202
}
}
- var3 = var1.getModifiers(); // L: 166
- if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 167
- var1.consume(); // L: 168
+ var3 = var1.getModifiers(); // L: 205
+ if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 206
+ var1.consume(); // L: 207
}
}
- } // L: 171
+ } // L: 210
public final synchronized void keyReleased(KeyEvent var1) {
- if (KeyHandler_instance != null) { // L: 174
- int var2 = var1.getKeyCode(); // L: 175
- if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 176
+ if (KeyHandler_instance != null) { // L: 213
+ int var2 = var1.getKeyCode(); // L: 214
+ if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 215
var2 = KeyHandler_keyCodes[var2] & -129;
} else {
- var2 = -1; // L: 177
+ var2 = -1; // L: 216
}
- if (field135 >= 0 && var2 >= 0) { // L: 178
- field133[field135] = ~var2; // L: 179
- field135 = field135 + 1 & 127; // L: 180
- if (field150 == field135) { // L: 181
- field135 = -1;
+ if (field140 >= 0 && var2 >= 0) { // L: 217
+ field138[field140] = ~var2; // L: 218
+ field140 = field140 + 1 & 127; // L: 219
+ if (field140 == field139) { // L: 220
+ field140 = -1;
}
}
}
- var1.consume(); // L: 184
- } // L: 185
+ var1.consume(); // L: 223
+ } // L: 224
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-1"
- )
- static int method329(int var0, Script var1, boolean var2) {
- if (var0 < 1000) { // L: 427
- return SoundSystem.method777(var0, var1, var2);
- } else if (var0 < 1100) { // L: 428
- return GrandExchangeOfferNameComparator.method5782(var0, var1, var2);
- } else if (var0 < 1200) { // L: 429
- return WorldMapAreaData.method4887(var0, var1, var2);
- } else if (var0 < 1300) { // L: 430
- return Interpreter.method1793(var0, var1, var2);
- } else if (var0 < 1400) { // L: 431
- return Calendar.method5349(var0, var1, var2);
- } else if (var0 < 1500) { // L: 432
- return Player.method2157(var0, var1, var2);
- } else if (var0 < 1600) { // L: 433
- return FriendsList.method6454(var0, var1, var2);
- } else if (var0 < 1700) { // L: 434
- return class138.method2880(var0, var1, var2);
- } else if (var0 < 1800) { // L: 435
- return class270.method5036(var0, var1, var2);
- } else if (var0 < 1900) { // L: 436
- return ArchiveLoader.method2041(var0, var1, var2);
- } else if (var0 < 2000) { // L: 437
- return FaceNormal.method4212(var0, var1, var2);
- } else if (var0 < 2100) { // L: 438
- return GrandExchangeOfferNameComparator.method5782(var0, var1, var2);
- } else if (var0 < 2200) { // L: 439
- return WorldMapAreaData.method4887(var0, var1, var2);
- } else if (var0 < 2300) { // L: 440
- return Interpreter.method1793(var0, var1, var2);
- } else if (var0 < 2400) { // L: 441
- return Calendar.method5349(var0, var1, var2);
- } else if (var0 < 2500) {
- return Player.method2157(var0, var1, var2); // L: 442
- } else if (var0 < 2600) { // L: 443
- return Tile.method3903(var0, var1, var2);
- } else if (var0 < 2700) { // L: 444
- return WorldMapDecoration.method4804(var0, var1, var2);
- } else if (var0 < 2800) { // L: 445
- return VerticalAlignment.method3447(var0, var1, var2);
- } else if (var0 < 2900) { // L: 446
- return class282.method5334(var0, var1, var2);
- } else if (var0 < 3000) { // L: 447
- return FaceNormal.method4212(var0, var1, var2);
- } else if (var0 < 3200) { // L: 448
- return DynamicObject.method1963(var0, var1, var2);
- } else if (var0 < 3300) { // L: 449
- return class137.method2873(var0, var1, var2);
- } else if (var0 < 3400) { // L: 450
- return class155.method3124(var0, var1, var2);
- } else if (var0 < 3500) { // L: 451
- return class309.method5600(var0, var1, var2);
- } else if (var0 < 3600) { // L: 452
- return ArchiveLoader.method2045(var0, var1, var2);
- } else if (var0 < 3700) { // L: 453
- return class305.method5591(var0, var1, var2);
- } else if (var0 < 3800) { // L: 454
- return class182.method3473(var0, var1, var2);
- } else if (var0 < 3900) { // L: 455
- return Language.method5884(var0, var1, var2);
- } else if (var0 < 4000) { // L: 456
- return Tiles.method2030(var0, var1, var2);
- } else if (var0 < 4100) { // L: 457
- return class302.method5584(var0, var1, var2);
- } else if (var0 < 4200) {
- return class267.method5027(var0, var1, var2); // L: 458
- } else if (var0 < 4300) { // L: 459
- return GrandExchangeOfferOwnWorldComparator.method1120(var0, var1, var2);
- } else if (var0 < 5100) { // L: 460
- return FontName.method7231(var0, var1, var2);
- } else if (var0 < 5400) { // L: 461
- return VertexNormal.method4377(var0, var1, var2);
- } else if (var0 < 5600) { // L: 462
- return Archive.method5623(var0, var1, var2);
- } else if (var0 < 5700) { // L: 463
- return class290.method5389(var0, var1, var2);
- } else if (var0 < 6300) { // L: 464
- return Client.method1240(var0, var1, var2);
- } else if (var0 < 6600) { // L: 465
- return class33.method592(var0, var1, var2);
- } else if (var0 < 6700) { // L: 466
- return class326.method5868(var0, var1, var2);
- } else if (var0 < 6800) { // L: 467
- return class6.method47(var0, var1, var2);
- } else if (var0 < 6900) { // L: 468
- return DevicePcmPlayerProvider.method335(var0, var1, var2);
- } else if (var0 < 7000) { // L: 469
- return ReflectionCheck.method598(var0, var1, var2);
- } else if (var0 < 7100) { // L: 470
- return TextureProvider.method4246(var0, var1, var2);
- } else if (var0 < 7200) { // L: 471
- return Tile.method3902(var0, var1, var2);
- } else if (var0 < 7300) { // L: 472
- return class182.method3472(var0, var1, var2);
- } else {
- return var0 < 7500 ? MusicPatch.method5277(var0, var1, var2) : 2; // L: 473 474
+ public final void focusGained(FocusEvent var1) {
+ } // L: 272
+
+ public final synchronized void focusLost(FocusEvent var1) {
+ if (KeyHandler_instance != null) { // L: 275
+ field140 = -1;
}
+
}
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Lbx;Lbx;IZI)I",
- garbageValue = "-380169429"
- )
- @Export("compareWorlds")
- static int compareWorlds(World var0, World var1, int var2, boolean var3) {
- if (var2 == 1) { // L: 221
- int var4 = var0.population; // L: 222
- int var5 = var1.population; // L: 223
- if (!var3) { // L: 224
- if (var4 == -1) { // L: 225
- var4 = 2001;
- }
-
- if (var5 == -1) { // L: 226
- var5 = 2001;
+ public final void keyTyped(KeyEvent var1) {
+ if (KeyHandler_instance != null) { // L: 227
+ char var2 = var1.getKeyChar(); // L: 228
+ if (var2 != 0 && var2 != '\uffff' && MusicPatchNode2.method5243(var2)) { // L: 229
+ int var3 = field143 + 1 & 127; // L: 230
+ if (var3 != field147) { // L: 231
+ field148[field143] = -1; // L: 232
+ field149[field143] = var2; // L: 233
+ field143 = var3; // L: 234
}
}
+ }
- return var4 - var5; // L: 228
- } else if (var2 == 2) { // L: 230
- return var0.location - var1.location;
- } else if (var2 == 3) { // L: 231
- if (var0.activity.equals("-")) { // L: 232
- if (var1.activity.equals("-")) { // L: 233
- return 0;
- } else {
- return var3 ? -1 : 1; // L: 234
- }
- } else if (var1.activity.equals("-")) { // L: 236
- return var3 ? 1 : -1;
+ var1.consume(); // L: 238
+ } // L: 239
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-82055101"
+ )
+ static void method286() {
+ if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 276
+ if (class19.clientPreferences.method2264() != null) { // L: 277
+ Login.Login_username = class19.clientPreferences.method2264(); // L: 278
+ Client.Login_isUsernameRemembered = true; // L: 279
} else {
- return var0.activity.compareTo(var1.activity); // L: 237
+ Client.Login_isUsernameRemembered = false; // L: 281
}
- } else if (var2 == 4) { // L: 239
- return var0.method1644() ? (var1.method1644() ? 0 : 1) : (var1.method1644() ? -1 : 0);
- } else if (var2 == 5) { // L: 240
- return var0.method1615() ? (var1.method1615() ? 0 : 1) : (var1.method1615() ? -1 : 0);
- } else if (var2 == 6) { // L: 241
- return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
- } else if (var2 == 7) { // L: 242
- return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
- } else {
- return var0.id - var1.id; // L: 243
+
}
+ } // L: 282
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(III)I",
+ garbageValue = "-1053414301"
+ )
+ public static int method302(int var0, int var1) {
+ int var2;
+ for (var2 = 0; var1 > 0; --var1) { // L: 85 86 89
+ var2 = var2 << 1 | var0 & 1; // L: 87
+ var0 >>>= 1; // L: 88
+ }
+
+ return var2; // L: 91
}
+
+ @ObfuscatedName("gp")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)V",
+ garbageValue = "50"
+ )
+ static final void method300(int var0, int var1) {
+ if (var0 < 128) { // L: 3970
+ var0 = 128;
+ }
+
+ if (var0 > 383) { // L: 3971
+ var0 = 383;
+ }
+
+ if (ViewportMouse.cameraPitch < var0) { // L: 3972
+ ViewportMouse.cameraPitch = (var0 - ViewportMouse.cameraPitch) * MidiPcmStream.field3231 / 1000 + ViewportMouse.cameraPitch + GameBuild.field3588; // L: 3973
+ if (ViewportMouse.cameraPitch > var0) { // L: 3974
+ ViewportMouse.cameraPitch = var0;
+ }
+ }
+
+ if (ViewportMouse.cameraPitch > var0) { // L: 3976
+ ViewportMouse.cameraPitch -= (ViewportMouse.cameraPitch - var0) * MidiPcmStream.field3231 / 1000 + GameBuild.field3588; // L: 3977
+ if (ViewportMouse.cameraPitch < var0) { // L: 3978
+ ViewportMouse.cameraPitch = var0;
+ }
+ }
+
+ int var2 = var1 - SoundCache.cameraYaw; // L: 3980
+ if (var2 > 1024) {
+ var2 -= 2048; // L: 3981
+ }
+
+ if (var2 < -1024) { // L: 3982
+ var2 += 2048;
+ }
+
+ if (var2 > 0) { // L: 3983
+ SoundCache.cameraYaw = var2 * MidiPcmStream.field3231 / 1000 + SoundCache.cameraYaw + GameBuild.field3588; // L: 3984
+ SoundCache.cameraYaw &= 2047; // L: 3985
+ }
+
+ if (var2 < 0) { // L: 3987
+ SoundCache.cameraYaw -= -var2 * MidiPcmStream.field3231 / 1000 + GameBuild.field3588; // L: 3988
+ SoundCache.cameraYaw &= 2047; // L: 3989
+ }
+
+ int var3 = var1 - SoundCache.cameraYaw; // L: 3991
+ if (var3 > 1024) { // L: 3992
+ var3 -= 2048;
+ }
+
+ if (var3 < -1024) { // L: 3993
+ var3 += 2048;
+ }
+
+ if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3994
+ SoundCache.cameraYaw = var1;
+ }
+
+ } // L: 3995
+
+ @ObfuscatedName("hb")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIIII)V",
+ garbageValue = "-1730640649"
+ )
+ static final void method301(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ int var8 = var6 - 334; // L: 5477
+ if (var8 < 0) { // L: 5478
+ var8 = 0;
+ } else if (var8 > 100) { // L: 5479
+ var8 = 100;
+ }
+
+ int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5480
+ int var7 = var5 * var9 / 256; // L: 5481
+ var8 = 2048 - var3 & 2047; // L: 5484
+ var9 = 2048 - var4 & 2047; // L: 5485
+ int var10 = 0; // L: 5486
+ int var11 = 0; // L: 5487
+ int var12 = var7; // L: 5488
+ int var13;
+ int var14;
+ int var15;
+ if (var8 != 0) { // L: 5489
+ var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5490
+ var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5491
+ var15 = var11 * var14 - var13 * var7 >> 16; // L: 5492
+ var12 = var14 * var7 + var11 * var13 >> 16; // L: 5493
+ var11 = var15; // L: 5494
+ }
+
+ if (var9 != 0) { // L: 5496
+ var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5497
+ var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5498
+ var15 = var12 * var13 + var14 * var10 >> 16; // L: 5499
+ var12 = var12 * var14 - var10 * var13 >> 16; // L: 5500
+ var10 = var15; // L: 5501
+ }
+
+ if (Client.isCameraLocked) { // L: 5503
+ Interpreter.field846 = var0 - var10; // L: 5504
+ WorldMapManager.field2743 = var1 - var11; // L: 5505
+ BoundaryObject.field2622 = var2 - var12; // L: 5506
+ Decimator.field402 = var3; // L: 5507
+ class390.field4423 = var4; // L: 5508
+ } else {
+ class18.cameraX = var0 - var10; // L: 5511
+ class16.cameraY = var1 - var11; // L: 5512
+ class228.cameraZ = var2 - var12; // L: 5513
+ ViewportMouse.cameraPitch = var3; // L: 5514
+ SoundCache.cameraYaw = var4; // L: 5515
+ }
+
+ if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (InterfaceParent.oculusOrbFocalPointX >> 7 != class101.localPlayer.x >> 7 || class141.oculusOrbFocalPointY >> 7 != class101.localPlayer.y >> 7)) { // L: 5517 5518
+ var13 = class101.localPlayer.plane; // L: 5519
+ var14 = (InterfaceParent.oculusOrbFocalPointX >> 7) + class28.baseX; // L: 5520
+ var15 = (class141.oculusOrbFocalPointY >> 7) + WorldMapLabelSize.baseY; // L: 5521
+ PacketBufferNode var16 = EnumComposition.getPacketBufferNode(ClientPacket.field2966, Client.packetWriter.isaacCipher); // L: 5524
+ var16.packetBuffer.method7763(var13); // L: 5525
+ var16.packetBuffer.writeIntME(var15); // L: 5526
+ var16.packetBuffer.method7760(Client.field635); // L: 5527
+ var16.packetBuffer.writeIntME(var14); // L: 5528
+ Client.packetWriter.addNode(var16); // L: 5529
+ }
+
+ } // L: 5533
}
diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java
index ae11b5fcd4..bcde298112 100644
--- a/runescape-client/src/main/java/KitDefinition.java
+++ b/runescape-client/src/main/java/KitDefinition.java
@@ -4,40 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fb")
+@ObfuscatedName("fi")
@Implements("KitDefinition")
public class KitDefinition extends DualNode {
- @ObfuscatedName("k")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Llh;"
+ )
+ @Export("KitDefinition_archive")
+ public static AbstractArchive KitDefinition_archive;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("KitDefinition_modelsArchive")
+ public static AbstractArchive KitDefinition_modelsArchive;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = 1206122503
+ )
+ @Export("KitDefinition_fileCount")
+ public static int KitDefinition_fileCount;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
)
@Export("KitDefinition_cached")
static EvictingDualNodeHashTable KitDefinition_cached;
@ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "Lqt;"
+ )
+ public static Buffer field1862;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1308166265
+ intValue = -1440625061
)
@Export("bodypartID")
public int bodypartID;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("models2")
int[] models2;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("recolorFrom")
short[] recolorFrom;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("recolorTo")
short[] recolorTo;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("retextureFrom")
short[] retextureFrom;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("retextureTo")
short[] retextureTo;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("models")
int[] models;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("nonSelectable")
public boolean nonSelectable;
@@ -51,178 +74,374 @@ public class KitDefinition extends DualNode {
this.nonSelectable = false; // L: 22
} // L: 24
- @ObfuscatedName("l")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-26"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-98"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 44
- if (var2 == 0) { // L: 45
- return; // L: 48
+ int var2 = var1.readUnsignedByte(); // L: 38
+ if (var2 == 0) { // L: 39
+ return; // L: 42
}
- this.decodeNext(var1, var2); // L: 46
+ this.decodeNext(var1, var2); // L: 40
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "16"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-1110315310"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 1) { // L: 51
+ if (var2 == 1) { // L: 45
this.bodypartID = var1.readUnsignedByte();
} else {
int var3;
int var4;
- if (var2 == 2) { // L: 52
- var3 = var1.readUnsignedByte(); // L: 53
- this.models2 = new int[var3]; // L: 54
+ if (var2 == 2) { // L: 46
+ var3 = var1.readUnsignedByte(); // L: 47
+ this.models2 = new int[var3]; // L: 48
- for (var4 = 0; var4 < var3; ++var4) { // L: 55
+ for (var4 = 0; var4 < var3; ++var4) {
this.models2[var4] = var1.readUnsignedShort();
}
- } else if (var2 == 3) { // L: 57
+ } else if (var2 == 3) {
this.nonSelectable = true;
- } else if (var2 == 40) { // L: 58
- var3 = var1.readUnsignedByte(); // L: 59
- this.recolorFrom = new short[var3]; // L: 60
- this.recolorTo = new short[var3]; // L: 61
+ } else if (var2 == 40) {
+ var3 = var1.readUnsignedByte();
+ this.recolorFrom = new short[var3]; // L: 54
+ this.recolorTo = new short[var3]; // L: 55
- for (var4 = 0; var4 < var3; ++var4) { // L: 62
- this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63
- this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64
+ for (var4 = 0; var4 < var3; ++var4) { // L: 56
+ this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57
+ this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58
}
- } else if (var2 == 41) { // L: 67
- var3 = var1.readUnsignedByte(); // L: 68
- this.retextureFrom = new short[var3]; // L: 69
- this.retextureTo = new short[var3]; // L: 70
+ } else if (var2 == 41) { // L: 61
+ var3 = var1.readUnsignedByte(); // L: 62
+ this.retextureFrom = new short[var3]; // L: 63
+ this.retextureTo = new short[var3]; // L: 64
- for (var4 = 0; var4 < var3; ++var4) { // L: 71
- this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72
- this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73
+ for (var4 = 0; var4 < var3; ++var4) { // L: 65
+ this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66
+ this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67
}
- } else if (var2 >= 60 && var2 < 70) { // L: 76
+ } else if (var2 >= 60 && var2 < 70) { // L: 70
this.models[var2 - 60] = var1.readUnsignedShort();
}
}
- } // L: 78
+ } // L: 72
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-312148005"
+ garbageValue = "-798633178"
)
@Export("ready")
public boolean ready() {
- if (this.models2 == null) { // L: 81
+ if (this.models2 == null) { // L: 75
return true;
} else {
- boolean var1 = true; // L: 82
+ boolean var1 = true; // L: 76
- for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83
- if (!class361.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) {
+ for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77
+ if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) {
var1 = false;
}
}
- return var1; // L: 84
+ return var1; // L: 78
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)Lgs;",
- garbageValue = "121889507"
+ descriptor = "(I)Lgw;",
+ garbageValue = "1219710236"
)
@Export("getModelData")
public ModelData getModelData() {
- if (this.models2 == null) { // L: 88
+ if (this.models2 == null) { // L: 82
return null;
} else {
- ModelData[] var1 = new ModelData[this.models2.length]; // L: 89
+ ModelData[] var1 = new ModelData[this.models2.length]; // L: 83
- for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90
- var1[var2] = ModelData.ModelData_get(class361.KitDefinition_modelsArchive, this.models2[var2], 0);
+ for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84
+ var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0);
}
ModelData var4;
- if (var1.length == 1) { // L: 92
+ if (var1.length == 1) { // L: 86
var4 = var1[0];
} else {
- var4 = new ModelData(var1, var1.length); // L: 93
+ var4 = new ModelData(var1, var1.length); // L: 87
}
int var3;
- if (this.recolorFrom != null) { // L: 94
- for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95
- var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96
+ if (this.recolorFrom != null) { // L: 88
+ for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89
+ var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90
}
}
- if (this.retextureFrom != null) { // L: 99
- for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100
- var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101
+ if (this.retextureFrom != null) { // L: 93
+ for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94
+ var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95
}
}
- return var4; // L: 104
+ return var4; // L: 98
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-92"
+ descriptor = "(I)Z",
+ garbageValue = "1459988613"
)
- public boolean method3335() {
- boolean var1 = true; // L: 108
+ public boolean method3417() {
+ boolean var1 = true; // L: 102
- for (int var2 = 0; var2 < 5; ++var2) { // L: 109
- if (this.models[var2] != -1 && !class361.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110
+ for (int var2 = 0; var2 < 5; ++var2) { // L: 103
+ if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104
var1 = false;
}
}
- return var1; // L: 112
+ return var1; // L: 106
}
- @ObfuscatedName("s")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)Lgs;",
- garbageValue = "-674666284"
+ descriptor = "(B)Lgw;",
+ garbageValue = "1"
)
@Export("getKitDefinitionModels")
public ModelData getKitDefinitionModels() {
- ModelData[] var1 = new ModelData[5]; // L: 116
- int var2 = 0; // L: 117
+ ModelData[] var1 = new ModelData[5]; // L: 110
+ int var2 = 0; // L: 111
- for (int var3 = 0; var3 < 5; ++var3) { // L: 118
- if (this.models[var3] != -1) { // L: 119
- var1[var2++] = ModelData.ModelData_get(class361.KitDefinition_modelsArchive, this.models[var3], 0);
+ for (int var3 = 0; var3 < 5; ++var3) { // L: 112
+ if (this.models[var3] != -1) { // L: 113
+ var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0);
}
}
- ModelData var5 = new ModelData(var1, var2); // L: 121
+ ModelData var5 = new ModelData(var1, var2); // L: 115
int var4;
- if (this.recolorFrom != null) { // L: 122
- for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123
- var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124
+ if (this.recolorFrom != null) { // L: 116
+ for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117
+ var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118
}
}
- if (this.retextureFrom != null) { // L: 127
- for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128
- var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129
+ if (this.retextureFrom != null) { // L: 121
+ for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122
+ var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123
}
}
- return var5; // L: 132
+ return var5; // L: 126
}
+
+ @ObfuscatedName("o")
+ @ObfuscatedSignature(
+ descriptor = "(IZII)V",
+ garbageValue = "1691347382"
+ )
+ public static final void method3438(int var0, boolean var1, int var2) {
+ if (var0 >= 8000 && var0 <= 48000) { // L: 49
+ PcmPlayer.field287 = var0; // L: 50
+ BuddyRankComparator.PcmPlayer_stereo = var1; // L: 51
+ HealthBarUpdate.field1212 = var2; // L: 52
+ } else {
+ throw new IllegalArgumentException();
+ }
+ } // L: 53
+
+ @ObfuscatedName("gn")
+ @ObfuscatedSignature(
+ descriptor = "(Lcj;I)V",
+ garbageValue = "-1471382870"
+ )
+ static final void method3439(Actor var0) {
+ var0.movementSequence = var0.idleSequence; // L: 4172
+ if (var0.pathLength == 0) { // L: 4173
+ var0.field1202 = 0; // L: 4174
+ } else {
+ if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4177
+ SequenceDefinition var1 = ScriptFrame.SequenceDefinition_get(var0.sequence); // L: 4178
+ if (var0.field1203 > 0 && var1.field2187 == 0) { // L: 4179
+ ++var0.field1202; // L: 4180
+ return; // L: 4181
+ }
+
+ if (var0.field1203 <= 0 && var1.field2188 == 0) { // L: 4183
+ ++var0.field1202; // L: 4184
+ return; // L: 4185
+ }
+ }
+
+ int var10 = var0.x; // L: 4188
+ int var2 = var0.y; // L: 4189
+ int var3 = var0.field1205 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4190
+ int var4 = var0.field1205 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4191
+ if (var10 < var3) { // L: 4192
+ if (var2 < var4) { // L: 4193
+ var0.orientation = 1280;
+ } else if (var2 > var4) { // L: 4194
+ var0.orientation = 1792;
+ } else {
+ var0.orientation = 1536; // L: 4195
+ }
+ } else if (var10 > var3) { // L: 4197
+ if (var2 < var4) { // L: 4198
+ var0.orientation = 768;
+ } else if (var2 > var4) { // L: 4199
+ var0.orientation = 256;
+ } else {
+ var0.orientation = 512; // L: 4200
+ }
+ } else if (var2 < var4) { // L: 4202
+ var0.orientation = 1024;
+ } else if (var2 > var4) { // L: 4203
+ var0.orientation = 0;
+ }
+
+ class192 var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4204
+ if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4205
+ int var6 = var0.orientation - var0.rotation & 2047; // L: 4212
+ if (var6 > 1024) { // L: 4213
+ var6 -= 2048;
+ }
+
+ int var7 = var0.walkBackSequence; // L: 4214
+ if (var6 >= -256 && var6 <= 256) { // L: 4215
+ var7 = var0.walkSequence;
+ } else if (var6 >= 256 && var6 < 768) { // L: 4216
+ var7 = var0.walkRightSequence;
+ } else if (var6 >= -768 && var6 <= -256) { // L: 4217
+ var7 = var0.walkLeftSequence;
+ }
+
+ if (var7 == -1) {
+ var7 = var0.walkSequence; // L: 4218
+ }
+
+ var0.movementSequence = var7; // L: 4219
+ int var8 = 4; // L: 4220
+ boolean var9 = true; // L: 4221
+ if (var0 instanceof NPC) { // L: 4222
+ var9 = ((NPC)var0).definition.isClickable;
+ }
+
+ if (var9) { // L: 4223
+ if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1129 != 0) { // L: 4224
+ var8 = 2;
+ }
+
+ if (var0.pathLength > 2) { // L: 4225
+ var8 = 6;
+ }
+
+ if (var0.pathLength > 3) { // L: 4226
+ var8 = 8;
+ }
+
+ if (var0.field1202 > 0 && var0.pathLength > 1) { // L: 4227
+ var8 = 8; // L: 4228
+ --var0.field1202; // L: 4229
+ }
+ } else {
+ if (var0.pathLength > 1) { // L: 4233
+ var8 = 6;
+ }
+
+ if (var0.pathLength > 2) { // L: 4234
+ var8 = 8;
+ }
+
+ if (var0.field1202 > 0 && var0.pathLength > 1) { // L: 4235
+ var8 = 8; // L: 4236
+ --var0.field1202; // L: 4237
+ }
+ }
+
+ if (var5 == class192.field2211) { // L: 4240
+ var8 <<= 1;
+ } else if (var5 == class192.field2209) { // L: 4241
+ var8 >>= 1;
+ }
+
+ if (var8 >= 8) { // L: 4242
+ if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4243
+ var0.movementSequence = var0.runSequence;
+ } else if (var0.movementSequence == var0.walkBackSequence && var0.field1180 != -1) { // L: 4244
+ var0.movementSequence = var0.field1180;
+ } else if (var0.walkLeftSequence == var0.movementSequence && var0.field1144 != -1) { // L: 4245
+ var0.movementSequence = var0.field1144;
+ } else if (var0.walkRightSequence == var0.movementSequence && var0.field1145 != -1) { // L: 4246
+ var0.movementSequence = var0.field1145;
+ }
+ } else if (var8 <= 1) { // L: 4248
+ if (var0.walkSequence == var0.movementSequence && var0.field1155 != -1) { // L: 4249
+ var0.movementSequence = var0.field1155;
+ } else if (var0.movementSequence == var0.walkBackSequence && var0.field1179 != -1) { // L: 4250
+ var0.movementSequence = var0.field1179;
+ } else if (var0.movementSequence == var0.walkLeftSequence && var0.field1137 != -1) { // L: 4251
+ var0.movementSequence = var0.field1137;
+ } else if (var0.walkRightSequence == var0.movementSequence && var0.field1149 != -1) { // L: 4252
+ var0.movementSequence = var0.field1149;
+ }
+ }
+
+ if (var3 != var10 || var2 != var4) { // L: 4254
+ if (var10 < var3) { // L: 4255
+ var0.x += var8; // L: 4256
+ if (var0.x > var3) { // L: 4257
+ var0.x = var3;
+ }
+ } else if (var10 > var3) { // L: 4259
+ var0.x -= var8; // L: 4260
+ if (var0.x < var3) { // L: 4261
+ var0.x = var3;
+ }
+ }
+
+ if (var2 < var4) { // L: 4263
+ var0.y += var8; // L: 4264
+ if (var0.y > var4) { // L: 4265
+ var0.y = var4;
+ }
+ } else if (var2 > var4) { // L: 4267
+ var0.y -= var8; // L: 4268
+ if (var0.y < var4) { // L: 4269
+ var0.y = var4;
+ }
+ }
+ }
+
+ if (var3 == var0.x && var4 == var0.y) { // L: 4272
+ --var0.pathLength; // L: 4273
+ if (var0.field1203 > 0) { // L: 4274
+ --var0.field1203;
+ }
+ }
+
+ } else {
+ var0.x = var3; // L: 4206
+ var0.y = var4; // L: 4207
+ --var0.pathLength; // L: 4208
+ if (var0.field1203 > 0) { // L: 4209
+ --var0.field1203;
+ }
+
+ }
+ }
+ } // L: 4175 4210 4276
}
diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java
index 1cd921dc44..eed2af4d95 100644
--- a/runescape-client/src/main/java/Language.java
+++ b/runescape-client/src/main/java/Language.java
@@ -6,97 +6,114 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("lq")
+@ObfuscatedName("lb")
@Implements("Language")
public class Language implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_EN")
public static final Language Language_EN;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_DE")
static final Language Language_DE;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_FR")
public static final Language Language_FR;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_PT")
static final Language Language_PT;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_NL")
static final Language Language_NL;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_ES")
public static final Language Language_ES;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Llq;"
+ descriptor = "Llb;"
)
@Export("Language_ES_MX")
static final Language Language_ES_MX;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "[Llq;"
+ descriptor = "[Llb;"
)
@Export("Language_valuesOrdered")
public static final Language[] Language_valuesOrdered;
- @ObfuscatedName("s")
- final String field4120;
- @ObfuscatedName("r")
+ @ObfuscatedName("eh")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ static Archive field4098;
+ @ObfuscatedName("mp")
+ @ObfuscatedGetter(
+ intValue = -1785071379
+ )
+ @Export("menuWidth")
+ static int menuWidth;
+ @ObfuscatedName("nm")
+ @ObfuscatedSignature(
+ descriptor = "Lkb;"
+ )
+ @Export("mousedOverWidgetIf1")
+ static Widget mousedOverWidgetIf1;
+ @ObfuscatedName("w")
+ final String field4099;
+ @ObfuscatedName("y")
@Export("language")
final String language;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1541903629
+ intValue = -2039584121
)
@Export("id")
final int id;
static {
- Language_EN = new Language("EN", "en", "English", ModeWhere.field4125, 0, "GB"); // L: 12
- Language_DE = new Language("DE", "de", "German", ModeWhere.field4125, 1, "DE"); // L: 13
- Language_FR = new Language("FR", "fr", "French", ModeWhere.field4125, 2, "FR"); // L: 14
- Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4125, 3, "BR"); // L: 15
- Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4130, 4, "NL"); // L: 16
- Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4130, 5, "ES"); // L: 17
- Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4125, 6, "MX"); // L: 18
- Language[] var0 = new Language[]{Language_FR, Language_NL, Language_DE, Language_ES, Language_ES_MX, Language_EN, Language_PT}; // L: 27
- Language_valuesOrdered = new Language[var0.length]; // L: 30
- Language[] var2 = var0; // L: 32
+ Language_EN = new Language("EN", "en", "English", ModeWhere.field4106, 0, "GB"); // L: 12
+ Language_DE = new Language("DE", "de", "German", ModeWhere.field4106, 1, "DE"); // L: 13
+ Language_FR = new Language("FR", "fr", "French", ModeWhere.field4106, 2, "FR"); // L: 14
+ Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field4106, 3, "BR"); // L: 15
+ Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field4105, 4, "NL"); // L: 16
+ Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field4105, 5, "ES"); // L: 17
+ Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field4106, 6, "MX"); // L: 18
+ Language[] var0 = method6069(); // L: 25
+ Language_valuesOrdered = new Language[var0.length];
+ Language[] var1 = var0;
- for (int var3 = 0; var3 < var2.length; ++var3) { // L: 33
- Language var4 = var2[var3]; // L: 34
- if (Language_valuesOrdered[var4.id] != null) { // L: 36
- throw new IllegalStateException(); // L: 37
+ for (int var2 = 0; var2 < var1.length; ++var2) {
+ Language var3 = var1[var2];
+ if (Language_valuesOrdered[var3.id] != null) {
+ throw new IllegalStateException();
}
- Language_valuesOrdered[var4.id] = var4; // L: 39
+ Language_valuesOrdered[var3.id] = var3; // L: 35
}
- } // L: 43
+ } // L: 39
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llz;ILjava/lang/String;)V"
)
Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) {
- this.field4120 = var1; // L: 46
+ this.field4099 = var1; // L: 46
this.language = var2; // L: 47
this.id = var5; // L: 48
if (var6 != null) { // L: 49
@@ -107,20 +124,20 @@ public class Language implements MouseWheel {
} // L: 55
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id; // L: 63
}
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "-75"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-2051641160"
)
@Export("getLanguage")
String getLanguage() {
@@ -131,549 +148,299 @@ public class Language implements MouseWheel {
return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 68
}
- @ObfuscatedName("l")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(CI)C",
- garbageValue = "-380169429"
+ descriptor = "(IB)Lbi;",
+ garbageValue = "32"
)
- static char method5877(char var0) {
- switch(var0) { // L: 103
- case ' ':
- case '-':
- case '_':
- case ' ':
- return '_'; // L: 163
- case '#':
- case '[':
- case ']':
- return var0; // L: 135
- case 'À':
- case 'Á':
- case 'Â':
- case 'Ã':
- case 'Ä':
- case 'à':
- case 'á':
- case 'â':
- case 'ã':
- case 'ä':
- return 'a'; // L: 128
- case 'Ç':
- case 'ç':
- return 'c'; // L: 117
- case 'È':
- case 'É':
- case 'Ê':
- case 'Ë':
- case 'è':
- case 'é':
- case 'ê':
- case 'ë':
- return 'e'; // L: 144
- case 'Í':
- case 'Î':
- case 'Ï':
- case 'í':
- case 'î':
- case 'ï':
- return 'i'; // L: 172
- case 'Ñ':
- case 'ñ':
- return 'n'; // L: 131
- case 'Ò':
- case 'Ó':
- case 'Ô':
- case 'Õ':
- case 'Ö':
- case 'ò':
- case 'ó':
- case 'ô':
- case 'õ':
- case 'ö':
- return 'o'; // L: 114
- case 'Ù':
- case 'Ú':
- case 'Û':
- case 'Ü':
- case 'ù':
- case 'ú':
- case 'û':
- case 'ü':
- return 'u'; // L: 153
- case 'ß':
- return 'b'; // L: 155
- case 'ÿ':
- case 'Ÿ':
- return 'y'; // L: 158
- default:
- return Character.toLowerCase(var0); // L: 165
+ @Export("getScript")
+ static Script getScript(int var0) {
+ Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26
+ if (var1 != null) { // L: 27
+ return var1;
+ } else {
+ byte[] var2 = class267.archive12.takeFile(var0, 0); // L: 28
+ if (var2 == null) { // L: 29
+ return null; // L: 30
+ } else {
+ var1 = class344.newScript(var2); // L: 32
+ Script.Script_cached.put(var1, (long)var0); // L: 33
+ return var1; // L: 34
+ }
}
}
- @ObfuscatedName("b")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lmx;Lmx;I)V",
- garbageValue = "412458899"
+ descriptor = "(B)[Llb;",
+ garbageValue = "65"
)
- static void method5885(Font var0, Font var1) {
- if (GameEngine.worldSelectBackSprites == null) { // L: 1661
- GameEngine.worldSelectBackSprites = Frames.method4218(class305.archive8, "sl_back", "");
+ static Language[] method6069() {
+ return new Language[]{Language_NL, Language_ES, Language_ES_MX, Language_DE, Language_FR, Language_EN, Language_PT}; // L: 42
+ }
+
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "(Laz;B)V",
+ garbageValue = "3"
+ )
+ @Export("PcmStream_disable")
+ static final void PcmStream_disable(PcmStream var0) {
+ var0.active = false; // L: 270
+ if (var0.sound != null) { // L: 271
+ var0.sound.position = 0;
}
- IndexedSprite[] var2;
- Archive var3;
+ for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
+ PcmStream_disable(var1); // L: 272
+ }
+
+ } // L: 273
+
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-364353679"
+ )
+ static int method6068(int var0, Script var1, boolean var2) {
+ int var3;
int var4;
- int var5;
- if (class260.worldSelectFlagSprites == null) { // L: 1662
- var3 = class305.archive8; // L: 1664
- var4 = var3.getGroupId("sl_flags"); // L: 1666
- var5 = var3.getFileId(var4, ""); // L: 1667
- var2 = ItemContainer.method2062(var3, var4, var5); // L: 1668
- class260.worldSelectFlagSprites = var2; // L: 1670
- }
-
- if (class114.worldSelectArrows == null) { // L: 1672
- var3 = class305.archive8; // L: 1674
- var4 = var3.getGroupId("sl_arrows"); // L: 1676
- var5 = var3.getFileId(var4, ""); // L: 1677
- var2 = ItemContainer.method2062(var3, var4, var5); // L: 1678
- class114.worldSelectArrows = var2; // L: 1680
- }
-
- if (class267.worldSelectStars == null) { // L: 1682
- var3 = class305.archive8; // L: 1684
- var4 = var3.getGroupId("sl_stars"); // L: 1686
- var5 = var3.getFileId(var4, ""); // L: 1687
- var2 = ItemContainer.method2062(var3, var4, var5); // L: 1688
- class267.worldSelectStars = var2; // L: 1690
- }
-
- if (class126.worldSelectLeftSprite == null) { // L: 1692
- class126.worldSelectLeftSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(class305.archive8, "leftarrow", "");
- }
-
- if (class424.worldSelectRightSprite == null) { // L: 1693
- class424.worldSelectRightSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(class305.archive8, "rightarrow", "");
- }
-
- Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1694
- Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1695
- Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1696
- var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1697
- if (class267.worldSelectStars != null) { // L: 1698
- class267.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1699
- var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1700
- class267.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1701
- var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1702
- }
-
- if (class114.worldSelectArrows != null) { // L: 1704
- int var22 = Login.xPadding + 280; // L: 1705
- if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1706
- class114.worldSelectArrows[2].drawAt(var22, 4);
- } else {
- class114.worldSelectArrows[0].drawAt(var22, 4); // L: 1707
- }
-
- if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1708
- class114.worldSelectArrows[3].drawAt(var22 + 15, 4);
- } else {
- class114.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1709
- }
-
- var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1710
- int var23 = Login.xPadding + 390; // L: 1711
- if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1712
- class114.worldSelectArrows[2].drawAt(var23, 4);
- } else {
- class114.worldSelectArrows[0].drawAt(var23, 4); // L: 1713
- }
-
- if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1714
- class114.worldSelectArrows[3].drawAt(var23 + 15, 4);
- } else {
- class114.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1715
- }
-
- var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1716
- var4 = Login.xPadding + 500; // L: 1717
- if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1718
- class114.worldSelectArrows[2].drawAt(var4, 4);
- } else {
- class114.worldSelectArrows[0].drawAt(var4, 4); // L: 1719
- }
-
- if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1720
- class114.worldSelectArrows[3].drawAt(var4 + 15, 4);
- } else {
- class114.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1721
- }
-
- var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1722
- var5 = Login.xPadding + 610; // L: 1723
- if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1724
- class114.worldSelectArrows[2].drawAt(var5, 4);
- } else {
- class114.worldSelectArrows[0].drawAt(var5, 4); // L: 1725
- }
-
- if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1726
- class114.worldSelectArrows[3].drawAt(var5 + 15, 4);
- } else {
- class114.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1727
- }
-
- var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1728
- }
-
- Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1730
- var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1731
- Login.hoveredWorldIndex = -1; // L: 1732
- if (GameEngine.worldSelectBackSprites != null) { // L: 1733
- byte var26 = 88; // L: 1734
- byte var27 = 19; // L: 1735
- var4 = 765 / (var26 + 1) - 1; // L: 1736
- var5 = 480 / (var27 + 1); // L: 1737
-
+ if (var0 == ScriptOpcodes.ADD) { // L: 3049
+ class446.Interpreter_intStackSize -= 2; // L: 3050
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3051
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3052
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 + var4; // L: 3053
+ return 1; // L: 3054
+ } else if (var0 == ScriptOpcodes.SUB) { // L: 3056
+ class446.Interpreter_intStackSize -= 2; // L: 3057
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3058
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3059
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 - var4; // L: 3060
+ return 1; // L: 3061
+ } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3063
+ class446.Interpreter_intStackSize -= 2; // L: 3064
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3065
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3066
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4 * var3; // L: 3067
+ return 1; // L: 3068
+ } else if (var0 == ScriptOpcodes.DIV) { // L: 3070
+ class446.Interpreter_intStackSize -= 2; // L: 3071
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3072
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3073
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 / var4; // L: 3074
+ return 1; // L: 3075
+ } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3077
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3078
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3079
+ return 1; // L: 3080
+ } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3082
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3083
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3084
+ return 1; // L: 3085
+ } else {
+ int var5;
int var6;
int var7;
- do {
- var6 = var5; // L: 1739
- var7 = var4; // L: 1740
- if (var5 * (var4 - 1) >= World.World_count) { // L: 1741
- --var4;
- }
-
- if (var4 * (var5 - 1) >= World.World_count) { // L: 1742
- --var5;
- }
-
- if (var4 * (var5 - 1) >= World.World_count) { // L: 1743
- --var5;
- }
- } while(var5 != var6 || var4 != var7); // L: 1744
-
- var6 = (765 - var26 * var4) / (var4 + 1); // L: 1746
- if (var6 > 5) { // L: 1747
- var6 = 5;
- }
-
- var7 = (480 - var5 * var27) / (var5 + 1); // L: 1748
- if (var7 > 5) { // L: 1749
- var7 = 5;
- }
-
- int var8 = (765 - var4 * var26 - var6 * (var4 - 1)) / 2; // L: 1750
- int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2; // L: 1751
- int var10 = (var5 + World.World_count - 1) / var5; // L: 1752
- Login.worldSelectPagesCount = var10 - var4; // L: 1753
- if (class126.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1754
- class126.worldSelectLeftSprite.drawAt(8, class433.canvasHeight / 2 - class126.worldSelectLeftSprite.subHeight / 2); // L: 1755
- }
-
- if (class424.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1757
- class424.worldSelectRightSprite.drawAt(GraphicsObject.canvasWidth - class424.worldSelectRightSprite.subWidth - 8, class433.canvasHeight / 2 - class424.worldSelectRightSprite.subHeight / 2); // L: 1758
- }
-
- int var11 = var9 + 23; // L: 1760
- int var12 = var8 + Login.xPadding; // L: 1761
- int var13 = 0; // L: 1762
- boolean var14 = false; // L: 1763
- int var15 = Login.worldSelectPage; // L: 1764
-
- int var16;
- for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1765 1766
- World var17 = World.World_worlds[var16]; // L: 1769
- boolean var18 = true; // L: 1770
- String var19 = Integer.toString(var17.population); // L: 1771
- if (var17.population == -1) { // L: 1772
- var19 = "OFF"; // L: 1773
- var18 = false; // L: 1774
- } else if (var17.population > 1980) { // L: 1776
- var19 = "FULL"; // L: 1777
- var18 = false; // L: 1778
- }
-
- int var21 = 0; // L: 1781
- byte var20;
- if (var17.isBeta()) { // L: 1782
- if (var17.isMembersOnly()) { // L: 1783
- var20 = 7;
- } else {
- var20 = 6; // L: 1784
- }
- } else if (var17.isDeadman()) { // L: 1786
- var21 = 16711680; // L: 1787
- if (var17.isMembersOnly()) { // L: 1788
- var20 = 5;
- } else {
- var20 = 4; // L: 1789
- }
- } else if (var17.method1619()) { // L: 1791
- if (var17.isMembersOnly()) { // L: 1792
- var20 = 9;
- } else {
- var20 = 8; // L: 1793
- }
- } else if (var17.isPvp()) { // L: 1795
- if (var17.isMembersOnly()) { // L: 1796
- var20 = 3;
- } else {
- var20 = 2; // L: 1797
- }
- } else if (var17.isMembersOnly()) { // L: 1800
- var20 = 1;
+ if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3087
+ class446.Interpreter_intStackSize -= 5; // L: 3088
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3089
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3090
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3091
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 3092
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 4]; // L: 3093
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); // L: 3094
+ return 1; // L: 3095
+ } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3097
+ class446.Interpreter_intStackSize -= 2; // L: 3098
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3099
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3100
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 3101
+ return 1; // L: 3102
+ } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3104
+ class446.Interpreter_intStackSize -= 2; // L: 3105
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3106
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3107
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3108
+ return 1; // L: 3109
+ } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3111
+ class446.Interpreter_intStackSize -= 2; // L: 3112
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3113
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3114
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3115
+ return 1; // L: 3116
+ } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3118
+ class446.Interpreter_intStackSize -= 2; // L: 3119
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3120
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3121
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3122
+ return 1; // L: 3123
+ } else if (var0 == ScriptOpcodes.MOD) { // L: 3125
+ class446.Interpreter_intStackSize -= 2; // L: 3126
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3127
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3128
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 % var4; // L: 3129
+ return 1; // L: 3130
+ } else if (var0 == ScriptOpcodes.POW) { // L: 3132
+ class446.Interpreter_intStackSize -= 2; // L: 3133
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3134
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3135
+ if (var3 == 0) { // L: 3136
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0;
} else {
- var20 = 0; // L: 1801
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3137
}
- if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var26 + var12 && MouseHandler.MouseHandler_y < var11 + var27 && var18) { // L: 1803
- Login.hoveredWorldIndex = var16; // L: 1804
- GameEngine.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); // L: 1805
- var14 = true; // L: 1806
+ return 1; // L: 3138
+ } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3140
+ class446.Interpreter_intStackSize -= 2; // L: 3141
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3142
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3143
+ if (var3 == 0) { // L: 3144
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3145
+ return 1; // L: 3146
} else {
- GameEngine.worldSelectBackSprites[var20].drawAt(var12, var11); // L: 1808
+ switch(var4) { // L: 3148
+ case 0:
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3161
+ break; // L: 3162
+ case 1:
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 3151
+ break;
+ case 2:
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3156
+ break; // L: 3157
+ case 3:
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3176
+ break;
+ case 4:
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3166
+ break; // L: 3167
+ default:
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3171
+ }
+
+ return 1; // L: 3180
+ }
+ } else if (var0 == ScriptOpcodes.AND) { // L: 3182
+ class446.Interpreter_intStackSize -= 2; // L: 3183
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3184
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3185
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 & var4; // L: 3186
+ return 1; // L: 3187
+ } else if (var0 == ScriptOpcodes.OR) { // L: 3189
+ class446.Interpreter_intStackSize -= 2; // L: 3190
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3191
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3192
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 | var4; // L: 3193
+ return 1; // L: 3194
+ } else if (var0 == ScriptOpcodes.SCALE) { // L: 3196
+ class446.Interpreter_intStackSize -= 3; // L: 3197
+ long var9 = (long)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3198
+ long var11 = (long)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3199
+ long var13 = (long)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3200
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 3201
+ return 1; // L: 3202
+ } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3204
+ var3 = class269.method5223(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 3205
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 3206
+ return 1; // L: 3207
+ } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3209
+ class446.Interpreter_intStackSize -= 2; // L: 3210
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3211
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3212
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3213
+ return 1; // L: 3214
+ } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3216
+ class446.Interpreter_intStackSize -= 3; // L: 3217
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3218
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3219
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3220
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class17.method232(var3, var4, var5); // L: 3221
+ return 1; // L: 3222
+ } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3224
+ class446.Interpreter_intStackSize -= 3; // L: 3225
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3226
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3227
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3228
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class137.method2931(var3, var4, var5); // L: 3229
+ return 1; // L: 3230
+ } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3232
+ class446.Interpreter_intStackSize -= 3; // L: 3233
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3234
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3235
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3236
+ var6 = 31 - var5; // L: 3237
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3238
+ return 1; // L: 3239
+ } else if (var0 == 4030) { // L: 3241
+ class446.Interpreter_intStackSize -= 4; // L: 3242
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3243
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3244
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3245
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 3246
+ var3 = class137.method2931(var3, var5, var6); // L: 3247
+ var7 = VarpDefinition.method3374(var6 - var5 + 1); // L: 3248
+ if (var4 > var7) { // L: 3249
+ var4 = var7;
}
- if (class260.worldSelectFlagSprites != null) { // L: 1809
- class260.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11);
- }
-
- var0.drawCentered(Integer.toString(var17.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); // L: 1810
- var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); // L: 1811
- var11 = var11 + var7 + var27; // L: 1812
- ++var13; // L: 1813
- if (var13 >= var5) {
- var11 = var9 + 23; // L: 1814
- var12 = var12 + var6 + var26; // L: 1815
- var13 = 0; // L: 1816
- ++var15; // L: 1817
- }
- }
-
- if (var14) { // L: 1820
- var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1821
- int var24 = var1.ascent + 8; // L: 1822
- int var25 = MouseHandler.MouseHandler_y + 25; // L: 1823
- if (var25 + var24 > 480) { // L: 1824
- var25 = MouseHandler.MouseHandler_y - 25 - var24; // L: 1825
- }
-
- Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 16777120); // L: 1827
- Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var24, 0); // L: 1828
- var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); // L: 1829
- }
- }
-
- DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 1832
- } // L: 1833
-
- @ObfuscatedName("ab")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-27"
- )
- static int method5884(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2710
- if (class358.guestClanSettings != null) { // L: 2711
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2712
- FontName.field4583 = class358.guestClanSettings; // L: 2713
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3250
+ return 1; // L: 3251
+ } else if (var0 == 4032) { // L: 3253
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1] = ClanMate.method6650(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1]); // L: 3254
+ return 1; // L: 3255
+ } else if (var0 == 4033) { // L: 3257
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1] = class155.method3194(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1]); // L: 3258
+ return 1; // L: 3259
+ } else if (var0 == 4034) { // L: 3261
+ class446.Interpreter_intStackSize -= 2; // L: 3262
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3263
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3264
+ var5 = class136.method2923(var3, var4); // L: 3265
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5; // L: 3266
+ return 1; // L: 3267
+ } else if (var0 == 4035) { // L: 3269
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1]); // L: 3270
+ return 1; // L: 3271
} else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2715
- }
-
- return 1; // L: 2716
- } else {
- int var3;
- if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2718
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2719
- if (Client.currentClanSettings[var3] != null) { // L: 2720
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2721
- FontName.field4583 = Client.currentClanSettings[var3]; // L: 2722
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2724
- }
-
- return 1; // L: 2725
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2727
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FontName.field4583.name; // L: 2728
- return 1; // L: 2729
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2731
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.allowGuests ? 1 : 0; // L: 2732
- return 1; // L: 2733
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2735
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1633; // L: 2736
- return 1; // L: 2737
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2739
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1641; // L: 2740
- return 1; // L: 2741
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2743
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1642; // L: 2744
- return 1; // L: 2745
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2747
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1648; // L: 2748
- return 1; // L: 2749
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2751
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.memberCount; // L: 2752
- return 1; // L: 2753
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2755
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2756
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FontName.field4583.memberNames[var3]; // L: 2757
- return 1; // L: 2758
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2760
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2761
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.memberRanks[var3]; // L: 2762
- return 1; // L: 2763
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2765
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.bannedMemberCount; // L: 2766
- return 1; // L: 2767
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2769
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2770
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FontName.field4583.bannedMemberNames[var3]; // L: 2771
- return 1; // L: 2772
- } else {
- int var5;
- int var6;
- if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2774
- class12.Interpreter_intStackSize -= 3; // L: 2775
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2776
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2777
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2778
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.method2885(var3, var6, var5); // L: 2779
- return 1; // L: 2780
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2782
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.currentOwner; // L: 2783
- return 1; // L: 2784
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2786
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1652; // L: 2787
- return 1; // L: 2788
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2790
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.method2884(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 2791
- return 1; // L: 2792
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2794
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = FontName.field4583.getSortedMembers()[Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]]; // L: 2795
- return 1; // L: 2796
- } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2798
- class12.Interpreter_intStackSize -= 2; // L: 2799
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2800
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2801
- class142.method2967(var6, var3); // L: 2802
- return 1; // L: 2803
- } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2805
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2806
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1649[var3]; // L: 2807
- return 1; // L: 2808
- } else {
- if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2810
- class12.Interpreter_intStackSize -= 3; // L: 2811
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2812
- boolean var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 2813
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2814
- class168.method3251(var5, var3, var4); // L: 2815
- }
-
- if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2817
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2818
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FontName.field4583.field1650[var3] ? 1 : 0; // L: 2819
- return 1; // L: 2820
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2822
- if (UserComparator10.guestClanChannel != null) { // L: 2823
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2824
- class1.field2 = UserComparator10.guestClanChannel; // L: 2825
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2827
- }
-
- return 1; // L: 2828
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2830
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2831
- if (Client.currentClanChannels[var3] != null) { // L: 2832
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2833
- class1.field2 = Client.currentClanChannels[var3]; // L: 2834
- class121.field1529 = var3; // L: 2835
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2837
- }
-
- return 1; // L: 2838
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2840
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class1.field2.name; // L: 2841
- return 1; // L: 2842
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2844
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.field1706; // L: 2845
- return 1; // L: 2846
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2848
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.field1711; // L: 2849
- return 1; // L: 2850
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2852
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.method3005(); // L: 2853
- return 1; // L: 2854
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2856
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2857
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class1.field2.members.get(var3)).username.getName(); // L: 2858
- return 1; // L: 2859
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2861
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2862
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field2.members.get(var3)).rank; // L: 2863
- return 1; // L: 2864
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2866
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2867
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field2.members.get(var3)).world; // L: 2868
- return 1; // L: 2869
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2871
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2872
- InterfaceParent.method2069(class121.field1529, var3); // L: 2873
- return 1; // L: 2874
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2876
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class1.field2.method3023(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 2877
- return 1; // L: 2878
- } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2880
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = class1.field2.getSortedMembers()[Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]]; // L: 2881
- return 1; // L: 2882
- } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2884
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator8.field1378 != null ? 1 : 0; // L: 2885
- return 1; // L: 2886
- } else {
- return 2; // L: 2888
- }
- }
+ return 2; // L: 3273
}
}
}
- @ObfuscatedName("jn")
+ @ObfuscatedName("he")
@ObfuscatedSignature(
- descriptor = "([Lki;IIIZB)V",
- garbageValue = "74"
+ descriptor = "(I)Z",
+ garbageValue = "1931091160"
)
- @Export("resizeInterface")
- static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
- for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10781
- Widget var6 = var0[var5]; // L: 10782
- if (var6 != null && var6.parentId == var1) { // L: 10783 10784
- FloorOverlayDefinition.alignWidgetSize(var6, var2, var3, var4); // L: 10785
- ChatChannel.alignWidgetPosition(var6, var2, var3); // L: 10786
- if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10787
- var6.scrollX = var6.scrollWidth - var6.width;
- }
+ static boolean method6070() {
+ return (Client.drawPlayerNames & 2) != 0; // L: 4949
+ }
- if (var6.scrollX < 0) { // L: 10788
- var6.scrollX = 0;
- }
-
- if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10789
- var6.scrollY = var6.scrollHeight - var6.height;
- }
-
- if (var6.scrollY < 0) { // L: 10790
- var6.scrollY = 0;
- }
-
- if (var6.type == 0) { // L: 10791
- UserComparator8.revalidateWidgetScroll(var0, var6, var4);
- }
- }
+ @ObfuscatedName("kg")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)Lcq;",
+ garbageValue = "-781279476"
+ )
+ static final InterfaceParent method6063(int var0, int var1, int var2) {
+ InterfaceParent var3 = new InterfaceParent(); // L: 11994
+ var3.group = var1; // L: 11995
+ var3.type = var2; // L: 11996
+ Client.interfaceParents.put(var3, (long)var0); // L: 11997
+ class17.Widget_resetModelFrames(var1); // L: 11998
+ Widget var4 = class140.getWidget(var0); // L: 11999
+ ChatChannel.invalidateWidget(var4); // L: 12000
+ if (Client.meslayerContinueWidget != null) { // L: 12001
+ ChatChannel.invalidateWidget(Client.meslayerContinueWidget); // L: 12002
+ Client.meslayerContinueWidget = null; // L: 12003
}
- } // L: 10793
+ BufferedNetSocket.revalidateWidgetScroll(SoundCache.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12005
+ WorldMapLabelSize.runWidgetOnLoadListener(var1); // L: 12006
+ if (Client.rootInterface != -1) { // L: 12007
+ class7.runIntfCloseListeners(Client.rootInterface, 1);
+ }
+
+ return var3; // L: 12008
+ }
}
diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java
index d8cbf45998..32ede2e4c5 100644
--- a/runescape-client/src/main/java/Link.java
+++ b/runescape-client/src/main/java/Link.java
@@ -3,23 +3,23 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("og")
+@ObfuscatedName("ou")
@Implements("Link")
public class Link {
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Log;"
+ descriptor = "Lou;"
)
@Export("previous")
public Link previous;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Log;"
+ descriptor = "Lou;"
)
@Export("next")
public Link next;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("remove")
public void remove() {
if (this.next != null) { // L: 8
diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java
index 65c4314efd..90162c9cda 100644
--- a/runescape-client/src/main/java/LinkDeque.java
+++ b/runescape-client/src/main/java/LinkDeque.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lm")
+@ObfuscatedName("li")
@Implements("LinkDeque")
public class LinkDeque {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Log;"
+ descriptor = "Lou;"
)
@Export("sentinel")
Link sentinel;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Log;"
+ descriptor = "Lou;"
)
@Export("current")
Link current;
@@ -25,9 +25,9 @@ public class LinkDeque {
this.sentinel.next = this.sentinel; // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Log;)V"
+ descriptor = "(Lou;)V"
)
@Export("addFirst")
public void addFirst(Link var1) {
@@ -41,9 +41,9 @@ public class LinkDeque {
var1.previous.next = var1; // L: 19
} // L: 20
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "()Log;"
+ descriptor = "()Lou;"
)
@Export("last")
public Link last() {
@@ -57,9 +57,9 @@ public class LinkDeque {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "()Log;"
+ descriptor = "()Lou;"
)
@Export("previous")
public Link previous() {
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index f3d6375e01..7f5fd197b2 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -5,166 +5,152 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bu")
+@ObfuscatedName("ba")
@Implements("Login")
public class Login {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("clearLoginScreen")
static boolean clearLoginScreen;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 276898147
+ intValue = -368109383
)
@Export("xPadding")
static int xPadding;
- @ObfuscatedName("k")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "[Lqd;"
+ descriptor = "Lqu;"
)
- @Export("runesSprite")
- static IndexedSprite[] runesSprite;
- @ObfuscatedName("a")
+ static IndexedSprite field914;
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Lqe;"
)
- @Export("titleboxSprite")
- static IndexedSprite titleboxSprite;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lqd;"
- )
- @Export("titlebuttonSprite")
- static IndexedSprite titlebuttonSprite;
+ @Export("rightTitleSprite")
+ static SpritePixels rightTitleSprite;
@ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Lqu;"
)
- static IndexedSprite field882;
- @ObfuscatedName("b")
+ @Export("logoSprite")
+ static IndexedSprite logoSprite;
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Lcf;"
)
- static IndexedSprite field888;
- @ObfuscatedName("d")
+ @Export("loginScreenRunesAnimation")
+ static LoginScreenAnimation loginScreenRunesAnimation;
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = -2055950189
+ intValue = -1216144849
)
@Export("loginBoxX")
static int loginBoxX;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = 135788845
+ intValue = -887287559
)
@Export("Login_loadingPercent")
static int Login_loadingPercent;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@Export("Login_loadingText")
static String Login_loadingText;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@ObfuscatedGetter(
- intValue = -799291101
+ intValue = 1711559605
)
- static int field887;
+ static int field897;
@ObfuscatedName("av")
@ObfuscatedGetter(
- intValue = 148812415
+ intValue = -1589978227
)
- static int field907;
- @ObfuscatedName("ax")
+ static int field902;
+ @ObfuscatedName("ay")
@ObfuscatedGetter(
- intValue = 1290370117
+ intValue = 2023908257
)
@Export("loginIndex")
static int loginIndex;
- @ObfuscatedName("at")
+ @ObfuscatedName("as")
@Export("Login_response0")
static String Login_response0;
- @ObfuscatedName("br")
+ @ObfuscatedName("be")
@Export("Login_response1")
static String Login_response1;
- @ObfuscatedName("ba")
+ @ObfuscatedName("bz")
@Export("Login_response2")
static String Login_response2;
- @ObfuscatedName("bk")
+ @ObfuscatedName("bp")
@Export("Login_response3")
static String Login_response3;
- @ObfuscatedName("bi")
+ @ObfuscatedName("bf")
@Export("Login_username")
static String Login_username;
- @ObfuscatedName("bc")
+ @ObfuscatedName("bg")
@Export("Login_password")
static String Login_password;
- @ObfuscatedName("bl")
- @ObfuscatedGetter(
- intValue = 1915795539
- )
- static int field896;
- @ObfuscatedName("bs")
- static String[] field876;
- @ObfuscatedName("bh")
- static boolean field879;
- @ObfuscatedName("bb")
- static boolean field881;
@ObfuscatedName("bn")
- static boolean field900;
- @ObfuscatedName("bg")
@ObfuscatedGetter(
- intValue = -1833124077
+ intValue = -1310477501
+ )
+ static int field910;
+ @ObfuscatedName("bq")
+ static String[] field911;
+ @ObfuscatedName("bw")
+ static boolean field912;
+ @ObfuscatedName("bi")
+ static boolean field913;
+ @ObfuscatedName("bm")
+ static boolean field895;
+ @ObfuscatedName("by")
+ @ObfuscatedGetter(
+ intValue = -265960089
)
@Export("currentLoginField")
static int currentLoginField;
- @ObfuscatedName("ck")
+ @ObfuscatedName("cq")
@Export("worldSelectOpen")
static boolean worldSelectOpen;
- @ObfuscatedName("cn")
+ @ObfuscatedName("cp")
@ObfuscatedGetter(
- intValue = 286320775
+ intValue = 306108477
)
@Export("hoveredWorldIndex")
static int hoveredWorldIndex;
- @ObfuscatedName("cc")
+ @ObfuscatedName("cf")
@ObfuscatedGetter(
- intValue = -246673921
+ intValue = -1875553221
)
@Export("worldSelectPage")
static int worldSelectPage;
- @ObfuscatedName("cy")
+ @ObfuscatedName("cv")
@ObfuscatedGetter(
- intValue = 70762845
+ intValue = 374883871
)
@Export("worldSelectPagesCount")
static int worldSelectPagesCount;
- @ObfuscatedName("cd")
+ @ObfuscatedName("co")
@ObfuscatedGetter(
- longValue = -2630741259631538253L
+ longValue = 413858699552618351L
)
- static long field883;
- @ObfuscatedName("cw")
+ static long field923;
+ @ObfuscatedName("cz")
@ObfuscatedGetter(
- longValue = -7505772833145072753L
+ longValue = 2000245042084222809L
)
- static long field909;
- @ObfuscatedName("cf")
- static String[] field910;
- @ObfuscatedName("cq")
- static String[] field911;
- @ObfuscatedName("dv")
- @Export("mouseCam")
- static boolean mouseCam;
- @ObfuscatedName("py")
- @ObfuscatedSignature(
- descriptor = "Lpd;"
- )
- @Export("HitSplatDefinition_cachedSprites")
- static class428 HitSplatDefinition_cachedSprites;
+ static long field925;
+ @ObfuscatedName("cu")
+ static String[] field924;
+ @ObfuscatedName("ce")
+ static String[] field916;
static {
xPadding = 0; // L: 47
loginBoxX = xPadding + 202; // L: 66
Login_loadingPercent = 10; // L: 68
Login_loadingText = ""; // L: 69
- field887 = -1; // L: 88
- field907 = 1; // L: 91
+ field897 = -1; // L: 88
+ field902 = 1; // L: 91
loginIndex = 0; // L: 95
Login_response0 = ""; // L: 96
Login_response1 = ""; // L: 97
@@ -172,11 +158,11 @@ public class Login {
Login_response3 = ""; // L: 99
Login_username = ""; // L: 100
Login_password = ""; // L: 101
- field896 = 0; // L: 103
- field876 = new String[8]; // L: 104
- field879 = false; // L: 115
- field881 = false; // L: 116
- field900 = true; // L: 119
+ field910 = 0; // L: 103
+ field911 = new String[8]; // L: 104
+ field912 = false; // L: 115
+ field913 = false; // L: 116
+ field895 = true; // L: 119
currentLoginField = 0; // L: 120
worldSelectOpen = false; // L: 124
hoveredWorldIndex = -1; // L: 132
@@ -184,9 +170,9 @@ public class Login {
worldSelectPagesCount = 0; // L: 134
new DecimalFormat("##0.00"); // L: 137
new class120();
- field883 = -1L; // L: 145
- field909 = -1L; // L: 146
- field910 = new String[]{"title.jpg"}; // L: 149
- field911 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 152
+ field923 = -1L; // L: 145
+ field925 = -1L; // L: 146
+ field924 = new String[]{"title.jpg"}; // L: 149
+ field916 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"}; // L: 152
}
}
diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java
index e306aa8ec4..b12f9e48ea 100644
--- a/runescape-client/src/main/java/LoginPacket.java
+++ b/runescape-client/src/main/java/LoginPacket.java
@@ -4,67 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jn")
+@ObfuscatedName("jx")
@Implements("LoginPacket")
-public class LoginPacket implements class261 {
- @ObfuscatedName("o")
+public class LoginPacket implements class260 {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ljn;"
+ descriptor = "Ljx;"
)
- public static final LoginPacket field3192;
+ public static final LoginPacket field3152;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Ljx;"
+ )
+ static final LoginPacket field3149;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Ljn;"
+ descriptor = "Ljx;"
)
- static final LoginPacket field3196;
- @ObfuscatedName("l")
+ public static final LoginPacket field3145;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ljn;"
+ descriptor = "Ljx;"
)
- public static final LoginPacket field3193;
- @ObfuscatedName("k")
+ public static final LoginPacket field3146;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Ljn;"
+ descriptor = "Ljx;"
)
- public static final LoginPacket field3194;
- @ObfuscatedName("a")
+ public static final LoginPacket field3147;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Ljn;"
+ descriptor = "Ljx;"
)
- public static final LoginPacket field3195;
- @ObfuscatedName("m")
+ static final LoginPacket field3148;
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Ljn;"
- )
- static final LoginPacket field3191;
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "[Ljn;"
+ descriptor = "[Ljx;"
)
@Export("LoginPacket_indexedValues")
static final LoginPacket[] LoginPacket_indexedValues;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -1526221881
+ intValue = -92535415
)
@Export("id")
public final int id;
static {
- field3192 = new LoginPacket(14, 0); // L: 5
- field3196 = new LoginPacket(15, 4); // L: 6
- field3193 = new LoginPacket(16, -2); // L: 7
- field3194 = new LoginPacket(18, -2); // L: 8
- field3195 = new LoginPacket(19, -2); // L: 9
- field3191 = new LoginPacket(27, 0); // L: 10
+ field3152 = new LoginPacket(14, 0); // L: 5
+ field3149 = new LoginPacket(15, 4); // L: 6
+ field3145 = new LoginPacket(16, -2); // L: 7
+ field3146 = new LoginPacket(18, -2); // L: 8
+ field3147 = new LoginPacket(19, -2); // L: 9
+ field3148 = new LoginPacket(27, 0); // L: 10
LoginPacket_indexedValues = new LoginPacket[32]; // L: 12
- LoginPacket[] var0 = UserList.method6607(); // L: 15
+ LoginPacket[] var0 = new LoginPacket[]{field3149, field3148, field3145, field3146, field3147, field3152}; // L: 17
+ LoginPacket[] var1 = var0; // L: 19
- for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16
- LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20
+ LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21
}
- } // L: 19
+ } // L: 23
@ObfuscatedSignature(
descriptor = "(II)V",
@@ -73,33 +74,4 @@ public class LoginPacket implements class261 {
LoginPacket(int var1, int var2) {
this.id = var1; // L: 26
} // L: 27
-
- @ObfuscatedName("l")
- public static boolean method5022(long var0) {
- return 0L != var0 && !class129.method2816(var0); // L: 52
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Lpx;B)Ljava/lang/String;",
- garbageValue = "120"
- )
- public static String method5025(Buffer var0) {
- String var1;
- try {
- int var2 = var0.readUShortSmart(); // L: 67
- if (var2 > 32767) { // L: 68
- var2 = 32767;
- }
-
- byte[] var3 = new byte[var2]; // L: 69
- var0.offset += class282.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 70
- String var4 = EnumComposition.decodeStringCp1252(var3, 0, var2); // L: 71
- var1 = var4; // L: 72
- } catch (Exception var6) { // L: 74
- var1 = "Cabbage"; // L: 75
- }
-
- return var1; // L: 78
- }
}
diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java
index 986802546a..fdcb5a7516 100644
--- a/runescape-client/src/main/java/LoginScreenAnimation.java
+++ b/runescape-client/src/main/java/LoginScreenAnimation.java
@@ -4,208 +4,214 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cc")
+@ObfuscatedName("cf")
@Implements("LoginScreenAnimation")
public class LoginScreenAnimation {
- @ObfuscatedName("o")
+ @ObfuscatedName("es")
@ObfuscatedSignature(
- descriptor = "[Lqd;"
+ descriptor = "Lnz;"
+ )
+ @Export("spriteIds")
+ static GraphicsDefaults spriteIds;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
)
@Export("sprites")
IndexedSprite[] sprites;
- @ObfuscatedName("p")
- int[] field1222;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = 60362303
- )
- int field1226;
- @ObfuscatedName("r")
- int[] field1221;
- @ObfuscatedName("v")
- int[] field1225;
- @ObfuscatedName("y")
- int[] field1224;
- @ObfuscatedName("c")
- int[] field1232;
+ @ObfuscatedName("g")
+ int[] field1234;
@ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 831623427
+ intValue = -1222340025
)
- int field1228;
- @ObfuscatedName("b")
- @ObfuscatedGetter(
- intValue = -159416635
- )
- int field1229;
+ int field1218;
+ @ObfuscatedName("y")
+ int[] field1219;
+ @ObfuscatedName("i")
+ int[] field1220;
+ @ObfuscatedName("s")
+ int[] field1217;
@ObfuscatedName("t")
- int[] field1230;
- @ObfuscatedName("g")
- int[] field1231;
- @ObfuscatedName("x")
- int[] field1236;
- @ObfuscatedName("n")
- int[] field1233;
- @ObfuscatedName("e")
+ int[] field1222;
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 1954849781
- )
- int field1234;
- @ObfuscatedName("h")
- @ObfuscatedGetter(
- intValue = -718393717
+ intValue = -592239065
)
int field1235;
- @ObfuscatedName("f")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 1681238853
+ intValue = -320519367
)
- int field1217;
+ int field1224;
+ @ObfuscatedName("u")
+ int[] field1225;
+ @ObfuscatedName("k")
+ int[] field1214;
+ @ObfuscatedName("h")
+ int[] field1233;
+ @ObfuscatedName("x")
+ int[] field1230;
+ @ObfuscatedName("l")
+ @ObfuscatedGetter(
+ intValue = -508956667
+ )
+ int field1229;
+ @ObfuscatedName("a")
+ @ObfuscatedGetter(
+ intValue = 1845848383
+ )
+ int field1226;
+ @ObfuscatedName("p")
+ @ObfuscatedGetter(
+ intValue = -744231703
+ )
+ int field1231;
@ObfuscatedSignature(
- descriptor = "([Lqd;)V"
+ descriptor = "([Lqu;)V"
)
LoginScreenAnimation(IndexedSprite[] var1) {
- this.field1222 = new int[256]; // L: 13
- this.field1226 = 0; // L: 14
- this.field1228 = 0; // L: 19
- this.field1229 = 0; // L: 20
- this.field1234 = 0; // L: 25
- this.field1235 = 0; // L: 26
- this.field1217 = 0; // L: 27
+ this.field1234 = new int[256]; // L: 13
+ this.field1218 = 0; // L: 14
+ this.field1235 = 0;
+ this.field1224 = 0; // L: 20
+ this.field1229 = 0;
+ this.field1226 = 0;
+ this.field1231 = 0;
this.sprites = var1; // L: 30
this.initColors(); // L: 31
} // L: 32
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-8569"
+ descriptor = "(B)V",
+ garbageValue = "28"
)
@Export("initColors")
void initColors() {
- this.field1225 = new int[256]; // L: 35
+ this.field1220 = new int[256]; // L: 35
int var1;
for (var1 = 0; var1 < 64; ++var1) { // L: 36
- this.field1225[var1] = var1 * 262144;
+ this.field1220[var1] = var1 * 262144;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 37
- this.field1225[var1 + 64] = var1 * 1024 + 16711680;
+ this.field1220[var1 + 64] = var1 * 1024 + 16711680;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 38
- this.field1225[var1 + 128] = var1 * 4 + 16776960;
+ this.field1220[var1 + 128] = var1 * 4 + 16776960;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 39
- this.field1225[var1 + 192] = 16777215;
+ this.field1220[var1 + 192] = 16777215;
}
- this.field1224 = new int[256]; // L: 40
+ this.field1217 = new int[256]; // L: 40
for (var1 = 0; var1 < 64; ++var1) { // L: 41
- this.field1224[var1] = var1 * 1024;
+ this.field1217[var1] = var1 * 1024;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 42
- this.field1224[var1 + 64] = var1 * 4 + 65280;
+ this.field1217[var1 + 64] = var1 * 4 + 65280;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 43
- this.field1224[var1 + 128] = var1 * 262144 + 65535;
+ this.field1217[var1 + 128] = var1 * 262144 + 65535;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 44
- this.field1224[var1 + 192] = 16777215;
+ this.field1217[var1 + 192] = 16777215;
}
- this.field1232 = new int[256]; // L: 45
+ this.field1222 = new int[256]; // L: 45
for (var1 = 0; var1 < 64; ++var1) { // L: 46
- this.field1232[var1] = var1 * 4;
+ this.field1222[var1] = var1 * 4;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 47
- this.field1232[var1 + 64] = var1 * 262144 + 255;
+ this.field1222[var1 + 64] = var1 * 262144 + 255;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 48
- this.field1232[var1 + 128] = var1 * 1024 + 16711935;
+ this.field1222[var1 + 128] = var1 * 1024 + 16711935;
}
for (var1 = 0; var1 < 64; ++var1) { // L: 49
- this.field1232[var1 + 192] = 16777215;
+ this.field1222[var1 + 192] = 16777215;
}
- this.field1221 = new int[256]; // L: 50
- this.field1234 = 0; // L: 51
- this.field1236 = new int[32768]; // L: 52
- this.field1233 = new int[32768]; // L: 53
- this.method2193((IndexedSprite)null); // L: 54
- this.field1230 = new int[32768]; // L: 55
- this.field1231 = new int[32768]; // L: 56
+ this.field1219 = new int[256]; // L: 50
+ this.field1229 = 0; // L: 51
+ this.field1233 = new int[32768]; // L: 52
+ this.field1230 = new int[32768]; // L: 53
+ this.method2215((IndexedSprite)null); // L: 54
+ this.field1225 = new int[32768]; // L: 55
+ this.field1214 = new int[32768]; // L: 56
} // L: 57
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1457219443"
+ )
+ void method2209() {
+ this.field1220 = null; // L: 60
+ this.field1217 = null; // L: 61
+ this.field1222 = null; // L: 62
+ this.field1219 = null; // L: 63
+ this.field1233 = null; // L: 64
+ this.field1230 = null; // L: 65
+ this.field1225 = null; // L: 66
+ this.field1214 = null; // L: 67
+ this.field1229 = 0; // L: 68
+ this.field1226 = 0; // L: 69
+ } // L: 70
+
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1724362438"
- )
- void method2214() {
- this.field1225 = null; // L: 60
- this.field1224 = null;
- this.field1232 = null;
- this.field1221 = null;
- this.field1236 = null;
- this.field1233 = null;
- this.field1230 = null;
- this.field1231 = null; // L: 67
- this.field1234 = 0; // L: 68
- this.field1235 = 0; // L: 69
- } // L: 70
-
- @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-1593640252"
+ garbageValue = "155264407"
)
@Export("draw")
void draw(int var1, int var2) {
- if (this.field1230 == null) { // L: 73
+ if (this.field1225 == null) { // L: 73
this.initColors(); // L: 74
}
- if (this.field1217 == 0) { // L: 76
- this.field1217 = var2; // L: 77
+ if (this.field1231 == 0) { // L: 76
+ this.field1231 = var2; // L: 77
}
- int var3 = var2 - this.field1217; // L: 79
+ int var3 = var2 - this.field1231; // L: 79
if (var3 >= 256) { // L: 80
var3 = 0;
}
- this.field1217 = var2; // L: 81
+ this.field1231 = var2; // L: 81
if (var3 > 0) { // L: 82
- this.method2189(var3); // L: 83
+ this.method2207(var3); // L: 83
}
- this.method2208(var1); // L: 85
+ this.method2213(var1); // L: 85
} // L: 86
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1193226532"
+ descriptor = "(IB)V",
+ garbageValue = "25"
)
- final void method2189(int var1) {
- this.field1234 += 128 * var1; // L: 89
+ final void method2207(int var1) {
+ this.field1229 += var1 * 128; // L: 89
int var2;
- if (this.field1234 > this.field1236.length) { // L: 90
- this.field1234 -= this.field1236.length; // L: 91
+ if (this.field1229 > this.field1233.length) { // L: 90
+ this.field1229 -= this.field1233.length; // L: 91
var2 = (int)(Math.random() * 12.0D); // L: 92
- this.method2193(this.sprites[var2]); // L: 93
+ this.method2215(this.sprites[var2]); // L: 93
}
var2 = 0; // L: 95
@@ -214,12 +220,12 @@ public class LoginScreenAnimation {
int var6;
for (int var5 = 0; var5 < var4; ++var5) { // L: 98
- var6 = this.field1230[var3 + var2] - this.field1236[var2 + this.field1234 & this.field1236.length - 1] * var1 / 6; // L: 99
+ var6 = this.field1225[var3 + var2] - this.field1233[var2 + this.field1229 & this.field1233.length - 1] * var1 / 6; // L: 99
if (var6 < 0) { // L: 100
var6 = 0;
}
- this.field1230[var2++] = var6; // L: 101
+ this.field1225[var2++] = var6; // L: 101
}
byte var15 = 10; // L: 103
@@ -233,42 +239,42 @@ public class LoginScreenAnimation {
for (int var9 = 0; var9 < 128; ++var9) { // L: 107
var10 = (int)(Math.random() * 100.0D); // L: 108
if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109
- this.field1230[var9 + var8] = 255;
+ this.field1225[var9 + var8] = 255;
} else {
- this.field1230[var9 + var8] = 0; // L: 110
+ this.field1225[var8 + var9] = 0; // L: 110
}
}
}
- if (this.field1228 > 0) { // L: 113
- this.field1228 -= var1 * 4;
+ if (this.field1235 > 0) { // L: 113
+ this.field1235 -= var1 * 4;
}
- if (this.field1229 > 0) { // L: 114
- this.field1229 -= var1 * 4;
+ if (this.field1224 > 0) { // L: 114
+ this.field1224 -= var1 * 4;
}
- if (this.field1228 == 0 && this.field1229 == 0) { // L: 115
+ if (this.field1235 == 0 && this.field1224 == 0) { // L: 115
var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116
if (var7 == 0) { // L: 117
- this.field1228 = 1024;
+ this.field1235 = 1024;
}
if (var7 == 1) { // L: 118
- this.field1229 = 1024;
+ this.field1224 = 1024;
}
}
for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120
- this.field1222[var7] = this.field1222[var7 + var1];
+ this.field1234[var7] = this.field1234[var7 + var1];
}
for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121
- this.field1222[var7] = (int)(Math.sin((double)this.field1226 / 14.0D) * 16.0D + Math.sin((double)this.field1226 / 15.0D) * 14.0D + Math.sin((double)this.field1226 / 16.0D) * 12.0D); // L: 122
- ++this.field1226; // L: 123
+ this.field1234[var7] = (int)(Math.sin((double)this.field1218 / 14.0D) * 16.0D + Math.sin((double)this.field1218 / 15.0D) * 14.0D + Math.sin((double)this.field1218 / 16.0D) * 12.0D); // L: 122
+ ++this.field1218; // L: 123
}
- this.field1235 += var1; // L: 125
+ this.field1226 += var1; // L: 125
var7 = ((Client.cycle & 1) + var1) / 2; // L: 126
if (var7 > 0) { // L: 127
short var16 = 128; // L: 128
@@ -278,13 +284,13 @@ public class LoginScreenAnimation {
int var11;
int var12;
int var13;
- for (var11 = 0; var11 < this.field1235 * 100; ++var11) { // L: 131
+ for (var11 = 0; var11 < this.field1226 * 100; ++var11) { // L: 131
var12 = (int)(Math.random() * (double)var10) + var17; // L: 132
var13 = (int)(Math.random() * (double)var16) + var16; // L: 133
- this.field1230[var12 + (var13 << 7)] = 192; // L: 134
+ this.field1225[var12 + (var13 << 7)] = 192; // L: 134
}
- this.field1235 = 0; // L: 136
+ this.field1226 = 0; // L: 136
int var14;
for (var11 = 0; var11 < 256; ++var11) { // L: 137
@@ -293,15 +299,15 @@ public class LoginScreenAnimation {
for (var14 = -var7; var14 < 128; ++var14) { // L: 140
if (var14 + var7 < 128) { // L: 141
- var12 += this.field1230[var13 + var14 + var7];
+ var12 += this.field1225[var7 + var13 + var14];
}
if (var14 - (var7 + 1) >= 0) { // L: 142
- var12 -= this.field1230[var14 + var13 - (var7 + 1)];
+ var12 -= this.field1225[var13 + var14 - (var7 + 1)];
}
if (var14 >= 0) { // L: 143
- this.field1231[var13 + var14] = var12 / (var7 * 2 + 1);
+ this.field1214[var13 + var14] = var12 / (var7 * 2 + 1);
}
}
}
@@ -312,15 +318,15 @@ public class LoginScreenAnimation {
for (var13 = -var7; var13 < 256; ++var13) { // L: 148
var14 = var13 * 128; // L: 149
if (var7 + var13 < 256) { // L: 150
- var12 += this.field1231[var11 + var14 + var7 * 128];
+ var12 += this.field1214[var11 + var14 + var7 * 128];
}
if (var13 - (var7 + 1) >= 0) { // L: 151
- var12 -= this.field1231[var14 + var11 - (var7 + 1) * 128];
+ var12 -= this.field1214[var14 + var11 - (var7 + 1) * 128];
}
if (var13 >= 0) { // L: 152
- this.field1230[var14 + var11] = var12 / (var7 * 2 + 1);
+ this.field1225[var14 + var11] = var12 / (var7 * 2 + 1);
}
}
}
@@ -328,66 +334,66 @@ public class LoginScreenAnimation {
} // L: 156
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(IIIS)I",
- garbageValue = "22355"
+ descriptor = "(IIII)I",
+ garbageValue = "80511097"
)
- final int method2190(int var1, int var2, int var3) {
+ final int method2212(int var1, int var2, int var3) {
int var4 = 256 - var3; // L: 159
return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(IB)V",
- garbageValue = "43"
+ garbageValue = "-53"
)
- final void method2208(int var1) {
- int var2 = this.field1221.length; // L: 164
- if (this.field1228 > 0) { // L: 165
- this.method2191(this.field1228, this.field1224); // L: 166
- } else if (this.field1229 > 0) { // L: 168
- this.method2191(this.field1229, this.field1232); // L: 169
+ final void method2213(int var1) {
+ int var2 = this.field1219.length; // L: 164
+ if (this.field1235 > 0) { // L: 165
+ this.method2224(this.field1235, this.field1217); // L: 166
+ } else if (this.field1224 > 0) { // L: 168
+ this.method2224(this.field1224, this.field1222); // L: 169
} else {
for (int var3 = 0; var3 < var2; ++var3) { // L: 172
- this.field1221[var3] = this.field1225[var3];
+ this.field1219[var3] = this.field1220[var3];
}
}
- this.method2187(var1); // L: 174
+ this.method2214(var1); // L: 174
} // L: 175
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I[IB)V",
- garbageValue = "1"
+ descriptor = "(I[II)V",
+ garbageValue = "-1744378164"
)
- final void method2191(int var1, int[] var2) {
- int var3 = this.field1221.length; // L: 178
+ final void method2224(int var1, int[] var2) {
+ int var3 = this.field1219.length; // L: 178
for (int var4 = 0; var4 < var3; ++var4) { // L: 179
if (var1 > 768) { // L: 180
- this.field1221[var4] = this.method2190(this.field1225[var4], var2[var4], 1024 - var1);
+ this.field1219[var4] = this.method2212(this.field1220[var4], var2[var4], 1024 - var1);
} else if (var1 > 256) {
- this.field1221[var4] = var2[var4]; // L: 181
+ this.field1219[var4] = var2[var4]; // L: 181
} else {
- this.field1221[var4] = this.method2190(var2[var4], this.field1225[var4], 256 - var1); // L: 182
+ this.field1219[var4] = this.method2212(var2[var4], this.field1220[var4], 256 - var1); // L: 182
}
}
} // L: 184
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "569365785"
+ descriptor = "(IB)V",
+ garbageValue = "-72"
)
- final void method2187(int var1) {
+ final void method2214(int var1) {
int var2 = 0; // L: 187
for (int var3 = 1; var3 < 255; ++var3) { // L: 188
- int var4 = (256 - var3) * this.field1222[var3] / 256; // L: 189
+ int var4 = (256 - var3) * this.field1234[var3] / 256; // L: 189
int var5 = var4 + var1; // L: 190
int var6 = 0; // L: 191
int var7 = 128; // L: 192
@@ -396,22 +402,22 @@ public class LoginScreenAnimation {
var5 = 0; // L: 195
}
- if (var5 + 128 >= DevicePcmPlayerProvider.rasterProvider.width) { // L: 197
- var7 = DevicePcmPlayerProvider.rasterProvider.width - var5; // L: 198
+ if (var5 + 128 >= Message.rasterProvider.width) { // L: 197
+ var7 = Message.rasterProvider.width - var5; // L: 198
}
- int var8 = var5 + (var3 + 8) * DevicePcmPlayerProvider.rasterProvider.width; // L: 200
+ int var8 = var5 + (var3 + 8) * Message.rasterProvider.width; // L: 200
var2 += var6; // L: 201
for (int var9 = var6; var9 < var7; ++var9) { // L: 202
- int var10 = this.field1230[var2++]; // L: 203
+ int var10 = this.field1225[var2++]; // L: 203
int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204
if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205
int var12 = var10; // L: 206
int var13 = 256 - var10; // L: 207
- var10 = this.field1221[var10]; // L: 208
- int var14 = DevicePcmPlayerProvider.rasterProvider.pixels[var8]; // L: 209
- DevicePcmPlayerProvider.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; // L: 210
+ var10 = this.field1219[var10]; // L: 208
+ int var14 = Message.rasterProvider.pixels[var8]; // L: 209
+ Message.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; // L: 210
} else {
++var8; // L: 212
}
@@ -422,21 +428,21 @@ public class LoginScreenAnimation {
} // L: 216
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Lqd;I)V",
- garbageValue = "1942415753"
+ descriptor = "(Lqu;I)V",
+ garbageValue = "1412465779"
)
- final void method2193(IndexedSprite var1) {
+ final void method2215(IndexedSprite var1) {
int var2;
- for (var2 = 0; var2 < this.field1236.length; ++var2) { // L: 219
- this.field1236[var2] = 0;
+ for (var2 = 0; var2 < this.field1233.length; ++var2) { // L: 219
+ this.field1233[var2] = 0;
}
int var3;
for (var2 = 0; var2 < 5000; ++var2) { // L: 220
var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221
- this.field1236[var3] = (int)(Math.random() * 256.0D); // L: 222
+ this.field1233[var3] = (int)(Math.random() * 256.0D); // L: 222
}
int var4;
@@ -445,13 +451,13 @@ public class LoginScreenAnimation {
for (var3 = 1; var3 < 255; ++var3) { // L: 225
for (var4 = 1; var4 < 127; ++var4) { // L: 226
var5 = var4 + (var3 << 7); // L: 227
- this.field1233[var5] = (this.field1236[var5 + 128] + this.field1236[var5 - 128] + this.field1236[var5 + 1] + this.field1236[var5 - 1]) / 4; // L: 228
+ this.field1230[var5] = (this.field1233[var5 + 128] + this.field1233[var5 - 128] + this.field1233[var5 + 1] + this.field1233[var5 - 1]) / 4; // L: 228
}
}
- int[] var8 = this.field1236; // L: 231
- this.field1236 = this.field1233; // L: 232
- this.field1233 = var8; // L: 233
+ int[] var8 = this.field1233; // L: 231
+ this.field1233 = this.field1230; // L: 232
+ this.field1230 = var8; // L: 233
}
if (var1 != null) { // L: 235
@@ -463,7 +469,7 @@ public class LoginScreenAnimation {
var5 = var4 + var1.xOffset + 16; // L: 240
int var6 = var3 + var1.yOffset + 16; // L: 241
int var7 = var5 + (var6 << 7); // L: 242
- this.field1236[var7] = 0; // L: 243
+ this.field1233[var7] = 0; // L: 243
}
}
}
@@ -471,16 +477,42 @@ public class LoginScreenAnimation {
} // L: 248
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "27409"
+ descriptor = "(Lqt;Lpb;I)Lpb;",
+ garbageValue = "-633051511"
)
- static void method2217() {
- ByteArrayPool.field4212.clear(); // L: 61
- ByteArrayPool.field4212.add(100); // L: 62
- ByteArrayPool.field4212.add(5000); // L: 63
- ByteArrayPool.field4212.add(10000); // L: 64
- ByteArrayPool.field4212.add(30000); // L: 65
- } // L: 66
+ @Export("readStringIntParameters")
+ static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
+ int var2 = var0.readUnsignedByte(); // L: 16
+ int var3;
+ if (var1 == null) {
+ var3 = class135.method2910(var2);
+ var1 = new IterableNodeHashTable(var3); // L: 19
+ }
+
+ for (var3 = 0; var3 < var2; ++var3) { // L: 21
+ boolean var4 = var0.readUnsignedByte() == 1; // L: 22
+ int var5 = var0.readMedium(); // L: 23
+ Object var6;
+ if (var4) { // L: 25
+ var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
+ } else {
+ var6 = new IntegerNode(var0.readInt()); // L: 26
+ }
+
+ var1.put((Node)var6, (long)var5); // L: 27
+ }
+
+ return var1; // L: 29
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;I)V",
+ garbageValue = "281700141"
+ )
+ public static void method2233(AbstractArchive var0) {
+ InvDefinition.InvDefinition_archive = var0; // L: 17
+ } // L: 18
}
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index 60ee08361b..6e843d9696 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -4,91 +4,191 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pj")
+@ObfuscatedName("pe")
@Implements("LoginType")
public class LoginType {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
@Export("oldscape")
public static final LoginType oldscape;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lpj;"
- )
- static final LoginType field4612;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lpj;"
- )
- static final LoginType field4610;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lpj;"
- )
- static final LoginType field4615;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
static final LoginType field4611;
- @ObfuscatedName("m")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
- static final LoginType field4613;
- @ObfuscatedName("p")
+ static final LoginType field4615;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
- static final LoginType field4614;
- @ObfuscatedName("s")
+ static final LoginType field4612;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
static final LoginType field4609;
- @ObfuscatedName("r")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "Lpe;"
)
- public static final LoginType field4616;
- @ObfuscatedName("gl")
- static int[] field4619;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = 2054125157
+ static final LoginType field4614;
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Lpe;"
)
- final int field4617;
+ static final LoginType field4613;
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "Lpe;"
+ )
+ static final LoginType field4617;
@ObfuscatedName("y")
- final String field4618;
+ @ObfuscatedSignature(
+ descriptor = "Lpe;"
+ )
+ public static final LoginType field4620;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = 217368977
+ )
+ final int field4618;
+ @ObfuscatedName("s")
+ final String field4619;
static {
- oldscape = new LoginType(3, 0, "", ""); // L: 5
- field4612 = new LoginType(1, 1, "", ""); // L: 6
- field4610 = new LoginType(2, 2, "", ""); // L: 7
- field4615 = new LoginType(4, 3, "", ""); // L: 8
- field4611 = new LoginType(6, 4, "", ""); // L: 9
- field4613 = new LoginType(0, 5, "", ""); // L: 10
- field4614 = new LoginType(8, 6, "", ""); // L: 11
- field4609 = new LoginType(7, 7, "", ""); // L: 12
- field4616 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4612, field4610, field4611, field4615}); // L: 13
+ oldscape = new LoginType(7, 0, "", ""); // L: 5
+ field4611 = new LoginType(5, 1, "", ""); // L: 6
+ field4615 = new LoginType(8, 2, "", ""); // L: 7
+ field4612 = new LoginType(0, 3, "", ""); // L: 8
+ field4609 = new LoginType(2, 4, "", ""); // L: 9
+ field4614 = new LoginType(4, 5, "", ""); // L: 10
+ field4613 = new LoginType(6, 6, "", ""); // L: 11
+ field4617 = new LoginType(1, 7, "", ""); // L: 12
+ field4620 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4611, field4615, field4609, field4612}); // L: 13
}
LoginType(int var1, int var2, String var3, String var4) {
- this.field4617 = var1; // L: 18
- this.field4618 = var4; // L: 19
+ this.field4618 = var1; // L: 18
+ this.field4619 = var4; // L: 19
} // L: 20
@ObfuscatedSignature(
- descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpj;)V"
+ descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lpe;)V"
)
LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) {
- this.field4617 = var1; // L: 23
- this.field4618 = var4; // L: 24
+ this.field4618 = var1; // L: 23
+ this.field4619 = var4; // L: 24
} // L: 25
public String toString() {
- return this.field4618; // L: 29
+ return this.field4619; // L: 29
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Lnk;FFFI)F",
+ garbageValue = "343733515"
+ )
+ static float method7453(class389 var0, float var1, float var2, float var3) {
+ float var4 = FileSystem.method3281(var0.field4415, var0.field4414, var1); // L: 116
+ if (Math.abs(var4) < class114.field1429) { // L: 117
+ return var1;
+ } else {
+ float var5 = FileSystem.method3281(var0.field4415, var0.field4414, var2); // L: 118
+ if (Math.abs(var5) < class114.field1429) { // L: 119
+ return var2;
+ } else {
+ float var6 = 0.0F; // L: 120
+ float var7 = 0.0F; // L: 121
+ float var8 = 0.0F; // L: 122
+ float var13 = 0.0F; // L: 127
+ boolean var14 = true; // L: 128
+ boolean var15 = false; // L: 129
+
+ do {
+ var15 = false; // L: 131
+ if (var14) { // L: 132
+ var6 = var1; // L: 133
+ var13 = var4; // L: 134
+ var7 = var2 - var1; // L: 135
+ var8 = var7; // L: 136
+ var14 = false; // L: 137
+ }
+
+ if (Math.abs(var13) < Math.abs(var5)) { // L: 139
+ var1 = var2; // L: 140
+ var2 = var6; // L: 141
+ var6 = var1; // L: 142
+ var4 = var5; // L: 143
+ var5 = var13; // L: 144
+ var13 = var4; // L: 145
+ }
+
+ float var16 = class114.field1432 * Math.abs(var2) + 0.5F * var3; // L: 147
+ float var17 = 0.5F * (var6 - var2); // L: 148
+ boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149
+ if (var18) { // L: 150
+ if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151
+ float var12 = var5 / var4; // L: 156
+ float var9;
+ float var10;
+ if (var6 == var1) { // L: 157
+ var9 = 2.0F * var17 * var12; // L: 158
+ var10 = 1.0F - var12; // L: 159
+ } else {
+ var10 = var4 / var13; // L: 162
+ float var11 = var5 / var13; // L: 163
+ var9 = ((var10 - var11) * 2.0F * var17 * var10 - (var2 - var1) * (var11 - 1.0F)) * var12; // L: 164
+ var10 = (var12 - 1.0F) * (var10 - 1.0F) * (var11 - 1.0F); // L: 165
+ }
+
+ if ((double)var9 > 0.0D) { // L: 167
+ var10 = -var10;
+ } else {
+ var9 = -var9; // L: 168
+ }
+
+ var12 = var8; // L: 169
+ var8 = var7; // L: 170
+ if (2.0F * var9 < var10 * 3.0F * var17 - Math.abs(var16 * var10) && var9 < Math.abs(var10 * var12 * 0.5F)) { // L: 171
+ var7 = var9 / var10; // L: 172
+ } else {
+ var7 = var17; // L: 175
+ var8 = var17; // L: 176
+ }
+ } else {
+ var7 = var17; // L: 152
+ var8 = var17; // L: 153
+ }
+
+ var1 = var2; // L: 179
+ var4 = var5; // L: 180
+ if (Math.abs(var7) > var16) { // L: 181
+ var2 += var7;
+ } else if ((double)var17 > 0.0D) { // L: 182
+ var2 += var16;
+ } else {
+ var2 -= var16; // L: 183
+ }
+
+ var5 = FileSystem.method3281(var0.field4415, var0.field4414, var2); // L: 184
+ if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185
+ var14 = true; // L: 186
+ var15 = true; // L: 187
+ } else {
+ var15 = true; // L: 190
+ }
+ }
+ } while(var15);
+
+ return var2; // L: 194
+ }
+ }
}
}
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index 2a140533eb..2e5d9f06cd 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -4,48 +4,103 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bv")
+@ObfuscatedName("bk")
@Implements("MenuAction")
public class MenuAction {
- @ObfuscatedName("b")
- static int[] field866;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 912945925
+ intValue = -513159761
)
@Export("param0")
int param0;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1803529141
+ intValue = 312244153
)
@Export("param1")
int param1;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1012533909
+ intValue = 1134197845
)
@Export("opcode")
int opcode;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1732693837
+ intValue = 59405457
)
@Export("identifier")
int identifier;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("action")
String action;
MenuAction() {
- } // L: 12749
+ } // L: 12524
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "32"
+ descriptor = "(S)Lny;",
+ garbageValue = "24881"
)
- public static boolean method1880(int var0, int var1) {
- return (var0 >> var1 + 1 & 1) != 0; // L: 9
+ public static class387 method1884() {
+ synchronized(class387.field4393) { // L: 25
+ if (class387.field4395 == 0) { // L: 26
+ return new class387();
+ } else {
+ class387.field4393[--class387.field4395].method6956(); // L: 28
+ return class387.field4393[class387.field4395]; // L: 29
+ }
+ }
}
+
+ @ObfuscatedName("gi")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IIS)V",
+ garbageValue = "4254"
+ )
+ @Export("checkIfMinimapClicked")
+ static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
+ if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3856
+ if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3857
+ SpriteMask var3 = var0.getSpriteMask(true); // L: 3858
+ if (var3 == null) { // L: 3859
+ return;
+ }
+
+ int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3860
+ int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3861
+ if (var3.contains(var4, var5)) { // L: 3862
+ var4 -= var3.width / 2; // L: 3863
+ var5 -= var3.height / 2; // L: 3864
+ int var6 = Client.camAngleY & 2047; // L: 3865
+ int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3866
+ int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3867
+ int var9 = var8 * var4 + var5 * var7 >> 11; // L: 3868
+ int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3869
+ int var11 = var9 + class101.localPlayer.x >> 7; // L: 3870
+ int var12 = class101.localPlayer.y - var10 >> 7; // L: 3871
+ PacketBufferNode var13 = EnumComposition.getPacketBufferNode(ClientPacket.field2913, Client.packetWriter.isaacCipher); // L: 3873
+ var13.packetBuffer.writeByte(18); // L: 3874
+ var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3875
+ var13.packetBuffer.writeShort(var11 + class28.baseX); // L: 3876
+ var13.packetBuffer.writeIntME(var12 + WorldMapLabelSize.baseY); // L: 3877
+ var13.packetBuffer.writeByte(var4); // L: 3878
+ var13.packetBuffer.writeByte(var5); // L: 3879
+ var13.packetBuffer.writeShort(Client.camAngleY); // L: 3880
+ var13.packetBuffer.writeByte(57); // L: 3881
+ var13.packetBuffer.writeByte(0); // L: 3882
+ var13.packetBuffer.writeByte(0); // L: 3883
+ var13.packetBuffer.writeByte(89); // L: 3884
+ var13.packetBuffer.writeShort(class101.localPlayer.x); // L: 3885
+ var13.packetBuffer.writeShort(class101.localPlayer.y); // L: 3886
+ var13.packetBuffer.writeByte(63); // L: 3887
+ Client.packetWriter.addNode(var13); // L: 3888
+ Client.destinationX = var11; // L: 3889
+ Client.destinationY = var12; // L: 3890
+ }
+ }
+
+ }
+ } // L: 3893
}
diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java
index 9bad81829f..4c7c821b75 100644
--- a/runescape-client/src/main/java/Message.java
+++ b/runescape-client/src/main/java/Message.java
@@ -4,105 +4,111 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bo")
+@ObfuscatedName("br")
@Implements("Message")
public class Message extends DualNode {
- @ObfuscatedName("tj")
- @ObfuscatedGetter(
- intValue = -126703041
- )
- static int field469;
- @ObfuscatedName("ec")
+ @ObfuscatedName("at")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Lqn;"
)
- @Export("archive5")
- static Archive archive5;
- @ObfuscatedName("o")
+ @Export("rasterProvider")
+ public static AbstractRasterProvider rasterProvider;
+ @ObfuscatedName("gb")
+ @ObfuscatedSignature(
+ descriptor = "Lnl;"
+ )
+ static AbstractSocket field461;
+ @ObfuscatedName("if")
+ @ObfuscatedSignature(
+ descriptor = "[Lqe;"
+ )
+ @Export("headIconPkSprites")
+ static SpritePixels[] headIconPkSprites;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 2133469117
+ intValue = 169965093
)
@Export("count")
int count;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1640607835
+ intValue = -1756063821
)
@Export("cycle")
int cycle;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1762197281
+ intValue = -163656379
)
@Export("type")
int type;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("sender")
String sender;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lqv;"
+ descriptor = "Lqa;"
)
@Export("senderUsername")
Username senderUsername;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("isFromFriend0")
TriBool isFromFriend0;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("isFromIgnored0")
TriBool isFromIgnored0;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("prefix")
String prefix;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("text")
String text;
Message(int var1, String var2, String var3, String var4) {
this.isFromFriend0 = TriBool.TriBool_unknown; // L: 13
- this.isFromIgnored0 = TriBool.TriBool_unknown;
+ this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 14
this.set(var1, var2, var3, var4); // L: 19
} // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
- garbageValue = "1537190698"
+ descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V",
+ garbageValue = "18718"
)
@Export("set")
void set(int var1, String var2, String var3, String var4) {
int var5 = ++Messages.Messages_count - 1; // L: 25
this.count = var5; // L: 27
- this.cycle = Client.cycle;
- this.type = var1;
- this.sender = var2;
- this.fillSenderUsername();
- this.prefix = var3;
- this.text = var4;
- this.clearIsFromFriend();
- this.clearIsFromIgnored();
+ this.cycle = Client.cycle; // L: 28
+ this.type = var1; // L: 29
+ this.sender = var2; // L: 30
+ this.fillSenderUsername(); // L: 31
+ this.prefix = var3; // L: 32
+ this.text = var4; // L: 33
+ this.clearIsFromFriend(); // L: 34
+ this.clearIsFromIgnored(); // L: 35
} // L: 36
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1779773713"
+ garbageValue = "2124874138"
)
@Export("clearIsFromFriend")
void clearIsFromFriend() {
this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39
} // L: 40
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "61"
+ descriptor = "(I)Z",
+ garbageValue = "1551662577"
)
@Export("isFromFriend")
final boolean isFromFriend() {
@@ -113,30 +119,30 @@ public class Message extends DualNode {
return this.isFromFriend0 == TriBool.TriBool_true; // L: 46
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "402871861"
+ garbageValue = "1419615044"
)
@Export("fillIsFromFriend")
void fillIsFromFriend() {
- this.isFromFriend0 = BufferedSource.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50
+ this.isFromFriend0 = Player.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50
} // L: 51
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-87"
+ descriptor = "(I)V",
+ garbageValue = "2083952991"
)
@Export("clearIsFromIgnored")
void clearIsFromIgnored() {
this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54
} // L: 55
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1909676695"
+ descriptor = "(B)Z",
+ garbageValue = "13"
)
@Export("isFromIgnored")
final boolean isFromIgnored() {
@@ -147,74 +153,72 @@ public class Message extends DualNode {
return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1418350386"
+ garbageValue = "-1213016043"
)
@Export("fillIsFromIgnored")
void fillIsFromIgnored() {
- this.isFromIgnored0 = BufferedSource.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65
+ this.isFromIgnored0 = Player.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65
} // L: 66
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "604155557"
+ garbageValue = "-470307536"
)
@Export("fillSenderUsername")
final void fillSenderUsername() {
- if (this.sender != null) { // L: 69
- this.senderUsername = new Username(class150.method3026(this.sender), class391.loginType);
+ if (this.sender != null) {
+ this.senderUsername = new Username(class92.method2388(this.sender), HealthBarDefinition.loginType); // L: 69
} else {
this.senderUsername = null; // L: 70
}
} // L: 71
- @ObfuscatedName("o")
+ @ObfuscatedName("kx")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "786721157"
+ descriptor = "(Lkb;I)Z",
+ garbageValue = "1375784000"
)
- static int method1079(int var0, int var1) {
- ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14
- if (var2 == null) { // L: 15
- return -1;
+ static final boolean method1065(Widget var0) {
+ int var1 = var0.contentType; // L: 12043
+ if (var1 == 205) { // L: 12044
+ Client.logoutTimer = 250; // L: 12045
+ return true; // L: 12046
} else {
- return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17
- }
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)Lgi;",
- garbageValue = "-1137848227"
- )
- public static FloorOverlayDefinition method1098(int var0) {
- FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 28
- if (var1 != null) { // L: 29
- return var1;
- } else {
- byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 30
- var1 = new FloorOverlayDefinition(); // L: 31
- if (var2 != null) { // L: 32
- var1.decode(new Buffer(var2), var0);
+ int var2;
+ int var3;
+ if (var1 >= 300 && var1 <= 313) { // L: 12048
+ var2 = (var1 - 300) / 2; // L: 12049
+ var3 = var1 & 1; // L: 12050
+ Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12051
}
- var1.postDecode(); // L: 33
- FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 34
- return var1; // L: 35
+ if (var1 >= 314 && var1 <= 323) { // L: 12053
+ var2 = (var1 - 314) / 2; // L: 12054
+ var3 = var1 & 1; // L: 12055
+ Client.playerAppearance.method5573(var2, var3 == 1); // L: 12056
+ }
+
+ if (var1 == 324) { // L: 12058
+ Client.playerAppearance.changeSex(false);
+ }
+
+ if (var1 == 325) { // L: 12059
+ Client.playerAppearance.changeSex(true);
+ }
+
+ if (var1 == 326) { // L: 12060
+ PacketBufferNode var4 = EnumComposition.getPacketBufferNode(ClientPacket.field3010, Client.packetWriter.isaacCipher); // L: 12062
+ Client.playerAppearance.write(var4.packetBuffer); // L: 12063
+ Client.packetWriter.addNode(var4); // L: 12064
+ return true; // L: 12065
+ } else {
+ return false; // L: 12067
+ }
}
}
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(IZI)Ljava/lang/String;",
- garbageValue = "15280176"
- )
- @Export("intToString")
- public static String intToString(int var0, boolean var1) {
- return var1 && var0 >= 0 ? class152.method3046(var0, 10, var1) : Integer.toString(var0); // L: 106 107
- }
}
diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java
index 859a6410da..41dc64a52a 100644
--- a/runescape-client/src/main/java/Messages.java
+++ b/runescape-client/src/main/java/Messages.java
@@ -6,31 +6,36 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@Deprecated
-@ObfuscatedName("ch")
+@ObfuscatedName("cb")
@Implements("Messages")
public class Messages {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("Messages_channels")
static final Map Messages_channels;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("Messages_hashTable")
static final IterableNodeHashTable Messages_hashTable;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lma;"
+ descriptor = "Lmh;"
)
@Export("Messages_queue")
static final IterableDualNodeQueue Messages_queue;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -501470971
+ intValue = 2048371745
)
@Export("Messages_count")
static int Messages_count;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = 46362835
+ )
+ @Export("gameCyclesToDo")
+ static int gameCyclesToDo;
static {
Messages_channels = new HashMap(); // L: 9
@@ -38,4 +43,115 @@ public class Messages {
Messages_queue = new IterableDualNodeQueue(); // L: 11
Messages_count = 0; // L: 12
}
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-472438759"
+ )
+ @Export("iLog")
+ public static int iLog(int var0) {
+ int var1 = 0; // L: 60
+ if (var0 < 0 || var0 >= 65536) { // L: 61
+ var0 >>>= 16; // L: 62
+ var1 += 16; // L: 63
+ }
+
+ if (var0 >= 256) { // L: 65
+ var0 >>>= 8; // L: 66
+ var1 += 8; // L: 67
+ }
+
+ if (var0 >= 16) { // L: 69
+ var0 >>>= 4; // L: 70
+ var1 += 4; // L: 71
+ }
+
+ if (var0 >= 4) { // L: 73
+ var0 >>>= 2; // L: 74
+ var1 += 2; // L: 75
+ }
+
+ if (var0 >= 1) { // L: 77
+ var0 >>>= 1; // L: 78
+ ++var1; // L: 79
+ }
+
+ return var0 + var1; // L: 81
+ }
+
+ @ObfuscatedName("gf")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-587731325"
+ )
+ static final void method2494() {
+ if (Client.field725 != PacketWriter.Client_plane) { // L: 3807
+ Client.field725 = PacketWriter.Client_plane; // L: 3808
+ int var0 = PacketWriter.Client_plane; // L: 3809
+ int[] var1 = FloorUnderlayDefinition.sceneMinimapSprite.pixels; // L: 3811
+ int var2 = var1.length; // L: 3812
+
+ int var3;
+ for (var3 = 0; var3 < var2; ++var3) { // L: 3813
+ var1[var3] = 0;
+ }
+
+ int var4;
+ int var5;
+ for (var3 = 1; var3 < 103; ++var3) { // L: 3814
+ var4 = (103 - var3) * 2048 + 24628; // L: 3815
+
+ for (var5 = 1; var5 < 103; ++var5) { // L: 3816
+ if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 3817
+ class356.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
+ }
+
+ if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
+ class356.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); // L: 3818
+ }
+
+ var4 += 4; // L: 3819
+ }
+ }
+
+ var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3822
+ var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3823
+ FloorUnderlayDefinition.sceneMinimapSprite.setRaster(); // L: 3824
+
+ int var6;
+ for (var5 = 1; var5 < 103; ++var5) { // L: 3825
+ for (var6 = 1; var6 < 103; ++var6) { // L: 3826
+ if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 3827
+ Decimator.drawObject(var0, var6, var5, var3, var4);
+ }
+
+ if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 3828
+ Decimator.drawObject(var0 + 1, var6, var5, var3, var4);
+ }
+ }
+ }
+
+ Client.mapIconCount = 0; // L: 3831
+
+ for (var5 = 0; var5 < 104; ++var5) { // L: 3832
+ for (var6 = 0; var6 < 104; ++var6) { // L: 3833
+ long var7 = class356.scene.getFloorDecorationTag(PacketWriter.Client_plane, var5, var6); // L: 3834
+ if (0L != var7) { // L: 3835
+ int var9 = Decimator.Entity_unpackID(var7); // L: 3836
+ int var10 = class162.getObjectDefinition(var9).mapIconId; // L: 3837
+ if (var10 >= 0 && class432.WorldMapElement_get(var10).field1837) { // L: 3838 3839
+ Client.mapIcons[Client.mapIconCount] = class432.WorldMapElement_get(var10).getSpriteBool(false); // L: 3842
+ Client.mapIconXs[Client.mapIconCount] = var5; // L: 3843
+ Client.mapIconYs[Client.mapIconCount] = var6; // L: 3844
+ ++Client.mapIconCount; // L: 3845
+ }
+ }
+ }
+ }
+
+ Message.rasterProvider.apply(); // L: 3850
+ }
+
+ } // L: 3853
}
diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java
index e211e7fb35..8e8ffc36bc 100644
--- a/runescape-client/src/main/java/MidiFileReader.java
+++ b/runescape-client/src/main/java/MidiFileReader.java
@@ -6,35 +6,35 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("je")
@Implements("MidiFileReader")
public class MidiFileReader {
- @ObfuscatedName("v")
- static final byte[] field3280;
- @ObfuscatedName("o")
+ @ObfuscatedName("i")
+ static final byte[] field3233;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "Lqt;"
)
@Export("buffer")
Buffer buffer;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("division")
int division;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("trackStarts")
int[] trackStarts;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("trackPositions")
int[] trackPositions;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("trackLengths")
int[] trackLengths;
- @ObfuscatedName("m")
- int[] field3276;
- @ObfuscatedName("p")
- int field3281;
- @ObfuscatedName("r")
- long field3279;
+ @ObfuscatedName("e")
+ int[] field3238;
+ @ObfuscatedName("g")
+ int field3239;
+ @ObfuscatedName("y")
+ long field3241;
static {
- field3280 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17
+ field3233 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17
}
MidiFileReader(byte[] var1) {
@@ -46,14 +46,14 @@ public class MidiFileReader {
this.buffer = new Buffer((byte[])null); // L: 8
} // L: 23
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("parse")
void parse(byte[] var1) {
this.buffer.array = var1; // L: 30
this.buffer.offset = 10; // L: 33
int var2 = this.buffer.readUnsignedShort(); // L: 34
this.division = this.buffer.readUnsignedShort(); // L: 36
- this.field3281 = 500000; // L: 37
+ this.field3239 = 500000; // L: 37
this.trackStarts = new int[var2]; // L: 38
Buffer var10000;
@@ -70,7 +70,7 @@ public class MidiFileReader {
var10000 = this.buffer; // L: 46
}
- this.field3279 = 0L; // L: 48
+ this.field3241 = 0L; // L: 48
this.trackPositions = new int[var2]; // L: 49
for (var3 = 0; var3 < var2; ++var3) { // L: 50
@@ -78,50 +78,50 @@ public class MidiFileReader {
}
this.trackLengths = new int[var2]; // L: 51
- this.field3276 = new int[var2]; // L: 52
+ this.field3238 = new int[var2]; // L: 52
} // L: 53
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("clear")
void clear() {
this.buffer.array = null; // L: 56
this.trackStarts = null; // L: 57
this.trackPositions = null; // L: 58
this.trackLengths = null; // L: 59
- this.field3276 = null; // L: 60
+ this.field3238 = null; // L: 60
} // L: 61
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("isReady")
boolean isReady() {
return this.buffer.array != null; // L: 64
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("trackCount")
int trackCount() {
return this.trackPositions.length; // L: 68
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("gotoTrack")
void gotoTrack(int var1) {
this.buffer.offset = this.trackPositions[var1]; // L: 72
} // L: 73
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("markTrackPosition")
void markTrackPosition(int var1) {
this.trackPositions[var1] = this.buffer.offset; // L: 76
} // L: 77
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("setTrackDone")
void setTrackDone() {
this.buffer.offset = -1; // L: 80
} // L: 81
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("readTrackLength")
void readTrackLength(int var1) {
int var2 = this.buffer.readVarInt(); // L: 84
@@ -129,36 +129,36 @@ public class MidiFileReader {
var10000[var1] += var2; // L: 85
} // L: 86
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("readMessage")
int readMessage(int var1) {
int var2 = this.readMessage0(var1); // L: 89
return var2; // L: 90
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("readMessage0")
int readMessage0(int var1) {
byte var2 = this.buffer.array[this.buffer.offset]; // L: 94
int var5;
if (var2 < 0) { // L: 95
var5 = var2 & 255; // L: 96
- this.field3276[var1] = var5; // L: 97
+ this.field3238[var1] = var5; // L: 97
++this.buffer.offset; // L: 98
} else {
- var5 = this.field3276[var1]; // L: 101
+ var5 = this.field3238[var1]; // L: 101
}
if (var5 != 240 && var5 != 247) { // L: 103
- return this.method5221(var1, var5); // L: 116
+ return this.method5386(var1, var5); // L: 116
} else {
int var3 = this.buffer.readVarInt(); // L: 104
if (var5 == 247 && var3 > 0) { // L: 105
int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106
if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107
++this.buffer.offset; // L: 108
- this.field3276[var1] = var4; // L: 109
- return this.method5221(var1, var4); // L: 110
+ this.field3238[var1] = var4; // L: 109
+ return this.method5386(var1, var4); // L: 110
}
}
@@ -168,8 +168,8 @@ public class MidiFileReader {
}
}
- @ObfuscatedName("y")
- int method5221(int var1, int var2) {
+ @ObfuscatedName("s")
+ int method5386(int var1, int var2) {
int var4;
if (var2 == 255) { // L: 120
int var7 = this.buffer.readUnsignedByte(); // L: 121
@@ -183,8 +183,8 @@ public class MidiFileReader {
int var5 = this.buffer.readMedium(); // L: 128
var4 -= 3; // L: 129
int var6 = this.trackLengths[var1]; // L: 130
- this.field3279 += (long)var6 * (long)(this.field3281 - var5); // L: 131
- this.field3281 = var5; // L: 132
+ this.field3241 += (long)var6 * (long)(this.field3239 - var5); // L: 131
+ this.field3239 = var5; // L: 132
var10000 = this.buffer; // L: 133
var10000.offset += var4;
return 2; // L: 134
@@ -194,7 +194,7 @@ public class MidiFileReader {
return 3; // L: 137
}
} else {
- byte var3 = field3280[var2 - 128]; // L: 139
+ byte var3 = field3233[var2 - 128]; // L: 139
var4 = var2; // L: 140
if (var3 >= 1) { // L: 141
var4 = var2 | this.buffer.readUnsignedByte() << 8;
@@ -208,12 +208,12 @@ public class MidiFileReader {
}
}
- @ObfuscatedName("c")
- long method5227(int var1) {
- return this.field3279 + (long)var1 * (long)this.field3281; // L: 147
+ @ObfuscatedName("t")
+ long method5399(int var1) {
+ return this.field3241 + (long)var1 * (long)this.field3239; // L: 147
}
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("getPrioritizedTrack")
int getPrioritizedTrack() {
int var1 = this.trackPositions.length; // L: 151
@@ -230,7 +230,7 @@ public class MidiFileReader {
return var2; // L: 161
}
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("isDone")
boolean isDone() {
int var1 = this.trackPositions.length; // L: 165
@@ -244,15 +244,15 @@ public class MidiFileReader {
return true; // L: 167
}
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("reset")
void reset(long var1) {
- this.field3279 = var1; // L: 171
+ this.field3241 = var1; // L: 171
int var3 = this.trackPositions.length; // L: 172
for (int var4 = 0; var4 < var3; ++var4) { // L: 173
this.trackLengths[var4] = 0; // L: 174
- this.field3276[var4] = 0; // L: 175
+ this.field3238[var4] = 0; // L: 175
this.buffer.offset = this.trackStarts[var4]; // L: 176
this.readTrackLength(var4); // L: 177
this.trackPositions[var4] = this.buffer.offset; // L: 178
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index 9d4f9f705d..559fff80fd 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -4,155 +4,160 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jw")
+@ObfuscatedName("jp")
@Implements("MidiPcmStream")
public class MidiPcmStream extends PcmStream {
- @ObfuscatedName("o")
+ @ObfuscatedName("tq")
+ @ObfuscatedGetter(
+ intValue = 1365503093
+ )
+ static int field3231;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("musicPatches")
NodeHashTable musicPatches;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = -1341819569
+ )
+ int field3222;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1448190869
+ intValue = 1306647529
)
- int field3243;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 830339397
- )
- int field3264;
- @ObfuscatedName("k")
- int[] field3245;
- @ObfuscatedName("a")
- int[] field3246;
- @ObfuscatedName("m")
- int[] field3269;
- @ObfuscatedName("p")
- int[] field3248;
- @ObfuscatedName("s")
- int[] field3249;
- @ObfuscatedName("r")
- int[] field3250;
- @ObfuscatedName("v")
- int[] field3251;
- @ObfuscatedName("y")
- int[] field3252;
- @ObfuscatedName("c")
- int[] field3253;
- @ObfuscatedName("h")
- int[] field3247;
+ int field3205;
@ObfuscatedName("f")
- int[] field3242;
- @ObfuscatedName("d")
- int[] field3265;
+ int[] field3206;
@ObfuscatedName("j")
- int[] field3257;
- @ObfuscatedName("z")
- int[] field3261;
+ int[] field3225;
+ @ObfuscatedName("e")
+ int[] field3208;
+ @ObfuscatedName("g")
+ int[] field3209;
+ @ObfuscatedName("y")
+ int[] field3212;
@ObfuscatedName("i")
- int[] field3259;
- @ObfuscatedName("u")
+ int[] field3211;
+ @ObfuscatedName("s")
+ int[] field3204;
+ @ObfuscatedName("t")
+ int[] field3203;
+ @ObfuscatedName("z")
+ int[] field3214;
+ @ObfuscatedName("a")
+ int[] field3210;
+ @ObfuscatedName("p")
+ int[] field3217;
+ @ObfuscatedName("b")
+ int[] field3218;
+ @ObfuscatedName("n")
+ int[] field3229;
+ @ObfuscatedName("o")
+ int[] field3220;
+ @ObfuscatedName("m")
+ int[] field3207;
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "[[Lji;"
+ descriptor = "[[Ljm;"
)
- MusicPatchNode[][] field3258;
- @ObfuscatedName("ag")
+ MusicPatchNode[][] field3215;
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
- descriptor = "[[Lji;"
+ descriptor = "[[Ljm;"
)
- MusicPatchNode[][] field3255;
- @ObfuscatedName("ar")
+ MusicPatchNode[][] field3223;
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
descriptor = "Lje;"
)
@Export("midiFile")
MidiFileReader midiFile;
- @ObfuscatedName("am")
- boolean field3263;
- @ObfuscatedName("ac")
+ @ObfuscatedName("al")
+ boolean field3213;
+ @ObfuscatedName("ao")
@ObfuscatedGetter(
- intValue = -2049940197
+ intValue = -958540141
)
@Export("track")
int track;
@ObfuscatedName("ab")
@ObfuscatedGetter(
- intValue = -124001117
+ intValue = 1440086017
)
@Export("trackLength")
int trackLength;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@ObfuscatedGetter(
- longValue = -8059779539702401793L
+ longValue = -4140427133495308021L
)
- long field3266;
+ long field3228;
+ @ObfuscatedName("ac")
+ @ObfuscatedGetter(
+ longValue = 6635359799012910237L
+ )
+ long field3221;
@ObfuscatedName("ae")
- @ObfuscatedGetter(
- longValue = 127445036892202121L
- )
- long field3267;
- @ObfuscatedName("az")
@ObfuscatedSignature(
- descriptor = "Ljv;"
+ descriptor = "Ljy;"
)
@Export("patchStream")
MusicPatchPcmStream patchStream;
public MidiPcmStream() {
- this.field3243 = 256; // L: 14
- this.field3264 = 1000000; // L: 15
- this.field3245 = new int[16]; // L: 16
- this.field3246 = new int[16]; // L: 17
- this.field3269 = new int[16]; // L: 18
- this.field3248 = new int[16]; // L: 19
- this.field3249 = new int[16]; // L: 20
- this.field3250 = new int[16]; // L: 21
- this.field3251 = new int[16]; // L: 22
- this.field3252 = new int[16]; // L: 23
- this.field3253 = new int[16]; // L: 24
- this.field3247 = new int[16]; // L: 28
- this.field3242 = new int[16]; // L: 29
- this.field3265 = new int[16]; // L: 30
- this.field3257 = new int[16]; // L: 31
- this.field3261 = new int[16]; // L: 32
- this.field3259 = new int[16]; // L: 33
- this.field3258 = new MusicPatchNode[16][128]; // L: 34
- this.field3255 = new MusicPatchNode[16][128]; // L: 35
+ this.field3222 = 256; // L: 14
+ this.field3205 = 1000000; // L: 15
+ this.field3206 = new int[16]; // L: 16
+ this.field3225 = new int[16]; // L: 17
+ this.field3208 = new int[16]; // L: 18
+ this.field3209 = new int[16]; // L: 19
+ this.field3212 = new int[16]; // L: 20
+ this.field3211 = new int[16]; // L: 21
+ this.field3204 = new int[16]; // L: 22
+ this.field3203 = new int[16]; // L: 23
+ this.field3214 = new int[16]; // L: 24
+ this.field3210 = new int[16]; // L: 28
+ this.field3217 = new int[16]; // L: 29
+ this.field3218 = new int[16]; // L: 30
+ this.field3229 = new int[16]; // L: 31
+ this.field3220 = new int[16]; // L: 32
+ this.field3207 = new int[16]; // L: 33
+ this.field3215 = new MusicPatchNode[16][128]; // L: 34
+ this.field3223 = new MusicPatchNode[16][128]; // L: 35
this.midiFile = new MidiFileReader(); // L: 36
this.patchStream = new MusicPatchPcmStream(this); // L: 42
this.musicPatches = new NodeHashTable(128); // L: 45
- this.method5099(); // L: 46
+ this.method5273(); // L: 46
} // L: 47
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IS)V",
- garbageValue = "-4293"
+ descriptor = "(II)V",
+ garbageValue = "273043499"
)
@Export("setPcmStreamVolume")
public synchronized void setPcmStreamVolume(int var1) {
- this.field3243 = var1; // L: 50
+ this.field3222 = var1; // L: 50
} // L: 51
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "6"
+ )
+ public int method5254() {
+ return this.field3222; // L: 54
+ }
+
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1552053459"
- )
- public int method5080() {
- return this.field3243; // L: 54
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Ljy;Llp;Lan;IB)Z",
- garbageValue = "-8"
+ descriptor = "(Ljj;Llh;Laq;II)Z",
+ garbageValue = "-1742328873"
)
@Export("loadMusicTrack")
- synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) {
- var1.method5310(); // L: 58
+ public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) {
+ var1.method5466(); // L: 58
boolean var5 = true; // L: 59
int[] var6 = null; // L: 60
if (var4 > 0) { // L: 61
@@ -180,7 +185,7 @@ public class MidiPcmStream extends PcmStream {
this.musicPatches.put(var10, (long)var8); // L: 80
}
- if (!var9.method5272(var3, var7.byteArray, var6)) { // L: 82
+ if (!var9.method5424(var3, var7.byteArray, var6)) { // L: 82
var5 = false;
}
}
@@ -192,23 +197,23 @@ public class MidiPcmStream extends PcmStream {
return var5; // L: 85
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1506862644"
+ garbageValue = "490922950"
)
@Export("clearAll")
- synchronized void clearAll() {
+ public synchronized void clearAll() {
for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89
var1.clear();
}
} // L: 90
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-768637497"
+ garbageValue = "732402985"
)
@Export("removeAll")
public synchronized void removeAll() {
@@ -218,65 +223,65 @@ public class MidiPcmStream extends PcmStream {
} // L: 94
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("firstSubStream")
protected synchronized PcmStream firstSubStream() {
return this.patchStream; // L: 469
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("nextSubStream")
protected synchronized PcmStream nextSubStream() {
return null; // L: 473
}
- @ObfuscatedName("s")
- protected synchronized int vmethod5295() {
+ @ObfuscatedName("w")
+ protected synchronized int vmethod5437() {
return 0; // L: 477
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("fill")
protected synchronized void fill(int[] var1, int var2, int var3) {
if (this.midiFile.isReady()) { // L: 481
- int var4 = this.midiFile.division * this.field3264 / PcmPlayer.field300; // L: 482
+ int var4 = this.midiFile.division * this.field3205 / PcmPlayer.field287; // L: 482
do {
- long var5 = this.field3266 + (long)var4 * (long)var3; // L: 484
- if (this.field3267 - var5 >= 0L) { // L: 485
- this.field3266 = var5; // L: 486
+ long var5 = this.field3228 + (long)var4 * (long)var3; // L: 484
+ if (this.field3221 - var5 >= 0L) { // L: 485
+ this.field3228 = var5; // L: 486
break;
}
- int var7 = (int)((this.field3267 - this.field3266 + (long)var4 - 1L) / (long)var4); // L: 489
- this.field3266 += (long)var7 * (long)var4; // L: 490
+ int var7 = (int)((this.field3221 - this.field3228 + (long)var4 - 1L) / (long)var4); // L: 489
+ this.field3228 += (long)var4 * (long)var7; // L: 490
this.patchStream.fill(var1, var2, var7); // L: 491
var2 += var7; // L: 492
var3 -= var7; // L: 493
- this.method5112(); // L: 494
+ this.method5286(); // L: 494
} while(this.midiFile.isReady()); // L: 495
}
this.patchStream.fill(var1, var2, var3); // L: 498
} // L: 499
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(Ljy;ZI)V",
- garbageValue = "-1388253754"
+ descriptor = "(Ljj;ZI)V",
+ garbageValue = "701180303"
)
@Export("setMusicTrack")
- synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
+ public synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
this.clear(); // L: 97
this.midiFile.parse(var1.midi); // L: 98
- this.field3263 = var2; // L: 99
- this.field3266 = 0L; // L: 100
+ this.field3213 = var2; // L: 99
+ this.field3228 = 0L; // L: 100
int var3 = this.midiFile.trackCount(); // L: 101
for (int var4 = 0; var4 < var3; ++var4) { // L: 102
@@ -287,248 +292,248 @@ public class MidiPcmStream extends PcmStream {
this.track = this.midiFile.getPrioritizedTrack(); // L: 107
this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108
- this.field3267 = this.midiFile.method5227(this.trackLength); // L: 109
+ this.field3221 = this.midiFile.method5399(this.trackLength); // L: 109
} // L: 110
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("skip")
protected synchronized void skip(int var1) {
if (this.midiFile.isReady()) { // L: 502
- int var2 = this.midiFile.division * this.field3264 / PcmPlayer.field300; // L: 503
+ int var2 = this.midiFile.division * this.field3205 / PcmPlayer.field287; // L: 503
do {
- long var3 = this.field3266 + (long)var1 * (long)var2; // L: 505
- if (this.field3267 - var3 >= 0L) { // L: 506
- this.field3266 = var3; // L: 507
+ long var3 = (long)var2 * (long)var1 + this.field3228; // L: 505
+ if (this.field3221 - var3 >= 0L) { // L: 506
+ this.field3228 = var3; // L: 507
break;
}
- int var5 = (int)(((long)var2 + (this.field3267 - this.field3266) - 1L) / (long)var2); // L: 510
- this.field3266 += (long)var5 * (long)var2; // L: 511
+ int var5 = (int)(((long)var2 + (this.field3221 - this.field3228) - 1L) / (long)var2); // L: 510
+ this.field3228 += (long)var5 * (long)var2; // L: 511
this.patchStream.skip(var5); // L: 512
var1 -= var5; // L: 513
- this.method5112(); // L: 514
+ this.method5286(); // L: 514
} while(this.midiFile.isReady()); // L: 515
}
this.patchStream.skip(var1); // L: 518
} // L: 519
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "187"
+ descriptor = "(I)V",
+ garbageValue = "-480918155"
)
@Export("clear")
public synchronized void clear() {
this.midiFile.clear(); // L: 113
- this.method5099(); // L: 114
+ this.method5273(); // L: 114
} // L: 115
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-1853291213"
+ garbageValue = "2138811243"
)
@Export("isReady")
public synchronized boolean isReady() {
return this.midiFile.isReady(); // L: 118
}
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "1725996416"
+ garbageValue = "734019784"
)
- public synchronized void method5151(int var1, int var2) {
- this.method5184(var1, var2); // L: 122
+ public synchronized void method5304(int var1, int var2) {
+ this.method5262(var1, var2); // L: 122
} // L: 123
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-201628098"
+ garbageValue = "473685475"
)
- void method5184(int var1, int var2) {
- this.field3248[var1] = var2; // L: 126
- this.field3250[var1] = var2 & -128; // L: 127
- this.method5089(var1, var2); // L: 128
+ void method5262(int var1, int var2) {
+ this.field3209[var1] = var2; // L: 126
+ this.field3211[var1] = var2 & -128; // L: 127
+ this.method5263(var1, var2); // L: 128
} // L: 129
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-1928331958"
+ garbageValue = "-1752032283"
)
- void method5089(int var1, int var2) {
- if (var2 != this.field3249[var1]) { // L: 132
- this.field3249[var1] = var2; // L: 133
+ void method5263(int var1, int var2) {
+ if (var2 != this.field3212[var1]) { // L: 132
+ this.field3212[var1] = var2; // L: 133
for (int var3 = 0; var3 < 128; ++var3) { // L: 134
- this.field3255[var1][var3] = null;
+ this.field3223[var1][var3] = null;
}
}
} // L: 136
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "(IIII)V",
- garbageValue = "-1114673013"
+ garbageValue = "-276178565"
)
- void method5212(int var1, int var2, int var3) {
- this.method5160(var1, var2, 64); // L: 139
- if ((this.field3247[var1] & 2) != 0) { // L: 140
+ void method5329(int var1, int var2, int var3) {
+ this.method5266(var1, var2, 64); // L: 139
+ if ((this.field3210[var1] & 2) != 0) { // L: 140
for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141
- if (var4.field3308 == var1 && var4.field3316 < 0) { // L: 142
- this.field3258[var1][var4.field3307] = null; // L: 143
- this.field3258[var1][var2] = var4; // L: 144
- int var8 = (var4.field3302 * var4.field3309 >> 12) + var4.field3310; // L: 145
- var4.field3310 += var2 - var4.field3307 << 8; // L: 146
- var4.field3309 = var8 - var4.field3310; // L: 147
- var4.field3302 = 4096; // L: 148
- var4.field3307 = var2; // L: 149
+ if (var4.field3284 == var1 && var4.field3278 < 0) { // L: 142
+ this.field3215[var1][var4.field3269] = null; // L: 143
+ this.field3215[var1][var2] = var4; // L: 144
+ int var8 = (var4.field3273 * var4.field3277 >> 12) + var4.field3272; // L: 145
+ var4.field3272 += var2 - var4.field3269 << 8; // L: 146
+ var4.field3273 = var8 - var4.field3272; // L: 147
+ var4.field3277 = 4096; // L: 148
+ var4.field3269 = var2; // L: 149
return; // L: 150
}
}
}
- MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3249[var1]); // L: 154
+ MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3212[var1]); // L: 154
if (var9 != null) { // L: 155
RawSound var5 = var9.rawSounds[var2]; // L: 156
if (var5 != null) { // L: 157
MusicPatchNode var6 = new MusicPatchNode(); // L: 158
- var6.field3308 = var1; // L: 159
+ var6.field3284 = var1; // L: 159
var6.patch = var9; // L: 160
var6.rawSound = var5; // L: 161
- var6.field3306 = var9.field3291[var2]; // L: 162
- var6.field3319 = var9.field3285[var2]; // L: 163
- var6.field3307 = var2; // L: 164
- var6.field3311 = var3 * var3 * var9.field3290[var2] * var9.field3288 + 1024 >> 11; // L: 165
- var6.field3312 = var9.field3289[var2] & 255; // L: 166
- var6.field3310 = (var2 << 8) - (var9.field3287[var2] & 32767); // L: 167
- var6.field3313 = 0; // L: 168
- var6.field3314 = 0; // L: 169
- var6.field3315 = 0; // L: 170
- var6.field3316 = -1; // L: 171
- var6.field3317 = 0; // L: 172
- if (this.field3257[var1] == 0) { // L: 173
- var6.stream = RawPcmStream.method829(var5, this.method5141(var6), this.method5105(var6), this.method5106(var6)); // L: 174
+ var6.field3264 = var9.field3252[var2]; // L: 162
+ var6.field3267 = var9.field3249[var2]; // L: 163
+ var6.field3269 = var2; // L: 164
+ var6.field3282 = var3 * var3 * var9.field3253[var2] * var9.field3247 + 1024 >> 11; // L: 165
+ var6.field3271 = var9.field3251[var2] & 255; // L: 166
+ var6.field3272 = (var2 << 8) - (var9.field3250[var2] & 32767); // L: 167
+ var6.field3275 = 0; // L: 168
+ var6.field3276 = 0; // L: 169
+ var6.field3274 = 0; // L: 170
+ var6.field3278 = -1; // L: 171
+ var6.field3279 = 0; // L: 172
+ if (this.field3229[var1] == 0) { // L: 173
+ var6.stream = RawPcmStream.method775(var5, this.method5278(var6), this.method5279(var6), this.method5312(var6)); // L: 174
} else {
- var6.stream = RawPcmStream.method829(var5, this.method5141(var6), 0, this.method5106(var6)); // L: 177
- this.method5091(var6, var9.field3287[var2] < 0); // L: 178
+ var6.stream = RawPcmStream.method775(var5, this.method5278(var6), 0, this.method5312(var6)); // L: 177
+ this.method5264(var6, var9.field3250[var2] < 0); // L: 178
}
- if (var9.field3287[var2] < 0) { // L: 180
+ if (var9.field3250[var2] < 0) { // L: 180
var6.stream.setNumLoops(-1);
}
- if (var6.field3319 >= 0) { // L: 181
- MusicPatchNode var7 = this.field3255[var1][var6.field3319]; // L: 182
- if (var7 != null && var7.field3316 < 0) { // L: 183
- this.field3258[var1][var7.field3307] = null; // L: 184
- var7.field3316 = 0; // L: 185
+ if (var6.field3267 >= 0) { // L: 181
+ MusicPatchNode var7 = this.field3223[var1][var6.field3267]; // L: 182
+ if (var7 != null && var7.field3278 < 0) { // L: 183
+ this.field3215[var1][var7.field3269] = null; // L: 184
+ var7.field3278 = 0; // L: 185
}
- this.field3255[var1][var6.field3319] = var6; // L: 187
+ this.field3223[var1][var6.field3267] = var6; // L: 187
}
this.patchStream.queue.addFirst(var6); // L: 189
- this.field3258[var1][var2] = var6; // L: 190
+ this.field3215[var1][var2] = var6; // L: 190
}
}
} // L: 191
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(Lji;ZI)V",
- garbageValue = "1848917000"
+ descriptor = "(Ljm;ZI)V",
+ garbageValue = "230504293"
)
- void method5091(MusicPatchNode var1, boolean var2) {
+ void method5264(MusicPatchNode var1, boolean var2) {
int var3 = var1.rawSound.samples.length; // L: 194
int var4;
- if (var2 && var1.rawSound.field266) { // L: 196
+ if (var2 && var1.rawSound.field261) { // L: 196
int var5 = var3 + var3 - var1.rawSound.start; // L: 197
- var4 = (int)((long)this.field3257[var1.field3308] * (long)var5 >> 6); // L: 198
+ var4 = (int)((long)this.field3229[var1.field3284] * (long)var5 >> 6); // L: 198
var3 <<= 8; // L: 199
if (var4 >= var3) { // L: 200
var4 = var3 + var3 - 1 - var4; // L: 201
- var1.stream.method811(); // L: 202
+ var1.stream.method784(); // L: 202
}
} else {
- var4 = (int)((long)var3 * (long)this.field3257[var1.field3308] >> 6); // L: 206
+ var4 = (int)((long)var3 * (long)this.field3229[var1.field3284] >> 6); // L: 206
}
- var1.stream.method807(var4); // L: 208
+ var1.stream.method786(var4); // L: 208
} // L: 209
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(IIIB)V",
- garbageValue = "-59"
+ garbageValue = "12"
)
- void method5160(int var1, int var2, int var3) {
- MusicPatchNode var4 = this.field3258[var1][var2]; // L: 212
+ void method5266(int var1, int var2, int var3) {
+ MusicPatchNode var4 = this.field3215[var1][var2]; // L: 212
if (var4 != null) { // L: 213
- this.field3258[var1][var2] = null; // L: 214
- if ((this.field3247[var1] & 2) != 0) { // L: 215
+ this.field3215[var1][var2] = null; // L: 214
+ if ((this.field3210[var1] & 2) != 0) { // L: 215
for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216
- if (var4.field3308 == var5.field3308 && var5.field3316 < 0 && var5 != var4) { // L: 217
- var4.field3316 = 0; // L: 218
+ if (var5.field3284 == var4.field3284 && var5.field3278 < 0 && var4 != var5) { // L: 217
+ var4.field3278 = 0; // L: 218
break; // L: 219
}
}
} else {
- var4.field3316 = 0; // L: 224
+ var4.field3278 = 0; // L: 224
}
}
} // L: 226
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
descriptor = "(IIII)V",
- garbageValue = "823222013"
+ garbageValue = "-691245882"
)
- void method5093(int var1, int var2, int var3) {
+ void method5267(int var1, int var2, int var3) {
} // L: 228
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "-750627525"
+ garbageValue = "1452089614"
)
- void method5087(int var1, int var2) {
+ void method5362(int var1, int var2) {
} // L: 229
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-926778021"
+ descriptor = "(IIB)V",
+ garbageValue = "114"
)
- void method5095(int var1, int var2) {
- this.field3251[var1] = var2; // L: 232
+ void method5272(int var1, int var2) {
+ this.field3204[var1] = var2; // L: 232
} // L: 233
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "-25"
+ descriptor = "(II)V",
+ garbageValue = "880130085"
)
- void method5096(int var1) {
+ void method5358(int var1) {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236
- if (var1 < 0 || var2.field3308 == var1) { // L: 237
+ if (var1 < 0 || var2.field3284 == var1) { // L: 237
if (var2.stream != null) { // L: 238
- var2.stream.method812(PcmPlayer.field300 / 100); // L: 239
- if (var2.stream.method935()) { // L: 240
+ var2.stream.method802(PcmPlayer.field287 / 100); // L: 239
+ if (var2.stream.method792()) { // L: 240
this.patchStream.mixer.addSubStream(var2.stream);
}
- var2.method5316(); // L: 241
+ var2.method5471(); // L: 241
}
- if (var2.field3316 < 0) { // L: 243
- this.field3258[var2.field3308][var2.field3307] = null;
+ if (var2.field3278 < 0) { // L: 243
+ this.field3215[var2.field3284][var2.field3269] = null;
}
var2.remove(); // L: 244
@@ -537,95 +542,95 @@ public class MidiPcmStream extends PcmStream {
} // L: 247
- @ObfuscatedName("z")
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1406320585"
+ descriptor = "(IB)V",
+ garbageValue = "32"
)
- void method5120(int var1) {
+ void method5252(int var1) {
if (var1 >= 0) { // L: 250
- this.field3245[var1] = 12800; // L: 254
- this.field3246[var1] = 8192; // L: 255
- this.field3269[var1] = 16383; // L: 256
- this.field3251[var1] = 8192; // L: 257
- this.field3252[var1] = 0; // L: 258
- this.field3253[var1] = 8192; // L: 259
- this.method5100(var1); // L: 260
- this.method5101(var1); // L: 261
- this.field3247[var1] = 0; // L: 262
- this.field3242[var1] = 32767; // L: 263
- this.field3265[var1] = 256; // L: 264
- this.field3257[var1] = 0; // L: 265
- this.method5138(var1, 8192); // L: 266
+ this.field3206[var1] = 12800; // L: 254
+ this.field3225[var1] = 8192; // L: 255
+ this.field3208[var1] = 16383; // L: 256
+ this.field3204[var1] = 8192; // L: 257
+ this.field3203[var1] = 0; // L: 258
+ this.field3214[var1] = 8192; // L: 259
+ this.method5274(var1); // L: 260
+ this.method5275(var1); // L: 261
+ this.field3210[var1] = 0; // L: 262
+ this.field3217[var1] = 32767; // L: 263
+ this.field3218[var1] = 256; // L: 264
+ this.field3229[var1] = 0; // L: 265
+ this.method5277(var1, 8192); // L: 266
} else {
for (var1 = 0; var1 < 16; ++var1) { // L: 251
- this.method5120(var1);
+ this.method5252(var1);
}
}
} // L: 252 267
- @ObfuscatedName("ab")
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "3"
+ descriptor = "(II)V",
+ garbageValue = "-861442886"
)
- void method5098(int var1) {
+ void method5326(int var1) {
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270
- if ((var1 < 0 || var2.field3308 == var1) && var2.field3316 < 0) { // L: 271 272
- this.field3258[var2.field3308][var2.field3307] = null; // L: 273
- var2.field3316 = 0; // L: 274
+ if ((var1 < 0 || var2.field3284 == var1) && var2.field3278 < 0) { // L: 271 272
+ this.field3215[var2.field3284][var2.field3269] = null; // L: 273
+ var2.field3278 = 0; // L: 274
}
}
} // L: 278
- @ObfuscatedName("aj")
+ @ObfuscatedName("ax")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1766234512"
+ garbageValue = "521776842"
)
- void method5099() {
- this.method5096(-1); // L: 281
- this.method5120(-1); // L: 282
+ void method5273() {
+ this.method5358(-1); // L: 281
+ this.method5252(-1); // L: 282
int var1;
for (var1 = 0; var1 < 16; ++var1) { // L: 283
- this.field3249[var1] = this.field3248[var1];
+ this.field3212[var1] = this.field3209[var1];
}
for (var1 = 0; var1 < 16; ++var1) { // L: 284
- this.field3250[var1] = this.field3248[var1] & -128;
+ this.field3211[var1] = this.field3209[var1] & -128;
}
} // L: 285
- @ObfuscatedName("as")
+ @ObfuscatedName("ar")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "1091575779"
+ garbageValue = "1976817510"
)
- void method5100(int var1) {
- if ((this.field3247[var1] & 2) != 0) { // L: 288
+ void method5274(int var1) {
+ if ((this.field3210[var1] & 2) != 0) { // L: 288
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289
- if (var2.field3308 == var1 && this.field3258[var1][var2.field3307] == null && var2.field3316 < 0) { // L: 290 291
- var2.field3316 = 0;
+ if (var2.field3284 == var1 && this.field3215[var1][var2.field3269] == null && var2.field3278 < 0) { // L: 290 291
+ var2.field3278 = 0;
}
}
}
} // L: 295
- @ObfuscatedName("au")
+ @ObfuscatedName("ag")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1548994766"
+ descriptor = "(IB)V",
+ garbageValue = "0"
)
- void method5101(int var1) {
- if ((this.field3247[var1] & 4) != 0) { // L: 298
+ void method5275(int var1) {
+ if ((this.field3210[var1] & 4) != 0) { // L: 298
for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299
- if (var2.field3308 == var1) { // L: 300
- var2.field3322 = 0;
+ if (var2.field3284 == var1) { // L: 300
+ var2.field3270 = 0;
}
}
}
@@ -635,9 +640,9 @@ public class MidiPcmStream extends PcmStream {
@ObfuscatedName("aq")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "181741177"
+ garbageValue = "834979458"
)
- void method5102(int var1) {
+ void method5276(int var1) {
int var2 = var1 & 240; // L: 306
int var3;
int var4;
@@ -646,260 +651,260 @@ public class MidiPcmStream extends PcmStream {
var3 = var1 & 15; // L: 308
var4 = var1 >> 8 & 127; // L: 309
var5 = var1 >> 16 & 127; // L: 310
- this.method5160(var3, var4, var5); // L: 311
+ this.method5266(var3, var4, var5); // L: 311
} else if (var2 == 144) { // L: 314
var3 = var1 & 15; // L: 315
var4 = var1 >> 8 & 127; // L: 316
var5 = var1 >> 16 & 127; // L: 317
if (var5 > 0) { // L: 318
- this.method5212(var3, var4, var5);
+ this.method5329(var3, var4, var5);
} else {
- this.method5160(var3, var4, 64); // L: 319
+ this.method5266(var3, var4, 64); // L: 319
}
} else if (var2 == 160) { // L: 322
var3 = var1 & 15; // L: 323
var4 = var1 >> 8 & 127; // L: 324
var5 = var1 >> 16 & 127; // L: 325
- this.method5093(var3, var4, var5); // L: 326
+ this.method5267(var3, var4, var5); // L: 326
} else if (var2 == 176) { // L: 329
var3 = var1 & 15; // L: 330
var4 = var1 >> 8 & 127; // L: 331
var5 = var1 >> 16 & 127; // L: 332
if (var4 == 0) { // L: 333
- this.field3250[var3] = (var5 << 14) + (this.field3250[var3] & -2080769);
+ this.field3211[var3] = (var5 << 14) + (this.field3211[var3] & -2080769);
}
if (var4 == 32) { // L: 334
- this.field3250[var3] = (var5 << 7) + (this.field3250[var3] & -16257);
+ this.field3211[var3] = (var5 << 7) + (this.field3211[var3] & -16257);
}
if (var4 == 1) { // L: 335
- this.field3252[var3] = (var5 << 7) + (this.field3252[var3] & -16257);
+ this.field3203[var3] = (var5 << 7) + (this.field3203[var3] & -16257);
}
if (var4 == 33) { // L: 336
- this.field3252[var3] = var5 + (this.field3252[var3] & -128);
+ this.field3203[var3] = var5 + (this.field3203[var3] & -128);
}
if (var4 == 5) { // L: 337
- this.field3253[var3] = (var5 << 7) + (this.field3253[var3] & -16257);
+ this.field3214[var3] = (var5 << 7) + (this.field3214[var3] & -16257);
}
if (var4 == 37) { // L: 338
- this.field3253[var3] = var5 + (this.field3253[var3] & -128);
+ this.field3214[var3] = var5 + (this.field3214[var3] & -128);
}
if (var4 == 7) { // L: 339
- this.field3245[var3] = (var5 << 7) + (this.field3245[var3] & -16257);
+ this.field3206[var3] = (var5 << 7) + (this.field3206[var3] & -16257);
}
if (var4 == 39) { // L: 340
- this.field3245[var3] = var5 + (this.field3245[var3] & -128);
+ this.field3206[var3] = var5 + (this.field3206[var3] & -128);
}
if (var4 == 10) { // L: 341
- this.field3246[var3] = (var5 << 7) + (this.field3246[var3] & -16257);
+ this.field3225[var3] = (var5 << 7) + (this.field3225[var3] & -16257);
}
if (var4 == 42) { // L: 342
- this.field3246[var3] = var5 + (this.field3246[var3] & -128);
+ this.field3225[var3] = var5 + (this.field3225[var3] & -128);
}
if (var4 == 11) { // L: 343
- this.field3269[var3] = (var5 << 7) + (this.field3269[var3] & -16257);
+ this.field3208[var3] = (var5 << 7) + (this.field3208[var3] & -16257);
}
if (var4 == 43) { // L: 344
- this.field3269[var3] = var5 + (this.field3269[var3] & -128);
+ this.field3208[var3] = var5 + (this.field3208[var3] & -128);
}
int[] var10000;
if (var4 == 64) { // L: 345
if (var5 >= 64) { // L: 346
- var10000 = this.field3247;
+ var10000 = this.field3210;
var10000[var3] |= 1;
} else {
- var10000 = this.field3247; // L: 347
+ var10000 = this.field3210; // L: 347
var10000[var3] &= -2;
}
}
if (var4 == 65) { // L: 349
if (var5 >= 64) { // L: 350
- var10000 = this.field3247;
+ var10000 = this.field3210;
var10000[var3] |= 2;
} else {
- this.method5100(var3); // L: 352
- var10000 = this.field3247; // L: 353
+ this.method5274(var3); // L: 352
+ var10000 = this.field3210; // L: 353
var10000[var3] &= -3;
}
}
if (var4 == 99) { // L: 356
- this.field3242[var3] = (var5 << 7) + (this.field3242[var3] & 127);
+ this.field3217[var3] = (var5 << 7) + (this.field3217[var3] & 127);
}
if (var4 == 98) { // L: 357
- this.field3242[var3] = (this.field3242[var3] & 16256) + var5;
+ this.field3217[var3] = (this.field3217[var3] & 16256) + var5;
}
if (var4 == 101) { // L: 358
- this.field3242[var3] = (var5 << 7) + (this.field3242[var3] & 127) + 16384;
+ this.field3217[var3] = (var5 << 7) + (this.field3217[var3] & 127) + 16384;
}
if (var4 == 100) { // L: 359
- this.field3242[var3] = (this.field3242[var3] & 16256) + var5 + 16384;
+ this.field3217[var3] = (this.field3217[var3] & 16256) + var5 + 16384;
}
if (var4 == 120) { // L: 360
- this.method5096(var3);
+ this.method5358(var3);
}
if (var4 == 121) { // L: 361
- this.method5120(var3);
+ this.method5252(var3);
}
if (var4 == 123) { // L: 362
- this.method5098(var3);
+ this.method5326(var3);
}
int var6;
if (var4 == 6) { // L: 363
- var6 = this.field3242[var3]; // L: 364
+ var6 = this.field3217[var3]; // L: 364
if (var6 == 16384) { // L: 365
- this.field3265[var3] = (var5 << 7) + (this.field3265[var3] & -16257);
+ this.field3218[var3] = (var5 << 7) + (this.field3218[var3] & -16257);
}
}
if (var4 == 38) { // L: 367
- var6 = this.field3242[var3]; // L: 368
+ var6 = this.field3217[var3]; // L: 368
if (var6 == 16384) { // L: 369
- this.field3265[var3] = var5 + (this.field3265[var3] & -128);
+ this.field3218[var3] = var5 + (this.field3218[var3] & -128);
}
}
if (var4 == 16) { // L: 371
- this.field3257[var3] = (var5 << 7) + (this.field3257[var3] & -16257);
+ this.field3229[var3] = (var5 << 7) + (this.field3229[var3] & -16257);
}
if (var4 == 48) { // L: 372
- this.field3257[var3] = var5 + (this.field3257[var3] & -128);
+ this.field3229[var3] = var5 + (this.field3229[var3] & -128);
}
if (var4 == 81) { // L: 373
if (var5 >= 64) { // L: 374
- var10000 = this.field3247;
+ var10000 = this.field3210;
var10000[var3] |= 4;
} else {
- this.method5101(var3); // L: 376
- var10000 = this.field3247; // L: 377
+ this.method5275(var3); // L: 376
+ var10000 = this.field3210; // L: 377
var10000[var3] &= -5;
}
}
if (var4 == 17) {
- this.method5138(var3, (var5 << 7) + (this.field3261[var3] & -16257)); // L: 380
+ this.method5277(var3, (var5 << 7) + (this.field3220[var3] & -16257)); // L: 380
}
if (var4 == 49) { // L: 381
- this.method5138(var3, var5 + (this.field3261[var3] & -128));
+ this.method5277(var3, var5 + (this.field3220[var3] & -128));
}
} else if (var2 == 192) { // L: 384
var3 = var1 & 15; // L: 385
var4 = var1 >> 8 & 127; // L: 386
- this.method5089(var3, var4 + this.field3250[var3]); // L: 387
+ this.method5263(var3, var4 + this.field3211[var3]); // L: 387
} else if (var2 == 208) { // L: 390
var3 = var1 & 15; // L: 391
var4 = var1 >> 8 & 127; // L: 392
- this.method5087(var3, var4); // L: 393
+ this.method5362(var3, var4); // L: 393
} else if (var2 == 224) { // L: 396
var3 = var1 & 15; // L: 397
var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398
- this.method5095(var3, var4); // L: 399
+ this.method5272(var3, var4); // L: 399
} else {
var2 = var1 & 255; // L: 402
if (var2 == 255) { // L: 403
- this.method5099(); // L: 404
+ this.method5273(); // L: 404
}
}
} // L: 312 320 327 382 388 394 400 405 407
- @ObfuscatedName("ad")
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "205692091"
+ garbageValue = "1788030679"
)
- void method5138(int var1, int var2) {
- this.field3261[var1] = var2; // L: 410
- this.field3259[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411
+ void method5277(int var1, int var2) {
+ this.field3220[var1] = var2; // L: 410
+ this.field3207[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411
} // L: 412
- @ObfuscatedName("an")
+ @ObfuscatedName("ai")
@ObfuscatedSignature(
- descriptor = "(Lji;I)I",
- garbageValue = "853798741"
+ descriptor = "(Ljm;B)I",
+ garbageValue = "-45"
)
- int method5141(MusicPatchNode var1) {
- int var2 = (var1.field3302 * var1.field3309 >> 12) + var1.field3310; // L: 415
- var2 += (this.field3251[var1.field3308] - 8192) * this.field3265[var1.field3308] >> 12; // L: 416
- MusicPatchNode2 var3 = var1.field3306; // L: 417
+ int method5278(MusicPatchNode var1) {
+ int var2 = (var1.field3277 * var1.field3273 >> 12) + var1.field3272; // L: 415
+ var2 += (this.field3204[var1.field3284] - 8192) * this.field3218[var1.field3284] >> 12; // L: 416
+ MusicPatchNode2 var3 = var1.field3264; // L: 417
int var4;
- if (var3.field3229 > 0 && (var3.field3228 > 0 || this.field3252[var1.field3308] > 0)) { // L: 418
- var4 = var3.field3228 << 2; // L: 419
- int var5 = var3.field3222 << 1; // L: 420
- if (var1.field3318 < var5) { // L: 421
- var4 = var4 * var1.field3318 / var5;
+ if (var3.field3187 > 0 && (var3.field3186 > 0 || this.field3203[var1.field3284] > 0)) { // L: 418
+ var4 = var3.field3186 << 2; // L: 419
+ int var5 = var3.field3188 << 1; // L: 420
+ if (var1.field3280 < var5) { // L: 421
+ var4 = var4 * var1.field3280 / var5;
}
- var4 += this.field3252[var1.field3308] >> 7; // L: 422
- double var6 = Math.sin((double)(var1.field3304 & 511) * 0.01227184630308513D); // L: 423
- var2 += (int)((double)var4 * var6); // L: 424
+ var4 += this.field3203[var1.field3284] >> 7; // L: 422
+ double var6 = Math.sin((double)(var1.field3281 & 511) * 0.01227184630308513D); // L: 423
+ var2 += (int)(var6 * (double)var4); // L: 424
}
- var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field300 + 0.5D); // L: 426
+ var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field287 + 0.5D); // L: 426
return var4 < 1 ? 1 : var4; // L: 427
}
- @ObfuscatedName("aw")
+ @ObfuscatedName("az")
@ObfuscatedSignature(
- descriptor = "(Lji;I)I",
- garbageValue = "-1655765523"
+ descriptor = "(Ljm;I)I",
+ garbageValue = "-512003611"
)
- int method5105(MusicPatchNode var1) {
- MusicPatchNode2 var2 = var1.field3306; // L: 431
- int var3 = this.field3269[var1.field3308] * this.field3245[var1.field3308] + 4096 >> 13; // L: 432
+ int method5279(MusicPatchNode var1) {
+ MusicPatchNode2 var2 = var1.field3264; // L: 431
+ int var3 = this.field3206[var1.field3284] * this.field3208[var1.field3284] + 4096 >> 13; // L: 432
var3 = var3 * var3 + 16384 >> 15; // L: 433
- var3 = var3 * var1.field3311 + 16384 >> 15; // L: 434
- var3 = var3 * this.field3243 + 128 >> 8; // L: 435
- if (var2.field3226 > 0) { // L: 436
- var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field3313 * (double)var2.field3226) + 0.5D); // L: 437
+ var3 = var3 * var1.field3282 + 16384 >> 15; // L: 434
+ var3 = var3 * this.field3222 + 128 >> 8; // L: 435
+ if (var2.field3182 > 0) { // L: 436
+ var3 = (int)((double)var3 * Math.pow(0.5D, (double)var1.field3275 * 1.953125E-5D * (double)var2.field3182) + 0.5D); // L: 437
}
int var4;
int var5;
int var6;
int var7;
- if (var2.field3232 != null) { // L: 439
- var4 = var1.field3314; // L: 440
- var5 = var2.field3232[var1.field3315 + 1]; // L: 441
- if (var1.field3315 < var2.field3232.length - 2) { // L: 442
- var6 = (var2.field3232[var1.field3315] & 255) << 8; // L: 443
- var7 = (var2.field3232[var1.field3315 + 2] & 255) << 8; // L: 444
- var5 += (var2.field3232[var1.field3315 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445
+ if (var2.field3184 != null) { // L: 439
+ var4 = var1.field3276; // L: 440
+ var5 = var2.field3184[var1.field3274 + 1]; // L: 441
+ if (var1.field3274 < var2.field3184.length - 2) { // L: 442
+ var6 = (var2.field3184[var1.field3274] & 255) << 8; // L: 443
+ var7 = (var2.field3184[var1.field3274 + 2] & 255) << 8; // L: 444
+ var5 += (var2.field3184[var1.field3274 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445
}
- var3 = var3 * var5 + 32 >> 6; // L: 447
+ var3 = var5 * var3 + 32 >> 6; // L: 447
}
- if (var1.field3316 > 0 && var2.field3223 != null) { // L: 449
- var4 = var1.field3316; // L: 450
- var5 = var2.field3223[var1.field3317 + 1]; // L: 451
- if (var1.field3317 < var2.field3223.length - 2) { // L: 452
- var6 = (var2.field3223[var1.field3317] & 255) << 8; // L: 453
- var7 = (var2.field3223[var1.field3317 + 2] & 255) << 8; // L: 454
- var5 += (var2.field3223[var1.field3317 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455
+ if (var1.field3278 > 0 && var2.field3181 != null) { // L: 449
+ var4 = var1.field3278; // L: 450
+ var5 = var2.field3181[var1.field3279 + 1]; // L: 451
+ if (var1.field3279 < var2.field3181.length - 2) { // L: 452
+ var6 = (var2.field3181[var1.field3279] & 255) << 8; // L: 453
+ var7 = (var2.field3181[var1.field3279 + 2] & 255) << 8; // L: 454
+ var5 += (var4 - var6) * (var2.field3181[var1.field3279 + 3] - var5) / (var7 - var6); // L: 455
}
var3 = var5 * var3 + 32 >> 6; // L: 457
@@ -908,27 +913,27 @@ public class MidiPcmStream extends PcmStream {
return var3; // L: 459
}
- @ObfuscatedName("ah")
+ @ObfuscatedName("av")
@ObfuscatedSignature(
- descriptor = "(Lji;I)I",
- garbageValue = "-1374034074"
+ descriptor = "(Ljm;I)I",
+ garbageValue = "953724274"
)
- int method5106(MusicPatchNode var1) {
- int var2 = this.field3246[var1.field3308]; // L: 463
- return var2 < 8192 ? var2 * var1.field3312 + 32 >> 6 : 16384 - ((128 - var1.field3312) * (16384 - var2) + 32 >> 6); // L: 464 465
+ int method5312(MusicPatchNode var1) {
+ int var2 = this.field3225[var1.field3284]; // L: 463
+ return var2 < 8192 ? var2 * var1.field3271 + 32 >> 6 : 16384 - ((128 - var1.field3271) * (16384 - var2) + 32 >> 6); // L: 464 465
}
- @ObfuscatedName("ao")
+ @ObfuscatedName("aw")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-37"
+ descriptor = "(I)V",
+ garbageValue = "-456467428"
)
- void method5112() {
+ void method5286() {
int var1 = this.track; // L: 522
int var2 = this.trackLength; // L: 523
long var3;
- for (var3 = this.field3267; var2 == this.trackLength; var3 = this.midiFile.method5227(var2)) { // L: 524 525 547
+ for (var3 = this.field3221; var2 == this.trackLength; var3 = this.midiFile.method5399(var2)) { // L: 524 525 547
while (var2 == this.midiFile.trackLengths[var1]) { // L: 526
this.midiFile.gotoTrack(var1); // L: 527
int var5 = this.midiFile.readMessage(var1); // L: 528
@@ -936,8 +941,8 @@ public class MidiPcmStream extends PcmStream {
this.midiFile.setTrackDone(); // L: 530
this.midiFile.markTrackPosition(var1); // L: 531
if (this.midiFile.isDone()) { // L: 532
- if (!this.field3263 || var2 == 0) { // L: 533
- this.method5099(); // L: 537
+ if (!this.field3213 || var2 == 0) { // L: 533
+ this.method5273(); // L: 537
this.midiFile.clear(); // L: 538
return; // L: 539
}
@@ -948,7 +953,7 @@ public class MidiPcmStream extends PcmStream {
}
if ((var5 & 128) != 0) { // L: 541
- this.method5102(var5);
+ this.method5276(var5);
}
this.midiFile.readTrackLength(var1); // L: 542
@@ -961,20 +966,20 @@ public class MidiPcmStream extends PcmStream {
this.track = var1; // L: 549
this.trackLength = var2; // L: 550
- this.field3267 = var3; // L: 551
+ this.field3221 = var3; // L: 551
} // L: 552
- @ObfuscatedName("av")
+ @ObfuscatedName("au")
@ObfuscatedSignature(
- descriptor = "(Lji;I)Z",
- garbageValue = "-1708353778"
+ descriptor = "(Ljm;I)Z",
+ garbageValue = "-29453707"
)
- boolean method5113(MusicPatchNode var1) {
+ boolean method5287(MusicPatchNode var1) {
if (var1.stream == null) { // L: 555
- if (var1.field3316 >= 0) { // L: 556
+ if (var1.field3278 >= 0) { // L: 556
var1.remove(); // L: 557
- if (var1.field3319 > 0 && var1 == this.field3255[var1.field3308][var1.field3319]) { // L: 558
- this.field3255[var1.field3308][var1.field3319] = null; // L: 559
+ if (var1.field3267 > 0 && var1 == this.field3223[var1.field3284][var1.field3267]) { // L: 558
+ this.field3223[var1.field3284][var1.field3267] = null; // L: 559
}
}
@@ -984,100 +989,100 @@ public class MidiPcmStream extends PcmStream {
}
}
- @ObfuscatedName("ai")
+ @ObfuscatedName("ay")
@ObfuscatedSignature(
- descriptor = "(Lji;[IIII)Z",
- garbageValue = "-2129548616"
+ descriptor = "(Ljm;[IIII)Z",
+ garbageValue = "12609433"
)
- boolean method5114(MusicPatchNode var1, int[] var2, int var3, int var4) {
- var1.field3321 = PcmPlayer.field300 / 100; // L: 568
- if (var1.field3316 < 0 || var1.stream != null && !var1.stream.method815()) { // L: 569
- int var5 = var1.field3302; // L: 577
+ boolean method5317(MusicPatchNode var1, int[] var2, int var3, int var4) {
+ var1.field3283 = PcmPlayer.field287 / 100; // L: 568
+ if (var1.field3278 < 0 || var1.stream != null && !var1.stream.method860()) { // L: 569
+ int var5 = var1.field3277; // L: 577
if (var5 > 0) { // L: 578
- var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3253[var1.field3308] * 4.921259842519685E-4D) + 0.5D); // L: 579
+ var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3214[var1.field3284] * 4.921259842519685E-4D) + 0.5D); // L: 579
if (var5 < 0) { // L: 580
var5 = 0;
}
- var1.field3302 = var5; // L: 581
+ var1.field3277 = var5; // L: 581
}
- var1.stream.method813(this.method5141(var1)); // L: 583
- MusicPatchNode2 var6 = var1.field3306; // L: 584
+ var1.stream.method789(this.method5278(var1)); // L: 583
+ MusicPatchNode2 var6 = var1.field3264; // L: 584
boolean var7 = false; // L: 585
- ++var1.field3318; // L: 586
- var1.field3304 += var6.field3229; // L: 587
- double var8 = 5.086263020833333E-6D * (double)((var1.field3307 - 60 << 8) + (var1.field3309 * var1.field3302 >> 12)); // L: 588
- if (var6.field3226 > 0) { // L: 589
- if (var6.field3227 > 0) { // L: 590
- var1.field3313 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3227 * var8) + 0.5D);
+ ++var1.field3280; // L: 586
+ var1.field3281 += var6.field3187; // L: 587
+ double var8 = (double)((var1.field3269 - 60 << 8) + (var1.field3273 * var1.field3277 >> 12)) * 5.086263020833333E-6D; // L: 588
+ if (var6.field3182 > 0) { // L: 589
+ if (var6.field3183 > 0) { // L: 590
+ var1.field3275 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3183 * var8) + 0.5D);
} else {
- var1.field3313 += 128; // L: 591
+ var1.field3275 += 128; // L: 591
}
}
- if (var6.field3232 != null) { // L: 593
- if (var6.field3225 > 0) { // L: 594
- var1.field3314 += (int)(128.0D * Math.pow(2.0D, (double)var6.field3225 * var8) + 0.5D);
+ if (var6.field3184 != null) { // L: 593
+ if (var6.field3190 > 0) { // L: 594
+ var1.field3276 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3190) + 0.5D);
} else {
- var1.field3314 += 128; // L: 595
+ var1.field3276 += 128; // L: 595
}
- while (var1.field3315 < var6.field3232.length - 2 && var1.field3314 > (var6.field3232[var1.field3315 + 2] & 255) << 8) { // L: 596
- var1.field3315 += 2;
+ while (var1.field3274 < var6.field3184.length - 2 && var1.field3276 > (var6.field3184[var1.field3274 + 2] & 255) << 8) { // L: 596
+ var1.field3274 += 2;
}
- if (var6.field3232.length - 2 == var1.field3315 && var6.field3232[var1.field3315 + 1] == 0) { // L: 597
+ if (var6.field3184.length - 2 == var1.field3274 && var6.field3184[var1.field3274 + 1] == 0) { // L: 597
var7 = true;
}
}
- if (var1.field3316 >= 0 && var6.field3223 != null && (this.field3247[var1.field3308] & 1) == 0 && (var1.field3319 < 0 || var1 != this.field3255[var1.field3308][var1.field3319])) { // L: 599 600
- if (var6.field3224 > 0) { // L: 601
- var1.field3316 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3224) + 0.5D);
+ if (var1.field3278 >= 0 && var6.field3181 != null && (this.field3210[var1.field3284] & 1) == 0 && (var1.field3267 < 0 || var1 != this.field3223[var1.field3284][var1.field3267])) { // L: 599 600
+ if (var6.field3185 > 0) { // L: 601
+ var1.field3278 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3185) + 0.5D);
} else {
- var1.field3316 += 128; // L: 602
+ var1.field3278 += 128; // L: 602
}
- while (var1.field3317 < var6.field3223.length - 2 && var1.field3316 > (var6.field3223[var1.field3317 + 2] & 255) << 8) { // L: 603
- var1.field3317 += 2;
+ while (var1.field3279 < var6.field3181.length - 2 && var1.field3278 > (var6.field3181[var1.field3279 + 2] & 255) << 8) { // L: 603
+ var1.field3279 += 2;
}
- if (var6.field3223.length - 2 == var1.field3317) { // L: 604
+ if (var6.field3181.length - 2 == var1.field3279) { // L: 604
var7 = true;
}
}
if (var7) { // L: 607
- var1.stream.method812(var1.field3321); // L: 608
+ var1.stream.method802(var1.field3283); // L: 608
if (var2 != null) { // L: 609
var1.stream.fill(var2, var3, var4);
} else {
var1.stream.skip(var4); // L: 610
}
- if (var1.stream.method935()) { // L: 611
+ if (var1.stream.method792()) { // L: 611
this.patchStream.mixer.addSubStream(var1.stream);
}
- var1.method5316(); // L: 612
- if (var1.field3316 >= 0) { // L: 613
+ var1.method5471(); // L: 612
+ if (var1.field3278 >= 0) { // L: 613
var1.remove(); // L: 614
- if (var1.field3319 > 0 && var1 == this.field3255[var1.field3308][var1.field3319]) { // L: 615
- this.field3255[var1.field3308][var1.field3319] = null; // L: 616
+ if (var1.field3267 > 0 && var1 == this.field3223[var1.field3284][var1.field3267]) { // L: 615
+ this.field3223[var1.field3284][var1.field3267] = null; // L: 616
}
}
return true; // L: 619
} else {
- var1.stream.method799(var1.field3321, this.method5105(var1), this.method5106(var1)); // L: 621
+ var1.stream.method787(var1.field3283, this.method5279(var1), this.method5312(var1)); // L: 621
return false; // L: 622
}
} else {
- var1.method5316(); // L: 570
+ var1.method5471(); // L: 570
var1.remove(); // L: 571
- if (var1.field3319 > 0 && var1 == this.field3255[var1.field3308][var1.field3319]) { // L: 572
- this.field3255[var1.field3308][var1.field3319] = null; // L: 573
+ if (var1.field3267 > 0 && var1 == this.field3223[var1.field3284][var1.field3267]) { // L: 572
+ this.field3223[var1.field3284][var1.field3267] = null; // L: 573
}
return true; // L: 575
diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java
index 799156250c..b672a65d27 100644
--- a/runescape-client/src/main/java/MilliClock.java
+++ b/runescape-client/src/main/java/MilliClock.java
@@ -1,141 +1,215 @@
+import java.io.File;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fz")
+@ObfuscatedName("ff")
@Implements("MilliClock")
public class MilliClock extends Clock {
- @ObfuscatedName("o")
- long[] field1817;
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("Widget_fontsArchive")
+ public static AbstractArchive Widget_fontsArchive;
+ @ObfuscatedName("c")
+ long[] field1788;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 822358683
+ )
+ int field1787;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -613728771
+ intValue = -39184651
)
- int field1815;
- @ObfuscatedName("l")
+ int field1789;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -2030028533
+ longValue = -7252286742317130981L
)
- int field1816;
- @ObfuscatedName("k")
+ long field1794;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- longValue = 6860375109753774457L
+ intValue = 187442115
)
- long field1814;
- @ObfuscatedName("a")
+ int field1791;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 101342221
+ intValue = 117006029
)
- int field1818;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 578259899
- )
- int field1819;
+ int field1792;
MilliClock() {
- this.field1817 = new long[10]; // L: 7
- this.field1815 = 256; // L: 15
- this.field1816 = 1; // L: 16
- this.field1818 = 0; // L: 17
- this.field1814 = class113.method2624(); // L: 18
+ this.field1788 = new long[10]; // L: 7
+ this.field1787 = 256; // L: 15
+ this.field1789 = 1;
+ this.field1791 = 0;
+ this.field1794 = class115.method2692();
- for (int var1 = 0; var1 < 10; ++var1) { // L: 19
- this.field1817[var1] = this.field1814; // L: 20
+ for (int var1 = 0; var1 < 10; ++var1) {
+ this.field1788[var1] = this.field1794; // L: 20
}
- }
+ } // L: 22
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1993169750"
+ garbageValue = "814382249"
)
@Export("mark")
public void mark() {
for (int var1 = 0; var1 < 10; ++var1) { // L: 25
- this.field1817[var1] = 0L; // L: 26
+ this.field1788[var1] = 0L; // L: 26
}
} // L: 28
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1389334721"
+ descriptor = "(IIB)I",
+ garbageValue = "-83"
)
@Export("wait")
public int wait(int var1, int var2) {
- int var3 = this.field1815; // L: 31
- int var4 = this.field1816; // L: 32
- this.field1815 = 300; // L: 33
- this.field1816 = 1; // L: 34
- this.field1814 = class113.method2624(); // L: 35
- if (0L == this.field1817[this.field1819]) { // L: 36
- this.field1815 = var3; // L: 37
- this.field1816 = var4; // L: 38
- } else if (this.field1814 > this.field1817[this.field1819]) { // L: 40
- this.field1815 = (int)((long)(var1 * 2560) / (this.field1814 - this.field1817[this.field1819]));
+ int var3 = this.field1787; // L: 31
+ int var4 = this.field1789; // L: 32
+ this.field1787 = 300; // L: 33
+ this.field1789 = 1; // L: 34
+ this.field1794 = class115.method2692(); // L: 35
+ if (this.field1788[this.field1792] == 0L) { // L: 36
+ this.field1787 = var3; // L: 37
+ this.field1789 = var4; // L: 38
+ } else if (this.field1794 > this.field1788[this.field1792]) { // L: 40
+ this.field1787 = (int)((long)(var1 * 2560) / (this.field1794 - this.field1788[this.field1792]));
}
- if (this.field1815 < 25) { // L: 41
- this.field1815 = 25;
+ if (this.field1787 < 25) { // L: 41
+ this.field1787 = 25;
}
- if (this.field1815 > 256) { // L: 42
- this.field1815 = 256; // L: 43
- this.field1816 = (int)((long)var1 - (this.field1814 - this.field1817[this.field1819]) / 10L); // L: 44
+ if (this.field1787 > 256) { // L: 42
+ this.field1787 = 256; // L: 43
+ this.field1789 = (int)((long)var1 - (this.field1794 - this.field1788[this.field1792]) / 10L); // L: 44
}
- if (this.field1816 > var1) { // L: 46
- this.field1816 = var1;
+ if (this.field1789 > var1) { // L: 46
+ this.field1789 = var1;
}
- this.field1817[this.field1819] = this.field1814; // L: 47
- this.field1819 = (this.field1819 + 1) % 10; // L: 48
+ this.field1788[this.field1792] = this.field1794; // L: 47
+ this.field1792 = (this.field1792 + 1) % 10; // L: 48
int var5;
- if (this.field1816 > 1) { // L: 49
+ if (this.field1789 > 1) { // L: 49
for (var5 = 0; var5 < 10; ++var5) { // L: 50
- if (0L != this.field1817[var5]) { // L: 51
- this.field1817[var5] += (long)this.field1816;
+ if (this.field1788[var5] != 0L) { // L: 51
+ this.field1788[var5] += (long)this.field1789;
}
}
}
- if (this.field1816 < var2) { // L: 54
- this.field1816 = var2;
+ if (this.field1789 < var2) { // L: 54
+ this.field1789 = var2;
}
- class241.method4815((long)this.field1816); // L: 55
+ DynamicObject.method1991((long)this.field1789); // L: 55
- for (var5 = 0; this.field1818 < 256; this.field1818 += this.field1815) { // L: 56 57 59
- ++var5; // L: 58
+ for (var5 = 0; this.field1791 < 256; this.field1791 += this.field1787) { // L: 56 57
+ ++var5;
}
- this.field1818 &= 255; // L: 61
- return var5; // L: 62
+ this.field1791 &= 255; // L: 61
+ return var5;
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1996215175"
+ descriptor = "(Ljava/io/File;I)V",
+ garbageValue = "88445335"
)
- static void method3219(int var0) {
- GrandExchangeOfferTotalQuantityComparator.field4069 = var0; // L: 21
- class388.field4402 = new class388[var0]; // L: 22
- class388.field4401 = 0; // L: 23
- } // L: 24
-
- @ObfuscatedName("ey")
- @ObfuscatedSignature(
- descriptor = "(I)Lop;",
- garbageValue = "-973548519"
- )
- @Export("getWorldMap")
- static WorldMap getWorldMap() {
- return ServerPacket.worldMap; // L: 679
+ static void method3309(File var0) {
+ FileSystem.FileSystem_cacheDir = var0; // L: 16
+ if (!FileSystem.FileSystem_cacheDir.exists()) {
+ throw new RuntimeException("");
+ } else {
+ FileSystem.FileSystem_hasPermissions = true; // L: 18
+ }
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Z",
+ garbageValue = "-1"
+ )
+ @Export("isWorldMapEvent")
+ public static boolean isWorldMapEvent(int var0) {
+ return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqc;"
+ )
+ @Export("newRunException")
+ public static RunException newRunException(Throwable var0, String var1) {
+ RunException var2;
+ if (var0 instanceof RunException) { // L: 58
+ var2 = (RunException)var0; // L: 59
+ var2.message = var2.message + ' ' + var1; // L: 60
+ } else {
+ var2 = new RunException(var0, var1); // L: 62
+ }
+
+ return var2; // L: 63
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)[Lcm;",
+ garbageValue = "-325604576"
+ )
+ static class83[] method3310() {
+ return new class83[]{class83.field1079, class83.field1075, class83.field1078, class83.field1074, class83.field1077, class83.field1084}; // L: 17
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-631328346"
+ )
+ public static void method3301() {
+ class435.PlayerAppearance_cachedModels.clear(); // L: 67
+ } // L: 68
+
+ @ObfuscatedName("av")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-535597968"
+ )
+ static int method3308(int var0, Script var1, boolean var2) {
+ if (var0 == 6900) { // L: 4545
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4546
+ return 1; // L: 4547
+ } else if (var0 == 6950) { // L: 4549
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4550
+ return 1; // L: 4551
+ } else {
+ return 2; // L: 4553
+ }
+ }
+
+ @ObfuscatedName("lz")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1241772972"
+ )
+ static void method3304() {
+ if (Client.oculusOrbState == 1) { // L: 12423
+ Client.field533 = true; // L: 12424
+ }
+
+ } // L: 12426
}
diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java
index 6b012ae586..66397ffede 100644
--- a/runescape-client/src/main/java/ModeWhere.java
+++ b/runescape-client/src/main/java/ModeWhere.java
@@ -1,3 +1,4 @@
+import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import net.runelite.mapping.Export;
@@ -9,906 +10,241 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("lz")
@Implements("ModeWhere")
public enum ModeWhere implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4125("", 0, new class327[]{class327.field4109}),
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4126("", 1, new class327[]{class327.field4108, class327.field4109}),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4127("", 2, new class327[]{class327.field4108, class327.field4110, class327.field4109}),
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4130("", 3, new class327[]{class327.field4108}),
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4129("", 4),
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4138("", 5, new class327[]{class327.field4108, class327.field4109}),
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4131("", 6, new class327[]{class327.field4109}),
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4132("", 8, new class327[]{class327.field4108, class327.field4109}),
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4128("", 9, new class327[]{class327.field4108, class327.field4110}),
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4134("", 10, new class327[]{class327.field4108}),
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Llz;"
- )
- field4135("", 11, new class327[]{class327.field4108}),
@ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "Llz;"
)
- field4136("", 12, new class327[]{class327.field4108, class327.field4109}),
+ field4106("", 0, new class326[]{class326.field4080}),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4103("", 1, new class326[]{class326.field4083, class326.field4080}),
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4104("", 2, new class326[]{class326.field4083, class326.field4079, class326.field4080}),
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4105("", 3, new class326[]{class326.field4083}),
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4115("", 4),
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4117("", 5, new class326[]{class326.field4083, class326.field4080}),
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4108("", 6, new class326[]{class326.field4080}),
@ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "Llz;"
)
- field4133("", 13, new class327[]{class327.field4108});
+ field4102("", 8, new class326[]{class326.field4083, class326.field4080}),
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4107("", 9, new class326[]{class326.field4083, class326.field4079}),
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4111("", 10, new class326[]{class326.field4083}),
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4112("", 11, new class326[]{class326.field4083}),
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4113("", 12, new class326[]{class326.field4083, class326.field4080}),
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "Llz;"
+ )
+ field4110("", 13, new class326[]{class326.field4083});
- @ObfuscatedName("b")
+ @ObfuscatedName("ix")
@ObfuscatedGetter(
- intValue = 1167171757
+ intValue = -2136536725
+ )
+ @Export("selectedItemWidget")
+ static int selectedItemWidget;
+ @ObfuscatedName("pq")
+ @ObfuscatedSignature(
+ descriptor = "Lpr;"
+ )
+ @Export("HitSplatDefinition_cached")
+ static class427 HitSplatDefinition_cached;
+ @ObfuscatedName("r")
+ @ObfuscatedGetter(
+ intValue = 2136032221
)
@Export("id")
final int id;
- @ObfuscatedName("t")
- final Set field4137;
+ @ObfuscatedName("u")
+ final Set field4116;
static {
- method5894(); // L: 28
+ method6075(); // L: 28
} // L: 29
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I[Lls;)V"
+ descriptor = "(Ljava/lang/String;I[Llg;)V"
)
- ModeWhere(String var3, int var4, class327[] var5) {
- this.field4137 = new HashSet();
+ ModeWhere(String var3, int var4, class326[] var5) {
+ this.field4116 = new HashSet();
this.id = var4; // L: 43
- class327[] var6 = var5; // L: 45
+ class326[] var6 = var5; // L: 45
for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46
- class327 var8 = var6[var7]; // L: 47
- this.field4137.add(var8); // L: 48
+ class326 var8 = var6[var7]; // L: 47
+ this.field4116.add(var8); // L: 48
}
} // L: 51
ModeWhere(String var3, int var4) {
- this.field4137 = new HashSet(); // L: 32
+ this.field4116 = new HashSet(); // L: 32
this.id = var4; // L: 39
} // L: 40
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id; // L: 55
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I)[Llz;",
- garbageValue = "-298356237"
+ descriptor = "(I)[Lfk;",
+ garbageValue = "1173982871"
)
- static ModeWhere[] method5894() {
- return new ModeWhere[]{field4126, field4138, field4127, field4130, field4129, field4136, field4133, field4132, field4128, field4135, field4134, field4131, field4125}; // L: 35
+ static HorizontalAlignment[] method6076() {
+ return new HorizontalAlignment[]{HorizontalAlignment.field1905, HorizontalAlignment.field1910, HorizontalAlignment.HorizontalAlignment_centered}; // L: 14
}
- @ObfuscatedName("iq")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V",
- garbageValue = "1808500640"
+ descriptor = "(B)[Llz;",
+ garbageValue = "110"
)
- @Export("menuAction")
- static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
- if (var2 >= 2000) { // L: 8923
- var2 -= 2000;
- }
+ static ModeWhere[] method6075() {
+ return new ModeWhere[]{field4107, field4106, field4110, field4112, field4102, field4111, field4113, field4108, field4115, field4104, field4105, field4117, field4103}; // L: 35
+ }
- PacketBufferNode var8;
- if (var2 == 1) { // L: 8924
- Client.mouseCrossX = var6; // L: 9291
- Client.mouseCrossY = var7; // L: 9292
- Client.mouseCrossColor = 2; // L: 9293
- Client.mouseCrossState = 0; // L: 9294
- Client.destinationX = var0; // L: 9295
- Client.destinationY = var1; // L: 9296
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2981, Client.packetWriter.isaacCipher); // L: 9298
- var8.packetBuffer.writeInt(class20.selectedItemWidget); // L: 9299
- var8.packetBuffer.method7550(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9300
- var8.packetBuffer.method7551(var0 + SecureRandomCallable.baseX); // L: 9301
- var8.packetBuffer.method7641(FloorUnderlayDefinition.selectedItemId); // L: 9302
- var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9303
- var8.packetBuffer.method7641(var3); // L: 9304
- var8.packetBuffer.method7550(PcmPlayer.selectedItemSlot); // L: 9305
- Client.packetWriter.addNode(var8); // L: 9306
- } else if (var2 == 2) {
- Client.mouseCrossX = var6; // L: 9100
- Client.mouseCrossY = var7; // L: 9101
- Client.mouseCrossColor = 2; // L: 9102
- Client.mouseCrossState = 0; // L: 9103
- Client.destinationX = var0; // L: 9104
- Client.destinationY = var1; // L: 9105
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3057, Client.packetWriter.isaacCipher); // L: 9106
- var8.packetBuffer.method7551(var0 + SecureRandomCallable.baseX); // L: 9107
- var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9108
- var8.packetBuffer.method7551(Client.selectedSpellItemId); // L: 9109
- var8.packetBuffer.method7551(Client.selectedSpellChildIndex); // L: 9110
- var8.packetBuffer.method7641(var3); // L: 9111
- var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9112
- var8.packetBuffer.writeIntME(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9113
- Client.packetWriter.addNode(var8); // L: 9114
- } else if (var2 == 3) {
- Client.mouseCrossX = var6; // L: 8938
- Client.mouseCrossY = var7; // L: 8939
- Client.mouseCrossColor = 2; // L: 8940
- Client.mouseCrossState = 0; // L: 8941
- Client.destinationX = var0; // L: 8942
- Client.destinationY = var1; // L: 8943
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2990, Client.packetWriter.isaacCipher); // L: 8945
- var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8946
- var8.packetBuffer.method7550(var3); // L: 8947
- var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 8948
- var8.packetBuffer.method7551(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 8949
- Client.packetWriter.addNode(var8); // L: 8950
- } else if (var2 == 4) {
- Client.mouseCrossX = var6; // L: 9554
- Client.mouseCrossY = var7; // L: 9555
- Client.mouseCrossColor = 2; // L: 9556
- Client.mouseCrossState = 0; // L: 9557
- Client.destinationX = var0; // L: 9558
- Client.destinationY = var1; // L: 9559
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3049, Client.packetWriter.isaacCipher); // L: 9561
- var8.packetBuffer.method7641(var3); // L: 9562
- var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9563
- var8.packetBuffer.method7550(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9564
- var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9565
- Client.packetWriter.addNode(var8); // L: 9566
- } else if (var2 == 5) {
- Client.mouseCrossX = var6; // L: 9014
- Client.mouseCrossY = var7; // L: 9015
- Client.mouseCrossColor = 2; // L: 9016
- Client.mouseCrossState = 0; // L: 9017
- Client.destinationX = var0; // L: 9018
- Client.destinationY = var1; // L: 9019
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3041, Client.packetWriter.isaacCipher); // L: 9021
- var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9022
- var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9023
- var8.packetBuffer.writeShort(var0 + SecureRandomCallable.baseX); // L: 9024
- var8.packetBuffer.method7550(var3); // L: 9025
- Client.packetWriter.addNode(var8); // L: 9026
- } else if (var2 == 6) {
- Client.mouseCrossX = var6; // L: 9160
- Client.mouseCrossY = var7; // L: 9161
- Client.mouseCrossColor = 2; // L: 9162
- Client.mouseCrossState = 0; // L: 9163
- Client.destinationX = var0; // L: 9164
- Client.destinationY = var1; // L: 9165
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 9167
- var8.packetBuffer.writeShort(var3); // L: 9168
- var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9169
- var8.packetBuffer.writeShort(var0 + SecureRandomCallable.baseX); // L: 9170
- var8.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9171
- Client.packetWriter.addNode(var8); // L: 9172
- } else {
- PacketBufferNode var9;
- NPC var13;
- if (var2 == 7) {
- var13 = Client.npcs[var3]; // L: 9572
- if (var13 != null) { // L: 9573
- Client.mouseCrossX = var6; // L: 9574
- Client.mouseCrossY = var7; // L: 9575
- Client.mouseCrossColor = 2; // L: 9576
- Client.mouseCrossState = 0; // L: 9577
- Client.destinationX = var0; // L: 9578
- Client.destinationY = var1; // L: 9579
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 9581
- var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9582
- var9.packetBuffer.writeShort(FloorUnderlayDefinition.selectedItemId); // L: 9583
- var9.packetBuffer.writeInt(class20.selectedItemWidget); // L: 9584
- var9.packetBuffer.writeShort(var3); // L: 9585
- var9.packetBuffer.writeShort(PcmPlayer.selectedItemSlot); // L: 9586
- Client.packetWriter.addNode(var9); // L: 9587
- }
- } else if (var2 == 8) {
- var13 = Client.npcs[var3]; // L: 9635
- if (var13 != null) { // L: 9636
- Client.mouseCrossX = var6; // L: 9637
- Client.mouseCrossY = var7; // L: 9638
- Client.mouseCrossColor = 2; // L: 9639
- Client.mouseCrossState = 0; // L: 9640
- Client.destinationX = var0; // L: 9641
- Client.destinationY = var1; // L: 9642
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 9643
- var9.packetBuffer.method7641(var3); // L: 9644
- var9.packetBuffer.writeShort(Client.selectedSpellItemId); // L: 9645
- var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9646
- var9.packetBuffer.method7551(Client.selectedSpellChildIndex); // L: 9647
- var9.packetBuffer.method7563(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9648
- Client.packetWriter.addNode(var9); // L: 9649
- }
- } else if (var2 == 9) {
- var13 = Client.npcs[var3]; // L: 9591
- if (var13 != null) { // L: 9592
- Client.mouseCrossX = var6; // L: 9593
- Client.mouseCrossY = var7; // L: 9594
- Client.mouseCrossColor = 2; // L: 9595
- Client.mouseCrossState = 0; // L: 9596
- Client.destinationX = var0; // L: 9597
- Client.destinationY = var1; // L: 9598
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3004, Client.packetWriter.isaacCipher); // L: 9600
- var9.packetBuffer.method7551(var3); // L: 9601
- var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9602
- Client.packetWriter.addNode(var9); // L: 9603
- }
- } else if (var2 == 10) {
- var13 = Client.npcs[var3]; // L: 9391
- if (var13 != null) { // L: 9392
- Client.mouseCrossX = var6; // L: 9393
- Client.mouseCrossY = var7; // L: 9394
- Client.mouseCrossColor = 2; // L: 9395
- Client.mouseCrossState = 0; // L: 9396
- Client.destinationX = var0; // L: 9397
- Client.destinationY = var1; // L: 9398
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3030, Client.packetWriter.isaacCipher); // L: 9400
- var9.packetBuffer.method7550(var3); // L: 9401
- var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9402
- Client.packetWriter.addNode(var9); // L: 9403
- }
- } else if (var2 == 11) {
- var13 = Client.npcs[var3]; // L: 9275
- if (var13 != null) { // L: 9276
- Client.mouseCrossX = var6; // L: 9277
- Client.mouseCrossY = var7; // L: 9278
- Client.mouseCrossColor = 2; // L: 9279
- Client.mouseCrossState = 0; // L: 9280
- Client.destinationX = var0; // L: 9281
- Client.destinationY = var1; // L: 9282
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3036, Client.packetWriter.isaacCipher); // L: 9284
- var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9285
- var9.packetBuffer.method7641(var3); // L: 9286
- Client.packetWriter.addNode(var9); // L: 9287
- }
- } else if (var2 == 12) {
- var13 = Client.npcs[var3]; // L: 8953
- if (var13 != null) { // L: 8954
- Client.mouseCrossX = var6; // L: 8955
- Client.mouseCrossY = var7; // L: 8956
- Client.mouseCrossColor = 2; // L: 8957
- Client.mouseCrossState = 0; // L: 8958
- Client.destinationX = var0; // L: 8959
- Client.destinationY = var1; // L: 8960
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2977, Client.packetWriter.isaacCipher); // L: 8962
- var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8963
- var9.packetBuffer.method7641(var3); // L: 8964
- Client.packetWriter.addNode(var9); // L: 8965
- }
- } else if (var2 == 13) {
- var13 = Client.npcs[var3]; // L: 9375
- if (var13 != null) { // L: 9376
- Client.mouseCrossX = var6; // L: 9377
- Client.mouseCrossY = var7; // L: 9378
- Client.mouseCrossColor = 2; // L: 9379
- Client.mouseCrossState = 0; // L: 9380
- Client.destinationX = var0; // L: 9381
- Client.destinationY = var1; // L: 9382
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3046, Client.packetWriter.isaacCipher); // L: 9384
- var9.packetBuffer.method7550(var3); // L: 9385
- var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9386
- Client.packetWriter.addNode(var9); // L: 9387
- }
- } else {
- Player var15;
- if (var2 == 14) {
- var15 = Client.players[var3]; // L: 9435
- if (var15 != null) { // L: 9436
- Client.mouseCrossX = var6; // L: 9437
- Client.mouseCrossY = var7; // L: 9438
- Client.mouseCrossColor = 2; // L: 9439
- Client.mouseCrossState = 0; // L: 9440
- Client.destinationX = var0; // L: 9441
- Client.destinationY = var1; // L: 9442
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3007, Client.packetWriter.isaacCipher); // L: 9444
- var9.packetBuffer.method7551(PcmPlayer.selectedItemSlot); // L: 9445
- var9.packetBuffer.method7641(var3); // L: 9446
- var9.packetBuffer.writeInt(class20.selectedItemWidget); // L: 9447
- var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9448
- var9.packetBuffer.method7641(FloorUnderlayDefinition.selectedItemId); // L: 9449
- Client.packetWriter.addNode(var9); // L: 9450
- }
- } else if (var2 == 15) {
- var15 = Client.players[var3]; // L: 9479
- if (var15 != null) { // L: 9480
- Client.mouseCrossX = var6; // L: 9481
- Client.mouseCrossY = var7; // L: 9482
- Client.mouseCrossColor = 2; // L: 9483
- Client.mouseCrossState = 0; // L: 9484
- Client.destinationX = var0; // L: 9485
- Client.destinationY = var1; // L: 9486
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3022, Client.packetWriter.isaacCipher); // L: 9487
- var9.packetBuffer.writeInt(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9488
- var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9489
- var9.packetBuffer.method7550(Client.selectedSpellItemId); // L: 9490
- var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9491
- var9.packetBuffer.method7641(var3); // L: 9492
- Client.packetWriter.addNode(var9); // L: 9493
- }
- } else if (var2 == 16) {
- Client.mouseCrossX = var6; // L: 9520
- Client.mouseCrossY = var7; // L: 9521
- Client.mouseCrossColor = 2; // L: 9522
- Client.mouseCrossState = 0; // L: 9523
- Client.destinationX = var0; // L: 9524
- Client.destinationY = var1; // L: 9525
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2996, Client.packetWriter.isaacCipher); // L: 9527
- var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 9528
- var8.packetBuffer.method7550(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9529
- var8.packetBuffer.method7641(FloorUnderlayDefinition.selectedItemId); // L: 9530
- var8.packetBuffer.method7563(class20.selectedItemWidget); // L: 9531
- var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9532
- var8.packetBuffer.method7641(PcmPlayer.selectedItemSlot); // L: 9533
- var8.packetBuffer.method7551(var3); // L: 9534
- Client.packetWriter.addNode(var8); // L: 9535
- } else if (var2 == 17) {
- Client.mouseCrossX = var6; // L: 9351
- Client.mouseCrossY = var7; // L: 9352
- Client.mouseCrossColor = 2; // L: 9353
- Client.mouseCrossState = 0; // L: 9354
- Client.destinationX = var0; // L: 9355
- Client.destinationY = var1; // L: 9356
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3010, Client.packetWriter.isaacCipher); // L: 9357
- var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9358
- var8.packetBuffer.method7551(Client.selectedSpellItemId); // L: 9359
- var8.packetBuffer.method7641(Client.selectedSpellChildIndex); // L: 9360
- var8.packetBuffer.writeShort(var3); // L: 9361
- var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9362
- var8.packetBuffer.writeInt(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9363
- var8.packetBuffer.writeShort(var0 + SecureRandomCallable.baseX); // L: 9364
- Client.packetWriter.addNode(var8); // L: 9365
- } else if (var2 == 18) {
- Client.mouseCrossX = var6; // L: 9056
- Client.mouseCrossY = var7; // L: 9057
- Client.mouseCrossColor = 2; // L: 9058
- Client.mouseCrossState = 0; // L: 9059
- Client.destinationX = var0; // L: 9060
- Client.destinationY = var1; // L: 9061
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3013, Client.packetWriter.isaacCipher); // L: 9063
- var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9064
- var8.packetBuffer.method7551(var3); // L: 9065
- var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9066
- var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9067
- Client.packetWriter.addNode(var8); // L: 9068
- } else if (var2 == 19) {
- Client.mouseCrossX = var6; // L: 9688
- Client.mouseCrossY = var7; // L: 9689
- Client.mouseCrossColor = 2; // L: 9690
- Client.mouseCrossState = 0; // L: 9691
- Client.destinationX = var0; // L: 9692
- Client.destinationY = var1; // L: 9693
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 9695
- var8.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9696
- var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9697
- var8.packetBuffer.method7641(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9698
- var8.packetBuffer.method7551(var3); // L: 9699
- Client.packetWriter.addNode(var8); // L: 9700
- } else if (var2 == 20) {
- Client.mouseCrossX = var6; // L: 9249
- Client.mouseCrossY = var7; // L: 9250
- Client.mouseCrossColor = 2; // L: 9251
- Client.mouseCrossState = 0; // L: 9252
- Client.destinationX = var0; // L: 9253
- Client.destinationY = var1; // L: 9254
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2997, Client.packetWriter.isaacCipher); // L: 9256
- var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9257
- var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9258
- var8.packetBuffer.method7551(var0 + SecureRandomCallable.baseX); // L: 9259
- var8.packetBuffer.method7641(var3); // L: 9260
- Client.packetWriter.addNode(var8); // L: 9261
- } else if (var2 == 21) {
- Client.mouseCrossX = var6; // L: 9188
- Client.mouseCrossY = var7; // L: 9189
- Client.mouseCrossColor = 2; // L: 9190
- Client.mouseCrossState = 0; // L: 9191
- Client.destinationX = var0; // L: 9192
- Client.destinationY = var1; // L: 9193
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2976, Client.packetWriter.isaacCipher); // L: 9195
- var8.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9196
- var8.packetBuffer.method7550(var0 + SecureRandomCallable.baseX); // L: 9197
- var8.packetBuffer.writeShort(var3); // L: 9198
- var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9199
- Client.packetWriter.addNode(var8); // L: 9200
- } else if (var2 == 22) {
- Client.mouseCrossX = var6; // L: 8983
- Client.mouseCrossY = var7; // L: 8984
- Client.mouseCrossColor = 2; // L: 8985
- Client.mouseCrossState = 0; // L: 8986
- Client.destinationX = var0; // L: 8987
- Client.destinationY = var1; // L: 8988
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2978, Client.packetWriter.isaacCipher); // L: 8990
- var8.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8991
- var8.packetBuffer.method7550(var3); // L: 8992
- var8.packetBuffer.method7551(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 8993
- var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 8994
- Client.packetWriter.addNode(var8); // L: 8995
- } else if (var2 == 23) {
- if (Client.isMenuOpen) { // L: 9664
- class175.scene.setViewportWalking(); // L: 9665
- } else {
- class175.scene.menuOpen(class128.Client_plane, var0, var1, true); // L: 9668
- }
- } else {
- PacketBufferNode var11;
- Widget var16;
- if (var2 == 24) {
- var16 = class92.getWidget(var1); // L: 9466
- if (var16 != null) { // L: 9467
- boolean var12 = true; // L: 9468
- if (var16.contentType > 0) { // L: 9469
- var12 = ReflectionCheck.method599(var16);
- }
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(I)[B",
+ garbageValue = "941818161"
+ )
+ public static byte[] method6082() {
+ byte[] var0 = new byte[24]; // L: 277
- if (var12) { // L: 9470
- var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3014, Client.packetWriter.isaacCipher); // L: 9472
- var11.packetBuffer.writeInt(var1); // L: 9473
- Client.packetWriter.addNode(var11); // L: 9474
- }
- }
- } else {
- if (var2 == 25) {
- var16 = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9175
- if (var16 != null) { // L: 9176
- MusicPatchNode2.Widget_runOnTargetLeave(); // L: 9177
- class93.selectSpell(var1, var0, WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var16)), var16.itemId); // L: 9178
- Client.isItemSelected = 0; // L: 9179
- Client.selectedSpellActionName = TriBool.Widget_getSpellActionName(var16); // L: 9180
- if (Client.selectedSpellActionName == null) { // L: 9181
- Client.selectedSpellActionName = "null";
- }
+ try {
+ JagexCache.JagexCache_randomDat.seek(0L); // L: 279
+ JagexCache.JagexCache_randomDat.readFully(var0); // L: 280
- if (var16.isIf3) { // L: 9182
- Client.selectedSpellName = var16.dataText + class166.colorStartTag(16777215);
- } else {
- Client.selectedSpellName = class166.colorStartTag(65280) + var16.spellName + class166.colorStartTag(16777215); // L: 9183
- }
- }
+ int var1;
+ for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 281 282 283
+ }
- return; // L: 9185
- }
-
- if (var2 == 26) {
- Varps.method5366(); // L: 9569
- } else {
- int var10;
- Widget var14;
- if (var2 == 28) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3014, Client.packetWriter.isaacCipher); // L: 9498
- var8.packetBuffer.writeInt(var1); // L: 9499
- Client.packetWriter.addNode(var8); // L: 9500
- var14 = class92.getWidget(var1); // L: 9501
- if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9502
- var10 = var14.cs1Instructions[0][1]; // L: 9503
- Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 9504
- class321.changeGameOptions(var10); // L: 9505
- }
- } else if (var2 == 29) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3014, Client.packetWriter.isaacCipher); // L: 9072
- var8.packetBuffer.writeInt(var1); // L: 9073
- Client.packetWriter.addNode(var8); // L: 9074
- var14 = class92.getWidget(var1); // L: 9075
- if (var14 != null && var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9076
- var10 = var14.cs1Instructions[0][1]; // L: 9077
- if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 9078
- Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 9079
- class321.changeGameOptions(var10); // L: 9080
- }
- }
- } else if (var2 == 30) {
- if (Client.meslayerContinueWidget == null) { // L: 9368
- Skills.resumePauseWidget(var1, var0); // L: 9369
- Client.meslayerContinueWidget = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9370
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 9371
- }
- } else if (var2 == 31) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2992, Client.packetWriter.isaacCipher); // L: 8970
- var8.packetBuffer.method7563(var1); // L: 8971
- var8.packetBuffer.method7550(var3); // L: 8972
- var8.packetBuffer.method7641(PcmPlayer.selectedItemSlot); // L: 8973
- var8.packetBuffer.method7565(class20.selectedItemWidget); // L: 8974
- var8.packetBuffer.method7550(var0); // L: 8975
- var8.packetBuffer.method7551(FloorUnderlayDefinition.selectedItemId); // L: 8976
- Client.packetWriter.addNode(var8); // L: 8977
- Client.field598 = 0; // L: 8978
- NPCComposition.field1991 = class92.getWidget(var1); // L: 8979
- Client.field599 = var0; // L: 8980
- } else if (var2 == 32) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3025, Client.packetWriter.isaacCipher); // L: 9204
- var8.packetBuffer.method7550(var0); // L: 9205
- var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9206
- var8.packetBuffer.writeIntME(var1); // L: 9207
- var8.packetBuffer.writeIntME(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9208
- var8.packetBuffer.method7550(var3); // L: 9209
- Client.packetWriter.addNode(var8); // L: 9210
- Client.field598 = 0; // L: 9211
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9212
- Client.field599 = var0; // L: 9213
- } else if (var2 == 33) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2971, Client.packetWriter.isaacCipher); // L: 9150
- var8.packetBuffer.writeShort(var0); // L: 9151
- var8.packetBuffer.writeShort(var3); // L: 9152
- var8.packetBuffer.writeIntME(var1); // L: 9153
- Client.packetWriter.addNode(var8); // L: 9154
- Client.field598 = 0; // L: 9155
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9156
- Client.field599 = var0; // L: 9157
- } else if (var2 == 34) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3045, Client.packetWriter.isaacCipher); // L: 9510
- var8.packetBuffer.method7551(var3); // L: 9511
- var8.packetBuffer.writeInt(var1); // L: 9512
- var8.packetBuffer.method7641(var0); // L: 9513
- Client.packetWriter.addNode(var8); // L: 9514
- Client.field598 = 0; // L: 9515
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9516
- Client.field599 = var0; // L: 9517
- } else if (var2 == 35) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3050, Client.packetWriter.isaacCipher); // L: 9408
- var8.packetBuffer.writeIntME(var1); // L: 9409
- var8.packetBuffer.method7551(var0); // L: 9410
- var8.packetBuffer.method7551(var3); // L: 9411
- Client.packetWriter.addNode(var8); // L: 9412
- Client.field598 = 0; // L: 9413
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9414
- Client.field599 = var0; // L: 9415
- } else if (var2 == 36) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3028, Client.packetWriter.isaacCipher); // L: 9619
- var8.packetBuffer.method7641(var3); // L: 9620
- var8.packetBuffer.method7641(var0); // L: 9621
- var8.packetBuffer.writeInt(var1); // L: 9622
- Client.packetWriter.addNode(var8); // L: 9623
- Client.field598 = 0; // L: 9624
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9625
- Client.field599 = var0; // L: 9626
- } else if (var2 == 37) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2979, Client.packetWriter.isaacCipher); // L: 9030
- var8.packetBuffer.method7550(var0); // L: 9031
- var8.packetBuffer.writeShort(var3); // L: 9032
- var8.packetBuffer.writeInt(var1); // L: 9033
- Client.packetWriter.addNode(var8); // L: 9034
- Client.field598 = 0; // L: 9035
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9036
- Client.field599 = var0; // L: 9037
- } else {
- if (var2 == 38) {
- MusicPatchNode2.Widget_runOnTargetLeave(); // L: 9454
- var16 = class92.getWidget(var1); // L: 9455
- Client.isItemSelected = 1; // L: 9456
- PcmPlayer.selectedItemSlot = var0; // L: 9457
- class20.selectedItemWidget = var1; // L: 9458
- FloorUnderlayDefinition.selectedItemId = var3; // L: 9459
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var16); // L: 9460
- Client.selectedItemName = class166.colorStartTag(16748608) + FileSystem.ItemDefinition_get(var3).name + class166.colorStartTag(16777215); // L: 9461
- if (Client.selectedItemName == null) { // L: 9462
- Client.selectedItemName = "null";
- }
-
- return; // L: 9463
- }
-
- if (var2 == 39) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3024, Client.packetWriter.isaacCipher); // L: 9320
- var8.packetBuffer.writeShort(var3); // L: 9321
- var8.packetBuffer.method7551(var0); // L: 9322
- var8.packetBuffer.method7565(var1); // L: 9323
- Client.packetWriter.addNode(var8); // L: 9324
- Client.field598 = 0; // L: 9325
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9326
- Client.field599 = var0; // L: 9327
- } else if (var2 == 40) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3008, Client.packetWriter.isaacCipher); // L: 9654
- var8.packetBuffer.method7551(var3); // L: 9655
- var8.packetBuffer.method7551(var0); // L: 9656
- var8.packetBuffer.method7565(var1); // L: 9657
- Client.packetWriter.addNode(var8); // L: 9658
- Client.field598 = 0; // L: 9659
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9660
- Client.field599 = var0; // L: 9661
- } else if (var2 == 41) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field3018, Client.packetWriter.isaacCipher); // L: 9608
- var8.packetBuffer.method7641(var0); // L: 9609
- var8.packetBuffer.method7551(var3); // L: 9610
- var8.packetBuffer.writeInt(var1); // L: 9611
- Client.packetWriter.addNode(var8); // L: 9612
- Client.field598 = 0; // L: 9613
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9614
- Client.field599 = var0; // L: 9615
- } else if (var2 == 42) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2961, Client.packetWriter.isaacCipher); // L: 9265
- var8.packetBuffer.method7641(var0); // L: 9266
- var8.packetBuffer.method7563(var1); // L: 9267
- var8.packetBuffer.method7550(var3); // L: 9268
- Client.packetWriter.addNode(var8); // L: 9269
- Client.field598 = 0; // L: 9270
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9271
- Client.field599 = var0; // L: 9272
- } else if (var2 == 43) {
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2966, Client.packetWriter.isaacCipher); // L: 9331
- var8.packetBuffer.method7641(var0); // L: 9332
- var8.packetBuffer.method7550(var3); // L: 9333
- var8.packetBuffer.writeInt(var1); // L: 9334
- Client.packetWriter.addNode(var8); // L: 9335
- Client.field598 = 0; // L: 9336
- NPCComposition.field1991 = class92.getWidget(var1); // L: 9337
- Client.field599 = var0; // L: 9338
- } else if (var2 == 44) {
- var15 = Client.players[var3]; // L: 9672
- if (var15 != null) { // L: 9673
- Client.mouseCrossX = var6; // L: 9674
- Client.mouseCrossY = var7; // L: 9675
- Client.mouseCrossColor = 2; // L: 9676
- Client.mouseCrossState = 0; // L: 9677
- Client.destinationX = var0; // L: 9678
- Client.destinationY = var1; // L: 9679
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9681
- var9.packetBuffer.writeShort(var3); // L: 9682
- var9.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9683
- Client.packetWriter.addNode(var9); // L: 9684
- }
- } else if (var2 == 45) {
- var15 = Client.players[var3]; // L: 9133
- if (var15 != null) { // L: 9134
- Client.mouseCrossX = var6; // L: 9135
- Client.mouseCrossY = var7; // L: 9136
- Client.mouseCrossColor = 2; // L: 9137
- Client.mouseCrossState = 0; // L: 9138
- Client.destinationX = var0; // L: 9139
- Client.destinationY = var1; // L: 9140
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2975, Client.packetWriter.isaacCipher); // L: 9142
- var9.packetBuffer.method7550(var3); // L: 9143
- var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9144
- Client.packetWriter.addNode(var9); // L: 9145
- }
- } else if (var2 == 46) {
- var15 = Client.players[var3]; // L: 8998
- if (var15 != null) { // L: 8999
- Client.mouseCrossX = var6; // L: 9000
- Client.mouseCrossY = var7; // L: 9001
- Client.mouseCrossColor = 2; // L: 9002
- Client.mouseCrossState = 0; // L: 9003
- Client.destinationX = var0; // L: 9004
- Client.destinationY = var1; // L: 9005
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3003, Client.packetWriter.isaacCipher); // L: 9007
- var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9008
- var9.packetBuffer.writeShort(var3); // L: 9009
- Client.packetWriter.addNode(var9); // L: 9010
- }
- } else if (var2 == 47) {
- var15 = Client.players[var3]; // L: 9117
- if (var15 != null) { // L: 9118
- Client.mouseCrossX = var6; // L: 9119
- Client.mouseCrossY = var7; // L: 9120
- Client.mouseCrossColor = 2; // L: 9121
- Client.mouseCrossState = 0; // L: 9122
- Client.destinationX = var0; // L: 9123
- Client.destinationY = var1; // L: 9124
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 9126
- var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9127
- var9.packetBuffer.method7641(var3); // L: 9128
- Client.packetWriter.addNode(var9); // L: 9129
- }
- } else if (var2 == 48) {
- var15 = Client.players[var3]; // L: 9040
- if (var15 != null) { // L: 9041
- Client.mouseCrossX = var6; // L: 9042
- Client.mouseCrossY = var7; // L: 9043
- Client.mouseCrossColor = 2; // L: 9044
- Client.mouseCrossState = 0; // L: 9045
- Client.destinationX = var0; // L: 9046
- Client.destinationY = var1; // L: 9047
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9049
- var9.packetBuffer.writeShort(var3); // L: 9050
- var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9051
- Client.packetWriter.addNode(var9); // L: 9052
- }
- } else if (var2 == 49) {
- var15 = Client.players[var3]; // L: 9703
- if (var15 != null) { // L: 9704
- Client.mouseCrossX = var6; // L: 9705
- Client.mouseCrossY = var7; // L: 9706
- Client.mouseCrossColor = 2; // L: 9707
- Client.mouseCrossState = 0; // L: 9708
- Client.destinationX = var0; // L: 9709
- Client.destinationY = var1; // L: 9710
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9712
- var9.packetBuffer.method7641(var3); // L: 9713
- var9.packetBuffer.method7687(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9714
- Client.packetWriter.addNode(var9); // L: 9715
- }
- } else if (var2 == 50) {
- var15 = Client.players[var3]; // L: 9538
- if (var15 != null) { // L: 9539
- Client.mouseCrossX = var6; // L: 9540
- Client.mouseCrossY = var7; // L: 9541
- Client.mouseCrossColor = 2; // L: 9542
- Client.mouseCrossState = 0; // L: 9543
- Client.destinationX = var0; // L: 9544
- Client.destinationY = var1; // L: 9545
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9547
- var9.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9548
- var9.packetBuffer.method7641(var3); // L: 9549
- Client.packetWriter.addNode(var9); // L: 9550
- }
- } else if (var2 == 51) {
- var15 = Client.players[var3]; // L: 9216
- if (var15 != null) { // L: 9217
- Client.mouseCrossX = var6; // L: 9218
- Client.mouseCrossY = var7; // L: 9219
- Client.mouseCrossColor = 2; // L: 9220
- Client.mouseCrossState = 0; // L: 9221
- Client.destinationX = var0; // L: 9222
- Client.destinationY = var1; // L: 9223
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field3019, Client.packetWriter.isaacCipher); // L: 9225
- var9.packetBuffer.method7542(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9226
- var9.packetBuffer.method7641(var3); // L: 9227
- Client.packetWriter.addNode(var9); // L: 9228
- }
- } else {
- label655: {
- if (var2 != 57) {
- if (var2 == 58) {
- var16 = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9235
- if (var16 != null) { // L: 9236
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2963, Client.packetWriter.isaacCipher); // L: 9238
- var9.packetBuffer.method7565(ArchiveDiskActionHandler.selectedSpellWidget); // L: 9239
- var9.packetBuffer.method7563(var1); // L: 9240
- var9.packetBuffer.writeShort(var16.itemId); // L: 9241
- var9.packetBuffer.method7551(Client.selectedSpellChildIndex); // L: 9242
- var9.packetBuffer.method7550(var0); // L: 9243
- var9.packetBuffer.method7641(Client.selectedSpellItemId); // L: 9244
- Client.packetWriter.addNode(var9); // L: 9245
- }
- break label655;
- }
-
- if (var2 == 1001) {
- Client.mouseCrossX = var6; // L: 9085
- Client.mouseCrossY = var7; // L: 9086
- Client.mouseCrossColor = 2; // L: 9087
- Client.mouseCrossState = 0; // L: 9088
- Client.destinationX = var0; // L: 9089
- Client.destinationY = var1; // L: 9090
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2994, Client.packetWriter.isaacCipher); // L: 9092
- var8.packetBuffer.writeShort(GrandExchangeOfferOwnWorldComparator.baseY + var1); // L: 9093
- var8.packetBuffer.writeShort(var3); // L: 9094
- var8.packetBuffer.method7641(var0 + SecureRandomCallable.baseX); // L: 9095
- var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9096
- Client.packetWriter.addNode(var8); // L: 9097
- break label655;
- }
-
- if (var2 == 1002) {
- Client.mouseCrossX = var6; // L: 9309
- Client.mouseCrossY = var7; // L: 9310
- Client.mouseCrossColor = 2; // L: 9311
- Client.mouseCrossState = 0; // L: 9312
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2950, Client.packetWriter.isaacCipher); // L: 9314
- var8.packetBuffer.writeShort(var3); // L: 9315
- Client.packetWriter.addNode(var8); // L: 9316
- break label655;
- }
-
- if (var2 == 1003) {
- Client.mouseCrossX = var6; // L: 9418
- Client.mouseCrossY = var7; // L: 9419
- Client.mouseCrossColor = 2; // L: 9420
- Client.mouseCrossState = 0; // L: 9421
- var13 = Client.npcs[var3]; // L: 9422
- if (var13 != null) { // L: 9423
- NPCComposition var17 = var13.definition; // L: 9424
- if (var17.transforms != null) { // L: 9425
- var17 = var17.transform();
- }
-
- if (var17 != null) { // L: 9426
- var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3016, Client.packetWriter.isaacCipher); // L: 9428
- var11.packetBuffer.method7550(var17.id); // L: 9429
- Client.packetWriter.addNode(var11); // L: 9430
- }
- }
- break label655;
- }
-
- if (var2 == 1004) {
- Client.mouseCrossX = var6; // L: 9341
- Client.mouseCrossY = var7; // L: 9342
- Client.mouseCrossColor = 2; // L: 9343
- Client.mouseCrossState = 0; // L: 9344
- var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 9346
- var8.packetBuffer.writeShort(var3); // L: 9347
- Client.packetWriter.addNode(var8); // L: 9348
- break label655;
- }
-
- if (var2 == 1005) {
- var16 = class92.getWidget(var1); // L: 8925
- if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8926
- WorldMapEvent.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + FileSystem.ItemDefinition_get(var3).name);
- } else {
- var9 = WallDecoration.getPacketBufferNode(ClientPacket.field2986, Client.packetWriter.isaacCipher); // L: 8929
- var9.packetBuffer.writeShort(var3); // L: 8930
- Client.packetWriter.addNode(var9); // L: 8931
- }
-
- Client.field598 = 0; // L: 8933
- NPCComposition.field1991 = class92.getWidget(var1); // L: 8934
- Client.field599 = var0; // L: 8935
- break label655;
- }
-
- if (var2 != 1007) {
- if (var2 == 1009 || var2 == 1011 || var2 == 1008 || var2 == 1010 || var2 == 1012) {
- ServerPacket.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9232
- }
- break label655;
- }
- }
-
- var16 = ApproximateRouteStrategy.getWidgetChild(var1, var0); // L: 9629
- if (var16 != null) { // L: 9630
- TaskHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9631
- }
- }
- }
- }
- }
- }
- }
+ if (var1 >= 24) {
+ throw new IOException(); // L: 285
+ }
+ } catch (Exception var4) {
+ for (int var2 = 0; var2 < 24; ++var2) { // L: 288
+ var0[var2] = -1;
}
}
- if (Client.isItemSelected != 0) { // L: 9718
- Client.isItemSelected = 0; // L: 9719
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(class92.getWidget(class20.selectedItemWidget)); // L: 9720
+ return var0; // L: 290
+ }
+
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)I",
+ garbageValue = "16"
+ )
+ static final int method6079(int var0, int var1) {
+ if (var0 == -2) { // L: 927
+ return 12345678;
+ } else if (var0 == -1) { // L: 928
+ if (var1 < 2) { // L: 929
+ var1 = 2;
+ } else if (var1 > 126) { // L: 930
+ var1 = 126;
+ }
+
+ return var1; // L: 931
+ } else {
+ var1 = (var0 & 127) * var1 / 128; // L: 933
+ if (var1 < 2) { // L: 934
+ var1 = 2;
+ } else if (var1 > 126) { // L: 935
+ var1 = 126;
+ }
+
+ return (var0 & 65408) + var1; // L: 936
+ }
+ }
+
+ @ObfuscatedName("ff")
+ @ObfuscatedSignature(
+ descriptor = "(IZZZZI)Llc;",
+ garbageValue = "-1168566075"
+ )
+ @Export("newArchive")
+ static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3, boolean var4) {
+ ArchiveDisk var5 = null; // L: 2030
+ if (JagexCache.JagexCache_dat2File != null) { // L: 2031
+ var5 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class359.JagexCache_idxFiles[var0], 1000000);
}
- if (Client.isSpellSelected) { // L: 9722
- MusicPatchNode2.Widget_runOnTargetLeave();
+ return new Archive(var5, CollisionMap.masterDisk, var0, var1, var2, var3, var4); // L: 2032
+ }
+
+ @ObfuscatedName("lu")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;",
+ garbageValue = "4"
+ )
+ static String method6080(String var0, boolean var1) {
+ String var2 = var1 ? "https://" : "http://"; // L: 12330
+ if (Client.gameBuild == 1) { // L: 12331
+ var0 = var0 + "-wtrc";
+ } else if (Client.gameBuild == 2) { // L: 12332
+ var0 = var0 + "-wtqa";
+ } else if (Client.gameBuild == 3) { // L: 12333
+ var0 = var0 + "-wtwip";
+ } else if (Client.gameBuild == 5) { // L: 12334
+ var0 = var0 + "-wti";
+ } else if (Client.gameBuild == 4) { // L: 12335
+ var0 = "local";
}
- if (NPCComposition.field1991 != null && Client.field598 == 0) { // L: 9723
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(NPCComposition.field1991);
+ String var3 = ""; // L: 12336
+ if (GrandExchangeOfferTotalQuantityComparator.field4045 != null) { // L: 12337
+ var3 = "/p=" + GrandExchangeOfferTotalQuantityComparator.field4045;
}
- } // L: 9724
+ String var4 = "runescape.com"; // L: 12338
+ return var2 + var0 + "." + var4 + "/l=" + class134.clientLanguage + "/a=" + class17.field99 + var3 + "/"; // L: 12339
+ }
}
diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java
index c95bf18c29..ea663a6ad4 100644
--- a/runescape-client/src/main/java/Model.java
+++ b/runescape-client/src/main/java/Model.java
@@ -3,212 +3,212 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hv")
+@ObfuscatedName("hy")
@Implements("Model")
public class Model extends Renderable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lhv;"
+ descriptor = "Lhy;"
)
@Export("Model_sharedSequenceModel")
static Model Model_sharedSequenceModel;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("Model_sharedSequenceModelFaceAlphas")
static byte[] Model_sharedSequenceModelFaceAlphas;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lhv;"
+ descriptor = "Lhy;"
)
@Export("Model_sharedSpotAnimationModel")
static Model Model_sharedSpotAnimationModel;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("Model_sharedSpotAnimationModelFaceAlphas")
static byte[] Model_sharedSpotAnimationModelFaceAlphas;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lnw;"
+ descriptor = "Lny;"
)
- static class388 field2550;
- @ObfuscatedName("m")
+ static class387 field2542;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lnw;"
+ descriptor = "Lny;"
)
- static class388 field2606;
- @ObfuscatedName("p")
+ static class387 field2510;
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lnw;"
+ descriptor = "Lny;"
)
- static class388 field2552;
- @ObfuscatedName("ah")
- static boolean[] field2597;
- @ObfuscatedName("ao")
- static boolean[] field2591;
+ static class387 field2511;
+ @ObfuscatedName("ai")
+ static boolean[] field2549;
+ @ObfuscatedName("az")
+ static boolean[] field2550;
@ObfuscatedName("av")
@Export("modelViewportXs")
static int[] modelViewportXs;
- @ObfuscatedName("ai")
+ @ObfuscatedName("aw")
@Export("modelViewportYs")
static int[] modelViewportYs;
- @ObfuscatedName("ay")
- static int[] field2548;
+ @ObfuscatedName("au")
+ static int[] field2553;
@ObfuscatedName("aa")
- static int[] field2590;
- @ObfuscatedName("ax")
- static int[] field2596;
- @ObfuscatedName("at")
- static int[] field2602;
- @ObfuscatedName("ba")
- static int[] field2573;
- @ObfuscatedName("bk")
- static int[][] field2561;
- @ObfuscatedName("bi")
- static int[] field2601;
+ static int[] field2520;
+ @ObfuscatedName("ay")
+ static int[] field2555;
+ @ObfuscatedName("as")
+ static int[] field2559;
+ @ObfuscatedName("bz")
+ static int[] field2558;
+ @ObfuscatedName("bp")
+ static int[][] field2509;
+ @ObfuscatedName("bf")
+ static int[] field2560;
+ @ObfuscatedName("bg")
+ static int[][] field2532;
+ @ObfuscatedName("br")
+ static int[] field2562;
+ @ObfuscatedName("bn")
+ static int[] field2508;
+ @ObfuscatedName("bq")
+ static int[] field2564;
@ObfuscatedName("bc")
- static int[][] field2547;
- @ObfuscatedName("bo")
- static int[] field2603;
+ static int[] field2505;
@ObfuscatedName("bl")
- static int[] field2604;
- @ObfuscatedName("bs")
- static int[] field2605;
- @ObfuscatedName("bx")
- static int[] field2616;
- @ObfuscatedName("bd")
- static int[] field2607;
- @ObfuscatedName("bj")
- static int[] field2608;
- @ObfuscatedName("be")
+ static int[] field2566;
+ @ObfuscatedName("bv")
+ static int[] field2567;
+ @ObfuscatedName("bt")
@Export("Model_transformTempX")
static int Model_transformTempX;
- @ObfuscatedName("bf")
+ @ObfuscatedName("bh")
@Export("Model_transformTempY")
static int Model_transformTempY;
- @ObfuscatedName("bz")
+ @ObfuscatedName("bs")
@Export("Model_transformTempZ")
static int Model_transformTempZ;
- @ObfuscatedName("bv")
- static boolean field2612;
- @ObfuscatedName("bq")
+ @ObfuscatedName("bk")
+ static boolean field2524;
+ @ObfuscatedName("bu")
@Export("Model_sine")
static int[] Model_sine;
- @ObfuscatedName("bh")
+ @ObfuscatedName("bw")
@Export("Model_cosine")
static int[] Model_cosine;
- @ObfuscatedName("bb")
+ @ObfuscatedName("bi")
@Export("Model_colorPalette")
static int[] Model_colorPalette;
- @ObfuscatedName("bm")
- static int[] field2560;
- @ObfuscatedName("s")
+ @ObfuscatedName("bo")
+ static int[] field2547;
+ @ObfuscatedName("w")
@Export("verticesCount")
int verticesCount;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("verticesX")
int[] verticesX;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("verticesY")
int[] verticesY;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("verticesZ")
int[] verticesZ;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("indicesCount")
int indicesCount;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("indices1")
int[] indices1;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("indices2")
int[] indices2;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("indices3")
int[] indices3;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("faceColors1")
int[] faceColors1;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("faceColors2")
int[] faceColors2;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("faceColors3")
int[] faceColors3;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("faceRenderPriorities")
byte[] faceRenderPriorities;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("faceAlphas")
byte[] faceAlphas;
- @ObfuscatedName("f")
- byte[] field2566;
- @ObfuscatedName("d")
+ @ObfuscatedName("p")
+ byte[] field2525;
+ @ObfuscatedName("b")
@Export("faceTextures")
short[] faceTextures;
- @ObfuscatedName("j")
- byte field2568;
- @ObfuscatedName("z")
- int field2569;
- @ObfuscatedName("i")
- int[] field2570;
- @ObfuscatedName("u")
- int[] field2571;
- @ObfuscatedName("ag")
- int[] field2572;
- @ObfuscatedName("ar")
+ @ObfuscatedName("n")
+ byte field2527;
+ @ObfuscatedName("o")
+ int field2528;
+ @ObfuscatedName("m")
+ int[] field2529;
+ @ObfuscatedName("d")
+ int[] field2522;
+ @ObfuscatedName("ad")
+ int[] field2531;
+ @ObfuscatedName("ak")
@Export("vertexLabels")
int[][] vertexLabels;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("faceLabelsAlpha")
int[][] faceLabelsAlpha;
- @ObfuscatedName("ac")
- int[][] field2575;
+ @ObfuscatedName("ao")
+ int[][] field2534;
@ObfuscatedName("ab")
- int[][] field2594;
- @ObfuscatedName("aj")
+ int[][] field2519;
+ @ObfuscatedName("ap")
@Export("isSingleTile")
public boolean isSingleTile;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("boundsType")
int boundsType;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("bottomY")
int bottomY;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@Export("xzRadius")
int xzRadius;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@Export("diameter")
int diameter;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@Export("radius")
int radius;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@Export("xMid")
int xMid;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@Export("yMid")
int yMid;
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@Export("zMid")
int zMid;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@Export("xMidOffset")
int xMidOffset;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@Export("yMidOffset")
int yMidOffset;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@Export("zMidOffset")
int zMidOffset;
- @ObfuscatedName("bg")
+ @ObfuscatedName("by")
@Export("overrideHue")
public byte overrideHue;
- @ObfuscatedName("bp")
+ @ObfuscatedName("bj")
@Export("overrideSaturation")
public byte overrideSaturation;
- @ObfuscatedName("bw")
+ @ObfuscatedName("bd")
@Export("overrideLuminance")
public byte overrideLuminance;
- @ObfuscatedName("co")
+ @ObfuscatedName("cr")
@Export("overrideAmount")
public byte overrideAmount;
@@ -217,39 +217,39 @@ public class Model extends Renderable {
Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 12
Model_sharedSpotAnimationModel = new Model(); // L: 13
Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 14
- field2550 = new class388(); // L: 15
- field2606 = new class388(); // L: 16
- field2552 = new class388(); // L: 17
- field2597 = new boolean[6500]; // L: 55
- field2591 = new boolean[6500]; // L: 56
+ field2542 = new class387(); // L: 15
+ field2510 = new class387(); // L: 16
+ field2511 = new class387(); // L: 17
+ field2549 = new boolean[6500]; // L: 55
+ field2550 = new boolean[6500]; // L: 56
modelViewportXs = new int[6500]; // L: 57
modelViewportYs = new int[6500]; // L: 58
- field2548 = new int[6500]; // L: 59
- field2590 = new int[6500]; // L: 60
- field2596 = new int[6500]; // L: 61
- field2602 = new int[6500]; // L: 62
- field2573 = new int[1600]; // L: 64
- field2561 = new int[1600][512]; // L: 65
- field2601 = new int[12]; // L: 66
- field2547 = new int[12][2000]; // L: 67
- field2603 = new int[2000]; // L: 68
- field2604 = new int[2000]; // L: 69
- field2605 = new int[12]; // L: 70
- field2616 = new int[10]; // L: 71
- field2607 = new int[10]; // L: 72
- field2608 = new int[10]; // L: 73
- field2612 = true; // L: 77
+ field2553 = new int[6500]; // L: 59
+ field2520 = new int[6500]; // L: 60
+ field2555 = new int[6500]; // L: 61
+ field2559 = new int[6500]; // L: 62
+ field2558 = new int[1600]; // L: 64
+ field2509 = new int[1600][512]; // L: 65
+ field2560 = new int[12]; // L: 66
+ field2532 = new int[12][2000]; // L: 67
+ field2562 = new int[2000]; // L: 68
+ field2508 = new int[2000]; // L: 69
+ field2564 = new int[12]; // L: 70
+ field2505 = new int[10]; // L: 71
+ field2566 = new int[10]; // L: 72
+ field2567 = new int[10]; // L: 73
+ field2524 = true; // L: 77
Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 80
Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 81
Model_colorPalette = Rasterizer3D.Rasterizer3D_colorPalette; // L: 82
- field2560 = Rasterizer3D.field2385; // L: 83
+ field2547 = Rasterizer3D.field2347; // L: 83
}
Model() {
this.verticesCount = 0;
this.indicesCount = 0;
- this.field2568 = 0;
- this.field2569 = 0;
+ this.field2527 = 0;
+ this.field2528 = 0;
this.isSingleTile = false;
this.xMidOffset = -1;
this.yMidOffset = -1;
@@ -257,13 +257,13 @@ public class Model extends Renderable {
} // L: 91
@ObfuscatedSignature(
- descriptor = "([Lhv;I)V"
+ descriptor = "([Lhy;I)V"
)
public Model(Model[] var1, int var2) {
this.verticesCount = 0; // L: 18
this.indicesCount = 0; // L: 22
- this.field2568 = 0; // L: 33
- this.field2569 = 0; // L: 34
+ this.field2527 = 0; // L: 33
+ this.field2528 = 0; // L: 34
this.isSingleTile = false; // L: 42
this.xMidOffset = -1; // L: 51
this.yMidOffset = -1; // L: 52
@@ -274,8 +274,8 @@ public class Model extends Renderable {
boolean var6 = false; // L: 97
this.verticesCount = 0; // L: 98
this.indicesCount = 0; // L: 99
- this.field2569 = 0; // L: 100
- this.field2568 = -1; // L: 101
+ this.field2528 = 0; // L: 100
+ this.field2527 = -1; // L: 101
int var7;
Model var8;
@@ -284,22 +284,22 @@ public class Model extends Renderable {
if (var8 != null) { // L: 104
this.verticesCount += var8.verticesCount; // L: 105
this.indicesCount += var8.indicesCount; // L: 106
- this.field2569 += var8.field2569; // L: 107
+ this.field2528 += var8.field2528; // L: 107
if (var8.faceRenderPriorities != null) { // L: 108
var3 = true;
} else {
- if (this.field2568 == -1) { // L: 110
- this.field2568 = var8.field2568;
+ if (this.field2527 == -1) { // L: 110
+ this.field2527 = var8.field2527;
}
- if (this.field2568 != var8.field2568) { // L: 111
+ if (this.field2527 != var8.field2527) { // L: 111
var3 = true;
}
}
var4 |= var8.faceAlphas != null; // L: 113
var5 |= var8.faceTextures != null; // L: 114
- var6 |= var8.field2566 != null; // L: 115
+ var6 |= var8.field2525 != null; // L: 115
}
}
@@ -325,18 +325,18 @@ public class Model extends Renderable {
}
if (var6) { // L: 130
- this.field2566 = new byte[this.indicesCount];
+ this.field2525 = new byte[this.indicesCount];
}
- if (this.field2569 > 0) { // L: 131
- this.field2570 = new int[this.field2569]; // L: 132
- this.field2571 = new int[this.field2569]; // L: 133
- this.field2572 = new int[this.field2569]; // L: 134
+ if (this.field2528 > 0) { // L: 131
+ this.field2529 = new int[this.field2528]; // L: 132
+ this.field2522 = new int[this.field2528]; // L: 133
+ this.field2531 = new int[this.field2528]; // L: 134
}
this.verticesCount = 0; // L: 136
this.indicesCount = 0; // L: 137
- this.field2569 = 0; // L: 138
+ this.field2528 = 0; // L: 138
for (var7 = 0; var7 < var2; ++var7) { // L: 139
var8 = var1[var7]; // L: 140
@@ -353,7 +353,7 @@ public class Model extends Renderable {
if (var8.faceRenderPriorities != null) { // L: 150
this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9];
} else {
- this.faceRenderPriorities[this.indicesCount] = var8.field2568; // L: 151
+ this.faceRenderPriorities[this.indicesCount] = var8.field2527; // L: 151
}
}
@@ -370,21 +370,21 @@ public class Model extends Renderable {
}
if (var6) { // L: 160
- if (var8.field2566 != null && var8.field2566[var9] != -1) { // L: 161
- this.field2566[this.indicesCount] = (byte)(this.field2569 + var8.field2566[var9]);
+ if (var8.field2525 != null && var8.field2525[var9] != -1) { // L: 161
+ this.field2525[this.indicesCount] = (byte)(this.field2528 + var8.field2525[var9]);
} else {
- this.field2566[this.indicesCount] = -1; // L: 162
+ this.field2525[this.indicesCount] = -1; // L: 162
}
}
++this.indicesCount; // L: 164
}
- for (var9 = 0; var9 < var8.field2569; ++var9) { // L: 166
- this.field2570[this.field2569] = this.verticesCount + var8.field2570[var9]; // L: 167
- this.field2571[this.field2569] = this.verticesCount + var8.field2571[var9]; // L: 168
- this.field2572[this.field2569] = this.verticesCount + var8.field2572[var9]; // L: 169
- ++this.field2569; // L: 170
+ for (var9 = 0; var9 < var8.field2528; ++var9) { // L: 166
+ this.field2529[this.field2528] = this.verticesCount + var8.field2529[var9]; // L: 167
+ this.field2522[this.field2528] = this.verticesCount + var8.field2522[var9]; // L: 168
+ this.field2531[this.field2528] = this.verticesCount + var8.field2531[var9]; // L: 169
+ ++this.field2528; // L: 170
}
for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 172
@@ -398,9 +398,9 @@ public class Model extends Renderable {
} // L: 180
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([[IIIIZI)Lhv;"
+ descriptor = "([[IIIIZI)Lhy;"
)
@Export("contourGround")
public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
@@ -422,7 +422,7 @@ public class Model extends Renderable {
var11 = new Model(); // L: 196
var11.verticesCount = this.verticesCount; // L: 197
var11.indicesCount = this.indicesCount; // L: 198
- var11.field2569 = this.field2569; // L: 199
+ var11.field2528 = this.field2528; // L: 199
var11.verticesX = this.verticesX; // L: 200
var11.verticesZ = this.verticesZ; // L: 201
var11.indices1 = this.indices1; // L: 202
@@ -433,12 +433,12 @@ public class Model extends Renderable {
var11.faceColors3 = this.faceColors3; // L: 207
var11.faceRenderPriorities = this.faceRenderPriorities; // L: 208
var11.faceAlphas = this.faceAlphas; // L: 209
- var11.field2566 = this.field2566; // L: 210
+ var11.field2525 = this.field2525; // L: 210
var11.faceTextures = this.faceTextures; // L: 211
- var11.field2568 = this.field2568; // L: 212
- var11.field2570 = this.field2570; // L: 213
- var11.field2571 = this.field2571; // L: 214
- var11.field2572 = this.field2572; // L: 215
+ var11.field2527 = this.field2527; // L: 212
+ var11.field2529 = this.field2529; // L: 213
+ var11.field2522 = this.field2522; // L: 214
+ var11.field2531 = this.field2531; // L: 215
var11.vertexLabels = this.vertexLabels; // L: 216
var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217
var11.isSingleTile = this.isSingleTile; // L: 218
@@ -496,9 +496,9 @@ public class Model extends Renderable {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Z)Lhv;"
+ descriptor = "(Z)Lhy;"
)
@Export("toSharedSequenceModel")
public Model toSharedSequenceModel(boolean var1) {
@@ -509,9 +509,9 @@ public class Model extends Renderable {
return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Z)Lhv;"
+ descriptor = "(Z)Lhy;"
)
@Export("toSharedSpotAnimationModel")
public Model toSharedSpotAnimationModel(boolean var1) {
@@ -522,15 +522,15 @@ public class Model extends Renderable {
return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266
}
- @ObfuscatedName("r")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(ZLhv;[B)Lhv;"
+ descriptor = "(ZLhy;[B)Lhy;"
)
@Export("buildSharedModel")
Model buildSharedModel(boolean var1, Model var2, byte[] var3) {
var2.verticesCount = this.verticesCount; // L: 270
var2.indicesCount = this.indicesCount; // L: 271
- var2.field2569 = this.field2569; // L: 272
+ var2.field2528 = this.field2528; // L: 272
if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 273
var2.verticesX = new int[this.verticesCount + 100]; // L: 274
var2.verticesY = new int[this.verticesCount + 100]; // L: 275
@@ -566,23 +566,23 @@ public class Model extends Renderable {
var2.faceColors2 = this.faceColors2; // L: 297
var2.faceColors3 = this.faceColors3; // L: 298
var2.faceRenderPriorities = this.faceRenderPriorities; // L: 299
- var2.field2566 = this.field2566; // L: 300
+ var2.field2525 = this.field2525; // L: 300
var2.faceTextures = this.faceTextures; // L: 301
- var2.field2568 = this.field2568; // L: 302
- var2.field2570 = this.field2570; // L: 303
- var2.field2571 = this.field2571; // L: 304
- var2.field2572 = this.field2572; // L: 305
+ var2.field2527 = this.field2527; // L: 302
+ var2.field2529 = this.field2529; // L: 303
+ var2.field2522 = this.field2522; // L: 304
+ var2.field2531 = this.field2531; // L: 305
var2.vertexLabels = this.vertexLabels; // L: 306
var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 307
- var2.field2575 = this.field2575; // L: 308
- var2.field2594 = this.field2594; // L: 309
+ var2.field2534 = this.field2534; // L: 308
+ var2.field2519 = this.field2519; // L: 309
var2.isSingleTile = this.isSingleTile; // L: 310
var2.resetBounds(); // L: 311
var2.overrideAmount = 0; // L: 312
return var2; // L: 313
}
- @ObfuscatedName("v")
+ @ObfuscatedName("w")
@Export("calculateBoundingBox")
void calculateBoundingBox(int var1) {
if (this.xMidOffset == -1) { // L: 317
@@ -596,9 +596,9 @@ public class Model extends Renderable {
int var9 = Model_sine[var1]; // L: 325
for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 326
- int var11 = Rasterizer3D.method3927(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327
+ int var11 = Rasterizer3D.method4052(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327
int var12 = this.verticesY[var10]; // L: 328
- int var13 = Rasterizer3D.method3951(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329
+ int var13 = Rasterizer3D.method4072(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329
if (var11 < var2) { // L: 330
var2 = var11;
}
@@ -681,8 +681,8 @@ public class Model extends Renderable {
}
} // L: 371
- @ObfuscatedName("c")
- void method4255() {
+ @ObfuscatedName("i")
+ void method4391() {
if (this.boundsType != 2) { // L: 374
this.boundsType = 2; // L: 375
this.xzRadius = 0; // L: 376
@@ -703,22 +703,22 @@ public class Model extends Renderable {
}
} // L: 387
- @ObfuscatedName("w")
- public int method4277() {
+ @ObfuscatedName("s")
+ public int method4456() {
this.calculateBoundsCylinder(); // L: 390
return this.xzRadius; // L: 391
}
- @ObfuscatedName("b")
+ @ObfuscatedName("t")
@Export("resetBounds")
public void resetBounds() {
this.boundsType = 0; // L: 395
this.xMidOffset = -1; // L: 396
} // L: 397
- @ObfuscatedName("t")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(Lgt;I)V"
+ descriptor = "(Lgh;I)V"
)
@Export("animate")
public void animate(Frames var1, int var2) {
@@ -740,36 +740,36 @@ public class Model extends Renderable {
}
} // L: 412
- @ObfuscatedName("g")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(Lds;I)V"
+ descriptor = "(Lda;I)V"
)
- public void method4259(class122 var1, int var2) {
- Skeleton var3 = var1.field1535; // L: 415
- class202 var4 = var3.method4023(); // L: 416
+ public void method4404(class122 var1, int var2) {
+ Skeleton var3 = var1.field1523; // L: 415
+ class201 var4 = var3.method4150(); // L: 416
if (var4 != null) { // L: 417
- var3.method4023().method4000(var1, var2); // L: 418
- this.method4313(var3.method4023(), var1.method2753()); // L: 419
+ var3.method4150().method4146(var1, var2); // L: 418
+ this.method4403(var3.method4150(), var1.method2766()); // L: 419
}
- if (var1.method2755()) { // L: 421
- this.method4260(var1, var2); // L: 422
+ if (var1.method2778()) { // L: 421
+ this.method4396(var1, var2); // L: 422
}
this.resetBounds(); // L: 424
} // L: 425
- @ObfuscatedName("x")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(Lds;I)V"
+ descriptor = "(Lda;I)V"
)
- void method4260(class122 var1, int var2) {
- Skeleton var3 = var1.field1535; // L: 428
+ void method4396(class122 var1, int var2) {
+ Skeleton var3 = var1.field1523; // L: 428
for (int var4 = 0; var4 < var3.count; ++var4) { // L: 429
int var5 = var3.transformTypes[var4]; // L: 430
- if (var5 == 5 && var1.field1530 != null && var1.field1530[var4] != null && var1.field1530[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432
- class117 var6 = var1.field1530[var4][0]; // L: 433
+ if (var5 == 5 && var1.field1518 != null && var1.field1518[var4] != null && var1.field1518[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432
+ class117 var6 = var1.field1518[var4][0]; // L: 433
int[] var7 = var3.labels[var4]; // L: 434
int var8 = var7.length; // L: 435
@@ -780,7 +780,7 @@ public class Model extends Renderable {
for (int var12 = 0; var12 < var11.length; ++var12) { // L: 440
int var13 = var11[var12]; // L: 441
- int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2689(var2) * 255.0F); // L: 442
+ int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2701(var2) * 255.0F); // L: 442
if (var14 < 0) { // L: 443
var14 = 0;
} else if (var14 > 255) { // L: 444
@@ -796,17 +796,17 @@ public class Model extends Renderable {
} // L: 452
- @ObfuscatedName("n")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(Lgb;I)V"
+ descriptor = "(Lgq;I)V"
)
- void method4313(class202 var1, int var2) {
- this.method4280(var1, var2); // L: 456
+ void method4403(class201 var1, int var2) {
+ this.method4424(var1, var2); // L: 456
} // L: 458
- @ObfuscatedName("e")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(Lgt;ILgt;I[I)V"
+ descriptor = "(Lgh;ILgh;I[I)V"
)
@Export("animate2")
public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) {
@@ -856,29 +856,29 @@ public class Model extends Renderable {
}
} // L: 464 490
- @ObfuscatedName("h")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(Lds;I[ZZ)V"
+ descriptor = "(Lda;I[ZZ)V"
)
- public void method4263(class122 var1, int var2, boolean[] var3, boolean var4) {
- Skeleton var5 = var1.field1535; // L: 493
- class202 var6 = var5.method4023(); // L: 494
+ public void method4399(class122 var1, int var2, boolean[] var3, boolean var4) {
+ Skeleton var5 = var1.field1523; // L: 493
+ class201 var6 = var5.method4150(); // L: 494
if (var6 != null) { // L: 495
- var6.method4014(var1, var2, var3, var4); // L: 496
- this.method4313(var6, var1.method2753()); // L: 497
+ var6.method4126(var1, var2, var3, var4); // L: 496
+ this.method4403(var6, var1.method2766()); // L: 497
}
- if (var1.method2755()) { // L: 499
- this.method4260(var1, var2); // L: 500
+ if (var1.method2778()) { // L: 499
+ this.method4396(var1, var2); // L: 500
}
} // L: 502
- @ObfuscatedName("f")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "(Lgt;I[IZ)V"
+ descriptor = "(Lgh;I[IZ)V"
)
- public void method4264(Frames var1, int var2, int[] var3, boolean var4) {
+ public void method4398(Frames var1, int var2, int[] var3, boolean var4) {
if (var3 == null) { // L: 505
this.animate(var1, var2); // L: 506
} else {
@@ -908,7 +908,7 @@ public class Model extends Renderable {
}
} // L: 507 526
- @ObfuscatedName("d")
+ @ObfuscatedName("a")
@Export("transform")
void transform(int var1, int[] var2, int var3, int var4, int var5) {
int var6 = var2.length; // L: 529
@@ -1076,7 +1076,7 @@ public class Model extends Renderable {
}
} // L: 558 573 615 636 654 656
- @ObfuscatedName("j")
+ @ObfuscatedName("p")
@Export("rotateY90Ccw")
public void rotateY90Ccw() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 659
@@ -1088,7 +1088,7 @@ public class Model extends Renderable {
this.resetBounds(); // L: 664
} // L: 665
- @ObfuscatedName("z")
+ @ObfuscatedName("b")
@Export("rotateY180")
public void rotateY180() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 668
@@ -1099,7 +1099,7 @@ public class Model extends Renderable {
this.resetBounds(); // L: 672
} // L: 673
- @ObfuscatedName("i")
+ @ObfuscatedName("n")
@Export("rotateY270Ccw")
public void rotateY270Ccw() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 676
@@ -1111,7 +1111,7 @@ public class Model extends Renderable {
this.resetBounds(); // L: 681
} // L: 682
- @ObfuscatedName("u")
+ @ObfuscatedName("o")
@Export("rotateZ")
public void rotateZ(int var1) {
int var2 = Model_sine[var1]; // L: 685
@@ -1126,7 +1126,7 @@ public class Model extends Renderable {
this.resetBounds(); // L: 692
} // L: 693
- @ObfuscatedName("ag")
+ @ObfuscatedName("m")
@Export("offsetBy")
public void offsetBy(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 696
@@ -1141,7 +1141,7 @@ public class Model extends Renderable {
this.resetBounds(); // L: 701
} // L: 702
- @ObfuscatedName("ar")
+ @ObfuscatedName("d")
@Export("scale")
public void scale(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 705
@@ -1153,11 +1153,11 @@ public class Model extends Renderable {
this.resetBounds(); // L: 710
} // L: 711
- @ObfuscatedName("am")
- public final void method4272(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
- field2573[0] = -1; // L: 714
+ @ObfuscatedName("ad")
+ public final void method4442(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+ field2558[0] = -1; // L: 714
if (this.boundsType != 2 && this.boundsType != 1) { // L: 715
- this.method4255();
+ this.method4391();
}
int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 716
@@ -1200,13 +1200,13 @@ public class Model extends Renderable {
var22 += var7; // L: 748
var23 = var21 * var17 - var22 * var16 >> 16; // L: 749
var22 = var21 * var16 + var22 * var17 >> 16; // L: 750
- field2548[var19] = var22 - var18; // L: 752
+ field2553[var19] = var22 - var18; // L: 752
modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 753
modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 754
- if (this.field2569 > 0) { // L: 755
- field2590[var19] = var20; // L: 756
- field2596[var19] = var23; // L: 757
- field2602[var19] = var22; // L: 758
+ if (this.field2528 > 0) { // L: 755
+ field2520[var19] = var20; // L: 756
+ field2555[var19] = var23; // L: 757
+ field2559[var19] = var22; // L: 758
}
}
@@ -1217,11 +1217,11 @@ public class Model extends Renderable {
} // L: 765
- @ObfuscatedName("ac")
- public final void method4273(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
- field2573[0] = -1; // L: 768
+ @ObfuscatedName("ak")
+ public final void method4462(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+ field2558[0] = -1; // L: 768
if (this.boundsType != 2 && this.boundsType != 1) { // L: 769
- this.method4255();
+ this.method4391();
}
int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 770
@@ -1264,13 +1264,13 @@ public class Model extends Renderable {
var23 += var7; // L: 802
var24 = var22 * var18 - var23 * var17 >> 16; // L: 803
var23 = var22 * var17 + var23 * var18 >> 16; // L: 804
- field2548[var20] = var23 - var19; // L: 806
+ field2553[var20] = var23 - var19; // L: 806
modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 807
modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 808
- if (this.field2569 > 0) { // L: 809
- field2590[var20] = var21; // L: 810
- field2596[var20] = var24; // L: 811
- field2602[var20] = var23; // L: 812
+ if (this.field2528 > 0) { // L: 809
+ field2520[var20] = var21; // L: 810
+ field2555[var20] = var24; // L: 811
+ field2559[var20] = var23; // L: 812
}
}
@@ -1281,16 +1281,16 @@ public class Model extends Renderable {
} // L: 819
- @ObfuscatedName("ab")
+ @ObfuscatedName("al")
@Export("draw0")
final void draw0(boolean var1, boolean var2, boolean var3, long var4) {
- if (this.diameter < 1600) { // L: 1026
+ if (this.diameter < 1600) { // L: 1017
int var6;
- for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1027
- field2573[var6] = 0;
+ for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1018
+ field2558[var6] = 0;
}
- var6 = var3 ? 20 : 5; // L: 1028
+ var6 = var3 ? 20 : 5; // L: 1019
int var7;
int var8;
@@ -1302,493 +1302,464 @@ public class Model extends Renderable {
int var16;
int var18;
int var28;
- for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1029
- if (this.faceColors3[var7] != -2) { // L: 1030
- var8 = this.indices1[var7]; // L: 1031
- var9 = this.indices2[var7]; // L: 1032
- var10 = this.indices3[var7]; // L: 1033
- var11 = modelViewportXs[var8]; // L: 1034
- var12 = modelViewportXs[var9]; // L: 1035
- var28 = modelViewportXs[var10]; // L: 1036
+ for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1020
+ if (this.faceColors3[var7] != -2) { // L: 1021
+ var8 = this.indices1[var7]; // L: 1022
+ var9 = this.indices2[var7]; // L: 1023
+ var10 = this.indices3[var7]; // L: 1024
+ var11 = modelViewportXs[var8]; // L: 1025
+ var12 = modelViewportXs[var9]; // L: 1026
+ var28 = modelViewportXs[var10]; // L: 1027
int var29;
- int var30;
- if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1037
- if (var2) { // L: 1063
- var15 = modelViewportYs[var8]; // L: 1065
- var16 = modelViewportYs[var9]; // L: 1066
- var30 = modelViewportYs[var10]; // L: 1067
- var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 1069
- boolean var34;
- if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 1070
- var34 = false; // L: 1071
- } else {
- var18 = ViewportMouse.ViewportMouse_y - var6; // L: 1074
- if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 1075
- var34 = false; // L: 1076
- } else {
- var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 1079
- if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 1080
- var34 = false; // L: 1081
- } else {
- var18 = ViewportMouse.ViewportMouse_x - var6; // L: 1084
- if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 1085
- var34 = false; // L: 1086
- } else {
- var34 = true; // L: 1089
- }
- }
- }
- }
-
- if (var34) { // L: 1091
- ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1094
- var2 = false; // L: 1096
- }
+ if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1028
+ if (var2 && class101.method2549(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 1054
+ class249.method5123(var4); // L: 1055
+ var2 = false; // L: 1056
}
- if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1099
- field2591[var7] = false; // L: 1100
- if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1101
- field2597[var7] = false; // L: 1102
+ if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1058
+ field2550[var7] = false; // L: 1059
+ if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1060
+ field2549[var7] = false; // L: 1061
} else {
- field2597[var7] = true;
+ field2549[var7] = true;
}
- var29 = (field2548[var8] + field2548[var9] + field2548[var10]) / 3 + this.radius; // L: 1103
- field2561[var29][field2573[var29]++] = var7; // L: 1104
+ var29 = (field2553[var8] + field2553[var9] + field2553[var10]) / 3 + this.radius; // L: 1062
+ field2509[var29][field2558[var29]++] = var7; // L: 1063
}
} else {
- var29 = field2590[var8]; // L: 1038
- var15 = field2590[var9]; // L: 1039
- var16 = field2590[var10]; // L: 1040
- var30 = field2596[var8]; // L: 1041
- var18 = field2596[var9]; // L: 1042
- int var19 = field2596[var10]; // L: 1043
- int var20 = field2602[var8]; // L: 1044
- int var21 = field2602[var9]; // L: 1045
- int var22 = field2602[var10]; // L: 1046
- var29 -= var15; // L: 1047
- var16 -= var15; // L: 1048
- var30 -= var18; // L: 1049
- var19 -= var18; // L: 1050
- var20 -= var21; // L: 1051
- var22 -= var21; // L: 1052
- int var23 = var30 * var22 - var20 * var19; // L: 1053
- int var24 = var20 * var16 - var29 * var22; // L: 1054
- int var25 = var29 * var19 - var30 * var16; // L: 1055
- if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1056
- field2591[var7] = true; // L: 1057
- int var26 = (field2548[var8] + field2548[var9] + field2548[var10]) / 3 + this.radius; // L: 1058
- field2561[var26][field2573[var26]++] = var7; // L: 1059
+ var29 = field2520[var8]; // L: 1029
+ var15 = field2520[var9]; // L: 1030
+ var16 = field2520[var10]; // L: 1031
+ int var30 = field2555[var8]; // L: 1032
+ var18 = field2555[var9]; // L: 1033
+ int var19 = field2555[var10]; // L: 1034
+ int var20 = field2559[var8]; // L: 1035
+ int var21 = field2559[var9]; // L: 1036
+ int var22 = field2559[var10]; // L: 1037
+ var29 -= var15; // L: 1038
+ var16 -= var15; // L: 1039
+ var30 -= var18; // L: 1040
+ var19 -= var18; // L: 1041
+ var20 -= var21; // L: 1042
+ var22 -= var21; // L: 1043
+ int var23 = var30 * var22 - var20 * var19; // L: 1044
+ int var24 = var20 * var16 - var29 * var22; // L: 1045
+ int var25 = var29 * var19 - var30 * var16; // L: 1046
+ if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1047
+ field2550[var7] = true; // L: 1048
+ int var26 = (field2553[var8] + field2553[var9] + field2553[var10]) / 3 + this.radius; // L: 1049
+ field2509[var26][field2558[var26]++] = var7; // L: 1050
}
}
}
}
int[] var27;
- if (this.faceRenderPriorities == null) { // L: 1108
- for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1109
- var8 = field2573[var7]; // L: 1110
- if (var8 > 0) { // L: 1111
- var27 = field2561[var7]; // L: 1112
+ if (this.faceRenderPriorities == null) { // L: 1067
+ for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1068
+ var8 = field2558[var7]; // L: 1069
+ if (var8 > 0) { // L: 1070
+ var27 = field2509[var7]; // L: 1071
- for (var10 = 0; var10 < var8; ++var10) { // L: 1113
+ for (var10 = 0; var10 < var8; ++var10) { // L: 1072
this.drawFace(var27[var10]);
}
}
}
} else {
- for (var7 = 0; var7 < 12; ++var7) { // L: 1118
- field2601[var7] = 0; // L: 1119
- field2605[var7] = 0; // L: 1120
+ for (var7 = 0; var7 < 12; ++var7) { // L: 1077
+ field2560[var7] = 0; // L: 1078
+ field2564[var7] = 0; // L: 1079
}
- for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1122
- var8 = field2573[var7]; // L: 1123
- if (var8 > 0) { // L: 1124
- var27 = field2561[var7]; // L: 1125
+ for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1081
+ var8 = field2558[var7]; // L: 1082
+ if (var8 > 0) { // L: 1083
+ var27 = field2509[var7]; // L: 1084
- for (var10 = 0; var10 < var8; ++var10) { // L: 1126
- var11 = var27[var10]; // L: 1127
- byte var33 = this.faceRenderPriorities[var11]; // L: 1128
- var28 = field2601[var33]++; // L: 1129
- field2547[var33][var28] = var11; // L: 1130
- if (var33 < 10) { // L: 1131
- int[] var10000 = field2605;
- var10000[var33] += var7;
- } else if (var33 == 10) { // L: 1132
- field2603[var28] = var7;
+ for (var10 = 0; var10 < var8; ++var10) { // L: 1085
+ var11 = var27[var10]; // L: 1086
+ byte var31 = this.faceRenderPriorities[var11]; // L: 1087
+ var28 = field2560[var31]++; // L: 1088
+ field2532[var31][var28] = var11; // L: 1089
+ if (var31 < 10) { // L: 1090
+ int[] var10000 = field2564;
+ var10000[var31] += var7;
+ } else if (var31 == 10) { // L: 1091
+ field2562[var28] = var7;
} else {
- field2604[var28] = var7; // L: 1133
+ field2508[var28] = var7; // L: 1092
}
}
}
}
- var7 = 0; // L: 1137
- if (field2601[1] > 0 || field2601[2] > 0) { // L: 1138
- var7 = (field2605[1] + field2605[2]) / (field2601[1] + field2601[2]);
+ var7 = 0; // L: 1096
+ if (field2560[1] > 0 || field2560[2] > 0) { // L: 1097
+ var7 = (field2564[1] + field2564[2]) / (field2560[1] + field2560[2]);
}
- var8 = 0; // L: 1139
- if (field2601[3] > 0 || field2601[4] > 0) { // L: 1140
- var8 = (field2605[3] + field2605[4]) / (field2601[3] + field2601[4]);
+ var8 = 0; // L: 1098
+ if (field2560[3] > 0 || field2560[4] > 0) { // L: 1099
+ var8 = (field2564[3] + field2564[4]) / (field2560[3] + field2560[4]);
}
- var9 = 0; // L: 1141
- if (field2601[6] > 0 || field2601[8] > 0) { // L: 1142
- var9 = (field2605[8] + field2605[6]) / (field2601[8] + field2601[6]);
+ var9 = 0; // L: 1100
+ if (field2560[6] > 0 || field2560[8] > 0) { // L: 1101
+ var9 = (field2564[8] + field2564[6]) / (field2560[8] + field2560[6]);
}
- var11 = 0; // L: 1144
- var12 = field2601[10]; // L: 1145
- int[] var13 = field2547[10]; // L: 1146
- int[] var14 = field2603; // L: 1147
- if (var11 == var12) { // L: 1148
- var11 = 0; // L: 1149
- var12 = field2601[11]; // L: 1150
- var13 = field2547[11]; // L: 1151
- var14 = field2604; // L: 1152
+ var11 = 0; // L: 1103
+ var12 = field2560[10]; // L: 1104
+ int[] var13 = field2532[10]; // L: 1105
+ int[] var14 = field2562; // L: 1106
+ if (var11 == var12) { // L: 1107
+ var11 = 0; // L: 1108
+ var12 = field2560[11]; // L: 1109
+ var13 = field2532[11]; // L: 1110
+ var14 = field2508; // L: 1111
}
- if (var11 < var12) { // L: 1154
+ if (var11 < var12) { // L: 1113
var10 = var14[var11];
} else {
- var10 = -1000; // L: 1155
+ var10 = -1000; // L: 1114
}
- for (var15 = 0; var15 < 10; ++var15) { // L: 1156
- while (var15 == 0 && var10 > var7) { // L: 1157
- this.drawFace(var13[var11++]); // L: 1158
- if (var11 == var12 && var13 != field2547[11]) { // L: 1159
- var11 = 0; // L: 1160
- var12 = field2601[11]; // L: 1161
- var13 = field2547[11]; // L: 1162
- var14 = field2604; // L: 1163
+ for (var15 = 0; var15 < 10; ++var15) { // L: 1115
+ while (var15 == 0 && var10 > var7) { // L: 1116
+ this.drawFace(var13[var11++]); // L: 1117
+ if (var11 == var12 && var13 != field2532[11]) { // L: 1118
+ var11 = 0; // L: 1119
+ var12 = field2560[11]; // L: 1120
+ var13 = field2532[11]; // L: 1121
+ var14 = field2508; // L: 1122
}
- if (var11 < var12) { // L: 1165
+ if (var11 < var12) { // L: 1124
var10 = var14[var11];
} else {
- var10 = -1000; // L: 1166
+ var10 = -1000; // L: 1125
}
}
- while (var15 == 3 && var10 > var8) { // L: 1168
- this.drawFace(var13[var11++]); // L: 1169
- if (var11 == var12 && var13 != field2547[11]) { // L: 1170
- var11 = 0; // L: 1171
- var12 = field2601[11]; // L: 1172
- var13 = field2547[11]; // L: 1173
- var14 = field2604; // L: 1174
+ while (var15 == 3 && var10 > var8) { // L: 1127
+ this.drawFace(var13[var11++]); // L: 1128
+ if (var11 == var12 && var13 != field2532[11]) { // L: 1129
+ var11 = 0; // L: 1130
+ var12 = field2560[11]; // L: 1131
+ var13 = field2532[11]; // L: 1132
+ var14 = field2508; // L: 1133
}
- if (var11 < var12) { // L: 1176
+ if (var11 < var12) { // L: 1135
var10 = var14[var11];
} else {
- var10 = -1000; // L: 1177
+ var10 = -1000; // L: 1136
}
}
- while (var15 == 5 && var10 > var9) { // L: 1179
- this.drawFace(var13[var11++]); // L: 1180
- if (var11 == var12 && var13 != field2547[11]) { // L: 1181
- var11 = 0; // L: 1182
- var12 = field2601[11]; // L: 1183
- var13 = field2547[11]; // L: 1184
- var14 = field2604; // L: 1185
+ while (var15 == 5 && var10 > var9) { // L: 1138
+ this.drawFace(var13[var11++]); // L: 1139
+ if (var11 == var12 && var13 != field2532[11]) { // L: 1140
+ var11 = 0; // L: 1141
+ var12 = field2560[11]; // L: 1142
+ var13 = field2532[11]; // L: 1143
+ var14 = field2508; // L: 1144
}
- if (var11 < var12) { // L: 1187
+ if (var11 < var12) { // L: 1146
var10 = var14[var11];
} else {
- var10 = -1000; // L: 1188
+ var10 = -1000; // L: 1147
}
}
- var16 = field2601[var15]; // L: 1190
- int[] var17 = field2547[var15]; // L: 1191
+ var16 = field2560[var15]; // L: 1149
+ int[] var17 = field2532[var15]; // L: 1150
- for (var18 = 0; var18 < var16; ++var18) { // L: 1192
- this.drawFace(var17[var18]); // L: 1193
+ for (var18 = 0; var18 < var16; ++var18) { // L: 1151
+ this.drawFace(var17[var18]); // L: 1152
}
}
- while (var10 != -1000) { // L: 1196
- this.drawFace(var13[var11++]); // L: 1197
- if (var11 == var12 && var13 != field2547[11]) { // L: 1198
- var11 = 0; // L: 1199
- var13 = field2547[11]; // L: 1200
- var12 = field2601[11]; // L: 1201
- var14 = field2604; // L: 1202
+ while (var10 != -1000) { // L: 1155
+ this.drawFace(var13[var11++]); // L: 1156
+ if (var11 == var12 && var13 != field2532[11]) { // L: 1157
+ var11 = 0; // L: 1158
+ var13 = field2532[11]; // L: 1159
+ var12 = field2560[11]; // L: 1160
+ var14 = field2508; // L: 1161
}
- if (var11 < var12) { // L: 1204
+ if (var11 < var12) { // L: 1163
var10 = var14[var11];
} else {
- var10 = -1000; // L: 1205
+ var10 = -1000; // L: 1164
}
}
}
}
- } // L: 1116 1207
+ } // L: 1075 1166
- @ObfuscatedName("aj")
+ @ObfuscatedName("ao")
@Export("drawFace")
final void drawFace(int var1) {
- if (field2591[var1]) { // L: 1210
- this.method4261(var1); // L: 1211
+ if (field2550[var1]) { // L: 1169
+ this.method4453(var1); // L: 1170
} else {
- int var2 = this.indices1[var1]; // L: 1214
- int var3 = this.indices2[var1]; // L: 1215
- int var4 = this.indices3[var1]; // L: 1216
- Rasterizer3D.field2395 = field2597[var1]; // L: 1217
- if (this.faceAlphas == null) { // L: 1218
- Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1219
+ int var2 = this.indices1[var1]; // L: 1173
+ int var3 = this.indices2[var1]; // L: 1174
+ int var4 = this.indices3[var1]; // L: 1175
+ Rasterizer3D.field2345 = field2549[var1]; // L: 1176
+ if (this.faceAlphas == null) { // L: 1177
+ Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1178
} else {
- Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1222
+ Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1181
}
- this.method4278(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1224
+ this.method4413(var1, modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1183
}
- } // L: 1212 1225
+ } // L: 1171 1184
- @ObfuscatedName("ae")
- final void method4278(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
- if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1228
+ @ObfuscatedName("ab")
+ final void method4413(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
+ if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1187
int var11;
int var12;
int var13;
- if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1246
- int var14 = this.field2566[var1] & 255; // L: 1247
- var11 = this.field2570[var14]; // L: 1248
- var12 = this.field2571[var14]; // L: 1249
- var13 = this.field2572[var14]; // L: 1250
+ if (this.field2525 != null && this.field2525[var1] != -1) { // L: 1205
+ int var14 = this.field2525[var1] & 255; // L: 1206
+ var11 = this.field2529[var14]; // L: 1207
+ var12 = this.field2522[var14]; // L: 1208
+ var13 = this.field2531[var14]; // L: 1209
} else {
- var11 = this.indices1[var1]; // L: 1253
- var12 = this.indices2[var1]; // L: 1254
- var13 = this.indices3[var1]; // L: 1255
+ var11 = this.indices1[var1]; // L: 1212
+ var12 = this.indices2[var1]; // L: 1213
+ var13 = this.indices3[var1]; // L: 1214
}
- if (this.faceColors3[var1] == -1) { // L: 1257
- Rasterizer3D.method3922(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2590[var11], field2590[var12], field2590[var13], field2596[var11], field2596[var12], field2596[var13], field2602[var11], field2602[var12], field2602[var13], this.faceTextures[var1]); // L: 1258
+ if (this.faceColors3[var1] == -1) { // L: 1216
+ Rasterizer3D.method4070(var2, var3, var4, var5, var6, var7, var8, var8, var8, field2520[var11], field2520[var12], field2520[var13], field2555[var11], field2555[var12], field2555[var13], field2559[var11], field2559[var12], field2559[var13], this.faceTextures[var1]); // L: 1217
} else {
- Rasterizer3D.method3922(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2590[var11], field2590[var12], field2590[var13], field2596[var11], field2596[var12], field2596[var13], field2602[var11], field2602[var12], field2602[var13], this.faceTextures[var1]); // L: 1261
+ Rasterizer3D.method4070(var2, var3, var4, var5, var6, var7, var8, var9, var10, field2520[var11], field2520[var12], field2520[var13], field2555[var11], field2555[var12], field2555[var13], field2559[var11], field2559[var12], field2559[var13], this.faceTextures[var1]); // L: 1220
}
- } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1229
- Rasterizer3D.method3993(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1230
- } else if (this.faceColors3[var1] == -1) { // L: 1232
- Rasterizer3D.method3919(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1233
- } else if (this.overrideAmount > 0) { // L: 1235
- Rasterizer3D.method3916(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1236
+ } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1188
+ Rasterizer3D.method4035(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]], this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1189
+ } else if (this.faceColors3[var1] == -1) { // L: 1191
+ Rasterizer3D.method4116(var2, var3, var4, var5, var6, var7, Model_colorPalette[this.faceColors1[var1]]); // L: 1192
+ } else if (this.overrideAmount > 0) { // L: 1194
+ Rasterizer3D.method4032(var2, var3, var4, var5, var6, var7, var8, var9, var10, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1195
} else {
- Rasterizer3D.method3915(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1239
+ Rasterizer3D.method4096(var2, var3, var4, var5, var6, var7, var8, var9, var10); // L: 1198
}
- } // L: 1264
+ } // L: 1223
- @ObfuscatedName("az")
- final void method4261(int var1) {
- int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1267
- int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1268
- int var4 = 0; // L: 1269
- int var5 = this.indices1[var1]; // L: 1270
- int var6 = this.indices2[var1]; // L: 1271
- int var7 = this.indices3[var1]; // L: 1272
- int var8 = field2602[var5]; // L: 1273
- int var9 = field2602[var6]; // L: 1274
- int var10 = field2602[var7]; // L: 1275
- if (this.faceAlphas == null) { // L: 1276
+ @ObfuscatedName("ap")
+ final void method4453(int var1) {
+ int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1226
+ int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1227
+ int var4 = 0; // L: 1228
+ int var5 = this.indices1[var1]; // L: 1229
+ int var6 = this.indices2[var1]; // L: 1230
+ int var7 = this.indices3[var1]; // L: 1231
+ int var8 = field2559[var5]; // L: 1232
+ int var9 = field2559[var6]; // L: 1233
+ int var10 = field2559[var7]; // L: 1234
+ if (this.faceAlphas == null) { // L: 1235
Rasterizer3D.Rasterizer3D_alpha = 0;
} else {
- Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1277
+ Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1236
}
int var11;
int var12;
int var13;
int var14;
- if (var8 >= 50) { // L: 1278
- field2616[var4] = modelViewportXs[var5]; // L: 1279
- field2607[var4] = modelViewportYs[var5]; // L: 1280
- field2608[var4++] = this.faceColors1[var1]; // L: 1281
+ if (var8 >= 50) { // L: 1237
+ field2505[var4] = modelViewportXs[var5]; // L: 1238
+ field2566[var4] = modelViewportYs[var5]; // L: 1239
+ field2567[var4++] = this.faceColors1[var1]; // L: 1240
} else {
- var11 = field2590[var5]; // L: 1284
- var12 = field2596[var5]; // L: 1285
- var13 = this.faceColors1[var1]; // L: 1286
- if (var10 >= 50) { // L: 1287
- var14 = field2560[var10 - var8] * (50 - var8); // L: 1288
- field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var7] - var11) * var14 >> 16)) / 50; // L: 1289
- field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var7] - var12) * var14 >> 16)) / 50; // L: 1290
- field2608[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1291
+ var11 = field2520[var5]; // L: 1243
+ var12 = field2555[var5]; // L: 1244
+ var13 = this.faceColors1[var1]; // L: 1245
+ if (var10 >= 50) { // L: 1246
+ var14 = field2547[var10 - var8] * (50 - var8); // L: 1247
+ field2505[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2520[var7] - var11) * var14 >> 16)) / 50; // L: 1248
+ field2566[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2555[var7] - var12) * var14 >> 16)) / 50; // L: 1249
+ field2567[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1250
}
- if (var9 >= 50) { // L: 1293
- var14 = field2560[var9 - var8] * (50 - var8); // L: 1294
- field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var6] - var11) * var14 >> 16)) / 50; // L: 1295
- field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var6] - var12) * var14 >> 16)) / 50; // L: 1296
- field2608[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1297
+ if (var9 >= 50) { // L: 1252
+ var14 = field2547[var9 - var8] * (50 - var8); // L: 1253
+ field2505[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2520[var6] - var11) * var14 >> 16)) / 50; // L: 1254
+ field2566[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2555[var6] - var12) * var14 >> 16)) / 50; // L: 1255
+ field2567[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1256
}
}
- if (var9 >= 50) { // L: 1300
- field2616[var4] = modelViewportXs[var6]; // L: 1301
- field2607[var4] = modelViewportYs[var6]; // L: 1302
- field2608[var4++] = this.faceColors2[var1]; // L: 1303
+ if (var9 >= 50) { // L: 1259
+ field2505[var4] = modelViewportXs[var6]; // L: 1260
+ field2566[var4] = modelViewportYs[var6]; // L: 1261
+ field2567[var4++] = this.faceColors2[var1]; // L: 1262
} else {
- var11 = field2590[var6]; // L: 1306
- var12 = field2596[var6]; // L: 1307
- var13 = this.faceColors2[var1]; // L: 1308
- if (var8 >= 50) { // L: 1309
- var14 = field2560[var8 - var9] * (50 - var9); // L: 1310
- field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var5] - var11) * var14 >> 16)) / 50; // L: 1311
- field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var5] - var12) * var14 >> 16)) / 50; // L: 1312
- field2608[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1313
+ var11 = field2520[var6]; // L: 1265
+ var12 = field2555[var6]; // L: 1266
+ var13 = this.faceColors2[var1]; // L: 1267
+ if (var8 >= 50) { // L: 1268
+ var14 = field2547[var8 - var9] * (50 - var9); // L: 1269
+ field2505[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2520[var5] - var11) * var14 >> 16)) / 50; // L: 1270
+ field2566[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2555[var5] - var12) * var14 >> 16)) / 50; // L: 1271
+ field2567[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1272
}
- if (var10 >= 50) { // L: 1315
- var14 = field2560[var10 - var9] * (50 - var9); // L: 1316
- field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var7] - var11) * var14 >> 16)) / 50; // L: 1317
- field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var7] - var12) * var14 >> 16)) / 50; // L: 1318
- field2608[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1319
+ if (var10 >= 50) { // L: 1274
+ var14 = field2547[var10 - var9] * (50 - var9); // L: 1275
+ field2505[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2520[var7] - var11) * var14 >> 16)) / 50; // L: 1276
+ field2566[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2555[var7] - var12) * var14 >> 16)) / 50; // L: 1277
+ field2567[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1278
}
}
- if (var10 >= 50) { // L: 1322
- field2616[var4] = modelViewportXs[var7]; // L: 1323
- field2607[var4] = modelViewportYs[var7]; // L: 1324
- field2608[var4++] = this.faceColors3[var1]; // L: 1325
+ if (var10 >= 50) { // L: 1281
+ field2505[var4] = modelViewportXs[var7]; // L: 1282
+ field2566[var4] = modelViewportYs[var7]; // L: 1283
+ field2567[var4++] = this.faceColors3[var1]; // L: 1284
} else {
- var11 = field2590[var7]; // L: 1328
- var12 = field2596[var7]; // L: 1329
- var13 = this.faceColors3[var1]; // L: 1330
- if (var9 >= 50) { // L: 1331
- var14 = field2560[var9 - var10] * (50 - var10); // L: 1332
- field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var6] - var11) * var14 >> 16)) / 50; // L: 1333
- field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var6] - var12) * var14 >> 16)) / 50; // L: 1334
- field2608[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1335
+ var11 = field2520[var7]; // L: 1287
+ var12 = field2555[var7]; // L: 1288
+ var13 = this.faceColors3[var1]; // L: 1289
+ if (var9 >= 50) { // L: 1290
+ var14 = field2547[var9 - var10] * (50 - var10); // L: 1291
+ field2505[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2520[var6] - var11) * var14 >> 16)) / 50; // L: 1292
+ field2566[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2555[var6] - var12) * var14 >> 16)) / 50; // L: 1293
+ field2567[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1294
}
- if (var8 >= 50) { // L: 1337
- var14 = field2560[var8 - var10] * (50 - var10); // L: 1338
- field2616[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2590[var5] - var11) * var14 >> 16)) / 50; // L: 1339
- field2607[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2596[var5] - var12) * var14 >> 16)) / 50; // L: 1340
- field2608[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1341
+ if (var8 >= 50) { // L: 1296
+ var14 = field2547[var8 - var10] * (50 - var10); // L: 1297
+ field2505[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2520[var5] - var11) * var14 >> 16)) / 50; // L: 1298
+ field2566[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2555[var5] - var12) * var14 >> 16)) / 50; // L: 1299
+ field2567[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1300
}
}
- var11 = field2616[0]; // L: 1344
- var12 = field2616[1]; // L: 1345
- var13 = field2616[2]; // L: 1346
- var14 = field2607[0]; // L: 1347
- int var15 = field2607[1]; // L: 1348
- int var16 = field2607[2]; // L: 1349
- Rasterizer3D.field2395 = false; // L: 1350
- if (var4 == 3) { // L: 1351
- if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1352
- Rasterizer3D.field2395 = true;
+ var11 = field2505[0]; // L: 1303
+ var12 = field2505[1]; // L: 1304
+ var13 = field2505[2]; // L: 1305
+ var14 = field2566[0]; // L: 1306
+ int var15 = field2566[1]; // L: 1307
+ int var16 = field2566[2]; // L: 1308
+ Rasterizer3D.field2345 = false; // L: 1309
+ if (var4 == 3) { // L: 1310
+ if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1311
+ Rasterizer3D.field2345 = true;
}
- this.method4278(var1, var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2]); // L: 1353
+ this.method4413(var1, var14, var15, var16, var11, var12, var13, field2567[0], field2567[1], field2567[2]); // L: 1312
}
- if (var4 == 4) { // L: 1355
- if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2616[3] < 0 || field2616[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1356
- Rasterizer3D.field2395 = true;
+ if (var4 == 4) { // L: 1314
+ if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2505[3] < 0 || field2505[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1315
+ Rasterizer3D.field2345 = true;
}
int var17;
- if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1357
+ if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1316
int var18;
int var19;
- if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1381
- int var20 = this.field2566[var1] & 255; // L: 1382
- var17 = this.field2570[var20]; // L: 1383
- var18 = this.field2571[var20]; // L: 1384
- var19 = this.field2572[var20]; // L: 1385
+ if (this.field2525 != null && this.field2525[var1] != -1) { // L: 1340
+ int var20 = this.field2525[var1] & 255; // L: 1341
+ var17 = this.field2529[var20]; // L: 1342
+ var18 = this.field2522[var20]; // L: 1343
+ var19 = this.field2531[var20]; // L: 1344
} else {
- var17 = var5; // L: 1388
- var18 = var6; // L: 1389
- var19 = var7; // L: 1390
+ var17 = var5; // L: 1347
+ var18 = var6; // L: 1348
+ var19 = var7; // L: 1349
}
- short var21 = this.faceTextures[var1]; // L: 1392
- if (this.faceColors3[var1] == -1) { // L: 1393
- Rasterizer3D.method3922(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1394
- Rasterizer3D.method3922(var14, var16, field2607[3], var11, var13, field2616[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1395
+ short var21 = this.faceTextures[var1]; // L: 1351
+ if (this.faceColors3[var1] == -1) { // L: 1352
+ Rasterizer3D.method4070(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2520[var17], field2520[var18], field2520[var19], field2555[var17], field2555[var18], field2555[var19], field2559[var17], field2559[var18], field2559[var19], var21); // L: 1353
+ Rasterizer3D.method4070(var14, var16, field2566[3], var11, var13, field2505[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2520[var17], field2520[var18], field2520[var19], field2555[var17], field2555[var18], field2555[var19], field2559[var17], field2559[var18], field2559[var19], var21); // L: 1354
} else {
- Rasterizer3D.method3922(var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1398
- Rasterizer3D.method3922(var14, var16, field2607[3], var11, var13, field2616[3], field2608[0], field2608[2], field2608[3], field2590[var17], field2590[var18], field2590[var19], field2596[var17], field2596[var18], field2596[var19], field2602[var17], field2602[var18], field2602[var19], var21); // L: 1399
+ Rasterizer3D.method4070(var14, var15, var16, var11, var12, var13, field2567[0], field2567[1], field2567[2], field2520[var17], field2520[var18], field2520[var19], field2555[var17], field2555[var18], field2555[var19], field2559[var17], field2559[var18], field2559[var19], var21); // L: 1357
+ Rasterizer3D.method4070(var14, var16, field2566[3], var11, var13, field2505[3], field2567[0], field2567[2], field2567[3], field2520[var17], field2520[var18], field2520[var19], field2555[var17], field2555[var18], field2555[var19], field2559[var17], field2559[var18], field2559[var19], var21); // L: 1358
}
- } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1358
- var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1359
- Rasterizer3D.method3993(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1360
- Rasterizer3D.method3993(var14, var16, field2607[3], var11, var13, field2616[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1361
- } else if (this.faceColors3[var1] == -1) { // L: 1363
- var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1364
- Rasterizer3D.method3919(var14, var15, var16, var11, var12, var13, var17); // L: 1365
- Rasterizer3D.method3919(var14, var16, field2607[3], var11, var13, field2616[3], var17); // L: 1366
- } else if (this.overrideAmount > 0) { // L: 1368
- Rasterizer3D.method3916(var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1369
- Rasterizer3D.method3916(var14, var16, field2607[3], var11, var13, field2616[3], field2608[0], field2608[2], field2608[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1370
+ } else if (this.faceColors3[var1] == -1 && this.overrideAmount > 0) { // L: 1317
+ var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1318
+ Rasterizer3D.method4035(var14, var15, var16, var11, var12, var13, var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1319
+ Rasterizer3D.method4035(var14, var16, field2566[3], var11, var13, field2505[3], var17, this.overrideHue, this.overrideSaturation, this.overrideLuminance, this.overrideAmount); // L: 1320
+ } else if (this.faceColors3[var1] == -1) { // L: 1322
+ var17 = Model_colorPalette[this.faceColors1[var1]]; // L: 1323
+ Rasterizer3D.method4116(var14, var15, var16, var11, var12, var13, var17); // L: 1324
+ Rasterizer3D.method4116(var14, var16, field2566[3], var11, var13, field2505[3], var17); // L: 1325
+ } else if (this.overrideAmount > 0) { // L: 1327
+ Rasterizer3D.method4032(var14, var15, var16, var11, var12, var13, field2567[0], field2567[1], field2567[2], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1328
+ Rasterizer3D.method4032(var14, var16, field2566[3], var11, var13, field2505[3], field2567[0], field2567[2], field2567[3], this.overrideHue, this.overrideLuminance, this.overrideSaturation, this.overrideAmount); // L: 1329
} else {
- Rasterizer3D.method3915(var14, var15, var16, var11, var12, var13, field2608[0], field2608[1], field2608[2]); // L: 1373
- Rasterizer3D.method3915(var14, var16, field2607[3], var11, var13, field2616[3], field2608[0], field2608[2], field2608[3]); // L: 1374
+ Rasterizer3D.method4096(var14, var15, var16, var11, var12, var13, field2567[0], field2567[1], field2567[2]); // L: 1332
+ Rasterizer3D.method4096(var14, var16, field2566[3], var11, var13, field2505[3], field2567[0], field2567[2], field2567[3]); // L: 1333
}
}
- } // L: 1403
+ } // L: 1362
- @ObfuscatedName("ap")
+ @ObfuscatedName("ac")
@ObfuscatedSignature(
- descriptor = "(ILnw;)V"
+ descriptor = "(ILny;)V"
)
- void method4302(int var1, class388 var2) {
- float var3 = (float)this.verticesX[var1]; // L: 1406
- float var4 = (float)(-this.verticesY[var1]); // L: 1407
- float var5 = (float)(-this.verticesZ[var1]); // L: 1408
- float var6 = 1.0F; // L: 1409
- this.verticesX[var1] = (int)(var2.field4400[0] * var3 + var2.field4400[4] * var4 + var2.field4400[8] * var5 + var2.field4400[12] * var6); // L: 1410
- this.verticesY[var1] = -((int)(var2.field4400[1] * var3 + var2.field4400[5] * var4 + var2.field4400[9] * var5 + var2.field4400[13] * var6)); // L: 1411
- this.verticesZ[var1] = -((int)(var2.field4400[2] * var3 + var2.field4400[6] * var4 + var2.field4400[10] * var5 + var2.field4400[14] * var6)); // L: 1412
- } // L: 1413
+ void method4415(int var1, class387 var2) {
+ float var3 = (float)this.verticesX[var1]; // L: 1365
+ float var4 = (float)(-this.verticesY[var1]); // L: 1366
+ float var5 = (float)(-this.verticesZ[var1]); // L: 1367
+ float var6 = 1.0F; // L: 1368
+ this.verticesX[var1] = (int)(var2.field4394[0] * var3 + var2.field4394[4] * var4 + var2.field4394[8] * var5 + var2.field4394[12] * var6); // L: 1369
+ this.verticesY[var1] = -((int)(var2.field4394[1] * var3 + var2.field4394[5] * var4 + var2.field4394[9] * var5 + var2.field4394[13] * var6)); // L: 1370
+ this.verticesZ[var1] = -((int)(var2.field4394[2] * var3 + var2.field4394[6] * var4 + var2.field4394[10] * var5 + var2.field4394[14] * var6)); // L: 1371
+ } // L: 1372
- @ObfuscatedName("as")
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "(Lgb;I)V"
+ descriptor = "(Lgq;I)V"
)
- void method4280(class202 var1, int var2) {
- if (this.field2575 != null) { // L: 1416
- for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1417
- int[] var4 = this.field2575[var3]; // L: 1418
- if (var4 != null && var4.length != 0) { // L: 1419
- int[] var5 = this.field2594[var3]; // L: 1420
- field2550.method6829(); // L: 1421
+ void method4424(class201 var1, int var2) {
+ if (this.field2534 != null) { // L: 1375
+ for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1376
+ int[] var4 = this.field2534[var3]; // L: 1377
+ if (var4 != null && var4.length != 0) { // L: 1378
+ int[] var5 = this.field2519[var3]; // L: 1379
+ field2542.method7016(); // L: 1380
- for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1422
- int var7 = var4[var6]; // L: 1423
- class115 var8 = var1.method3997(var7); // L: 1424
- if (var8 != null) { // L: 1425
- field2606.method6806((float)var5[var6] / 255.0F); // L: 1426
- field2552.method6868(var8.method2666(var2)); // L: 1427
- field2552.method6816(field2606); // L: 1428
- field2550.method6815(field2552); // L: 1429
+ for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1381
+ int var7 = var4[var6]; // L: 1382
+ class115 var8 = var1.method4123(var7); // L: 1383
+ if (var8 != null) { // L: 1384
+ field2510.method6963((float)var5[var6] / 255.0F); // L: 1385
+ field2511.method6973(var8.method2651(var2)); // L: 1386
+ field2511.method6962(field2510); // L: 1387
+ field2542.method6965(field2511); // L: 1388
}
}
- this.method4302(var3, field2550); // L: 1431
+ this.method4415(var3, field2542); // L: 1390
}
}
}
- } // L: 1433
+ } // L: 1392
- @ObfuscatedName("cd")
+ @ObfuscatedName("cv")
@Export("draw")
void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
- field2573[0] = -1; // L: 822
+ field2558[0] = -1; // L: 822
if (this.boundsType != 1) { // L: 823
this.calculateBoundsCylinder();
}
@@ -1819,176 +1790,174 @@ public class Model extends Renderable {
var26 = true;
}
- boolean var27 = var26 || this.field2569 > 0; // L: 847
- int var28 = class146.method2993(); // L: 848
- int var29 = WallDecoration.method4391(); // L: 849
- boolean var30 = ViewportMouse.ViewportMouse_isInViewport; // L: 852
- boolean var32 = LoginPacket.method5022(var9); // L: 855
+ boolean var27 = var26 || this.field2528 > 0; // L: 847
+ int var28 = class120.method2758(); // L: 848
+ int var29 = ViewportMouse.ViewportMouse_y; // L: 851
+ boolean var31 = class174.method3458(); // L: 854
+ boolean var32 = Canvas.method322(var9); // L: 855
boolean var33 = false; // L: 856
+ int var37;
int var38;
int var39;
int var40;
- int var41;
- int var49;
- int var55;
- int var56;
- int var57;
- if (var32 && var30) { // L: 857
+ int var48;
+ int var52;
+ int var53;
+ int var54;
+ if (var32 && var31) { // L: 857
boolean var34 = false; // L: 858
- if (field2612) { // L: 859
- boolean var37 = ViewportMouse.ViewportMouse_isInViewport; // L: 865
+ if (field2524) { // L: 859
boolean var35;
- if (!var37) { // L: 867
- var35 = false; // L: 868
+ if (!class174.method3458()) { // L: 863
+ var35 = false; // L: 864
} else {
+ int var43;
int var44;
int var45;
- int var46;
- int var58;
- if (!ViewportMouse.ViewportMouse_false0) { // L: 872
- var38 = Scene.Scene_cameraPitchSine; // L: 873
- var39 = Scene.Scene_cameraPitchCosine; // L: 874
- var40 = Scene.Scene_cameraYawSine; // L: 875
- var41 = Scene.Scene_cameraYawCosine; // L: 876
- byte var42 = 50; // L: 877
- short var43 = 3500; // L: 878
- var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 879
- var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 880
- var46 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 881
- int var47 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var43 / Rasterizer3D.Rasterizer3D_zoom; // L: 882
- int var48 = Rasterizer3D.method3930(var45, var42, var39, var38); // L: 884
- var57 = Rasterizer3D.method3931(var45, var42, var39, var38); // L: 885
- var45 = var48; // L: 886
- var48 = Rasterizer3D.method3930(var47, var43, var39, var38); // L: 887
- var58 = Rasterizer3D.method3931(var47, var43, var39, var38); // L: 888
- var47 = var48; // L: 889
- var48 = Rasterizer3D.method3929(var44, var57, var41, var40); // L: 890
- var57 = Rasterizer3D.method3980(var44, var57, var41, var40); // L: 891
- var44 = var48; // L: 892
- var48 = Rasterizer3D.method3929(var46, var58, var41, var40); // L: 893
- var58 = Rasterizer3D.method3980(var46, var58, var41, var40); // L: 894
- ViewportMouse.field2635 = (var44 + var48) / 2; // L: 896
- ArchiveDisk.field4363 = (var45 + var47) / 2; // L: 897
- InvDefinition.field1853 = (var58 + var57) / 2; // L: 898
- ViewportMouse.field2630 = (var48 - var44) / 2; // L: 899
- class342.field4162 = (var47 - var45) / 2; // L: 900
- RouteStrategy.field2242 = (var58 - var57) / 2; // L: 901
- class113.field1421 = Math.abs(ViewportMouse.field2630); // L: 902
- ChatChannel.field973 = Math.abs(class342.field4162); // L: 903
- TriBool.field4339 = Math.abs(RouteStrategy.field2242); // L: 904
+ if (!ViewportMouse.ViewportMouse_false0) { // L: 868
+ var37 = Scene.Scene_cameraPitchSine; // L: 869
+ var38 = Scene.Scene_cameraPitchCosine; // L: 870
+ var39 = Scene.Scene_cameraYawSine; // L: 871
+ var40 = Scene.Scene_cameraYawCosine; // L: 872
+ byte var41 = 50; // L: 873
+ short var42 = 3500; // L: 874
+ var43 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 875
+ var44 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 876
+ var45 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 877
+ int var46 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 878
+ int var47 = Rasterizer3D.method4045(var44, var41, var38, var37); // L: 880
+ var53 = Rasterizer3D.method4046(var44, var41, var38, var37); // L: 881
+ var44 = var47; // L: 882
+ var47 = Rasterizer3D.method4045(var46, var42, var38, var37); // L: 883
+ var54 = Rasterizer3D.method4046(var46, var42, var38, var37); // L: 884
+ var46 = var47; // L: 885
+ var47 = Rasterizer3D.method4025(var43, var53, var40, var39); // L: 886
+ var53 = Rasterizer3D.method4044(var43, var53, var40, var39); // L: 887
+ var43 = var47; // L: 888
+ var47 = Rasterizer3D.method4025(var45, var54, var40, var39); // L: 889
+ var54 = Rasterizer3D.method4044(var45, var54, var40, var39); // L: 890
+ ViewportMouse.field2588 = (var43 + var47) / 2; // L: 892
+ GZipDecompressor.field4821 = (var46 + var44) / 2; // L: 893
+ class340.field4138 = (var54 + var53) / 2; // L: 894
+ ViewportMouse.field2589 = (var47 - var43) / 2; // L: 895
+ ItemComposition.field2148 = (var46 - var44) / 2; // L: 896
+ User.field4308 = (var54 - var53) / 2; // L: 897
+ class421.field4607 = Math.abs(ViewportMouse.field2589); // L: 898
+ ViewportMouse.field2590 = Math.abs(ItemComposition.field2148); // L: 899
+ class136.field1612 = Math.abs(User.field4308); // L: 900
}
- var38 = this.xMid + var6; // L: 906
- var39 = var7 + this.yMid; // L: 907
- var40 = var8 + this.zMid; // L: 908
- var41 = this.xMidOffset; // L: 909
- var57 = this.yMidOffset; // L: 910
- var58 = this.zMidOffset; // L: 911
- var44 = ViewportMouse.field2635 - var38; // L: 912
- var45 = ArchiveDisk.field4363 - var39; // L: 913
- var46 = InvDefinition.field1853 - var40; // L: 914
- if (Math.abs(var44) > var41 + class113.field1421) { // L: 915
+ var37 = this.xMid + var6; // L: 902
+ var38 = var7 + this.yMid; // L: 903
+ var39 = var8 + this.zMid; // L: 904
+ var40 = this.xMidOffset; // L: 905
+ var53 = this.yMidOffset; // L: 906
+ var54 = this.zMidOffset; // L: 907
+ var43 = ViewportMouse.field2588 - var37; // L: 908
+ var44 = GZipDecompressor.field4821 - var38; // L: 909
+ var45 = class340.field4138 - var39; // L: 910
+ if (Math.abs(var43) > var40 + class421.field4607) { // L: 911
+ var35 = false; // L: 912
+ } else if (Math.abs(var44) > var53 + ViewportMouse.field2590) { // L: 915
var35 = false; // L: 916
- } else if (Math.abs(var45) > var57 + ChatChannel.field973) { // L: 919
+ } else if (Math.abs(var45) > var54 + class136.field1612) { // L: 919
var35 = false; // L: 920
- } else if (Math.abs(var46) > var58 + TriBool.field4339) { // L: 923
+ } else if (Math.abs(var45 * ItemComposition.field2148 - var44 * User.field4308) > var53 * class136.field1612 + var54 * ViewportMouse.field2590) { // L: 923
var35 = false; // L: 924
- } else if (Math.abs(var46 * class342.field4162 - var45 * RouteStrategy.field2242) > var57 * TriBool.field4339 + var58 * ChatChannel.field973) { // L: 927
+ } else if (Math.abs(var43 * User.field4308 - var45 * ViewportMouse.field2589) > var54 * class421.field4607 + var40 * class136.field1612) { // L: 927
var35 = false; // L: 928
- } else if (Math.abs(var44 * RouteStrategy.field2242 - var46 * ViewportMouse.field2630) > var41 * TriBool.field4339 + var58 * class113.field1421) { // L: 931
+ } else if (Math.abs(var44 * ViewportMouse.field2589 - var43 * ItemComposition.field2148) > var40 * ViewportMouse.field2590 + var53 * class421.field4607) { // L: 931
var35 = false; // L: 932
- } else if (Math.abs(var45 * ViewportMouse.field2630 - var44 * class342.field4162) > var57 * class113.field1421 + var41 * ChatChannel.field973) { // L: 935
- var35 = false; // L: 936
} else {
- var35 = true; // L: 939
+ var35 = true; // L: 935
}
}
- var34 = var35; // L: 941
+ var34 = var35; // L: 937
} else {
- var56 = var12 - var13; // L: 944
- if (var56 <= 50) { // L: 945
- var56 = 50;
+ var52 = var12 - var13; // L: 940
+ if (var52 <= 50) { // L: 941
+ var52 = 50;
}
- if (var15 > 0) { // L: 946
- var16 /= var14; // L: 947
- var17 /= var56; // L: 948
+ if (var15 > 0) { // L: 942
+ var16 /= var14; // L: 943
+ var17 /= var52; // L: 944
} else {
- var17 /= var14; // L: 951
- var16 /= var56; // L: 952
+ var17 /= var14; // L: 947
+ var16 /= var52; // L: 948
}
- if (var18 > 0) { // L: 954
- var23 /= var14; // L: 955
- var21 /= var56; // L: 956
+ if (var18 > 0) { // L: 950
+ var23 /= var14; // L: 951
+ var21 /= var52; // L: 952
} else {
- var21 /= var14; // L: 959
- var23 /= var56; // L: 960
+ var21 /= var14; // L: 955
+ var23 /= var52; // L: 956
}
- var49 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 962
- var55 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 963
- if (var49 > var16 && var49 < var17 && var55 > var23 && var55 < var21) { // L: 964
- var34 = true; // L: 965
+ var48 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 958
+ var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 959
+ if (var48 > var16 && var48 < var17 && var37 > var23 && var37 < var21) { // L: 960
+ var34 = true; // L: 961
}
}
- if (var34) { // L: 968
- if (this.isSingleTile) { // L: 969
- ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 972
+ if (var34) { // L: 964
+ if (this.isSingleTile) { // L: 965
+ class249.method5123(var9);
} else {
- var33 = true; // L: 975
+ var33 = true; // L: 966
}
}
}
- int var54 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 978
- var56 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 979
- var49 = 0; // L: 980
- var55 = 0; // L: 981
- if (var1 != 0) { // L: 982
- var49 = Model_sine[var1]; // L: 983
- var55 = Model_cosine[var1]; // L: 984
+ int var51 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 969
+ var52 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 970
+ var48 = 0; // L: 971
+ var37 = 0; // L: 972
+ if (var1 != 0) { // L: 973
+ var48 = Model_sine[var1]; // L: 974
+ var37 = Model_cosine[var1]; // L: 975
}
- for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 986
- var39 = this.verticesX[var38]; // L: 987
- var40 = this.verticesY[var38]; // L: 988
- var41 = this.verticesZ[var38]; // L: 989
- if (var1 != 0) { // L: 990
- var57 = var41 * var49 + var39 * var55 >> 16; // L: 991
- var41 = var41 * var55 - var39 * var49 >> 16; // L: 992
- var39 = var57; // L: 993
+ for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 977
+ var39 = this.verticesX[var38]; // L: 978
+ var40 = this.verticesY[var38]; // L: 979
+ var53 = this.verticesZ[var38]; // L: 980
+ if (var1 != 0) { // L: 981
+ var54 = var53 * var48 + var39 * var37 >> 16; // L: 982
+ var53 = var53 * var37 - var39 * var48 >> 16; // L: 983
+ var39 = var54; // L: 984
}
- var39 += var6; // L: 995
- var40 += var7; // L: 996
- var41 += var8; // L: 997
- var57 = var41 * var4 + var5 * var39 >> 16; // L: 998
- var41 = var5 * var41 - var39 * var4 >> 16; // L: 999
- var39 = var57; // L: 1000
- var57 = var3 * var40 - var41 * var2 >> 16; // L: 1001
- var41 = var40 * var2 + var3 * var41 >> 16; // L: 1002
- field2548[var38] = var41 - var12; // L: 1004
- if (var41 >= 50) { // L: 1005
- modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var54; // L: 1006
- modelViewportYs[var38] = var57 * Rasterizer3D.Rasterizer3D_zoom / var41 + var56; // L: 1007
+ var39 += var6; // L: 986
+ var40 += var7; // L: 987
+ var53 += var8; // L: 988
+ var54 = var53 * var4 + var5 * var39 >> 16; // L: 989
+ var53 = var5 * var53 - var39 * var4 >> 16; // L: 990
+ var39 = var54; // L: 991
+ var54 = var3 * var40 - var53 * var2 >> 16; // L: 992
+ var53 = var40 * var2 + var3 * var53 >> 16; // L: 993
+ field2553[var38] = var53 - var12; // L: 995
+ if (var53 >= 50) { // L: 996
+ modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var53 + var51; // L: 997
+ modelViewportYs[var38] = var54 * Rasterizer3D.Rasterizer3D_zoom / var53 + var52; // L: 998
} else {
- modelViewportXs[var38] = -5000; // L: 1010
- var25 = true; // L: 1011
+ modelViewportXs[var38] = -5000; // L: 1001
+ var25 = true; // L: 1002
}
- if (var27) { // L: 1013
- field2590[var38] = var39; // L: 1014
- field2596[var38] = var57; // L: 1015
- field2602[var38] = var41; // L: 1016
+ if (var27) { // L: 1004
+ field2520[var38] = var39; // L: 1005
+ field2555[var38] = var54; // L: 1006
+ field2559[var38] = var53; // L: 1007
}
}
try {
- this.draw0(var25, var33, this.isSingleTile, var9); // L: 1020
- } catch (Exception var53) { // L: 1022
+ this.draw0(var25, var33, this.isSingleTile, var9); // L: 1011
+ } catch (Exception var50) { // L: 1013
}
}
@@ -1996,5 +1965,5 @@ public class Model extends Renderable {
}
}
}
- } // L: 1023
+ } // L: 1014
}
diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java
index c462b3133e..77d502c5e2 100644
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -3,139 +3,139 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gs")
+@ObfuscatedName("gw")
@Implements("ModelData")
public class ModelData extends Renderable {
+ @ObfuscatedName("at")
+ static int[] field2239;
+ @ObfuscatedName("ag")
+ static int[] field2240;
@ObfuscatedName("aq")
- static int[] field2314;
- @ObfuscatedName("ad")
- static int[] field2290;
- @ObfuscatedName("an")
- static int field2308;
- @ObfuscatedName("aw")
+ static int field2245;
+ @ObfuscatedName("ah")
@Export("ModelData_sine")
static int[] ModelData_sine;
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@Export("ModelData_cosine")
static int[] ModelData_cosine;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("verticesCount")
int verticesCount;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("verticesX")
int[] verticesX;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("verticesY")
int[] verticesY;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("verticesZ")
int[] verticesZ;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("faceCount")
int faceCount;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("indices1")
int[] indices1;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("indices2")
int[] indices2;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("indices3")
int[] indices3;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("faceRenderTypes")
byte[] faceRenderTypes;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("faceRenderPriorities")
byte[] faceRenderPriorities;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("faceAlphas")
byte[] faceAlphas;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("textureCoords")
byte[] textureCoords;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("faceColors")
short[] faceColors;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("faceTextures")
short[] faceTextures;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("priority")
byte priority;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("textureTriangleCount")
int textureTriangleCount;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("textureRenderTypes")
byte[] textureRenderTypes;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("texTriangleX")
short[] texTriangleX;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("texTriangleY")
short[] texTriangleY;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@Export("texTriangleZ")
short[] texTriangleZ;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("vertexSkins")
int[] vertexSkins;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@Export("faceSkins")
int[] faceSkins;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@Export("vertexLabels")
int[][] vertexLabels;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("faceLabelsAlpha")
int[][] faceLabelsAlpha;
- @ObfuscatedName("ar")
- int[][] field2301;
- @ObfuscatedName("am")
- int[][] field2302;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ak")
+ int[][] field2262;
+ @ObfuscatedName("al")
+ int[][] field2263;
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "[Lgg;"
+ descriptor = "[Lgt;"
)
@Export("faceNormals")
FaceNormal[] faceNormals;
@ObfuscatedName("ab")
@ObfuscatedSignature(
- descriptor = "[Lhq;"
+ descriptor = "[Lhj;"
)
@Export("vertexNormals")
VertexNormal[] vertexNormals;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@ObfuscatedSignature(
- descriptor = "[Lhq;"
+ descriptor = "[Lhj;"
)
@Export("vertexVertices")
VertexNormal[] vertexVertices;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("ambient")
public short ambient;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("contrast")
public short contrast;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@Export("isBoundsCalculated")
boolean isBoundsCalculated;
- @ObfuscatedName("as")
- int field2309;
- @ObfuscatedName("au")
- int field2310;
- @ObfuscatedName("ak")
- int field2315;
+ @ObfuscatedName("am")
+ int field2270;
+ @ObfuscatedName("an")
+ int field2271;
@ObfuscatedName("af")
- int field2312;
- @ObfuscatedName("al")
- int field2313;
+ int field2276;
+ @ObfuscatedName("ax")
+ int field2273;
+ @ObfuscatedName("ar")
+ int field2274;
static {
- field2314 = new int[10000]; // L: 49
- field2290 = new int[10000]; // L: 50
- field2308 = 0; // L: 51
+ field2239 = new int[10000]; // L: 49
+ field2240 = new int[10000]; // L: 50
+ field2245 = 0; // L: 51
ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52
ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53
}
@@ -148,7 +148,7 @@ public class ModelData extends Renderable {
} // L: 55
@ObfuscatedSignature(
- descriptor = "([Lgs;I)V"
+ descriptor = "([Lgw;I)V"
)
public ModelData(ModelData[] var1, int var2) {
this.verticesCount = 0;
@@ -192,7 +192,7 @@ public class ModelData extends Renderable {
var6 |= var11.faceSkins != null; // L: 945
var7 |= var11.faceTextures != null; // L: 946
var8 |= var11.textureCoords != null; // L: 947
- var9 |= var11.field2301 != null; // L: 948
+ var9 |= var11.field2262 != null; // L: 948
}
}
@@ -228,8 +228,8 @@ public class ModelData extends Renderable {
}
if (var9) { // L: 964
- this.field2301 = new int[this.verticesCount][]; // L: 965
- this.field2302 = new int[this.verticesCount][]; // L: 966
+ this.field2262 = new int[this.verticesCount][]; // L: 965
+ this.field2263 = new int[this.verticesCount][]; // L: 966
}
this.faceColors = new short[this.faceCount]; // L: 968
@@ -249,8 +249,8 @@ public class ModelData extends Renderable {
if (var11 != null) { // L: 980
int var12;
for (var12 = 0; var12 < var11.faceCount; ++var12) { // L: 981
- if (var3 && var11.faceRenderTypes != null) { // L: 982
- this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; // L: 983
+ if (var3 && var11.faceRenderTypes != null) { // L: 982 983
+ this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12];
}
if (var4) { // L: 985
@@ -286,18 +286,18 @@ public class ModelData extends Renderable {
}
this.faceColors[this.faceCount] = var11.faceColors[var12]; // L: 1003
- this.indices1[this.faceCount] = this.method3811(var11, var11.indices1[var12]); // L: 1004
- this.indices2[this.faceCount] = this.method3811(var11, var11.indices2[var12]); // L: 1005
- this.indices3[this.faceCount] = this.method3811(var11, var11.indices3[var12]); // L: 1006
+ this.indices1[this.faceCount] = this.method3928(var11, var11.indices1[var12]); // L: 1004
+ this.indices2[this.faceCount] = this.method3928(var11, var11.indices2[var12]); // L: 1005
+ this.indices3[this.faceCount] = this.method3928(var11, var11.indices3[var12]); // L: 1006
++this.faceCount; // L: 1007
}
for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { // L: 1009
byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; // L: 1010
if (var13 == 0) { // L: 1011
- this.texTriangleX[this.textureTriangleCount] = (short)this.method3811(var11, var11.texTriangleX[var12]); // L: 1012
- this.texTriangleY[this.textureTriangleCount] = (short)this.method3811(var11, var11.texTriangleY[var12]); // L: 1013
- this.texTriangleZ[this.textureTriangleCount] = (short)this.method3811(var11, var11.texTriangleZ[var12]); // L: 1014
+ this.texTriangleX[this.textureTriangleCount] = (short)this.method3928(var11, var11.texTriangleX[var12]); // L: 1012
+ this.texTriangleY[this.textureTriangleCount] = (short)this.method3928(var11, var11.texTriangleY[var12]); // L: 1013
+ this.texTriangleZ[this.textureTriangleCount] = (short)this.method3928(var11, var11.texTriangleZ[var12]); // L: 1014
}
++this.textureTriangleCount; // L: 1016
@@ -315,19 +315,19 @@ public class ModelData extends Renderable {
Buffer var2 = new Buffer(10); // L: 64
var2.writeShort(-2); // L: 65
if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { // L: 66
- this.method3812(var1);
+ this.method3924(var1);
} else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67
- this.method3889(var1);
+ this.method3925(var1);
} else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68
- this.method3814(var1);
+ this.method3926(var1);
} else {
- this.method3815(var1); // L: 69
+ this.method3981(var1); // L: 69
}
} // L: 70
@ObfuscatedSignature(
- descriptor = "(Lgs;ZZZZ)V",
+ descriptor = "(Lgw;ZZZZ)V",
garbageValue = "1"
)
public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) {
@@ -394,14 +394,14 @@ public class ModelData extends Renderable {
this.vertexNormals = var1.vertexNormals; // L: 1101
this.faceNormals = var1.faceNormals; // L: 1102
this.vertexVertices = var1.vertexVertices; // L: 1103
- this.field2301 = var1.field2301; // L: 1104
- this.field2302 = var1.field2302; // L: 1105
+ this.field2262 = var1.field2262; // L: 1104
+ this.field2263 = var1.field2263; // L: 1105
this.ambient = var1.ambient; // L: 1106
this.contrast = var1.contrast; // L: 1107
}
- @ObfuscatedName("l")
- void method3812(byte[] var1) {
+ @ObfuscatedName("q")
+ void method3924(byte[] var1) {
Buffer var2 = new Buffer(var1); // L: 73
Buffer var3 = new Buffer(var1); // L: 74
Buffer var4 = new Buffer(var1); // L: 75
@@ -544,8 +544,8 @@ public class ModelData extends Renderable {
}
if (var18 == 1) { // L: 169
- this.field2301 = new int[var9][]; // L: 170
- this.field2302 = new int[var9][]; // L: 171
+ this.field2262 = new int[var9][]; // L: 170
+ this.field2263 = new int[var9][]; // L: 171
}
this.faceColors = new short[var10]; // L: 173
@@ -600,12 +600,12 @@ public class ModelData extends Renderable {
if (var18 == 1) { // L: 203
for (var53 = 0; var53 < var9; ++var53) { // L: 204
var54 = var6.readUnsignedByte(); // L: 205
- this.field2301[var53] = new int[var54]; // L: 206
- this.field2302[var53] = new int[var54]; // L: 207
+ this.field2262[var53] = new int[var54]; // L: 206
+ this.field2263[var53] = new int[var54]; // L: 207
for (var55 = 0; var55 < var54; ++var55) { // L: 208
- this.field2301[var53][var55] = var6.readUnsignedByte(); // L: 209
- this.field2302[var53][var55] = var6.readUnsignedByte(); // L: 210
+ this.field2262[var53][var55] = var6.readUnsignedByte(); // L: 209
+ this.field2263[var53][var55] = var6.readUnsignedByte(); // L: 210
}
}
}
@@ -723,8 +723,8 @@ public class ModelData extends Renderable {
} // L: 299
- @ObfuscatedName("k")
- void method3889(byte[] var1) {
+ @ObfuscatedName("f")
+ void method3925(byte[] var1) {
boolean var2 = false; // L: 302
boolean var3 = false; // L: 303
Buffer var4 = new Buffer(var1); // L: 304
@@ -825,8 +825,8 @@ public class ModelData extends Renderable {
}
if (var17 == 1) { // L: 376
- this.field2301 = new int[var9][]; // L: 377
- this.field2302 = new int[var9][]; // L: 378
+ this.field2262 = new int[var9][]; // L: 377
+ this.field2263 = new int[var9][]; // L: 378
}
this.faceColors = new short[var10]; // L: 380
@@ -875,12 +875,12 @@ public class ModelData extends Renderable {
if (var17 == 1) { // L: 405
for (var40 = 0; var40 < var9; ++var40) { // L: 406
var41 = var8.readUnsignedByte(); // L: 407
- this.field2301[var40] = new int[var41]; // L: 408
- this.field2302[var40] = new int[var41]; // L: 409
+ this.field2262[var40] = new int[var41]; // L: 408
+ this.field2263[var40] = new int[var41]; // L: 409
for (var42 = 0; var42 < var41; ++var42) { // L: 410
- this.field2301[var40][var42] = var8.readUnsignedByte(); // L: 411
- this.field2302[var40][var42] = var8.readUnsignedByte(); // L: 412
+ this.field2262[var40][var42] = var8.readUnsignedByte(); // L: 411
+ this.field2263[var40][var42] = var8.readUnsignedByte(); // L: 412
}
}
}
@@ -1017,8 +1017,8 @@ public class ModelData extends Renderable {
} // L: 511
- @ObfuscatedName("r")
- void method3814(byte[] var1) {
+ @ObfuscatedName("j")
+ void method3926(byte[] var1) {
Buffer var2 = new Buffer(var1); // L: 514
Buffer var3 = new Buffer(var1); // L: 515
Buffer var4 = new Buffer(var1); // L: 516
@@ -1323,8 +1323,8 @@ public class ModelData extends Renderable {
} // L: 723
- @ObfuscatedName("v")
- void method3815(byte[] var1) {
+ @ObfuscatedName("w")
+ void method3981(byte[] var1) {
boolean var2 = false; // L: 726
boolean var3 = false; // L: 727
Buffer var4 = new Buffer(var1); // L: 728
@@ -1602,9 +1602,9 @@ public class ModelData extends Renderable {
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Lgs;I)I"
+ descriptor = "(Lgw;I)I"
)
- final int method3811(ModelData var1, int var2) {
+ final int method3928(ModelData var1, int var2) {
int var3 = -1; // L: 1023
int var4 = var1.verticesX[var2]; // L: 1024
int var5 = var1.verticesY[var2]; // L: 1025
@@ -1625,9 +1625,9 @@ public class ModelData extends Renderable {
this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037
}
- if (var1.field2301 != null) { // L: 1038
- this.field2301[this.verticesCount] = var1.field2301[var2]; // L: 1039
- this.field2302[this.verticesCount] = var1.field2302[var2]; // L: 1040
+ if (var1.field2262 != null) { // L: 1038
+ this.field2262[this.verticesCount] = var1.field2262[var2]; // L: 1039
+ this.field2263[this.verticesCount] = var1.field2263[var2]; // L: 1040
}
var3 = this.verticesCount++; // L: 1042
@@ -1636,9 +1636,9 @@ public class ModelData extends Renderable {
return var3; // L: 1044
}
- @ObfuscatedName("c")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "()Lgs;"
+ descriptor = "()Lgw;"
)
@Export("copyModelData")
public ModelData copyModelData() {
@@ -1681,16 +1681,16 @@ public class ModelData extends Renderable {
return var1; // L: 1144
}
- @ObfuscatedName("w")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "([[IIIIZI)Lgs;"
+ descriptor = "([[IIIIZI)Lgw;"
)
- public ModelData method3847(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
+ public ModelData method3921(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
this.calculateBounds(); // L: 1148
- int var7 = var2 + this.field2310; // L: 1149
- int var8 = var2 + this.field2315; // L: 1150
- int var9 = var4 + this.field2313; // L: 1151
- int var10 = var4 + this.field2312; // L: 1152
+ int var7 = var2 + this.field2271; // L: 1149
+ int var8 = var2 + this.field2276; // L: 1150
+ int var9 = var4 + this.field2274; // L: 1151
+ int var10 = var4 + this.field2273; // L: 1152
if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 1153
var7 >>= 7; // L: 1154
var8 = var8 + 127 >> 7; // L: 1155
@@ -1775,8 +1775,8 @@ public class ModelData extends Renderable {
}
}
- @ObfuscatedName("b")
- void method3859() {
+ @ObfuscatedName("t")
+ void method3972() {
int[] var1;
int var2;
int var10002;
@@ -1836,8 +1836,8 @@ public class ModelData extends Renderable {
} // L: 1266
- @ObfuscatedName("t")
- public void method3820() {
+ @ObfuscatedName("z")
+ public void method3932() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1269
int var2 = this.verticesX[var1]; // L: 1270
this.verticesX[var1] = this.verticesZ[var1]; // L: 1271
@@ -1847,8 +1847,8 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1274
} // L: 1275
- @ObfuscatedName("g")
- public void method3854() {
+ @ObfuscatedName("r")
+ public void method3933() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1278
this.verticesX[var1] = -this.verticesX[var1]; // L: 1279
this.verticesZ[var1] = -this.verticesZ[var1]; // L: 1280
@@ -1857,8 +1857,8 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1282
} // L: 1283
- @ObfuscatedName("x")
- public void method3822() {
+ @ObfuscatedName("u")
+ public void method3942() {
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1286
int var2 = this.verticesZ[var1]; // L: 1287
this.verticesZ[var1] = this.verticesX[var1]; // L: 1288
@@ -1868,8 +1868,8 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1291
} // L: 1292
- @ObfuscatedName("n")
- public void method3823(int var1) {
+ @ObfuscatedName("k")
+ public void method3935(int var1) {
int var2 = ModelData_sine[var1]; // L: 1295
int var3 = ModelData_cosine[var1]; // L: 1296
@@ -1882,7 +1882,7 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1302
} // L: 1303
- @ObfuscatedName("e")
+ @ObfuscatedName("h")
@Export("changeOffset")
public void changeOffset(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1306
@@ -1897,7 +1897,7 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1311
} // L: 1312
- @ObfuscatedName("h")
+ @ObfuscatedName("x")
@Export("recolor")
public void recolor(short var1, short var2) {
for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1315
@@ -1908,7 +1908,7 @@ public class ModelData extends Renderable {
} // L: 1318
- @ObfuscatedName("f")
+ @ObfuscatedName("l")
@Export("retexture")
public void retexture(short var1, short var2) {
if (this.faceTextures != null) { // L: 1321
@@ -1921,8 +1921,8 @@ public class ModelData extends Renderable {
}
} // L: 1325
- @ObfuscatedName("d")
- public void method3841() {
+ @ObfuscatedName("a")
+ public void method3973() {
int var1;
for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328
this.verticesZ[var1] = -this.verticesZ[var1];
@@ -1937,7 +1937,7 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1334
} // L: 1335
- @ObfuscatedName("j")
+ @ObfuscatedName("p")
@Export("resize")
public void resize(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1338
@@ -1949,7 +1949,7 @@ public class ModelData extends Renderable {
this.invalidate(); // L: 1343
} // L: 1344
- @ObfuscatedName("z")
+ @ObfuscatedName("b")
@Export("calculateVertexNormals")
public void calculateVertexNormals() {
if (this.vertexNormals == null) { // L: 1347
@@ -2025,7 +2025,7 @@ public class ModelData extends Renderable {
}
} // L: 1402
- @ObfuscatedName("i")
+ @ObfuscatedName("n")
@Export("invalidate")
void invalidate() {
this.vertexNormals = null; // L: 1405
@@ -2034,43 +2034,43 @@ public class ModelData extends Renderable {
this.isBoundsCalculated = false; // L: 1408
} // L: 1409
- @ObfuscatedName("u")
+ @ObfuscatedName("o")
@Export("calculateBounds")
void calculateBounds() {
if (!this.isBoundsCalculated) { // L: 1412
super.height = 0; // L: 1413
- this.field2309 = 0; // L: 1414
- this.field2310 = 999999; // L: 1415
- this.field2315 = -999999; // L: 1416
- this.field2312 = -99999; // L: 1417
- this.field2313 = 99999; // L: 1418
+ this.field2270 = 0; // L: 1414
+ this.field2271 = 999999; // L: 1415
+ this.field2276 = -999999; // L: 1416
+ this.field2273 = -99999; // L: 1417
+ this.field2274 = 99999; // L: 1418
for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1419
int var2 = this.verticesX[var1]; // L: 1420
int var3 = this.verticesY[var1]; // L: 1421
int var4 = this.verticesZ[var1]; // L: 1422
- if (var2 < this.field2310) { // L: 1423
- this.field2310 = var2;
+ if (var2 < this.field2271) { // L: 1423
+ this.field2271 = var2;
}
- if (var2 > this.field2315) { // L: 1424
- this.field2315 = var2;
+ if (var2 > this.field2276) { // L: 1424
+ this.field2276 = var2;
}
- if (var4 < this.field2313) { // L: 1425
- this.field2313 = var4;
+ if (var4 < this.field2274) { // L: 1425
+ this.field2274 = var4;
}
- if (var4 > this.field2312) { // L: 1426
- this.field2312 = var4;
+ if (var4 > this.field2273) { // L: 1426
+ this.field2273 = var4;
}
if (-var3 > super.height) { // L: 1427
super.height = -var3;
}
- if (var3 > this.field2309) { // L: 1428
- this.field2309 = var3;
+ if (var3 > this.field2270) { // L: 1428
+ this.field2270 = var3;
}
}
@@ -2078,9 +2078,9 @@ public class ModelData extends Renderable {
}
} // L: 1431
- @ObfuscatedName("ar")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "(IIIII)Lhv;"
+ descriptor = "(IIIII)Lhy;"
)
@Export("toModel")
public final Model toModel(int var1, int var2, int var3, int var4, int var5) {
@@ -2101,38 +2101,38 @@ public class ModelData extends Renderable {
}
}
- var8.field2569 = 0; // L: 1502
+ var8.field2528 = 0; // L: 1502
for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503
if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504
- ++var8.field2569;
+ ++var8.field2528;
}
}
- var8.field2570 = new int[var8.field2569]; // L: 1506
- var8.field2571 = new int[var8.field2569]; // L: 1507
- var8.field2572 = new int[var8.field2569]; // L: 1508
+ var8.field2529 = new int[var8.field2528]; // L: 1506
+ var8.field2522 = new int[var8.field2528]; // L: 1507
+ var8.field2531 = new int[var8.field2528]; // L: 1508
var10 = 0; // L: 1509
int var11;
for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1510
if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1511
- var8.field2570[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512
- var8.field2571[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513
- var8.field2572[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514
+ var8.field2529[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512
+ var8.field2522[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513
+ var8.field2531[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514
var9[var11] = var10++; // L: 1515
} else {
var9[var11] = -1; // L: 1517
}
}
- var8.field2566 = new byte[this.faceCount]; // L: 1519
+ var8.field2525 = new byte[this.faceCount]; // L: 1519
for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1520
if (this.textureCoords[var11] != -1) { // L: 1521
- var8.field2566[var11] = (byte)var9[this.textureCoords[var11] & 255];
+ var8.field2525[var11] = (byte)var9[this.textureCoords[var11] & 255];
} else {
- var8.field2566[var11] = -1; // L: 1522
+ var8.field2525[var11] = -1; // L: 1522
}
}
}
@@ -2175,7 +2175,7 @@ public class ModelData extends Renderable {
if (var17 == 1) { // L: 1555
var19 = this.faceNormals[var16]; // L: 1556
var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1557
- var8.faceColors1[var16] = method3834(this.faceColors[var16] & '\uffff', var14); // L: 1558
+ var8.faceColors1[var16] = method3946(this.faceColors[var16] & '\uffff', var14); // L: 1558
var8.faceColors3[var16] = -1; // L: 1559
} else if (var17 == 3) { // L: 1561
var8.faceColors1[var16] = 128; // L: 1562
@@ -2192,7 +2192,7 @@ public class ModelData extends Renderable {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544
- var8.faceColors1[var16] = method3834(var15, var14); // L: 1545
+ var8.faceColors1[var16] = method3946(var15, var14); // L: 1545
if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546
var13 = this.vertexVertices[this.indices2[var16]];
} else {
@@ -2200,7 +2200,7 @@ public class ModelData extends Renderable {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548
- var8.faceColors2[var16] = method3834(var15, var14); // L: 1549
+ var8.faceColors2[var16] = method3946(var15, var14); // L: 1549
if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550
var13 = this.vertexVertices[this.indices3[var16]];
} else {
@@ -2208,13 +2208,13 @@ public class ModelData extends Renderable {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552
- var8.faceColors3[var16] = method3834(var15, var14); // L: 1553
+ var8.faceColors3[var16] = method3946(var15, var14); // L: 1553
}
} else if (var17 != 0) { // L: 1570
if (var17 == 1) { // L: 1586
var19 = this.faceNormals[var16]; // L: 1587
var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1588
- var8.faceColors1[var16] = method3817(var14); // L: 1589
+ var8.faceColors1[var16] = method3947(var14); // L: 1589
var8.faceColors3[var16] = -1; // L: 1590
} else {
var8.faceColors3[var16] = -2; // L: 1593
@@ -2227,7 +2227,7 @@ public class ModelData extends Renderable {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575
- var8.faceColors1[var16] = method3817(var14); // L: 1576
+ var8.faceColors1[var16] = method3947(var14); // L: 1576
if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577
var13 = this.vertexVertices[this.indices2[var16]];
} else {
@@ -2235,19 +2235,19 @@ public class ModelData extends Renderable {
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1579
- var8.faceColors2[var16] = method3817(var14); // L: 1580
- if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) {
- var13 = this.vertexVertices[this.indices3[var16]]; // L: 1581
+ var8.faceColors2[var16] = method3947(var14); // L: 1580
+ if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1581
+ var13 = this.vertexVertices[this.indices3[var16]];
} else {
var13 = this.vertexNormals[this.indices3[var16]]; // L: 1582
}
var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583
- var8.faceColors3[var16] = method3817(var14); // L: 1584
+ var8.faceColors3[var16] = method3947(var14); // L: 1584
}
}
- this.method3859(); // L: 1597
+ this.method3972(); // L: 1597
var8.verticesCount = this.verticesCount; // L: 1598
var8.verticesX = this.verticesX; // L: 1599
var8.verticesY = this.verticesY; // L: 1600
@@ -2258,18 +2258,18 @@ public class ModelData extends Renderable {
var8.indices3 = this.indices3; // L: 1605
var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1606
var8.faceAlphas = this.faceAlphas; // L: 1607
- var8.field2568 = this.priority; // L: 1608
+ var8.field2527 = this.priority; // L: 1608
var8.vertexLabels = this.vertexLabels; // L: 1609
var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1610
var8.faceTextures = this.faceTextures; // L: 1611
- var8.field2575 = this.field2301; // L: 1612
- var8.field2594 = this.field2302; // L: 1613
+ var8.field2534 = this.field2262; // L: 1612
+ var8.field2519 = this.field2263; // L: 1613
return var8; // L: 1614
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;II)Lgs;"
+ descriptor = "(Llh;II)Lgw;"
)
@Export("ModelData_get")
public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) {
@@ -2277,16 +2277,16 @@ public class ModelData extends Renderable {
return var3 == null ? null : new ModelData(var3); // L: 59
}
- @ObfuscatedName("ag")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "(Lgs;Lgs;IIIZ)V"
+ descriptor = "(Lgw;Lgw;IIIZ)V"
)
- static void method3862(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
+ static void method3944(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
var0.calculateBounds(); // L: 1434
var0.calculateVertexNormals(); // L: 1435
var1.calculateBounds(); // L: 1436
var1.calculateVertexNormals(); // L: 1437
- ++field2308; // L: 1438
+ ++field2245; // L: 1438
int var6 = 0; // L: 1439
int[] var7 = var1.verticesX; // L: 1440
int var8 = var1.verticesCount; // L: 1441
@@ -2296,11 +2296,11 @@ public class ModelData extends Renderable {
VertexNormal var10 = var0.vertexNormals[var9]; // L: 1443
if (var10.magnitude != 0) { // L: 1444
int var11 = var0.verticesY[var9] - var3; // L: 1445
- if (var11 <= var1.field2309) { // L: 1446
+ if (var11 <= var1.field2270) { // L: 1446
int var12 = var0.verticesX[var9] - var2; // L: 1447
- if (var12 >= var1.field2310 && var12 <= var1.field2315) { // L: 1448
+ if (var12 >= var1.field2271 && var12 <= var1.field2276) { // L: 1448
int var13 = var0.verticesZ[var9] - var4; // L: 1449
- if (var13 >= var1.field2313 && var13 <= var1.field2312) { // L: 1450
+ if (var13 >= var1.field2274 && var13 <= var1.field2273) { // L: 1450
for (int var14 = 0; var14 < var8; ++var14) { // L: 1451
VertexNormal var15 = var1.vertexNormals[var14]; // L: 1452
if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 1453
@@ -2331,8 +2331,8 @@ public class ModelData extends Renderable {
var17.z += var10.z; // L: 1466
var17.magnitude += var10.magnitude; // L: 1467
++var6; // L: 1468
- field2314[var9] = field2308; // L: 1469
- field2290[var14] = field2308; // L: 1470
+ field2239[var9] = field2245; // L: 1469
+ field2240[var14] = field2245; // L: 1470
}
}
}
@@ -2343,7 +2343,7 @@ public class ModelData extends Renderable {
if (var6 >= 3 && var5) { // L: 1474
for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1475
- if (field2314[var0.indices1[var9]] == field2308 && field2314[var0.indices2[var9]] == field2308 && field2314[var0.indices3[var9]] == field2308) { // L: 1476
+ if (field2239[var0.indices1[var9]] == field2245 && field2239[var0.indices2[var9]] == field2245 && field2239[var0.indices3[var9]] == field2245) { // L: 1476
if (var0.faceRenderTypes == null) { // L: 1477
var0.faceRenderTypes = new byte[var0.faceCount];
}
@@ -2353,7 +2353,7 @@ public class ModelData extends Renderable {
}
for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1481
- if (field2308 == field2290[var1.indices1[var9]] && field2308 == field2290[var1.indices2[var9]] && field2308 == field2290[var1.indices3[var9]]) { // L: 1482
+ if (field2245 == field2240[var1.indices1[var9]] && field2245 == field2240[var1.indices2[var9]] && field2245 == field2240[var1.indices3[var9]]) { // L: 1482
if (var1.faceRenderTypes == null) { // L: 1483
var1.faceRenderTypes = new byte[var1.faceCount];
}
@@ -2365,8 +2365,8 @@ public class ModelData extends Renderable {
}
} // L: 1487
- @ObfuscatedName("am")
- static final int method3834(int var0, int var1) {
+ @ObfuscatedName("ad")
+ static final int method3946(int var0, int var1) {
var1 = (var0 & 127) * var1 >> 7; // L: 1618
if (var1 < 2) { // L: 1619
var1 = 2;
@@ -2377,8 +2377,8 @@ public class ModelData extends Renderable {
return (var0 & 65408) + var1; // L: 1621
}
- @ObfuscatedName("ac")
- static final int method3817(int var0) {
+ @ObfuscatedName("ak")
+ static final int method3947(int var0) {
if (var0 < 2) { // L: 1625
var0 = 2;
} else if (var0 > 126) {
diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java
index 26d6155a8f..4667e7981a 100644
--- a/runescape-client/src/main/java/ModelData0.java
+++ b/runescape-client/src/main/java/ModelData0.java
@@ -4,46 +4,237 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hl")
+@ObfuscatedName("hx")
@Implements("ModelData0")
public class ModelData0 {
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- static AbstractArchive field2654;
- @ObfuscatedName("fi")
- static String field2661;
- @ObfuscatedName("gb")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- longValue = 2783986170892939363L
+ intValue = -2071887987
)
- static long field2658;
- @ObfuscatedName("lu")
+ @Export("SpriteBuffer_spriteWidth")
+ static int SpriteBuffer_spriteWidth;
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Lca;"
+ descriptor = "Law;"
)
- @Export("localPlayer")
- static Player localPlayer;
+ @Export("pcmPlayerProvider")
+ static class47 pcmPlayerProvider;
+ @ObfuscatedName("az")
+ @Export("hasFocus")
+ protected static boolean hasFocus;
ModelData0() {
} // L: 4
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I[BLnc;I)V",
- garbageValue = "709536384"
+ descriptor = "(Lpq;II)Z",
+ garbageValue = "215126751"
)
- static void method4378(int var0, byte[] var1, ArchiveDisk var2) {
- ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18
- var3.type = 0; // L: 19
- var3.key = (long)var0; // L: 20
- var3.data = var1; // L: 21
- var3.archiveDisk = var2; // L: 22
- synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23
- ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24
- } // L: 25
+ @Export("updateExternalPlayer")
+ static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
+ int var2 = var0.readBits(2); // L: 589
+ int var3;
+ int var4;
+ int var7;
+ int var8;
+ int var9;
+ int var10;
+ if (var2 == 0) { // L: 590
+ if (var0.readBits(1) != 0) { // L: 591
+ updateExternalPlayer(var0, var1);
+ }
- class306.method5595(); // L: 26
- } // L: 27
+ var3 = var0.readBits(13); // L: 592
+ var4 = var0.readBits(13); // L: 593
+ boolean var12 = var0.readBits(1) == 1; // L: 594
+ if (var12) { // L: 595
+ Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+ }
+
+ if (Client.players[var1] != null) { // L: 596
+ throw new RuntimeException(); // L: 597
+ } else {
+ Player var11 = Client.players[var1] = new Player(); // L: 599
+ var11.index = var1; // L: 600
+ if (Players.field1307[var1] != null) { // L: 601
+ var11.read(Players.field1307[var1]);
+ }
+
+ var11.orientation = Players.Players_orientations[var1]; // L: 602
+ var11.targetIndex = Players.Players_targetIndices[var1]; // L: 603
+ var7 = Players.Players_regions[var1]; // L: 604
+ var8 = var7 >> 28; // L: 605
+ var9 = var7 >> 14 & 255; // L: 606
+ var10 = var7 & 255; // L: 607
+ var11.pathTraversed[0] = Players.field1304[var1]; // L: 608
+ var11.plane = (byte)var8; // L: 609
+ var11.resetPath((var9 << 13) + var3 - class28.baseX, (var10 << 13) + var4 - WorldMapLabelSize.baseY); // L: 610
+ var11.field1088 = false; // L: 611
+ return true; // L: 612
+ }
+ } else if (var2 == 1) { // L: 614
+ var3 = var0.readBits(2); // L: 615
+ var4 = Players.Players_regions[var1]; // L: 616
+ Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 617
+ return false; // L: 618
+ } else {
+ int var5;
+ int var6;
+ if (var2 == 2) { // L: 620
+ var3 = var0.readBits(5); // L: 621
+ var4 = var3 >> 3; // L: 622
+ var5 = var3 & 7; // L: 623
+ var6 = Players.Players_regions[var1]; // L: 624
+ var7 = (var6 >> 28) + var4 & 3; // L: 625
+ var8 = var6 >> 14 & 255; // L: 626
+ var9 = var6 & 255; // L: 627
+ if (var5 == 0) { // L: 628
+ --var8; // L: 629
+ --var9; // L: 630
+ }
+
+ if (var5 == 1) { // L: 632
+ --var9;
+ }
+
+ if (var5 == 2) { // L: 633
+ ++var8; // L: 634
+ --var9; // L: 635
+ }
+
+ if (var5 == 3) { // L: 637
+ --var8;
+ }
+
+ if (var5 == 4) { // L: 638
+ ++var8;
+ }
+
+ if (var5 == 5) { // L: 639
+ --var8; // L: 640
+ ++var9; // L: 641
+ }
+
+ if (var5 == 6) { // L: 643
+ ++var9;
+ }
+
+ if (var5 == 7) { // L: 644
+ ++var8; // L: 645
+ ++var9; // L: 646
+ }
+
+ Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 648
+ return false; // L: 649
+ } else {
+ var3 = var0.readBits(18); // L: 651
+ var4 = var3 >> 16; // L: 652
+ var5 = var3 >> 8 & 255; // L: 653
+ var6 = var3 & 255; // L: 654
+ var7 = Players.Players_regions[var1]; // L: 655
+ var8 = (var7 >> 28) + var4 & 3; // L: 656
+ var9 = var5 + (var7 >> 14) & 255; // L: 657
+ var10 = var6 + var7 & 255; // L: 658
+ Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 659
+ return false; // L: 660
+ }
+ }
+ }
+
+ @ObfuscatedName("fs")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "1"
+ )
+ static final void method4532() {
+ for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3633
+ int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3634
+ if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3635
+ SoundEffect var1 = Client.soundEffects[var0]; // L: 3647
+ if (var1 == null) { // L: 3648
+ Object var10000 = null; // L: 3649
+ var1 = SoundEffect.readSoundEffect(Client.archive4, Client.soundEffectIds[var0], 0);
+ if (var1 == null) { // L: 3650
+ continue;
+ }
+
+ int[] var13 = Client.queuedSoundEffectDelays; // L: 3651
+ var13[var0] += var1.calculateDelay();
+ Client.soundEffects[var0] = var1; // L: 3652
+ }
+
+ if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3658
+ int var2;
+ if (Client.soundLocations[var0] != 0) { // L: 3660
+ int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3661
+ int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3662
+ int var5 = var4 * 128 + 64 - class101.localPlayer.x; // L: 3663
+ if (var5 < 0) { // L: 3664
+ var5 = -var5;
+ }
+
+ int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3665
+ int var7 = var6 * 128 + 64 - class101.localPlayer.y; // L: 3666
+ if (var7 < 0) { // L: 3667
+ var7 = -var7;
+ }
+
+ int var8 = var7 + var5 - 128; // L: 3668
+ if (var8 > var3) { // L: 3669
+ Client.queuedSoundEffectDelays[var0] = -100; // L: 3670
+ continue; // L: 3671
+ }
+
+ if (var8 < 0) { // L: 3673
+ var8 = 0;
+ }
+
+ var2 = (var3 - var8) * class19.clientPreferences.method2262() / var3; // L: 3674
+ } else {
+ var2 = class19.clientPreferences.method2241(); // L: 3676
+ }
+
+ if (var2 > 0) { // L: 3677
+ RawSound var9 = var1.toRawSound().resample(WorldMapRegion.decimator); // L: 3678
+ RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3679
+ var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3680
+ class21.pcmStreamMixer.addSubStream(var10); // L: 3681
+ }
+
+ Client.queuedSoundEffectDelays[var0] = -100; // L: 3683
+ }
+ } else {
+ --Client.soundEffectCount; // L: 3636
+
+ for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3637
+ Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3638
+ Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3639
+ Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3640
+ Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3641
+ Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3642
+ }
+
+ --var0; // L: 3644
+ }
+ }
+
+ if (Client.playingJingle) { // L: 3686
+ boolean var12;
+ if (class272.musicPlayerStatus != 0) { // L: 3689
+ var12 = true; // L: 3690
+ } else {
+ var12 = class272.midiPcmStream.isReady(); // L: 3693
+ }
+
+ if (!var12) { // L: 3695
+ if (class19.clientPreferences.method2258() != 0 && Client.currentTrackGroupId != -1) { // L: 3696
+ AttackOption.method2410(class121.archive6, Client.currentTrackGroupId, 0, class19.clientPreferences.method2258(), false);
+ }
+
+ Client.playingJingle = false; // L: 3697
+ }
+ }
+
+ } // L: 3700
}
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index 4e4597ee91..e3e648c690 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -3,135 +3,137 @@ import java.awt.event.FocusListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
+import java.util.LinkedList;
+import java.util.List;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ae")
+@ObfuscatedName("ac")
@Implements("MouseHandler")
public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener {
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = 1681939429
- )
- @Export("MouseHandler_x")
- public static int MouseHandler_x;
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lae;"
+ descriptor = "Lac;"
)
@Export("MouseHandler_instance")
public static MouseHandler MouseHandler_instance;
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1954795539
+ intValue = -383852009
)
@Export("MouseHandler_idleCycles")
public static volatile int MouseHandler_idleCycles;
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -990713497
+ intValue = 241459279
)
@Export("MouseHandler_currentButtonVolatile")
- static volatile int MouseHandler_currentButtonVolatile;
- @ObfuscatedName("s")
+ public static volatile int MouseHandler_currentButtonVolatile;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -2068251699
+ intValue = -1768893521
)
@Export("MouseHandler_xVolatile")
- static volatile int MouseHandler_xVolatile;
- @ObfuscatedName("r")
+ public static volatile int MouseHandler_xVolatile;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1733497125
+ intValue = -89007159
)
@Export("MouseHandler_yVolatile")
- static volatile int MouseHandler_yVolatile;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- longValue = 8288662778520390807L
- )
- @Export("MouseHandler_lastMovedVolatile")
- static volatile long MouseHandler_lastMovedVolatile;
+ public static volatile int MouseHandler_yVolatile;
@ObfuscatedName("y")
@ObfuscatedGetter(
- longValue = -7279409155159127695L
+ longValue = -4642298123597580975L
)
@Export("MouseHandler_millis")
public static long MouseHandler_millis;
- @ObfuscatedName("c")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 86476017
+ longValue = -2350153647188660461L
+ )
+ @Export("MouseHandler_lastMovedVolatile")
+ public static volatile long MouseHandler_lastMovedVolatile;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = 1455272801
)
@Export("MouseHandler_currentButton")
public static int MouseHandler_currentButton;
- @ObfuscatedName("w")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -1263316171
+ intValue = 1882994615
+ )
+ @Export("MouseHandler_x")
+ public static int MouseHandler_x;
+ @ObfuscatedName("z")
+ @ObfuscatedGetter(
+ intValue = 673527067
)
@Export("MouseHandler_y")
public static int MouseHandler_y;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 14622161
+ intValue = -2102199951
)
@Export("MouseHandler_lastButtonVolatile")
- static volatile int MouseHandler_lastButtonVolatile;
- @ObfuscatedName("t")
+ public static volatile int MouseHandler_lastButtonVolatile;
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = 1442175051
+ intValue = 1399413665
)
@Export("MouseHandler_lastPressedXVolatile")
- static volatile int MouseHandler_lastPressedXVolatile;
- @ObfuscatedName("g")
+ public static volatile int MouseHandler_lastPressedXVolatile;
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 844374905
+ intValue = 2125601879
)
@Export("MouseHandler_lastPressedYVolatile")
- static volatile int MouseHandler_lastPressedYVolatile;
- @ObfuscatedName("x")
+ public static volatile int MouseHandler_lastPressedYVolatile;
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- longValue = 6423114043985559653L
+ longValue = -1006217129422716167L
)
@Export("MouseHandler_lastPressedTimeMillisVolatile")
- static volatile long MouseHandler_lastPressedTimeMillisVolatile;
- @ObfuscatedName("n")
+ public static volatile long MouseHandler_lastPressedTimeMillisVolatile;
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = 265860113
+ intValue = 1415111361
)
@Export("MouseHandler_lastButton")
public static int MouseHandler_lastButton;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 1874338505
+ intValue = -1792808507
)
@Export("MouseHandler_lastPressedX")
public static int MouseHandler_lastPressedX;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 797268567
+ intValue = 1987452137
)
@Export("MouseHandler_lastPressedY")
public static int MouseHandler_lastPressedY;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- longValue = 1079896650509100317L
+ longValue = -814886068230391219L
)
@Export("MouseHandler_lastPressedTimeMillis")
public static long MouseHandler_lastPressedTimeMillis;
- @ObfuscatedName("eo")
+ @ObfuscatedName("ey")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Llc;"
)
- @Export("archive4")
- static Archive archive4;
- @ObfuscatedName("hi")
+ @Export("archive19")
+ static Archive archive19;
+ @ObfuscatedName("hu")
@ObfuscatedSignature(
- descriptor = "Lpo;"
+ descriptor = "Lmt;"
)
- @Export("WorldMapElement_fonts")
- static Fonts WorldMapElement_fonts;
+ @Export("fontPlain11")
+ static Font fontPlain11;
static {
MouseHandler_instance = new MouseHandler(); // L: 15
@@ -157,124 +159,294 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
MouseHandler() {
} // L: 34
- @ObfuscatedName("a")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(Ljava/awt/event/MouseEvent;I)I",
- garbageValue = "-845105013"
+ garbageValue = "-987876058"
)
@Export("getButton")
final int getButton(MouseEvent var1) {
- int var2 = var1.getButton(); // L: 68
- if (!var1.isAltDown() && var2 != 2) { // L: 69
- return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 70 71
+ int var2 = var1.getButton(); // L: 49
+ if (!var1.isAltDown() && var2 != 2) { // L: 50
+ return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 51 52
} else {
return 4;
}
}
public final synchronized void mouseMoved(MouseEvent var1) {
- if (MouseHandler_instance != null) { // L: 116
- MouseHandler_idleCycles = 0; // L: 117
- MouseHandler_xVolatile = var1.getX(); // L: 118
- MouseHandler_yVolatile = var1.getY(); // L: 119
- MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 120
+ if (MouseHandler_instance != null) { // L: 97
+ MouseHandler_idleCycles = 0; // L: 98
+ MouseHandler_xVolatile = var1.getX(); // L: 99
+ MouseHandler_yVolatile = var1.getY(); // L: 100
+ MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 101
}
- } // L: 122
-
- public final synchronized void focusLost(FocusEvent var1) {
- if (MouseHandler_instance != null) { // L: 127
- MouseHandler_currentButtonVolatile = 0;
- }
-
- } // L: 128
-
- public final synchronized void mouseReleased(MouseEvent var1) {
- if (MouseHandler_instance != null) { // L: 87
- MouseHandler_idleCycles = 0; // L: 88
- MouseHandler_currentButtonVolatile = 0; // L: 89
- }
-
- if (var1.isPopupTrigger()) { // L: 91
- var1.consume();
- }
-
- } // L: 92
-
- public final void mouseClicked(MouseEvent var1) {
- if (var1.isPopupTrigger()) { // L: 95
- var1.consume();
- }
-
- } // L: 96
-
- public final synchronized void mouseEntered(MouseEvent var1) {
- this.mouseMoved(var1); // L: 99
- } // L: 100
-
- public final void focusGained(FocusEvent var1) {
- } // L: 124
-
- public final synchronized void mouseDragged(MouseEvent var1) {
- this.mouseMoved(var1); // L: 112
- } // L: 113
+ } // L: 103
public final synchronized void mousePressed(MouseEvent var1) {
- if (MouseHandler_instance != null) { // L: 75
- MouseHandler_idleCycles = 0; // L: 76
- MouseHandler_lastPressedXVolatile = var1.getX(); // L: 77
- MouseHandler_lastPressedYVolatile = var1.getY(); // L: 78
- MouseHandler_lastPressedTimeMillisVolatile = class113.method2624(); // L: 79
- MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 80
- if (MouseHandler_lastButtonVolatile != 0) { // L: 81
+ if (MouseHandler_instance != null) { // L: 56
+ MouseHandler_idleCycles = 0; // L: 57
+ MouseHandler_lastPressedXVolatile = var1.getX(); // L: 58
+ MouseHandler_lastPressedYVolatile = var1.getY(); // L: 59
+ MouseHandler_lastPressedTimeMillisVolatile = class115.method2692(); // L: 60
+ MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 61
+ if (MouseHandler_lastButtonVolatile != 0) { // L: 62
MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile;
}
}
- if (var1.isPopupTrigger()) { // L: 83
+ if (var1.isPopupTrigger()) { // L: 64
var1.consume();
}
- } // L: 84
+ } // L: 65
- public final synchronized void mouseExited(MouseEvent var1) {
- if (MouseHandler_instance != null) { // L: 103
- MouseHandler_idleCycles = 0; // L: 104
- MouseHandler_xVolatile = -1; // L: 105
- MouseHandler_yVolatile = -1; // L: 106
- MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107
+ public final void mouseClicked(MouseEvent var1) {
+ if (var1.isPopupTrigger()) { // L: 76
+ var1.consume();
+ }
+
+ } // L: 77
+
+ public final synchronized void mouseReleased(MouseEvent var1) {
+ if (MouseHandler_instance != null) { // L: 68
+ MouseHandler_idleCycles = 0; // L: 69
+ MouseHandler_currentButtonVolatile = 0; // L: 70
+ }
+
+ if (var1.isPopupTrigger()) { // L: 72
+ var1.consume();
+ }
+
+ } // L: 73
+
+ public final synchronized void mouseDragged(MouseEvent var1) {
+ this.mouseMoved(var1); // L: 93
+ } // L: 94
+
+ public final void focusGained(FocusEvent var1) {
+ } // L: 105
+
+ public final synchronized void focusLost(FocusEvent var1) {
+ if (MouseHandler_instance != null) { // L: 108
+ MouseHandler_currentButtonVolatile = 0;
}
} // L: 109
- @ObfuscatedName("fw")
- @ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "1658227237"
- )
- static void method588(int var0, int var1, int var2) {
- if (var0 != 0) { // L: 3774
- int var3 = var0 >> 8; // L: 3775
- int var4 = var0 >> 4 & 7; // L: 3776
- int var5 = var0 & 15; // L: 3777
- Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 3778
- Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 3779
- Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3780
- Client.soundEffects[Client.soundEffectCount] = null; // L: 3781
- int var6 = (var1 - 64) / 128; // L: 3782
- int var7 = (var2 - 64) / 128; // L: 3783
- Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 3784
- ++Client.soundEffectCount; // L: 3785
+ public final synchronized void mouseExited(MouseEvent var1) {
+ if (MouseHandler_instance != null) { // L: 84
+ MouseHandler_idleCycles = 0; // L: 85
+ MouseHandler_xVolatile = -1; // L: 86
+ MouseHandler_yVolatile = -1; // L: 87
+ MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 88
}
- } // L: 3786
- @ObfuscatedName("kv")
+ } // L: 90
+
+ public final synchronized void mouseEntered(MouseEvent var1) {
+ this.mouseMoved(var1); // L: 80
+ } // L: 81
+
+ @ObfuscatedName("be")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1845150784"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1889680041"
)
- static final void method591(int var0) {
- var0 = Math.min(Math.max(var0, 0), 127); // L: 12078
- class12.clientPreferences.method2278(var0); // L: 12079
- } // L: 12080
+ static int method547(int var0, Script var1, boolean var2) {
+ int var3;
+ Object var4;
+ int var5;
+ class436 var6;
+ int var7;
+ if (var0 != 7500 && var0 != 7508) { // L: 4732
+ if (var0 != 7501) { // L: 4754
+ int var19;
+ int var20;
+ if (var0 == 7502) { // L: 4763
+ class446.Interpreter_intStackSize -= 3; // L: 4764
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4765
+ var19 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 4766
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 4767
+ var20 = class285.method5516(var19); // L: 4768
+ var7 = HealthBarUpdate.method2199(var19); // L: 4769
+ int var21 = class141.method3048(var19); // L: 4770
+ class437 var26 = FriendLoginUpdate.method6631(var3); // L: 4771
+ class435 var27 = UserComparator6.method2626(var20); // L: 4772
+ int[] var28 = var27.field4668[var7]; // L: 4773
+ int var12 = 0; // L: 4774
+ int var13 = var28.length; // L: 4775
+ if (var21 >= 0) { // L: 4776
+ if (var21 >= var13) { // L: 4777
+ throw new RuntimeException("Tuple index out-of-bounds. Requested: " + var21 + ", Max: " + var13); // L: 4778
+ }
+
+ var12 = var21; // L: 4780
+ var13 = var21 + 1; // L: 4781
+ }
+
+ Object[] var14 = var26.method7625(var7); // L: 4783
+ if (var14 == null && var27.field4669 != null) { // L: 4784 4785
+ var14 = var27.field4669[var7];
+ }
+
+ int var15;
+ int var16;
+ if (var14 == null) { // L: 4787
+ for (var15 = var12; var15 < var13; ++var15) { // L: 4788
+ var16 = var28[var15]; // L: 4789
+ class432 var22 = MusicPatchNode.method5472(var16); // L: 4790
+ if (var22 == class432.field4657) { // L: 4791
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ArchiveLoader.method2075(var16); // L: 4792
+ }
+ }
+
+ return 1; // L: 4794
+ } else {
+ var15 = var14.length / var28.length; // L: 4796
+ if (var5 >= 0 && var5 < var15) { // L: 4797
+ for (var16 = var12; var16 < var13; ++var16) { // L: 4800
+ int var17 = var16 + var28.length * var5; // L: 4801
+ class432 var18 = MusicPatchNode.method5472(var28[var16]); // L: 4802
+ if (var18 == class432.field4657) { // L: 4803
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = (String)var14[var17];
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (Integer)var14[var17]; // L: 4804
+ }
+ }
+
+ return 1; // L: 4806
+ } else {
+ throw new RuntimeException(); // L: 4798
+ }
+ }
+ } else if (var0 == 7503) { // L: 4808
+ class446.Interpreter_intStackSize -= 2; // L: 4809
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4810
+ var19 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 4811
+ var5 = 0; // L: 4812
+ var20 = class285.method5516(var19); // L: 4813
+ var7 = HealthBarUpdate.method2199(var19); // L: 4814
+ class437 var25 = FriendLoginUpdate.method6631(var3); // L: 4815
+ class435 var9 = UserComparator6.method2626(var20); // L: 4816
+ int[] var10 = var9.field4668[var7]; // L: 4817
+ Object[] var11 = var25.method7625(var7); // L: 4818
+ if (var11 == null && var9.field4669 != null) { // L: 4819 4820
+ var11 = var9.field4669[var7]; // L: 4821
+ }
+
+ if (var11 != null) { // L: 4824
+ var5 = var11.length / var10.length;
+ }
+
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5; // L: 4825
+ return 1; // L: 4826
+ } else if (var0 != 7504 && var0 != 7509) { // L: 4828
+ if (var0 == 7505) { // L: 4845
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4846
+ class437 var24 = FriendLoginUpdate.method6631(var3); // L: 4847
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var24.field4678; // L: 4848
+ return 1; // L: 4849
+ } else if (var0 == 7506) { // L: 4851
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4852
+ var19 = -1; // L: 4853
+ if (UrlRequest.field1373 != null && var3 >= 0 && var3 < UrlRequest.field1373.size()) { // L: 4854
+ var19 = (Integer)UrlRequest.field1373.get(var3); // L: 4855
+ }
+
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var19; // L: 4857
+ return 1; // L: 4858
+ } else if (var0 != 7507 && var0 != 7510) { // L: 4860
+ return 2; // L: 4887
+ } else {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4861
+ var4 = class137.method2937(var3); // L: 4862
+ var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4863
+ var6 = class123.method2813(var5); // L: 4864
+ if (var6 == null) { // L: 4865
+ throw new RuntimeException(); // L: 4866
+ } else if (class285.method5516(var5) != Client.field588) { // L: 4868
+ throw new RuntimeException(); // L: 4869
+ } else if (UrlRequest.field1373 == null && UrlRequest.field1373.isEmpty()) { // L: 4871
+ throw new RuntimeException(); // L: 4872
+ } else {
+ var7 = class141.method3048(var5); // L: 4874
+ List var8 = var6.method7619(var4, var7); // L: 4875
+ UrlRequest.field1373 = new LinkedList(UrlRequest.field1373); // L: 4876
+ if (var8 != null) { // L: 4877
+ UrlRequest.field1373.retainAll(var8); // L: 4878
+ } else {
+ UrlRequest.field1373.clear(); // L: 4881
+ }
+
+ SoundSystem.field312 = UrlRequest.field1373.iterator(); // L: 4883
+ if (var0 == 7507) { // L: 4884
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = UrlRequest.field1373.size();
+ }
+
+ return 1; // L: 4885
+ }
+ }
+ } else {
+ --class446.Interpreter_intStackSize; // L: 4829
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4830
+ class436 var23 = WorldMapRectangle.method4988(var3); // L: 4831
+ if (var23 == null) { // L: 4832
+ throw new RuntimeException(); // L: 4833
+ } else {
+ UrlRequest.field1373 = var23.method7619(0, 0); // L: 4835
+ var5 = 0; // L: 4836
+ if (UrlRequest.field1373 != null) { // L: 4837
+ Client.field588 = var3; // L: 4838
+ SoundSystem.field312 = UrlRequest.field1373.iterator(); // L: 4839
+ var5 = UrlRequest.field1373.size(); // L: 4840
+ }
+
+ if (var0 == 7504) { // L: 4842
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5;
+ }
+
+ return 1; // L: 4843
+ }
+ }
+ } else {
+ if (SoundSystem.field312 != null && SoundSystem.field312.hasNext()) { // L: 4755
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (Integer)SoundSystem.field312.next(); // L: 4756
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4759
+ }
+
+ return 1; // L: 4761
+ }
+ } else {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4733
+ var4 = class137.method2937(var3); // L: 4734
+ var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4735
+ var6 = class123.method2813(var5); // L: 4736
+ if (var6 == null) { // L: 4737
+ throw new RuntimeException(); // L: 4738
+ } else {
+ var7 = class141.method3048(var5); // L: 4740
+ UrlRequest.field1373 = var6.method7619(var4, var7); // L: 4741
+ if (UrlRequest.field1373 != null) { // L: 4742
+ Client.field588 = class285.method5516(var5); // L: 4743
+ SoundSystem.field312 = UrlRequest.field1373.iterator(); // L: 4744
+ if (var0 == 7500) { // L: 4745
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = UrlRequest.field1373.size();
+ }
+ } else {
+ Client.field588 = -1; // L: 4748
+ SoundSystem.field312 = null; // L: 4749
+ if (var0 == 7500) { // L: 4750
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0;
+ }
+ }
+
+ return 1; // L: 4752
+ }
+ }
+ }
}
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 4706380998..6f928d1f44 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -1,32 +1,36 @@
-import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cv")
+@ObfuscatedName("cx")
@Implements("MouseRecorder")
public class MouseRecorder implements Runnable {
- @ObfuscatedName("o")
+ @ObfuscatedName("bu")
+ @ObfuscatedGetter(
+ intValue = 1484453343
+ )
+ static int field1064;
+ @ObfuscatedName("c")
@Export("isRunning")
boolean isRunning;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("lock")
Object lock;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1556283769
+ intValue = -1641337251
)
@Export("index")
int index;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("xs")
int[] xs;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("ys")
int[] ys;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("millis")
long[] millis;
@@ -40,7 +44,7 @@ public class MouseRecorder implements Runnable {
} // L: 14
public void run() {
- for (; this.isRunning; class241.method4815(50L)) { // L: 18 27
+ for (; this.isRunning; DynamicObject.method1991(50L)) { // L: 18 27
synchronized(this.lock) { // L: 19
if (this.index < 500) { // L: 20
this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21
@@ -53,28 +57,144 @@ public class MouseRecorder implements Runnable {
} // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(ZB)V",
- garbageValue = "-105"
+ descriptor = "([Lbc;II[I[IB)V",
+ garbageValue = "0"
)
- public static void method2088(boolean var0) {
- if (NetCache.NetCache_socket != null) { // L: 42
- try {
- Buffer var1 = new Buffer(4); // L: 44
- var1.writeByte(var0 ? 2 : 3); // L: 45
- var1.writeMedium(0); // L: 46
- NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47
- } catch (IOException var4) {
- try {
- NetCache.NetCache_socket.close(); // L: 51
- } catch (Exception var3) { // L: 53
- }
+ @Export("sortWorlds")
+ static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+ if (var1 < var2) { // L: 81
+ int var5 = var1 - 1; // L: 82
+ int var6 = var2 + 1; // L: 83
+ int var7 = (var2 + var1) / 2; // L: 84
+ World var8 = var0[var7]; // L: 85
+ var0[var7] = var0[var1]; // L: 86
+ var0[var1] = var8; // L: 87
- ++NetCache.NetCache_ioExceptions; // L: 54
- NetCache.NetCache_socket = null; // L: 55
+ while (var5 < var6) { // L: 88
+ boolean var9 = true; // L: 89
+
+ int var10;
+ int var11;
+ int var12;
+ do {
+ --var6; // L: 91
+
+ for (var10 = 0; var10 < 4; ++var10) { // L: 92
+ if (var3[var10] == 2) { // L: 95
+ var11 = var0[var6].index; // L: 96
+ var12 = var8.index; // L: 97
+ } else if (var3[var10] == 1) { // L: 99
+ var11 = var0[var6].population; // L: 100
+ var12 = var8.population; // L: 101
+ if (var11 == -1 && var4[var10] == 1) { // L: 102
+ var11 = 2001;
+ }
+
+ if (var12 == -1 && var4[var10] == 1) { // L: 103
+ var12 = 2001;
+ }
+ } else if (var3[var10] == 3) { // L: 105
+ var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106
+ var12 = var8.isMembersOnly() ? 1 : 0; // L: 107
+ } else {
+ var11 = var0[var6].id; // L: 110
+ var12 = var8.id; // L: 111
+ }
+
+ if (var12 != var11) { // L: 113
+ if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117
+ var9 = false; // L: 119
+ }
+ break;
+ }
+
+ if (var10 == 3) { // L: 114
+ var9 = false;
+ }
+ }
+ } while(var9);
+
+ var9 = true; // L: 124
+
+ do {
+ ++var5; // L: 126
+
+ for (var10 = 0; var10 < 4; ++var10) { // L: 127
+ if (var3[var10] == 2) { // L: 130
+ var11 = var0[var5].index; // L: 131
+ var12 = var8.index; // L: 132
+ } else if (var3[var10] == 1) { // L: 134
+ var11 = var0[var5].population; // L: 135
+ var12 = var8.population; // L: 136
+ if (var11 == -1 && var4[var10] == 1) { // L: 137
+ var11 = 2001;
+ }
+
+ if (var12 == -1 && var4[var10] == 1) { // L: 138
+ var12 = 2001;
+ }
+ } else if (var3[var10] == 3) { // L: 140
+ var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141
+ var12 = var8.isMembersOnly() ? 1 : 0; // L: 142
+ } else {
+ var11 = var0[var5].id; // L: 145
+ var12 = var8.id; // L: 146
+ }
+
+ if (var12 != var11) { // L: 148
+ if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152
+ var9 = false; // L: 154
+ }
+ break;
+ }
+
+ if (var10 == 3) { // L: 149
+ var9 = false;
+ }
+ }
+ } while(var9);
+
+ if (var5 < var6) { // L: 159
+ World var13 = var0[var5]; // L: 160
+ var0[var5] = var0[var6]; // L: 161
+ var0[var6] = var13; // L: 162
+ }
}
+ sortWorlds(var0, var1, var6, var3, var4); // L: 165
+ sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166
}
- } // L: 57
+
+ } // L: 168
+
+ @ObfuscatedName("fy")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "76"
+ )
+ @Export("logOut")
+ static final void logOut() {
+ Client.packetWriter.close(); // L: 2902
+ Projectile.method1961(); // L: 2903
+ class356.scene.clear(); // L: 2904
+
+ for (int var0 = 0; var0 < 4; ++var0) { // L: 2905
+ Client.collisionMaps[var0].clear();
+ }
+
+ System.gc(); // L: 2906
+ class272.musicPlayerStatus = 1; // L: 2908
+ class272.musicTrackArchive = null; // L: 2909
+ class272.musicTrackGroupId = -1; // L: 2910
+ class151.musicTrackFileId = -1; // L: 2911
+ class272.musicTrackVolume = 0; // L: 2912
+ class11.musicTrackBoolean = false; // L: 2913
+ class272.pcmSampleLength = 2; // L: 2914
+ Client.currentTrackGroupId = -1; // L: 2916
+ Client.playingJingle = false; // L: 2917
+ Decimator.method1018(); // L: 2918
+ HealthBarUpdate.updateGameState(10); // L: 2919
+ } // L: 2920
}
diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java
index 39a33b38ea..bd2c2abd49 100644
--- a/runescape-client/src/main/java/MouseWheel.java
+++ b/runescape-client/src/main/java/MouseWheel.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lk")
+@ObfuscatedName("la")
@Implements("MouseWheel")
public interface MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
int rsOrdinal();
diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java
index 437fea4e0b..6479179c29 100644
--- a/runescape-client/src/main/java/MouseWheelHandler.java
+++ b/runescape-client/src/main/java/MouseWheelHandler.java
@@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("j")
+@ObfuscatedName("n")
@Implements("MouseWheelHandler")
public final class MouseWheelHandler implements class158, MouseWheelListener {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1405253987
+ intValue = 27869471
)
@Export("rotation")
int rotation;
@@ -21,30 +21,30 @@ public final class MouseWheelHandler implements class158, MouseWheelListener {
this.rotation = 0; // L: 8
} // L: 10
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/awt/Component;I)V",
- garbageValue = "-1767860580"
+ descriptor = "(Ljava/awt/Component;B)V",
+ garbageValue = "0"
)
@Export("addTo")
void addTo(Component var1) {
var1.addMouseWheelListener(this); // L: 13
} // L: 14
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ljava/awt/Component;I)V",
- garbageValue = "-1913817294"
+ descriptor = "(Ljava/awt/Component;B)V",
+ garbageValue = "-38"
)
@Export("removeFrom")
void removeFrom(Component var1) {
var1.removeMouseWheelListener(this); // L: 17
} // L: 18
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-479610962"
+ descriptor = "(B)I",
+ garbageValue = "-105"
)
@Export("useRotation")
public synchronized int useRotation() {
diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java
index 66e4671717..8a18f81186 100644
--- a/runescape-client/src/main/java/MusicPatch.java
+++ b/runescape-client/src/main/java/MusicPatch.java
@@ -4,47 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jt")
+@ObfuscatedName("jg")
@Implements("MusicPatch")
public class MusicPatch extends Node {
- @ObfuscatedName("y")
- @Export("Tiles_saturation")
- static int[] Tiles_saturation;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -690673201
+ intValue = -1740181359
)
- int field3288;
- @ObfuscatedName("q")
+ int field3247;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "[Lak;"
+ descriptor = "[Laf;"
)
@Export("rawSounds")
RawSound[] rawSounds;
- @ObfuscatedName("l")
- short[] field3287;
- @ObfuscatedName("k")
- byte[] field3290;
- @ObfuscatedName("a")
- byte[] field3289;
- @ObfuscatedName("m")
+ @ObfuscatedName("q")
+ short[] field3250;
+ @ObfuscatedName("f")
+ byte[] field3253;
+ @ObfuscatedName("j")
+ byte[] field3251;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "[Ljp;"
+ descriptor = "[Ljv;"
)
- MusicPatchNode2[] field3291;
- @ObfuscatedName("p")
- byte[] field3285;
- @ObfuscatedName("s")
- int[] field3292;
+ MusicPatchNode2[] field3252;
+ @ObfuscatedName("g")
+ byte[] field3249;
+ @ObfuscatedName("w")
+ int[] field3254;
MusicPatch(byte[] var1) {
this.rawSounds = new RawSound[128]; // L: 21
- this.field3287 = new short[128]; // L: 22
- this.field3290 = new byte[128]; // L: 23
- this.field3289 = new byte[128]; // L: 24
- this.field3291 = new MusicPatchNode2[128]; // L: 25
- this.field3285 = new byte[128]; // L: 26
- this.field3292 = new int[128]; // L: 27
+ this.field3250 = new short[128]; // L: 22
+ this.field3253 = new byte[128]; // L: 23
+ this.field3251 = new byte[128]; // L: 24
+ this.field3252 = new MusicPatchNode2[128]; // L: 25
+ this.field3249 = new byte[128]; // L: 26
+ this.field3254 = new int[128]; // L: 27
Buffer var2 = new Buffer(var1); // L: 28
int var3;
@@ -60,11 +57,11 @@ public class MusicPatch extends Node {
++var2.offset; // L: 33
++var3; // L: 34
- var5 = var2.offset; // L: 35
- var2.offset += var3; // L: 36
+ var5 = var2.offset;
+ var2.offset += var3;
int var6;
- for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38
+ for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) {
}
byte[] var7 = new byte[var6]; // L: 39
@@ -91,51 +88,51 @@ public class MusicPatch extends Node {
++var2.offset; // L: 49
++var9; // L: 50
- byte[] var36 = new byte[var9]; // L: 51
+ byte[] var38 = new byte[var9]; // L: 51
int var12;
int var14;
if (var9 > 1) { // L: 53
- var36[1] = 1; // L: 54
+ var38[1] = 1; // L: 54
int var13 = 1; // L: 55
var12 = 2; // L: 56
for (var14 = 2; var14 < var9; ++var14) { // L: 57
- int var41 = var2.readUnsignedByte(); // L: 58
- if (var41 == 0) { // L: 59
+ int var43 = var2.readUnsignedByte(); // L: 58
+ if (var43 == 0) { // L: 59
var13 = var12++;
} else {
- if (var41 <= var13) { // L: 61
- --var41;
+ if (var43 <= var13) { // L: 61
+ --var43;
}
- var13 = var41; // L: 62
+ var13 = var43; // L: 62
}
- var36[var14] = (byte)var13; // L: 64
+ var38[var14] = (byte)var13; // L: 64
}
} else {
var12 = var9; // L: 67
}
- MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 68
+ MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68
MusicPatchNode2 var15;
- for (var14 = 0; var14 < var37.length; ++var14) { // L: 69
- var15 = var37[var14] = new MusicPatchNode2(); // L: 70
- int var40 = var2.readUnsignedByte(); // L: 71
- if (var40 > 0) { // L: 72
- var15.field3232 = new byte[var40 * 2];
+ for (var14 = 0; var14 < var39.length; ++var14) { // L: 69
+ var15 = var39[var14] = new MusicPatchNode2(); // L: 70
+ int var42 = var2.readUnsignedByte(); // L: 71
+ if (var42 > 0) { // L: 72
+ var15.field3184 = new byte[var42 * 2];
}
- var40 = var2.readUnsignedByte(); // L: 73
- if (var40 > 0) { // L: 74
- var15.field3223 = new byte[var40 * 2 + 2]; // L: 75
- var15.field3223[1] = 64; // L: 76
+ var42 = var2.readUnsignedByte(); // L: 73
+ if (var42 > 0) { // L: 74
+ var15.field3181 = new byte[var42 * 2 + 2]; // L: 75
+ var15.field3181[1] = 64; // L: 76
}
}
var14 = var2.readUnsignedByte(); // L: 79
- byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80
+ byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80
var14 = var2.readUnsignedByte(); // L: 81
byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82
@@ -157,16 +154,16 @@ public class MusicPatch extends Node {
int var20;
for (var20 = 0; var20 < 128; ++var20) { // L: 90
var19 += var2.readUnsignedByte(); // L: 91
- this.field3287[var20] = (short)var19; // L: 92
+ this.field3250[var20] = (short)var19; // L: 92
}
var19 = 0; // L: 94
- short[] var48;
+ short[] var50;
for (var20 = 0; var20 < 128; ++var20) { // L: 95
var19 += var2.readUnsignedByte(); // L: 96
- var48 = this.field3287; // L: 97
- var48[var20] = (short)(var48[var20] + (var19 << 8));
+ var50 = this.field3250; // L: 97
+ var50[var20] = (short)(var50[var20] + (var19 << 8));
}
var20 = 0; // L: 99
@@ -185,9 +182,9 @@ public class MusicPatch extends Node {
var22 = var2.readVarInt(); // L: 106
}
- var48 = this.field3287; // L: 108
- var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14));
- this.field3292[var23] = var22; // L: 109
+ var50 = this.field3250; // L: 108
+ var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14));
+ this.field3254[var23] = var22; // L: 109
--var20; // L: 110
}
@@ -197,7 +194,7 @@ public class MusicPatch extends Node {
int var24;
for (var24 = 0; var24 < 128; ++var24) { // L: 115
- if (this.field3292[var24] != 0) { // L: 116
+ if (this.field3254[var24] != 0) { // L: 116
if (var20 == 0) { // L: 117
if (var21 < var4.length) { // L: 118
var20 = var4[var21++];
@@ -208,7 +205,7 @@ public class MusicPatch extends Node {
var23 = var2.array[var5++] - 1; // L: 120
}
- this.field3285[var24] = (byte)var23; // L: 122
+ this.field3249[var24] = (byte)var23; // L: 122
--var20; // L: 123
}
}
@@ -218,10 +215,10 @@ public class MusicPatch extends Node {
var24 = 0; // L: 127
for (int var25 = 0; var25 < 128; ++var25) { // L: 128
- if (this.field3292[var25] != 0) { // L: 129
+ if (this.field3254[var25] != 0) { // L: 129
if (var20 == 0) { // L: 130
- if (var21 < var7.length) { // L: 131
- var20 = var7[var21++];
+ if (var21 < var7.length) {
+ var20 = var7[var21++]; // L: 131
} else {
var20 = -1; // L: 132
}
@@ -229,20 +226,20 @@ public class MusicPatch extends Node {
var24 = var2.array[var8++] + 16 << 2; // L: 133
}
- this.field3289[var25] = (byte)var24; // L: 135
+ this.field3251[var25] = (byte)var24; // L: 135
--var20; // L: 136
}
}
var20 = 0; // L: 138
var21 = 0; // L: 139
- MusicPatchNode2 var38 = null; // L: 140
+ MusicPatchNode2 var40 = null; // L: 140
int var26;
for (var26 = 0; var26 < 128; ++var26) { // L: 141
- if (this.field3292[var26] != 0) { // L: 142
+ if (this.field3254[var26] != 0) { // L: 142
if (var20 == 0) { // L: 143
- var38 = var37[var36[var21]]; // L: 144
+ var40 = var39[var38[var21]]; // L: 144
if (var21 < var10.length) { // L: 145
var20 = var10[var21++];
} else {
@@ -250,7 +247,7 @@ public class MusicPatch extends Node {
}
}
- this.field3291[var26] = var38; // L: 148
+ this.field3252[var26] = var40; // L: 148
--var20; // L: 149
}
}
@@ -268,37 +265,37 @@ public class MusicPatch extends Node {
var20 = -1; // L: 157
}
- if (this.field3292[var27] > 0) { // L: 158
+ if (this.field3254[var27] > 0) { // L: 158
var26 = var2.readUnsignedByte() + 1;
}
}
- this.field3290[var27] = (byte)var26; // L: 160
+ this.field3253[var27] = (byte)var26; // L: 160
--var20; // L: 161
}
- this.field3288 = var2.readUnsignedByte() + 1; // L: 163
+ this.field3247 = var2.readUnsignedByte() + 1; // L: 163
int var29;
- MusicPatchNode2 var39;
+ MusicPatchNode2 var41;
for (var27 = 0; var27 < var12; ++var27) { // L: 164
- var39 = var37[var27]; // L: 165
- if (var39.field3232 != null) { // L: 166
- for (var29 = 1; var29 < var39.field3232.length; var29 += 2) { // L: 167
- var39.field3232[var29] = var2.readByte();
+ var41 = var39[var27]; // L: 165
+ if (var41.field3184 != null) { // L: 166
+ for (var29 = 1; var29 < var41.field3184.length; var29 += 2) { // L: 167
+ var41.field3184[var29] = var2.readByte();
}
}
- if (var39.field3223 != null) { // L: 169
- for (var29 = 3; var29 < var39.field3223.length - 2; var29 += 2) { // L: 170
- var39.field3223[var29] = var2.readByte();
+ if (var41.field3181 != null) { // L: 169
+ for (var29 = 3; var29 < var41.field3181.length - 2; var29 += 2) { // L: 170
+ var41.field3181[var29] = var2.readByte();
}
}
}
- if (var42 != null) { // L: 173
- for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 174
- var42[var27] = var2.readByte();
+ if (var44 != null) { // L: 173
+ for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174
+ var44[var27] = var2.readByte();
}
}
@@ -309,25 +306,25 @@ public class MusicPatch extends Node {
}
for (var27 = 0; var27 < var12; ++var27) { // L: 179
- var39 = var37[var27]; // L: 180
- if (var39.field3223 != null) { // L: 181
+ var41 = var39[var27]; // L: 180
+ if (var41.field3181 != null) { // L: 181
var19 = 0; // L: 182
- for (var29 = 2; var29 < var39.field3223.length; var29 += 2) { // L: 183
- var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184
- var39.field3223[var29] = (byte)var19; // L: 185
+ for (var29 = 2; var29 < var41.field3181.length; var29 += 2) { // L: 183
+ var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184
+ var41.field3181[var29] = (byte)var19; // L: 185
}
}
}
for (var27 = 0; var27 < var12; ++var27) { // L: 189
- var39 = var37[var27]; // L: 190
- if (var39.field3232 != null) { // L: 191
+ var41 = var39[var27]; // L: 190
+ if (var41.field3184 != null) { // L: 191
var19 = 0; // L: 192
- for (var29 = 2; var29 < var39.field3232.length; var29 += 2) { // L: 193
- var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194
- var39.field3232[var29] = (byte)var19; // L: 195
+ for (var29 = 2; var29 < var41.field3184.length; var29 += 2) { // L: 193
+ var19 = 1 + var19 + var2.readUnsignedByte(); // L: 194
+ var41.field3184[var29] = (byte)var19; // L: 195
}
}
}
@@ -336,245 +333,223 @@ public class MusicPatch extends Node {
int var32;
int var33;
int var34;
- int var45;
- byte var47;
- if (var42 != null) { // L: 199
+ int var35;
+ int var36;
+ int var47;
+ byte var49;
+ if (var44 != null) { // L: 199
var19 = var2.readUnsignedByte(); // L: 200
- var42[0] = (byte)var19; // L: 201
+ var44[0] = (byte)var19; // L: 201
- for (var27 = 2; var27 < var42.length; var27 += 2) { // L: 202
+ for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202
var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203
- var42[var27] = (byte)var19; // L: 204
+ var44[var27] = (byte)var19; // L: 204
}
- var47 = var42[0]; // L: 206
- byte var28 = var42[1]; // L: 207
+ var49 = var44[0]; // L: 206
+ byte var28 = var44[1]; // L: 207
- for (var29 = 0; var29 < var47; ++var29) { // L: 208
- this.field3290[var29] = (byte)(var28 * this.field3290[var29] + 32 >> 6);
+ for (var29 = 0; var29 < var49; ++var29) { // L: 208
+ this.field3253[var29] = (byte)(var28 * this.field3253[var29] + 32 >> 6);
}
- for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221
- var30 = var42[var29]; // L: 211
- byte var31 = var42[var29 + 1]; // L: 212
- var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213
+ for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227
+ var30 = var44[var29]; // L: 211
+ byte var31 = var44[var29 + 1]; // L: 212
+ var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 213
- for (var33 = var47; var33 < var30; ++var33) { // L: 214
- var34 = class134.method2841(var32, var30 - var47); // L: 215
- this.field3290[var33] = (byte)(var34 * this.field3290[var33] + 32 >> 6); // L: 216
- var32 += var31 - var28; // L: 217
+ for (var33 = var49; var33 < var30; ++var33) { // L: 214
+ var35 = var30 - var49; // L: 216
+ var36 = var32 >>> 31; // L: 218
+ var34 = (var32 + var36) / var35 - var36; // L: 219
+ this.field3253[var33] = (byte)(var34 * this.field3253[var33] + 32 >> 6); // L: 222
+ var32 += var31 - var28; // L: 223
}
- var47 = var30; // L: 219
- var28 = var31; // L: 220
+ var49 = var30; // L: 225
+ var28 = var31; // L: 226
}
- for (var45 = var47; var45 < 128; ++var45) { // L: 223
- this.field3290[var45] = (byte)(var28 * this.field3290[var45] + 32 >> 6);
+ for (var47 = var49; var47 < 128; ++var47) { // L: 229
+ this.field3253[var47] = (byte)(var28 * this.field3253[var47] + 32 >> 6);
}
- var15 = null; // L: 224
+ var15 = null; // L: 230
}
- if (var16 != null) { // L: 226
- var19 = var2.readUnsignedByte(); // L: 227
- var16[0] = (byte)var19; // L: 228
+ if (var16 != null) { // L: 232
+ var19 = var2.readUnsignedByte(); // L: 233
+ var16[0] = (byte)var19; // L: 234
- for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 229
- var19 = var19 + 1 + var2.readUnsignedByte(); // L: 230
- var16[var27] = (byte)var19; // L: 231
+ for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235
+ var19 = 1 + var19 + var2.readUnsignedByte(); // L: 236
+ var16[var27] = (byte)var19; // L: 237
}
- var47 = var16[0]; // L: 233
- int var44 = var16[1] << 1; // L: 234
+ var49 = var16[0]; // L: 239
+ int var46 = var16[1] << 1; // L: 240
- for (var29 = 0; var29 < var47; ++var29) { // L: 235
- var45 = var44 + (this.field3289[var29] & 255); // L: 236
- if (var45 < 0) { // L: 237
- var45 = 0;
+ for (var29 = 0; var29 < var49; ++var29) { // L: 241
+ var47 = var46 + (this.field3251[var29] & 255); // L: 242
+ if (var47 < 0) { // L: 243
+ var47 = 0;
}
- if (var45 > 128) { // L: 238
- var45 = 128;
+ if (var47 > 128) { // L: 244
+ var47 = 128;
}
- this.field3289[var29] = (byte)var45; // L: 239
+ this.field3251[var29] = (byte)var47; // L: 245
}
- int var46;
- for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 241 242 256
- var30 = var16[var29]; // L: 243
- var46 = var16[var29 + 1] << 1; // L: 244
- var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245
+ int var48;
+ for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 268
+ var30 = var16[var29]; // L: 249
+ var48 = var16[var29 + 1] << 1; // L: 250
+ var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 251
- for (var33 = var47; var33 < var30; ++var33) { // L: 246
- var34 = class134.method2841(var32, var30 - var47); // L: 247
- int var35 = var34 + (this.field3289[var33] & 255); // L: 248
- if (var35 < 0) { // L: 249
- var35 = 0;
+ for (var33 = var49; var33 < var30; ++var33) { // L: 252
+ var35 = var30 - var49; // L: 254
+ var36 = var32 >>> 31; // L: 256
+ var34 = (var36 + var32) / var35 - var36; // L: 257
+ int var37 = var34 + (this.field3251[var33] & 255); // L: 260
+ if (var37 < 0) { // L: 261
+ var37 = 0;
}
- if (var35 > 128) { // L: 250
- var35 = 128;
+ if (var37 > 128) { // L: 262
+ var37 = 128;
}
- this.field3289[var33] = (byte)var35; // L: 251
- var32 += var46 - var44; // L: 252
+ this.field3251[var33] = (byte)var37; // L: 263
+ var32 += var48 - var46; // L: 264
}
- var47 = var30; // L: 254
- var44 = var46; // L: 255
+ var49 = var30; // L: 266
+ var46 = var48; // L: 267
}
- for (var45 = var47; var45 < 128; ++var45) { // L: 258
- var46 = var44 + (this.field3289[var45] & 255); // L: 259
- if (var46 < 0) { // L: 260
- var46 = 0;
+ for (var47 = var49; var47 < 128; ++var47) { // L: 270
+ var48 = var46 + (this.field3251[var47] & 255); // L: 271
+ if (var48 < 0) { // L: 272
+ var48 = 0;
}
- if (var46 > 128) { // L: 261
- var46 = 128;
+ if (var48 > 128) { // L: 273
+ var48 = 128;
}
- this.field3289[var45] = (byte)var46; // L: 262
+ this.field3251[var47] = (byte)var48; // L: 274
}
- Object var43 = null; // L: 264
- }
-
- for (var27 = 0; var27 < var12; ++var27) { // L: 266
- var37[var27].field3226 = var2.readUnsignedByte();
- }
-
- for (var27 = 0; var27 < var12; ++var27) { // L: 267
- var39 = var37[var27]; // L: 268
- if (var39.field3232 != null) { // L: 269
- var39.field3225 = var2.readUnsignedByte();
- }
-
- if (var39.field3223 != null) { // L: 270
- var39.field3224 = var2.readUnsignedByte();
- }
-
- if (var39.field3226 > 0) { // L: 271
- var39.field3227 = var2.readUnsignedByte();
- }
- }
-
- for (var27 = 0; var27 < var12; ++var27) { // L: 273
- var37[var27].field3229 = var2.readUnsignedByte();
- }
-
- for (var27 = 0; var27 < var12; ++var27) { // L: 274
- var39 = var37[var27]; // L: 275
- if (var39.field3229 > 0) { // L: 276
- var39.field3228 = var2.readUnsignedByte();
- }
+ Object var45 = null; // L: 276
}
for (var27 = 0; var27 < var12; ++var27) { // L: 278
- var39 = var37[var27]; // L: 279
- if (var39.field3228 > 0) { // L: 280
- var39.field3222 = var2.readUnsignedByte();
+ var39[var27].field3182 = var2.readUnsignedByte();
+ }
+
+ for (var27 = 0; var27 < var12; ++var27) { // L: 279
+ var41 = var39[var27]; // L: 280
+ if (var41.field3184 != null) { // L: 281
+ var41.field3190 = var2.readUnsignedByte();
+ }
+
+ if (var41.field3181 != null) { // L: 282
+ var41.field3185 = var2.readUnsignedByte();
+ }
+
+ if (var41.field3182 > 0) { // L: 283
+ var41.field3183 = var2.readUnsignedByte();
}
}
- } // L: 282
+ for (var27 = 0; var27 < var12; ++var27) { // L: 285
+ var39[var27].field3187 = var2.readUnsignedByte();
+ }
- @ObfuscatedName("o")
+ for (var27 = 0; var27 < var12; ++var27) { // L: 286
+ var41 = var39[var27]; // L: 287
+ if (var41.field3187 > 0) { // L: 288
+ var41.field3186 = var2.readUnsignedByte();
+ }
+ }
+
+ for (var27 = 0; var27 < var12; ++var27) { // L: 290
+ var41 = var39[var27]; // L: 291
+ if (var41.field3186 > 0) { // L: 292
+ var41.field3188 = var2.readUnsignedByte();
+ }
+ }
+
+ } // L: 294
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lan;[B[II)Z",
- garbageValue = "-489821860"
+ descriptor = "(Laq;[B[II)Z",
+ garbageValue = "-348736464"
)
- boolean method5272(SoundCache var1, byte[] var2, int[] var3) {
- boolean var4 = true; // L: 285
- int var5 = 0; // L: 286
- RawSound var6 = null; // L: 287
+ boolean method5424(SoundCache var1, byte[] var2, int[] var3) {
+ boolean var4 = true; // L: 297
+ int var5 = 0; // L: 298
+ RawSound var6 = null; // L: 299
- for (int var7 = 0; var7 < 128; ++var7) { // L: 288
- if (var2 == null || var2[var7] != 0) { // L: 289
- int var8 = this.field3292[var7]; // L: 290
- if (var8 != 0) { // L: 291
- if (var8 != var5) { // L: 292
- var5 = var8--; // L: 293 294
- if ((var8 & 1) == 0) { // L: 295
+ for (int var7 = 0; var7 < 128; ++var7) { // L: 300
+ if (var2 == null || var2[var7] != 0) { // L: 301
+ int var8 = this.field3254[var7]; // L: 302
+ if (var8 != 0) { // L: 303
+ if (var8 != var5) { // L: 304
+ var5 = var8--; // L: 305 306
+ if ((var8 & 1) == 0) { // L: 307
var6 = var1.getSoundEffect(var8 >> 2, var3);
} else {
- var6 = var1.getMusicSample(var8 >> 2, var3); // L: 296
+ var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308
}
- if (var6 == null) { // L: 297
+ if (var6 == null) { // L: 309
var4 = false;
}
}
- if (var6 != null) { // L: 299
- this.rawSounds[var7] = var6; // L: 300
- this.field3292[var7] = 0; // L: 301
+ if (var6 != null) { // L: 311
+ this.rawSounds[var7] = var6; // L: 312
+ this.field3254[var7] = 0; // L: 313
}
}
}
}
- return var4; // L: 305
+ return var4; // L: 317
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(S)V",
+ garbageValue = "31189"
+ )
+ @Export("clear")
+ void clear() {
+ this.field3254 = null; // L: 321
+ } // L: 322
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)[Lka;",
+ garbageValue = "-1569941202"
+ )
+ public static GameBuild[] method5433() {
+ return new GameBuild[]{GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE, GameBuild.LIVE}; // L: 13
}
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "75"
+ descriptor = "([BB)[B",
+ garbageValue = "1"
)
- @Export("clear")
- void clear() {
- this.field3292 = null; // L: 309
- } // L: 310
-
- @ObfuscatedName("ax")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-879482214"
- )
- static int method5277(int var0, Script var1, boolean var2) {
- if (var0 == 7400) { // L: 4670
- --class12.Interpreter_intStackSize; // L: 4671
- --class9.Interpreter_stringStackSize; // L: 4672
- return 1; // L: 4673
- } else if (var0 == 7401) { // L: 4675
- --class12.Interpreter_intStackSize; // L: 4676
- --class9.Interpreter_stringStackSize; // L: 4677
- return 1; // L: 4678
- } else if (var0 == 7402) { // L: 4680
- class12.Interpreter_intStackSize -= 2; // L: 4681
- --class9.Interpreter_stringStackSize; // L: 4682
- return 1; // L: 4683
- } else if (var0 == 7403) { // L: 4685
- class12.Interpreter_intStackSize -= 2; // L: 4686
- --class9.Interpreter_stringStackSize; // L: 4687
- return 1; // L: 4688
- } else if (var0 == 7404) { // L: 4690
- --class12.Interpreter_intStackSize; // L: 4691
- --class9.Interpreter_stringStackSize; // L: 4692
- return 1; // L: 4693
- } else if (var0 == 7405) { // L: 4695
- class12.Interpreter_intStackSize -= 2; // L: 4696
- return 1; // L: 4697
- } else if (var0 == 7406) { // L: 4699
- --class12.Interpreter_intStackSize; // L: 4700
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4701
- return 1; // L: 4702
- } else if (var0 == 7407) { // L: 4704
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4705
- return 1; // L: 4706
- } else if (var0 == 7408) { // L: 4708
- class12.Interpreter_intStackSize -= 2; // L: 4709
- --class9.Interpreter_stringStackSize; // L: 4710
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4711
- return 1; // L: 4712
- } else if (var0 == 7409) { // L: 4714
- --class12.Interpreter_intStackSize; // L: 4715
- return 1; // L: 4716
- } else {
- return 2; // L: 4718
- }
+ static byte[] method5432(byte[] var0) {
+ int var1 = var0.length; // L: 35
+ byte[] var2 = new byte[var1]; // L: 36
+ System.arraycopy(var0, 0, var2, 0, var1); // L: 37
+ return var2; // L: 38
}
}
diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java
index dc98eb2e1f..380c54691d 100644
--- a/runescape-client/src/main/java/MusicPatchNode.java
+++ b/runescape-client/src/main/java/MusicPatchNode.java
@@ -4,308 +4,165 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ji")
+@ObfuscatedName("jm")
@Implements("MusicPatchNode")
public class MusicPatchNode extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1633027795
+ intValue = -1539628919
)
- int field3308;
- @ObfuscatedName("q")
+ int field3284;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Ljt;"
+ descriptor = "Ljg;"
)
@Export("patch")
MusicPatch patch;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lak;"
+ descriptor = "Laf;"
)
@Export("rawSound")
RawSound rawSound;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ljp;"
+ descriptor = "Ljv;"
)
- MusicPatchNode2 field3306;
- @ObfuscatedName("a")
+ MusicPatchNode2 field3264;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1595060947
+ intValue = 1874501073
)
- int field3319;
- @ObfuscatedName("m")
+ int field3267;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1588715753
+ intValue = -370020525
)
- int field3307;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 694428029
- )
- int field3311;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = 1945733599
- )
- int field3312;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -1493240557
- )
- int field3310;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = -1183801873
- )
- int field3309;
- @ObfuscatedName("y")
- @ObfuscatedGetter(
- intValue = -1743024279
- )
- int field3302;
- @ObfuscatedName("c")
- @ObfuscatedGetter(
- intValue = 181824205
- )
- int field3313;
- @ObfuscatedName("w")
- @ObfuscatedGetter(
- intValue = 883462029
- )
- int field3314;
- @ObfuscatedName("b")
- @ObfuscatedGetter(
- intValue = -2130944147
- )
- int field3315;
- @ObfuscatedName("t")
- @ObfuscatedGetter(
- intValue = 1027674077
- )
- int field3316;
+ int field3269;
@ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1108202467
+ intValue = 785892757
)
- int field3317;
+ int field3282;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = -2029040381
+ )
+ int field3271;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 2036763329
+ )
+ int field3272;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = -1389641683
+ )
+ int field3273;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = -1743724405
+ )
+ int field3277;
+ @ObfuscatedName("t")
+ @ObfuscatedGetter(
+ intValue = -848752911
+ )
+ int field3275;
+ @ObfuscatedName("z")
+ @ObfuscatedGetter(
+ intValue = 1533749071
+ )
+ int field3276;
+ @ObfuscatedName("r")
+ @ObfuscatedGetter(
+ intValue = -950899707
+ )
+ int field3274;
+ @ObfuscatedName("u")
+ @ObfuscatedGetter(
+ intValue = 1022110285
+ )
+ int field3278;
+ @ObfuscatedName("k")
+ @ObfuscatedGetter(
+ intValue = -1739604047
+ )
+ int field3279;
+ @ObfuscatedName("h")
+ @ObfuscatedGetter(
+ intValue = -407034595
+ )
+ int field3280;
@ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = 2110000655
+ intValue = -1860967229
)
- int field3318;
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = 121475961
- )
- int field3304;
- @ObfuscatedName("e")
+ int field3281;
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "Lah;"
+ descriptor = "Lai;"
)
@Export("stream")
RawPcmStream stream;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = -2111788587
+ intValue = -292002933
)
- int field3321;
- @ObfuscatedName("d")
+ int field3283;
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 378248553
+ intValue = -799763535
)
- int field3322;
+ int field3270;
MusicPatchNode() {
- }
+ } // L: 31
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-115"
+ garbageValue = "-120"
)
- void method5316() {
- this.patch = null;
+ void method5471() {
+ this.patch = null; // L: 34
this.rawSound = null; // L: 35
- this.field3306 = null;
- this.stream = null;
+ this.field3264 = null; // L: 36
+ this.stream = null; // L: 37
+ } // L: 38
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljt;",
+ garbageValue = "-1448337434"
+ )
+ public static PacketBufferNode method5473() {
+ PacketBufferNode var0;
+ if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 47
+ var0 = new PacketBufferNode(); // L: 48
+ } else {
+ var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 51
+ }
+
+ var0.clientPacket = null; // L: 54
+ var0.clientPacketLength = 0; // L: 55
+ var0.packetBuffer = new PacketBuffer(5000); // L: 56
+ return var0; // L: 57
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ldz;FB)F",
- garbageValue = "-47"
+ descriptor = "(II)Lpv;",
+ garbageValue = "-507334207"
)
- static float method5315(class117 var0, float var1) {
- if (var0 != null && var0.method2695() != 0) { // L: 18
- if (var1 < (float)var0.field1476[0].field1430) { // L: 21
- return var0.field1472 == class116.field1470 ? var0.field1476[0].field1428 : JagexCache.method3159(var0, var1, true); // L: 22 23 25
- } else if (var1 > (float)var0.field1476[var0.method2695() - 1].field1430) { // L: 27
- return var0.field1475 == class116.field1470 ? var0.field1476[var0.method2695() - 1].field1428 : JagexCache.method3159(var0, var1, false); // L: 28 29 31
- } else if (var0.field1487) { // L: 33
- return var0.field1476[0].field1428; // L: 34
- } else {
- class113 var2 = var0.method2707(var1); // L: 36
- boolean var3 = false; // L: 37
- boolean var4 = false; // L: 38
- if (var2 == null) { // L: 39
- return 0.0F; // L: 205
- } else {
- float var7;
- if ((double)var2.field1425 == 0.0D && 0.0D == (double)var2.field1426) { // L: 40
- var3 = true; // L: 41
- } else if (var2.field1425 == Float.MAX_VALUE && Float.MAX_VALUE == var2.field1426) { // L: 43
- var4 = true; // L: 44
- } else if (var2.field1427 != null) { // L: 46
- if (var0.field1482) { // L: 47
- float[] var5 = new float[4]; // L: 48
- float[] var6 = new float[4]; // L: 49
- var5[0] = (float)var2.field1430; // L: 50
- var6[0] = var2.field1428; // L: 51
- var5[1] = var2.field1425 * 0.33333334F + var5[0]; // L: 52
- var6[1] = var6[0] + 0.33333334F * var2.field1426; // L: 53
- var5[3] = (float)var2.field1427.field1430; // L: 54
- var6[3] = var2.field1427.field1428; // L: 55
- var5[2] = var5[3] - var2.field1427.field1423 * 0.33333334F; // L: 56
- var6[2] = var6[3] - var2.field1427.field1424 * 0.33333334F; // L: 57
- if (var0.field1477) { // L: 58
- if (var0 != null) { // L: 60
- var7 = var5[3] - var5[0]; // L: 63
- if ((double)var7 != 0.0D) { // L: 64
- float var8 = var5[1] - var5[0]; // L: 67
- float var9 = var5[2] - var5[0]; // L: 68
- Float var10 = var8 / var7; // L: 69
- Float var11 = var9 / var7; // L: 70
- var0.field1480 = var10 == 0.33333334F && var11 == 0.6666667F; // L: 71
- float var12 = var10; // L: 72
- float var13 = var11; // L: 73
- if ((double)var10 < 0.0D) { // L: 74
- var10 = 0.0F;
- }
-
- if ((double)var11 > 1.0D) { // L: 75
- var11 = 1.0F;
- }
-
- if ((double)var10 > 1.0D || var11 < -1.0F) { // L: 76
- Float var14 = var10; // L: 77
- Float var15 = 1.0F - var11; // L: 80
- if (var10 < 0.0F) { // L: 81
- var14 = 0.0F;
- }
-
- if (var15 < 0.0F) { // L: 82
- var15 = 0.0F;
- }
-
- if (var14 > 1.0F || var15 > 1.0F) { // L: 83
- float var16 = (float)((double)(var14 * (var14 - 2.0F + var15)) + (double)var15 * ((double)var15 - 2.0D) + 1.0D); // L: 84
- if (var16 + class114.field1435 > 0.0F) { // L: 85
- Float var18;
- if (var14 + class114.field1435 < 1.3333334F) { // L: 89
- float var19 = var14 - 2.0F; // L: 90
- float var20 = var14 - 1.0F; // L: 91
- float var21 = (float)Math.sqrt((double)(var19 * var19 - 4.0F * var20 * var20)); // L: 92
- float var22 = 0.5F * (var21 + -var19); // L: 93
- if (var15 + class114.field1435 > var22) { // L: 94
- var18 = var22 - class114.field1435; // L: 95
- } else {
- var22 = 0.5F * (-var19 - var21); // L: 98
- if (var15 < var22 + class114.field1435) { // L: 99
- var18 = var22 + class114.field1435; // L: 100
- }
- }
- } else {
- Float var17 = 1.3333334F - class114.field1435; // L: 105
- var18 = 0.33333334F - class114.field1435; // L: 106
- }
- }
- }
-
- var15 = 1.0F - var15; // L: 111
- }
-
- if (var10 != var12) { // L: 114
- var5[1] = var5[0] + var10 * var7; // L: 115
- if (0.0D != (double)var12) { // L: 116
- var6[1] = var6[0] + (var6[1] - var6[0]) * var10 / var12; // L: 117
- }
- }
-
- if (var11 != var13) { // L: 120
- var5[2] = var5[0] + var11 * var7; // L: 121
- if ((double)var13 != 1.0D) { // L: 122
- var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var11) / (1.0D - (double)var13)); // L: 123
- }
- }
-
- var0.field1478 = var5[0]; // L: 126
- var0.field1479 = var5[3]; // L: 127
- class341.method6090(0.0F, var10, var11, 1.0F, var0.field1473); // L: 128
- class341.method6090(var6[0], var6[1], var6[2], var6[3], var0.field1481); // L: 129
- }
- }
- } else {
- class113.method2623(var0, var5, var6); // L: 133
- }
-
- var0.field1482 = false; // L: 135
- }
- } else {
- var3 = true; // L: 139
- }
-
- if (var3) { // L: 141
- return var2.field1428; // L: 142
- } else if (var4) { // L: 144
- return (float)var2.field1430 != var1 && var2.field1427 != null ? var2.field1427.field1428 : var2.field1428; // L: 145 146 149
- } else {
- float var23;
- float var24;
- if (var0.field1477) { // L: 152
- if (var0 == null) { // L: 155
- var24 = 0.0F; // L: 156
- } else {
- if (var1 == var0.field1478) { // L: 160
- var23 = 0.0F; // L: 161
- } else if (var0.field1479 == var1) { // L: 163
- var23 = 1.0F; // L: 164
- } else {
- var23 = (var1 - var0.field1478) / (var0.field1479 - var0.field1478); // L: 167
- }
-
- if (var0.field1480) { // L: 170
- var7 = var23; // L: 171
- } else {
- float[] var25 = new float[]{var0.field1473[0] - var23, var0.field1473[1], var0.field1473[2], var0.field1473[3]}; // L: 174 175 176 177 178
- float[] var26 = new float[5]; // L: 179
- int var27 = GrandExchangeOfferAgeComparator.method5798(var25, 3, 0.0F, true, 1.0F, true, var26); // L: 180
- if (var27 == 1) { // L: 181
- var7 = var26[0]; // L: 182
- } else {
- var7 = 0.0F; // L: 185
- }
- }
-
- var24 = var0.field1481[0] + var7 * (var0.field1481[1] + (var7 * var0.field1481[3] + var0.field1481[2]) * var7); // L: 188
- }
-
- return var24; // L: 190
- } else {
- if (var0 == null) { // L: 195
- var24 = 0.0F; // L: 196
- } else {
- var23 = var1 - var0.field1478; // L: 199
- var24 = (var0.field1473[2] + var23 * (var0.field1473[0] * var23 + var0.field1473[1])) * var23 + var0.field1473[3]; // L: 200
- }
-
- return var24; // L: 202
- }
- }
- }
- }
+ public static class432 method5472(int var0) {
+ int var1 = class430.field4652[var0]; // L: 19
+ if (var1 == 1) { // L: 20
+ return class432.field4658; // L: 21
+ } else if (var1 == 2) { // L: 23
+ return class432.field4657; // L: 24
} else {
- return 0.0F; // L: 19
+ return var1 == 3 ? class432.field4656 : null; // L: 26 27 29
}
}
}
diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java
index a497639c49..6fc39c5703 100644
--- a/runescape-client/src/main/java/MusicPatchNode2.java
+++ b/runescape-client/src/main/java/MusicPatchNode2.java
@@ -4,71 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jp")
+@ObfuscatedName("jv")
@Implements("MusicPatchNode2")
public class MusicPatchNode2 {
- @ObfuscatedName("o")
- byte[] field3232;
+ @ObfuscatedName("i")
+ @Export("Tiles_hue")
+ static int[] Tiles_hue;
+ @ObfuscatedName("c")
+ byte[] field3184;
+ @ObfuscatedName("v")
+ byte[] field3181;
@ObfuscatedName("q")
- byte[] field3223;
- @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 706358109
+ intValue = 444022475
)
- int field3226;
- @ObfuscatedName("k")
+ int field3182;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 2100894531
+ intValue = -1028117213
)
- int field3225;
- @ObfuscatedName("a")
+ int field3190;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 2080800417
+ intValue = -1704743957
)
- int field3224;
- @ObfuscatedName("m")
+ int field3185;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1431898739
+ intValue = 1934945847
)
- int field3227;
- @ObfuscatedName("p")
+ int field3183;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -1294985269
+ intValue = 986515665
)
- int field3228;
- @ObfuscatedName("s")
+ int field3186;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1586241363
+ intValue = 952644039
)
- int field3229;
- @ObfuscatedName("r")
+ int field3187;
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 1620713125
+ intValue = 270113767
)
- int field3222;
+ int field3188;
MusicPatchNode2() {
} // L: 14
- @ObfuscatedName("if")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1059182079"
+ descriptor = "(II)Lfe;",
+ garbageValue = "527401858"
)
- @Export("Widget_runOnTargetLeave")
- static void Widget_runOnTargetLeave() {
- if (Client.isSpellSelected) { // L: 9786
- Widget var0 = ApproximateRouteStrategy.getWidgetChild(ArchiveDiskActionHandler.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9787
- if (var0 != null && var0.onTargetLeave != null) { // L: 9788
- ScriptEvent var1 = new ScriptEvent(); // L: 9789
- var1.widget = var0; // L: 9790
- var1.args = var0.onTargetLeave; // L: 9791
- class144.runScriptEvent(var1); // L: 9792
+ public static HealthBarDefinition method5244(int var0) {
+ HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32
+ if (var1 != null) { // L: 33
+ return var1;
+ } else {
+ byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34
+ var1 = new HealthBarDefinition(); // L: 35
+ if (var2 != null) { // L: 36
+ var1.decode(new Buffer(var2));
}
- Client.selectedSpellItemId = -1; // L: 9794
- Client.isSpellSelected = false; // L: 9795
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 9796
+ HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37
+ return var1; // L: 38
}
- } // L: 9797
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(CI)Z",
+ garbageValue = "-1387162064"
+ )
+ public static boolean method5243(char var0) {
+ if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45
+ if (var0 != 0) { // L: 46
+ char[] var1 = class340.cp1252AsciiExtension; // L: 48
+
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49
+ char var3 = var1[var2]; // L: 50
+ if (var0 == var3) { // L: 52
+ return true;
+ }
+ }
+ }
+
+ return false; // L: 57
+ } else {
+ return true;
+ }
+ }
}
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index f771df6844..4fdcba4af6 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -3,36 +3,36 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jv")
+@ObfuscatedName("jy")
@Implements("MusicPatchPcmStream")
public class MusicPatchPcmStream extends PcmStream {
- @ObfuscatedName("v")
+ @ObfuscatedName("b")
@ObfuscatedSignature(
- descriptor = "Lad;"
+ descriptor = "Llh;"
)
- @Export("soundSystem")
- static SoundSystem soundSystem;
- @ObfuscatedName("o")
+ @Export("Widget_archive")
+ public static AbstractArchive Widget_archive;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ljw;"
+ descriptor = "Ljp;"
)
@Export("superStream")
MidiPcmStream superStream;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("queue")
NodeDeque queue;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Las;"
+ descriptor = "Lam;"
)
@Export("mixer")
PcmStreamMixer mixer;
@ObfuscatedSignature(
- descriptor = "(Ljw;)V"
+ descriptor = "(Ljp;)V"
)
MusicPatchPcmStream(MidiPcmStream var1) {
this.queue = new NodeDeque(); // L: 11
@@ -40,48 +40,48 @@ public class MusicPatchPcmStream extends PcmStream {
this.superStream = var1; // L: 15
} // L: 16
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lji;[IIIII)V",
- garbageValue = "-2062540713"
+ descriptor = "(Ljm;[IIIIB)V",
+ garbageValue = "110"
)
- void method5281(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
- if ((this.superStream.field3247[var1.field3308] & 4) != 0 && var1.field3316 < 0) { // L: 73
- int var6 = this.superStream.field3259[var1.field3308] / PcmPlayer.field300; // L: 74
+ void method5439(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
+ if ((this.superStream.field3210[var1.field3284] & 4) != 0 && var1.field3278 < 0) { // L: 73
+ int var6 = this.superStream.field3207[var1.field3284] / PcmPlayer.field287; // L: 74
while (true) {
- int var7 = (var6 + 1048575 - var1.field3322) / var6; // L: 76
+ int var7 = (var6 + 1048575 - var1.field3270) / var6; // L: 76
if (var7 > var4) { // L: 77
- var1.field3322 += var6 * var4; // L: 99
+ var1.field3270 += var6 * var4; // L: 99
break;
}
var1.stream.fill(var2, var3, var7); // L: 78
var3 += var7; // L: 79
var4 -= var7; // L: 80
- var1.field3322 += var6 * var7 - 1048576; // L: 81
- int var8 = PcmPlayer.field300 / 100; // L: 82
+ var1.field3270 += var7 * var6 - 1048576; // L: 81
+ int var8 = PcmPlayer.field287 / 100; // L: 82
int var9 = 262144 / var6; // L: 83
if (var9 < var8) { // L: 84
var8 = var9;
}
RawPcmStream var10 = var1.stream; // L: 85
- if (this.superStream.field3257[var1.field3308] == 0) { // L: 86
- var1.stream = RawPcmStream.method829(var1.rawSound, var10.method884(), var10.method805(), var10.method806()); // L: 87
+ if (this.superStream.field3229[var1.field3284] == 0) { // L: 86
+ var1.stream = RawPcmStream.method775(var1.rawSound, var10.method819(), var10.method918(), var10.method782()); // L: 87
} else {
- var1.stream = RawPcmStream.method829(var1.rawSound, var10.method884(), 0, var10.method806()); // L: 90
- this.superStream.method5091(var1, var1.patch.field3287[var1.field3307] < 0); // L: 91
- var1.stream.method810(var8, var10.method805()); // L: 92
+ var1.stream = RawPcmStream.method775(var1.rawSound, var10.method819(), 0, var10.method782()); // L: 90
+ this.superStream.method5264(var1, var1.patch.field3250[var1.field3269] < 0); // L: 91
+ var1.stream.method890(var8, var10.method918()); // L: 92
}
- if (var1.patch.field3287[var1.field3307] < 0) { // L: 94
+ if (var1.patch.field3250[var1.field3269] < 0) { // L: 94
var1.stream.setNumLoops(-1);
}
- var10.method812(var8); // L: 95
+ var10.method802(var8); // L: 95
var10.fill(var2, var3, var5 - var3); // L: 96
- if (var10.method935()) { // L: 97
+ if (var10.method792()) { // L: 97
this.mixer.addSubStream(var10);
}
}
@@ -90,38 +90,38 @@ public class MusicPatchPcmStream extends PcmStream {
var1.stream.fill(var2, var3, var4); // L: 101
} // L: 102
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lji;II)V",
- garbageValue = "-1512136486"
+ descriptor = "(Ljm;IB)V",
+ garbageValue = "79"
)
- void method5297(MusicPatchNode var1, int var2) {
- if ((this.superStream.field3247[var1.field3308] & 4) != 0 && var1.field3316 < 0) { // L: 105
- int var3 = this.superStream.field3259[var1.field3308] / PcmPlayer.field300; // L: 106
- int var4 = (var3 + 1048575 - var1.field3322) / var3; // L: 107
- var1.field3322 = var3 * var2 + var1.field3322 & 1048575; // L: 108
+ void method5440(MusicPatchNode var1, int var2) {
+ if ((this.superStream.field3210[var1.field3284] & 4) != 0 && var1.field3278 < 0) { // L: 105
+ int var3 = this.superStream.field3207[var1.field3284] / PcmPlayer.field287; // L: 106
+ int var4 = (var3 + 1048575 - var1.field3270) / var3; // L: 107
+ var1.field3270 = var3 * var2 + var1.field3270 & 1048575; // L: 108
if (var4 <= var2) { // L: 109
- if (this.superStream.field3257[var1.field3308] == 0) { // L: 110
- var1.stream = RawPcmStream.method829(var1.rawSound, var1.stream.method884(), var1.stream.method805(), var1.stream.method806()); // L: 111
+ if (this.superStream.field3229[var1.field3284] == 0) { // L: 110
+ var1.stream = RawPcmStream.method775(var1.rawSound, var1.stream.method819(), var1.stream.method918(), var1.stream.method782()); // L: 111
} else {
- var1.stream = RawPcmStream.method829(var1.rawSound, var1.stream.method884(), 0, var1.stream.method806()); // L: 114
- this.superStream.method5091(var1, var1.patch.field3287[var1.field3307] < 0); // L: 115
+ var1.stream = RawPcmStream.method775(var1.rawSound, var1.stream.method819(), 0, var1.stream.method782()); // L: 114
+ this.superStream.method5264(var1, var1.patch.field3250[var1.field3269] < 0); // L: 115
}
- if (var1.patch.field3287[var1.field3307] < 0) { // L: 117
+ if (var1.patch.field3250[var1.field3269] < 0) { // L: 117
var1.stream.setNumLoops(-1);
}
- var2 = var1.field3322 / var3; // L: 118
+ var2 = var1.field3270 / var3; // L: 118
}
}
var1.stream.skip(var2); // L: 121
} // L: 122
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("firstSubStream")
protected PcmStream firstSubStream() {
@@ -133,9 +133,9 @@ public class MusicPatchPcmStream extends PcmStream {
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("nextSubStream")
protected PcmStream nextSubStream() {
@@ -150,105 +150,125 @@ public class MusicPatchPcmStream extends PcmStream {
return var1.stream;
}
- @ObfuscatedName("s")
- protected int vmethod5295() {
+ @ObfuscatedName("w")
+ protected int vmethod5437() {
return 0; // L: 34
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("fill")
protected void fill(int[] var1, int var2, int var3) {
this.mixer.fill(var1, var2, var3); // L: 40
for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41
- if (!this.superStream.method5113(var6)) { // L: 42
+ if (!this.superStream.method5287(var6)) { // L: 42
int var4 = var2; // L: 43
int var5 = var3; // L: 44
do {
- if (var5 <= var6.field3321) { // L: 45
- this.method5281(var6, var1, var4, var5, var4 + var5); // L: 51
- var6.field3321 -= var5; // L: 52
+ if (var5 <= var6.field3283) { // L: 45
+ this.method5439(var6, var1, var4, var5, var5 + var4); // L: 51
+ var6.field3283 -= var5; // L: 52
break;
}
- this.method5281(var6, var1, var4, var6.field3321, var5 + var4); // L: 46
- var4 += var6.field3321; // L: 47
- var5 -= var6.field3321; // L: 48
- } while(!this.superStream.method5114(var6, var1, var4, var5)); // L: 49
+ this.method5439(var6, var1, var4, var6.field3283, var5 + var4); // L: 46
+ var4 += var6.field3283; // L: 47
+ var5 -= var6.field3283; // L: 48
+ } while(!this.superStream.method5317(var6, var1, var4, var5)); // L: 49
}
}
} // L: 54
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("skip")
protected void skip(int var1) {
this.mixer.skip(var1); // L: 58
for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59
- if (!this.superStream.method5113(var3)) { // L: 60
+ if (!this.superStream.method5287(var3)) { // L: 60
int var2 = var1; // L: 61
do {
- if (var2 <= var3.field3321) { // L: 62
- this.method5297(var3, var2); // L: 67
- var3.field3321 -= var2; // L: 68
+ if (var2 <= var3.field3283) { // L: 62
+ this.method5440(var3, var2); // L: 67
+ var3.field3283 -= var2; // L: 68
break;
}
- this.method5297(var3, var3.field3321); // L: 63
- var2 -= var3.field3321; // L: 64
- } while(!this.superStream.method5114(var3, (int[])null, 0, var2)); // L: 65
+ this.method5440(var3, var3.field3283); // L: 63
+ var2 -= var3.field3283; // L: 64
+ } while(!this.superStream.method5317(var3, (int[])null, 0, var2)); // L: 65
}
}
} // L: 70
- @ObfuscatedName("jh")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "([Lki;II)V",
- garbageValue = "1623622888"
+ descriptor = "(Lbc;Lbc;IZIZB)I",
+ garbageValue = "44"
)
- @Export("runComponentCloseListeners")
- static final void runComponentCloseListeners(Widget[] var0, int var1) {
- for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11746
- Widget var3 = var0[var2]; // L: 11747
- if (var3 != null) { // L: 11748
- if (var3.type == 0) { // L: 11749
- if (var3.children != null) { // L: 11750
- runComponentCloseListeners(var3.children, var1);
- }
+ static int method5445(World var0, World var1, int var2, boolean var3, int var4, boolean var5) {
+ int var6 = class133.compareWorlds(var0, var1, var2, var3); // L: 199
+ if (var6 != 0) { // L: 200
+ return var3 ? -var6 : var6; // L: 201
+ } else if (var4 == -1) { // L: 204
+ return 0;
+ } else {
+ int var7 = class133.compareWorlds(var0, var1, var4, var5); // L: 205
+ return var5 ? -var7 : var7; // L: 206
+ }
+ }
- InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11751
- if (var4 != null) { // L: 11752
- WorldMapLabelSize.runIntfCloseListeners(var4.group, var1);
- }
- }
+ @ObfuscatedName("ka")
+ @ObfuscatedSignature(
+ descriptor = "(Lcq;ZB)V",
+ garbageValue = "38"
+ )
+ @Export("closeInterface")
+ static final void closeInterface(InterfaceParent var0, boolean var1) {
+ int var2 = var0.group; // L: 12012
+ int var3 = (int)var0.key; // L: 12013
+ var0.remove(); // L: 12014
+ if (var1 && var2 != -1 && class228.Widget_loadedInterfaces[var2]) { // L: 12015 12016 12017
+ Widget_archive.clearFilesGroup(var2); // L: 12018
+ if (SoundCache.Widget_interfaceComponents[var2] != null) { // L: 12019
+ boolean var4 = true; // L: 12020
- ScriptEvent var5;
- if (var1 == 0 && var3.onDialogAbort != null) { // L: 11754
- var5 = new ScriptEvent(); // L: 11755
- var5.widget = var3; // L: 11756
- var5.args = var3.onDialogAbort; // L: 11757
- class144.runScriptEvent(var5); // L: 11758
- }
-
- if (var1 == 1 && var3.onSubChange != null) { // L: 11760
- if (var3.childIndex >= 0) { // L: 11761
- Widget var6 = class92.getWidget(var3.id); // L: 11762
- if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11763
- continue;
+ for (int var5 = 0; var5 < SoundCache.Widget_interfaceComponents[var2].length; ++var5) { // L: 12021
+ if (SoundCache.Widget_interfaceComponents[var2][var5] != null) { // L: 12022
+ if (SoundCache.Widget_interfaceComponents[var2][var5].type != 2) { // L: 12023
+ SoundCache.Widget_interfaceComponents[var2][var5] = null;
+ } else {
+ var4 = false; // L: 12024
}
}
-
- var5 = new ScriptEvent(); // L: 11767
- var5.widget = var3; // L: 11768
- var5.args = var3.onSubChange; // L: 11769
- class144.runScriptEvent(var5); // L: 11770
}
+
+ if (var4) { // L: 12027
+ SoundCache.Widget_interfaceComponents[var2] = null;
+ }
+
+ class228.Widget_loadedInterfaces[var2] = false; // L: 12028
}
}
- } // L: 11773
+ for (IntegerNode var6 = (IntegerNode)Client.widgetFlags.first(); var6 != null; var6 = (IntegerNode)Client.widgetFlags.next()) { // L: 12031
+ if ((long)var2 == (var6.key >> 48 & 65535L)) { // L: 12032
+ var6.remove(); // L: 12033
+ }
+ }
+
+ Widget var7 = class140.getWidget(var3); // L: 12037
+ if (var7 != null) { // L: 12038
+ ChatChannel.invalidateWidget(var7);
+ }
+
+ if (Client.rootInterface != -1) { // L: 12039
+ class7.runIntfCloseListeners(Client.rootInterface, 1);
+ }
+
+ } // L: 12040
}
diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java
index c895317b52..87335c1e5d 100644
--- a/runescape-client/src/main/java/MusicTrack.java
+++ b/runescape-client/src/main/java/MusicTrack.java
@@ -3,21 +3,21 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jy")
+@ObfuscatedName("jj")
@Implements("MusicTrack")
public class MusicTrack extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("table")
NodeHashTable table;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("midi")
byte[] midi;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
MusicTrack(Buffer var1) {
var1.offset = var1.array.length - 3; // L: 22
@@ -196,7 +196,7 @@ public class MusicTrack extends Node {
int[] var59 = new int[128]; // L: 172
var28 = 0; // L: 173
- label243:
+ label244:
for (int var60 = 0; var60 < var2; ++var60) { // L: 174
var51.writeInt(1297379947); // L: 175
var51.offset += 4; // L: 176
@@ -218,7 +218,7 @@ public class MusicTrack extends Node {
var51.writeByte(47); // L: 187
var51.writeByte(0); // L: 188
var51.writeLengthInt(var51.offset - var61); // L: 269
- continue label243;
+ continue label244;
}
if (var64 == 23) { // L: 191
@@ -335,8 +335,8 @@ public class MusicTrack extends Node {
} // L: 271
- @ObfuscatedName("q")
- void method5310() {
+ @ObfuscatedName("v")
+ void method5466() {
if (this.table == null) { // L: 274
this.table = new NodeHashTable(16); // L: 275
int[] var1 = new int[16]; // L: 276
@@ -416,18 +416,18 @@ public class MusicTrack extends Node {
}
} // L: 331
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("clear")
void clear() {
this.table = null; // L: 334
} // L: 335
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;II)Ljy;"
+ descriptor = "(Llh;II)Ljj;"
)
@Export("readTrack")
- static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) {
+ public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) {
byte[] var3 = var0.takeFile(var1, var2); // L: 16
return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17
}
diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java
index 83581d6f0c..549213230d 100644
--- a/runescape-client/src/main/java/NPC.java
+++ b/runescape-client/src/main/java/NPC.java
@@ -1,59 +1,46 @@
+import java.util.Date;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cd")
+@ObfuscatedName("co")
@Implements("NPC")
public final class NPC extends Actor {
- @ObfuscatedName("tu")
- @ObfuscatedGetter(
- intValue = -558114619
- )
- static int field1262;
- @ObfuscatedName("s")
- static byte[][][] field1259;
- @ObfuscatedName("v")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lcb;"
- )
- @Export("World_request")
- static UrlRequest World_request;
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lfm;"
+ descriptor = "Lfj;"
)
@Export("definition")
NPCComposition definition;
- @ObfuscatedName("q")
- String field1258;
+ @ObfuscatedName("v")
+ String field1261;
NPC() {
- this.field1258 = ""; // L: 11
+ this.field1261 = ""; // L: 11
} // L: 13
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "0"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "-1916980767"
)
- void method2338(String var1) {
- this.field1258 = var1 == null ? "" : var1; // L: 16
+ void method2373(String var1) {
+ this.field1261 = var1 == null ? "" : var1; // L: 16
} // L: 17
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) { // L: 96
return null;
} else {
- SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class114.SequenceDefinition_get(super.sequence) : null; // L: 97
- SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? class114.SequenceDefinition_get(super.movementSequence) : null; // L: 98
+ SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ScriptFrame.SequenceDefinition_get(super.sequence) : null; // L: 97
+ SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : ScriptFrame.SequenceDefinition_get(super.movementSequence); // L: 98
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 99
if (var3 == null) { // L: 100
return null;
@@ -61,7 +48,7 @@ public final class NPC extends Actor {
var3.calculateBoundsCylinder(); // L: 101
super.defaultHeight = var3.height; // L: 102
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 103
- Model var4 = class136.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 104
+ Model var4 = ObjectSound.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 104
if (var4 != null) { // L: 105
var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 106
Model[] var5 = new Model[]{var3, var4}; // L: 107
@@ -73,11 +60,11 @@ public final class NPC extends Actor {
var3.isSingleTile = true;
}
- if (super.field1140 != 0 && Client.cycle >= super.field1196 && Client.cycle < super.field1197) { // L: 112
- var3.overrideHue = super.field1143; // L: 113
- var3.overrideSaturation = super.field1199; // L: 114
- var3.overrideLuminance = super.field1153; // L: 115
- var3.overrideAmount = super.field1140; // L: 116
+ if (super.field1133 != 0 && Client.cycle >= super.field1189 && Client.cycle < super.field1135) { // L: 112
+ var3.overrideHue = super.field1191; // L: 113
+ var3.overrideSaturation = super.field1192; // L: 114
+ var3.overrideLuminance = super.field1193; // L: 115
+ var3.overrideAmount = super.field1133; // L: 116
} else {
var3.overrideAmount = 0; // L: 119
}
@@ -87,14 +74,14 @@ public final class NPC extends Actor {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "922322997"
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "56"
)
- final String method2342() {
- if (!this.field1258.isEmpty()) { // L: 20
- return this.field1258; // L: 21
+ final String method2360() {
+ if (!this.field1261.isEmpty()) { // L: 20
+ return this.field1261; // L: 21
} else {
NPCComposition var1 = this.definition; // L: 23
if (var1.transforms != null) { // L: 24
@@ -108,25 +95,25 @@ public final class NPC extends Actor {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(ILgd;B)V",
- garbageValue = "1"
+ descriptor = "(ILgn;I)V",
+ garbageValue = "376054191"
)
- final void method2340(int var1, class193 var2) {
- int var3 = super.pathX[0]; // L: 34
- int var4 = super.pathY[0]; // L: 35
- if (var1 == 0) { // L: 36
- --var3; // L: 37
- ++var4; // L: 38
+ final void method2361(int var1, class192 var2) {
+ int var3 = super.pathX[0];
+ int var4 = super.pathY[0];
+ if (var1 == 0) {
+ --var3;
+ ++var4;
}
- if (var1 == 1) { // L: 40
+ if (var1 == 1) {
++var4;
}
if (var1 == 2) { // L: 41
- ++var3; // L: 42
+ ++var3;
++var4; // L: 43
}
@@ -152,7 +139,7 @@ public final class NPC extends Actor {
--var4; // L: 54
}
- if (super.sequence != -1 && class114.SequenceDefinition_get(super.sequence).field2206 == 1) { // L: 56
+ if (super.sequence != -1 && ScriptFrame.SequenceDefinition_get(super.sequence).field2188 == 1) { // L: 56
super.sequence = -1;
}
@@ -171,17 +158,17 @@ public final class NPC extends Actor {
super.pathTraversed[0] = var2; // L: 65
} // L: 66
- @ObfuscatedName("r")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(IIZI)V",
- garbageValue = "83074574"
+ garbageValue = "1894796101"
)
- final void method2341(int var1, int var2, boolean var3) {
- if (super.sequence != -1 && class114.SequenceDefinition_get(super.sequence).field2206 == 1) { // L: 69
+ final void method2362(int var1, int var2, boolean var3) {
+ if (super.sequence != -1 && ScriptFrame.SequenceDefinition_get(super.sequence).field2188 == 1) {
super.sequence = -1;
}
- if (!var3) { // L: 70
+ if (!var3) {
int var4 = var1 - super.pathX[0]; // L: 71
int var5 = var2 - super.pathY[0]; // L: 72
if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { // L: 73
@@ -197,27 +184,81 @@ public final class NPC extends Actor {
super.pathX[0] = var1; // L: 80
super.pathY[0] = var2; // L: 81
- super.pathTraversed[0] = class193.field2251; // L: 82
+ super.pathTraversed[0] = class192.field2212; // L: 82
return; // L: 83
}
}
super.pathLength = 0; // L: 86
- super.field1200 = 0; // L: 87
- super.field1194 = 0; // L: 88
+ super.field1203 = 0; // L: 87
+ super.field1202 = 0; // L: 88
super.pathX[0] = var1; // L: 89
super.pathY[0] = var2; // L: 90
- super.x = super.field1167 * 64 + super.pathX[0] * 128; // L: 91
- super.y = super.field1167 * 64 + super.pathY[0] * 128; // L: 92
+ super.x = super.pathX[0] * 128 + super.field1205 * 64; // L: 91
+ super.y = super.field1205 * 64 + super.pathY[0] * 128; // L: 92
} // L: 93
- @ObfuscatedName("h")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-4"
+ descriptor = "(I)Z",
+ garbageValue = "9013641"
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null; // L: 125
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "17"
+ )
+ public static void method2365() {
+ if (MouseHandler.MouseHandler_instance != null) {
+ synchronized(MouseHandler.MouseHandler_instance) {
+ MouseHandler.MouseHandler_instance = null;
+ } // L: 40
+ }
+
+ } // L: 42
+
+ @ObfuscatedName("c")
+ public static String method2382(long var0) {
+ Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 31
+ int var2 = Calendar.Calendar_calendar.get(7); // L: 32
+ int var3 = Calendar.Calendar_calendar.get(5); // L: 33
+ int var4 = Calendar.Calendar_calendar.get(2); // L: 34
+ int var5 = Calendar.Calendar_calendar.get(1); // L: 35
+ int var6 = Calendar.Calendar_calendar.get(11); // L: 36
+ int var7 = Calendar.Calendar_calendar.get(12); // L: 37
+ int var8 = Calendar.Calendar_calendar.get(13); // L: 38
+ return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 39
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-839633711"
+ )
+ public static void method2379() {
+ FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69
+ } // L: 70
+
+ @ObfuscatedName("kz")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IIII)V",
+ garbageValue = "1069482621"
+ )
+ @Export("drawCompass")
+ static final void drawCompass(Widget var0, int var1, int var2, int var3) {
+ SpriteMask var4 = var0.getSpriteMask(false); // L: 12156
+ if (var4 != null) { // L: 12157
+ if (Client.minimapState < 3) { // L: 12158
+ class267.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+ } else {
+ Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12159
+ }
+
+ }
+ } // L: 12160
}
diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java
index 555f4e7064..35e1c45d1a 100644
--- a/runescape-client/src/main/java/NPCComposition.java
+++ b/runescape-client/src/main/java/NPCComposition.java
@@ -4,224 +4,225 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fm")
+@ObfuscatedName("fj")
@Implements("NPCComposition")
public class NPCComposition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("NpcDefinition_archive")
public static AbstractArchive NpcDefinition_archive;
- @ObfuscatedName("l")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Llh;"
+ )
+ @Export("NpcDefinition_modelArchive")
+ public static AbstractArchive NpcDefinition_modelArchive;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
)
@Export("NpcDefinition_cached")
- public static EvictingDualNodeHashTable NpcDefinition_cached;
- @ObfuscatedName("k")
+ static EvictingDualNodeHashTable NpcDefinition_cached;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("NpcDefinition_cachedModels")
- public static EvictingDualNodeHashTable NpcDefinition_cachedModels;
- @ObfuscatedName("km")
- @ObfuscatedSignature(
- descriptor = "Lki;"
- )
- static Widget field1991;
- @ObfuscatedName("a")
+ static EvictingDualNodeHashTable NpcDefinition_cachedModels;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -764893815
+ intValue = 1106010493
)
@Export("id")
public int id;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("name")
public String name;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1453161805
+ intValue = 240333133
)
@Export("size")
public int size;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("models")
int[] models;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
int[] field1957;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 2027605293
+ intValue = -691237691
)
@Export("idleSequence")
public int idleSequence;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -331023543
+ intValue = -1321768823
)
@Export("turnLeftSequence")
public int turnLeftSequence;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 504124231
+ intValue = -1307482783
)
@Export("turnRightSequence")
public int turnRightSequence;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 658265029
+ intValue = 1041697287
)
@Export("walkSequence")
public int walkSequence;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 1856656397
+ intValue = 228498015
)
@Export("walkBackSequence")
public int walkBackSequence;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = 1600160867
+ intValue = 291003989
)
@Export("walkLeftSequence")
public int walkLeftSequence;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = -1406265677
+ intValue = 891139269
)
@Export("walkRightSequence")
public int walkRightSequence;
- @ObfuscatedName("x")
- @ObfuscatedGetter(
- intValue = -1459326563
- )
- public int field1959;
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = -977511409
- )
- public int field1960;
- @ObfuscatedName("e")
- @ObfuscatedGetter(
- intValue = 1606438855
- )
- public int field1961;
@ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = 450211323
+ intValue = -1737917717
)
- public int field1946;
- @ObfuscatedName("f")
+ public int field1931;
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = 1014160671
+ intValue = -1769301813
)
- public int field1985;
- @ObfuscatedName("d")
+ public int field1944;
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = -997110887
+ intValue = -1173963921
)
- public int field1964;
- @ObfuscatedName("j")
+ public int field1932;
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 1212486307
+ intValue = 1674260469
)
- public int field1956;
- @ObfuscatedName("z")
+ public int field1933;
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = 1453579091
+ intValue = 364496937
)
- public int field1966;
- @ObfuscatedName("i")
+ public int field1934;
+ @ObfuscatedName("b")
+ @ObfuscatedGetter(
+ intValue = -783163973
+ )
+ public int field1935;
+ @ObfuscatedName("n")
+ @ObfuscatedGetter(
+ intValue = 500790963
+ )
+ public int field1936;
+ @ObfuscatedName("o")
+ @ObfuscatedGetter(
+ intValue = 764272225
+ )
+ public int field1930;
+ @ObfuscatedName("m")
@Export("recolorFrom")
short[] recolorFrom;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@Export("recolorTo")
short[] recolorTo;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("retextureFrom")
short[] retextureFrom;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@Export("retextureTo")
short[] retextureTo;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("actions")
public String[] actions;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("drawMapDot")
public boolean drawMapDot;
@ObfuscatedName("ab")
@ObfuscatedGetter(
- intValue = -200769043
+ intValue = -1544891593
)
@Export("combatLevel")
public int combatLevel;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@ObfuscatedGetter(
- intValue = 1202800419
+ intValue = -2021472829
)
@Export("widthScale")
int widthScale;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@ObfuscatedGetter(
- intValue = -152191005
+ intValue = -1611563555
)
@Export("heightScale")
int heightScale;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("isVisible")
public boolean isVisible;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = -191765959
+ intValue = 369486765
)
@Export("ambient")
int ambient;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = -1793396325
+ intValue = -280785601
)
@Export("contrast")
int contrast;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = 1238786573
+ intValue = 429217381
)
@Export("headIconPrayer")
public int headIconPrayer;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@ObfuscatedGetter(
- intValue = 1934684837
+ intValue = -263603535
)
@Export("rotation")
public int rotation;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@Export("transforms")
public int[] transforms;
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@ObfuscatedGetter(
- intValue = 569831853
+ intValue = 814884949
)
@Export("transformVarbit")
int transformVarbit;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@ObfuscatedGetter(
- intValue = -837879399
+ intValue = -22170763
)
@Export("transformVarp")
int transformVarp;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@Export("isInteractable")
public boolean isInteractable;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@Export("isClickable")
public boolean isClickable;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@Export("isFollower")
public boolean isFollower;
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("params")
IterableNodeHashTable params;
@@ -241,14 +242,14 @@ public class NPCComposition extends DualNode {
this.walkBackSequence = -1; // L: 29
this.walkLeftSequence = -1; // L: 30
this.walkRightSequence = -1; // L: 31
- this.field1959 = -1; // L: 32
- this.field1960 = -1; // L: 33
- this.field1961 = -1; // L: 34
- this.field1946 = -1; // L: 35
- this.field1985 = -1; // L: 36
- this.field1964 = -1; // L: 37
- this.field1956 = -1; // L: 38
- this.field1966 = -1; // L: 39
+ this.field1931 = -1; // L: 32
+ this.field1944 = -1; // L: 33
+ this.field1932 = -1; // L: 34
+ this.field1933 = -1; // L: 35
+ this.field1934 = -1; // L: 36
+ this.field1935 = -1; // L: 37
+ this.field1936 = -1; // L: 38
+ this.field1930 = -1; // L: 39
this.actions = new String[5]; // L: 44
this.drawMapDot = true; // L: 45
this.combatLevel = -1; // L: 46
@@ -266,19 +267,19 @@ public class NPCComposition extends DualNode {
this.isFollower = false; // L: 59
} // L: 62
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-111"
+ descriptor = "(I)V",
+ garbageValue = "1436800966"
)
@Export("postDecode")
void postDecode() {
} // L: 76
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-60"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1857305783"
)
@Export("decode")
void decode(Buffer var1) {
@@ -292,10 +293,10 @@ public class NPCComposition extends DualNode {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "425630105"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "509647972"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
@@ -383,21 +384,21 @@ public class NPCComposition extends DualNode {
} else if (var2 == 111) { // L: 163
this.isFollower = true;
} else if (var2 == 114) { // L: 164
- this.field1959 = var1.readUnsignedShort();
+ this.field1931 = var1.readUnsignedShort();
} else if (var2 == 115) { // L: 165
- this.field1959 = var1.readUnsignedShort(); // L: 166
- this.field1960 = var1.readUnsignedShort(); // L: 167
- this.field1961 = var1.readUnsignedShort(); // L: 168
- this.field1946 = var1.readUnsignedShort(); // L: 169
- } else if (var2 == 116) {
- this.field1985 = var1.readUnsignedShort(); // L: 171
+ this.field1931 = var1.readUnsignedShort(); // L: 166
+ this.field1944 = var1.readUnsignedShort(); // L: 167
+ this.field1932 = var1.readUnsignedShort(); // L: 168
+ this.field1933 = var1.readUnsignedShort(); // L: 169
+ } else if (var2 == 116) { // L: 171
+ this.field1934 = var1.readUnsignedShort();
} else if (var2 == 117) { // L: 172
- this.field1985 = var1.readUnsignedShort(); // L: 173
- this.field1964 = var1.readUnsignedShort(); // L: 174
- this.field1956 = var1.readUnsignedShort(); // L: 175
- this.field1966 = var1.readUnsignedShort(); // L: 176
+ this.field1934 = var1.readUnsignedShort(); // L: 173
+ this.field1935 = var1.readUnsignedShort(); // L: 174
+ this.field1936 = var1.readUnsignedShort(); // L: 175
+ this.field1930 = var1.readUnsignedShort(); // L: 176
} else if (var2 == 249) { // L: 178
- this.params = JagexCache.readStringIntParameters(var1, this.params);
+ this.params = LoginScreenAnimation.readStringIntParameters(var1, this.params);
}
} else {
this.transformVarbit = var1.readUnsignedShort(); // L: 144
@@ -433,10 +434,10 @@ public class NPCComposition extends DualNode {
} // L: 180
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lgq;ILgq;IB)Lhv;",
- garbageValue = "90"
+ descriptor = "(Lgc;ILgc;II)Lhy;",
+ garbageValue = "-280219235"
)
@Export("getModel")
public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
@@ -449,7 +450,7 @@ public class NPCComposition extends DualNode {
boolean var6 = false; // L: 190
for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 191
- if (!class17.NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
+ if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
var6 = true;
}
}
@@ -462,7 +463,7 @@ public class NPCComposition extends DualNode {
int var9;
for (var9 = 0; var9 < this.models.length; ++var9) { // L: 195
- var8[var9] = ModelData.ModelData_get(class17.NpcDefinition_modelArchive, this.models[var9], 0);
+ var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0);
}
ModelData var10;
@@ -507,10 +508,10 @@ public class NPCComposition extends DualNode {
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)Lgs;",
- garbageValue = "1498884102"
+ descriptor = "(B)Lgw;",
+ garbageValue = "22"
)
@Export("getModelData")
public final ModelData getModelData() {
@@ -523,7 +524,7 @@ public class NPCComposition extends DualNode {
boolean var1 = false; // L: 227
for (int var2 = 0; var2 < this.field1957.length; ++var2) { // L: 228
- if (!class17.NpcDefinition_modelArchive.tryLoadFile(this.field1957[var2], 0)) {
+ if (!NpcDefinition_modelArchive.tryLoadFile(this.field1957[var2], 0)) {
var1 = true;
}
}
@@ -534,12 +535,12 @@ public class NPCComposition extends DualNode {
ModelData[] var5 = new ModelData[this.field1957.length]; // L: 230
for (int var3 = 0; var3 < this.field1957.length; ++var3) { // L: 231
- var5[var3] = ModelData.ModelData_get(class17.NpcDefinition_modelArchive, this.field1957[var3], 0);
+ var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1957[var3], 0);
}
ModelData var6;
- if (var5.length == 1) {
- var6 = var5[0]; // L: 233
+ if (var5.length == 1) { // L: 233
+ var6 = var5[0];
} else {
var6 = new ModelData(var5, var5.length); // L: 234
}
@@ -562,16 +563,16 @@ public class NPCComposition extends DualNode {
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)Lfm;",
- garbageValue = "2129984667"
+ descriptor = "(I)Lfj;",
+ garbageValue = "-1382276161"
)
@Export("transform")
public final NPCComposition transform() {
int var1 = -1; // L: 249
if (this.transformVarbit != -1) { // L: 250
- var1 = class18.getVarbit(this.transformVarbit);
+ var1 = class388.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { // L: 251
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -583,13 +584,13 @@ public class NPCComposition extends DualNode {
var2 = this.transforms[this.transforms.length - 1];
}
- return var2 != -1 ? WorldMapSectionType.getNpcDefinition(var2) : null; // L: 255 256
+ return var2 != -1 ? BuddyRankComparator.getNpcDefinition(var2) : null; // L: 255 256
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(S)Z",
- garbageValue = "13546"
+ descriptor = "(I)Z",
+ garbageValue = "1046218760"
)
@Export("transformIsVisible")
public boolean transformIsVisible() {
@@ -598,7 +599,7 @@ public class NPCComposition extends DualNode {
} else {
int var1 = -1; // L: 261
if (this.transformVarbit != -1) { // L: 262
- var1 = class18.getVarbit(this.transformVarbit);
+ var1 = class388.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { // L: 263
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -611,23 +612,36 @@ public class NPCComposition extends DualNode {
}
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(IIS)I",
- garbageValue = "301"
+ descriptor = "(IIB)I",
+ garbageValue = "47"
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- return class154.method3061(this.params, var1, var2); // L: 269
+ return class124.method2818(this.params, var1, var2); // L: 269
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
- garbageValue = "-820829648"
+ garbageValue = "1090803746"
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
- return AttackOption.method2393(this.params, var1, var2); // L: 273
+ IterableNodeHashTable var4 = this.params; // L: 274
+ String var3;
+ if (var4 == null) { // L: 276
+ var3 = var2; // L: 277
+ } else {
+ ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 280
+ if (var5 == null) { // L: 281
+ var3 = var2; // L: 282
+ } else {
+ var3 = (String)var5.obj; // L: 285
+ }
+ }
+
+ return var3; // L: 287
}
}
diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java
index 8e78506894..3d0b2421d4 100644
--- a/runescape-client/src/main/java/NanoClock.java
+++ b/runescape-client/src/main/java/NanoClock.java
@@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("eu")
+@ObfuscatedName("er")
@Implements("NanoClock")
public class NanoClock extends Clock {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- longValue = 5309226644315502439L
+ longValue = -7279977814907586545L
)
@Export("lastTimeNano")
long lastTimeNano;
@@ -18,20 +18,20 @@ public class NanoClock extends Clock {
this.lastTimeNano = System.nanoTime(); // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1993169750"
+ garbageValue = "814382249"
)
@Export("mark")
public void mark() {
this.lastTimeNano = System.nanoTime(); // L: 14
} // L: 15
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1389334721"
+ descriptor = "(IIB)I",
+ garbageValue = "-83"
)
@Export("wait")
public int wait(int var1, int var2) {
@@ -41,7 +41,7 @@ public class NanoClock extends Clock {
var5 = var3;
}
- class241.method4815(var5 / 1000000L); // L: 21
+ DynamicObject.method1991(var5 / 1000000L); // L: 21
long var7 = System.nanoTime(); // L: 22
int var9;
diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java
index 6b00032a23..071de08b62 100644
--- a/runescape-client/src/main/java/NetCache.java
+++ b/runescape-client/src/main/java/NetCache.java
@@ -5,114 +5,130 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lc")
+@ObfuscatedName("lt")
@Implements("NetCache")
public class NetCache {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lnf;"
+ descriptor = "Lnl;"
)
@Export("NetCache_socket")
public static AbstractSocket NetCache_socket;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 570239275
+ intValue = -1449190645
)
@Export("NetCache_loadTime")
public static int NetCache_loadTime;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- longValue = -3511910326709006749L
+ longValue = 2643126664749175459L
)
- public static long field4041;
- @ObfuscatedName("k")
+ public static long field4029;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("NetCache_pendingPriorityWrites")
public static NodeHashTable NetCache_pendingPriorityWrites;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 974242219
+ intValue = -318837229
)
@Export("NetCache_pendingPriorityWritesCount")
public static int NetCache_pendingPriorityWritesCount;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("NetCache_pendingPriorityResponses")
public static NodeHashTable NetCache_pendingPriorityResponses;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 2115840371
+ intValue = -524738317
)
@Export("NetCache_pendingPriorityResponsesCount")
public static int NetCache_pendingPriorityResponsesCount;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "Llr;"
)
@Export("NetCache_pendingWritesQueue")
public static DualNodeDeque NetCache_pendingWritesQueue;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("NetCache_pendingWrites")
- static NodeHashTable NetCache_pendingWrites;
- @ObfuscatedName("v")
+ public static NodeHashTable NetCache_pendingWrites;
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 122834193
+ intValue = -1780049053
)
@Export("NetCache_pendingWritesCount")
public static int NetCache_pendingWritesCount;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("NetCache_pendingResponses")
public static NodeHashTable NetCache_pendingResponses;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 903629059
+ intValue = 1884264021
)
@Export("NetCache_pendingResponsesCount")
public static int NetCache_pendingResponsesCount;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "Lqt;"
)
@Export("NetCache_responseHeaderBuffer")
public static Buffer NetCache_responseHeaderBuffer;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = -557211503
+ intValue = -29686833
)
- public static int field4052;
- @ObfuscatedName("e")
+ public static int field4027;
+ @ObfuscatedName("l")
@Export("NetCache_crc")
public static CRC32 NetCache_crc;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "[Lle;"
+ descriptor = "[Llc;"
)
@Export("NetCache_archives")
public static Archive[] NetCache_archives;
- @ObfuscatedName("d")
- public static byte field4043;
- @ObfuscatedName("j")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 738633419
+ intValue = 294807501
+ )
+ static int field4031;
+ @ObfuscatedName("n")
+ @ObfuscatedGetter(
+ intValue = -1367817673
+ )
+ static int field4032;
+ @ObfuscatedName("o")
+ public static byte field4033;
+ @ObfuscatedName("m")
+ @ObfuscatedGetter(
+ intValue = -1326647825
)
@Export("NetCache_crcMismatches")
public static int NetCache_crcMismatches;
- @ObfuscatedName("z")
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = 1292218169
+ intValue = 1616448373
)
@Export("NetCache_ioExceptions")
public static int NetCache_ioExceptions;
+ @ObfuscatedName("na")
+ @ObfuscatedGetter(
+ intValue = -1436839649
+ )
+ @Export("selectedSpellWidget")
+ static int selectedSpellWidget;
static {
NetCache_loadTime = 0; // L: 13
@@ -126,11 +142,30 @@ public class NetCache {
NetCache_pendingResponses = new NodeHashTable(4096); // L: 22
NetCache_pendingResponsesCount = 0; // L: 23
NetCache_responseHeaderBuffer = new Buffer(8); // L: 26
- field4052 = 0; // L: 28
+ field4027 = 0; // L: 28
NetCache_crc = new CRC32(); // L: 30
NetCache_archives = new Archive[256]; // L: 32
- field4043 = 0; // L: 33
- NetCache_crcMismatches = 0; // L: 34
- NetCache_ioExceptions = 0; // L: 35
+ field4031 = -1; // L: 33
+ field4032 = 255; // L: 34
+ field4033 = 0; // L: 35
+ NetCache_crcMismatches = 0; // L: 36
+ NetCache_ioExceptions = 0; // L: 37
+ }
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+ garbageValue = "140433559"
+ )
+ public static String method5952(CharSequence var0) {
+ int var2 = var0.length(); // L: 187
+ char[] var3 = new char[var2]; // L: 189
+
+ for (int var4 = 0; var4 < var2; ++var4) { // L: 190
+ var3[var4] = '*';
+ }
+
+ String var1 = new String(var3); // L: 191
+ return var1; // L: 193
}
}
diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java
index 80660354bd..b5eed5f20b 100644
--- a/runescape-client/src/main/java/NetFileRequest.java
+++ b/runescape-client/src/main/java/NetFileRequest.java
@@ -1,38 +1,43 @@
+import java.security.SecureRandom;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("li")
+@ObfuscatedName("le")
@Implements("NetFileRequest")
public class NetFileRequest extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("p")
+ @Export("formattedOperatingSystemName")
+ public static String formattedOperatingSystemName;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Llc;"
)
@Export("archive")
public Archive archive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 211628067
+ intValue = -196698659
)
@Export("crc")
public int crc;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("padding")
public byte padding;
NetFileRequest() {
} // L: 10
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;B)Z",
- garbageValue = "112"
+ descriptor = "(I)Ljava/security/SecureRandom;",
+ garbageValue = "-1298247103"
)
- @Export("isNumber")
- public static boolean isNumber(CharSequence var0) {
- return class162.method3207(var0, 10, true); // L: 35
+ static SecureRandom method5843() {
+ SecureRandom var0 = new SecureRandom(); // L: 39
+ var0.nextInt(); // L: 40
+ return var0; // L: 41
}
}
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
deleted file mode 100644
index 1b3f16309c..0000000000
--- a/runescape-client/src/main/java/NetSocket.java
+++ /dev/null
@@ -1,367 +0,0 @@
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fh")
-@Implements("NetSocket")
-public final class NetSocket extends AbstractSocket implements Runnable {
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "[[Lki;"
- )
- @Export("Widget_interfaceComponents")
- public static Widget[][] Widget_interfaceComponents;
- @ObfuscatedName("en")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive0")
- static Archive archive0;
- @ObfuscatedName("o")
- @Export("socket")
- Socket socket;
- @ObfuscatedName("q")
- @Export("inputStream")
- InputStream inputStream;
- @ObfuscatedName("l")
- @Export("outputStream")
- OutputStream outputStream;
- @ObfuscatedName("k")
- @Export("isClosed")
- boolean isClosed;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lfs;"
- )
- @Export("taskHandler")
- TaskHandler taskHandler;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lfl;"
- )
- @Export("task")
- Task task;
- @ObfuscatedName("p")
- @Export("outBuffer")
- byte[] outBuffer;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = -440186297
- )
- @Export("outLength")
- int outLength;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -375712399
- )
- @Export("outOffset")
- int outOffset;
- @ObfuscatedName("v")
- @Export("exceptionWriting")
- boolean exceptionWriting;
- @ObfuscatedName("y")
- @ObfuscatedGetter(
- intValue = -759611045
- )
- @Export("bufferLength")
- final int bufferLength;
- @ObfuscatedName("c")
- @ObfuscatedGetter(
- intValue = 2033351313
- )
- @Export("maxPacketLength")
- final int maxPacketLength;
-
- @ObfuscatedSignature(
- descriptor = "(Ljava/net/Socket;Lfs;I)V"
- )
- public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException {
- this.isClosed = false; // L: 16
- this.outLength = 0; // L: 20
- this.outOffset = 0; // L: 21
- this.exceptionWriting = false; // L: 22
- this.taskHandler = var2; // L: 28
- this.socket = var1; // L: 29
- this.bufferLength = var3; // L: 30
- this.maxPacketLength = var3 - 100; // L: 31
- this.socket.setSoTimeout(30000); // L: 32
- this.socket.setTcpNoDelay(true); // L: 33
- this.socket.setReceiveBufferSize(65536); // L: 34
- this.socket.setSendBufferSize(65536); // L: 35
- this.inputStream = this.socket.getInputStream(); // L: 36
- this.outputStream = this.socket.getOutputStream(); // L: 37
- } // L: 38
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "731891927"
- )
- @Export("close")
- public void close() {
- if (!this.isClosed) { // L: 41
- synchronized(this) { // L: 42
- this.isClosed = true; // L: 43
- this.notifyAll(); // L: 44
- } // L: 45
-
- if (this.task != null) { // L: 46
- while (this.task.status == 0) { // L: 47
- class241.method4815(1L); // L: 48
- }
-
- if (this.task.status == 1) { // L: 50
- try {
- ((Thread)this.task.result).join(); // L: 52
- } catch (InterruptedException var3) { // L: 54
- }
- }
- }
-
- this.task = null; // L: 57
- }
- } // L: 58
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "18"
- )
- @Export("readUnsignedByte")
- public int readUnsignedByte() throws IOException {
- return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1429957580"
- )
- @Export("available")
- public int available() throws IOException {
- return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "-15219997"
- )
- @Export("isAvailable")
- public boolean isAvailable(int var1) throws IOException {
- if (this.isClosed) { // L: 75
- return false;
- } else {
- return this.inputStream.available() >= var1; // L: 76
- }
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "([BIII)I",
- garbageValue = "-642682113"
- )
- @Export("read")
- public int read(byte[] var1, int var2, int var3) throws IOException {
- if (this.isClosed) { // L: 80
- return 0;
- } else {
- int var4;
- int var5;
- for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86
- var5 = this.inputStream.read(var1, var2, var3); // L: 83
- if (var5 <= 0) {
- throw new EOFException();
- }
-
- var2 += var5; // L: 85
- }
-
- return var4; // L: 88
- }
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "([BIII)V",
- garbageValue = "367101522"
- )
- @Export("write0")
- void write0(byte[] var1, int var2, int var3) throws IOException {
- if (!this.isClosed) { // L: 92
- if (this.exceptionWriting) { // L: 93
- this.exceptionWriting = false; // L: 94
- throw new IOException(); // L: 95
- } else {
- if (this.outBuffer == null) { // L: 97
- this.outBuffer = new byte[this.bufferLength];
- }
-
- synchronized(this) { // L: 98
- for (int var5 = 0; var5 < var3; ++var5) { // L: 99
- this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100
- this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101
- if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102
- throw new IOException(); // L: 103
- }
- }
-
- if (this.task == null) { // L: 106
- this.task = this.taskHandler.newThreadTask(this, 3); // L: 107
- }
-
- this.notifyAll(); // L: 109
- }
- }
- }
- } // L: 111
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "([BIII)V",
- garbageValue = "257086671"
- )
- @Export("write")
- public void write(byte[] var1, int var2, int var3) throws IOException {
- this.write0(var1, var2, var3); // L: 161
- } // L: 162
-
- public void run() {
- try {
- while (true) {
- label84: {
- int var1;
- int var2;
- synchronized(this) { // L: 118
- if (this.outLength == this.outOffset) { // L: 119
- if (this.isClosed) { // L: 120
- break label84;
- }
-
- try {
- this.wait(); // L: 122
- } catch (InterruptedException var10) { // L: 124
- }
- }
-
- var2 = this.outLength; // L: 126
- if (this.outOffset >= this.outLength) { // L: 127
- var1 = this.outOffset - this.outLength;
- } else {
- var1 = this.bufferLength - this.outLength; // L: 128
- }
- }
-
- if (var1 <= 0) { // L: 130
- continue;
- }
-
- try {
- this.outputStream.write(this.outBuffer, var2, var1); // L: 132
- } catch (IOException var9) { // L: 134
- this.exceptionWriting = true; // L: 135
- }
-
- this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137
-
- try {
- if (this.outLength == this.outOffset) { // L: 139
- this.outputStream.flush();
- }
- } catch (IOException var8) { // L: 141
- this.exceptionWriting = true; // L: 142
- }
- continue;
- }
-
- try {
- if (this.inputStream != null) { // L: 147
- this.inputStream.close();
- }
-
- if (this.outputStream != null) { // L: 148
- this.outputStream.close();
- }
-
- if (this.socket != null) { // L: 149
- this.socket.close();
- }
- } catch (IOException var7) { // L: 151
- }
-
- this.outBuffer = null; // L: 152
- break;
- }
- } catch (Exception var12) { // L: 154
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var12); // L: 155
- }
-
- } // L: 157
-
- protected void finalize() {
- this.close(); // L: 61
- } // L: 62
-
- @ObfuscatedName("y")
- @Export("Entity_unpackID")
- public static int Entity_unpackID(long var0) {
- return (int)(var0 >>> 17 & 4294967295L); // L: 84
- }
-
- @ObfuscatedName("kc")
- @ObfuscatedSignature(
- descriptor = "(Lck;ZB)V",
- garbageValue = "102"
- )
- @Export("closeInterface")
- static final void closeInterface(InterfaceParent var0, boolean var1) {
- int var2 = var0.group; // L: 12229
- int var3 = (int)var0.key; // L: 12230
- var0.remove(); // L: 12231
- if (var1 && var2 != -1 && class120.Widget_loadedInterfaces[var2]) { // L: 12232 12233 12234
- class134.Widget_archive.clearFilesGroup(var2); // L: 12235
- if (Widget_interfaceComponents[var2] != null) { // L: 12236
- boolean var4 = true; // L: 12237
-
- for (int var5 = 0; var5 < Widget_interfaceComponents[var2].length; ++var5) { // L: 12238
- if (Widget_interfaceComponents[var2][var5] != null) { // L: 12239
- if (Widget_interfaceComponents[var2][var5].type != 2) { // L: 12240
- Widget_interfaceComponents[var2][var5] = null;
- } else {
- var4 = false; // L: 12241
- }
- }
- }
-
- if (var4) { // L: 12244
- Widget_interfaceComponents[var2] = null;
- }
-
- class120.Widget_loadedInterfaces[var2] = false; // L: 12245
- }
- }
-
- for (IntegerNode var6 = (IntegerNode)Client.widgetFlags.first(); var6 != null; var6 = (IntegerNode)Client.widgetFlags.next()) { // L: 12248
- if ((var6.key >> 48 & 65535L) == (long)var2) { // L: 12249
- var6.remove(); // L: 12250
- }
- }
-
- Widget var7 = class92.getWidget(var3); // L: 12254
- if (var7 != null) { // L: 12255
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var7);
- }
-
- if (Client.rootInterface != -1) { // L: 12256
- WorldMapLabelSize.runIntfCloseListeners(Client.rootInterface, 1);
- }
-
- } // L: 12257
-}
diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java
index d129d0aff8..7f7910da75 100644
--- a/runescape-client/src/main/java/Node.java
+++ b/runescape-client/src/main/java/Node.java
@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("os")
+@ObfuscatedName("oh")
@Implements("Node")
public class Node {
- @ObfuscatedName("gh")
+ @ObfuscatedName("gu")
@Export("key")
public long key;
- @ObfuscatedName("gw")
+ @ObfuscatedName("gn")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("previous")
public Node previous;
- @ObfuscatedName("gd")
+ @ObfuscatedName("go")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("next")
public Node next;
- @ObfuscatedName("fv")
+ @ObfuscatedName("fw")
@Export("remove")
public void remove() {
if (this.next != null) { // L: 9
@@ -33,7 +33,7 @@ public class Node {
}
} // L: 14
- @ObfuscatedName("ff")
+ @ObfuscatedName("fb")
@Export("hasNext")
public boolean hasNext() {
return this.next != null; // L: 17
diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java
index ddb2dc2e2e..df02847fdd 100644
--- a/runescape-client/src/main/java/NodeDeque.java
+++ b/runescape-client/src/main/java/NodeDeque.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("lv")
+@ObfuscatedName("lo")
@Implements("NodeDeque")
public class NodeDeque {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("sentinel")
public Node sentinel;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("current")
Node current;
@@ -25,7 +25,7 @@ public class NodeDeque {
this.sentinel.next = this.sentinel; // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("clear")
public void clear() {
while (true) {
@@ -39,9 +39,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Los;)V"
+ descriptor = "(Loh;)V"
)
@Export("addFirst")
public void addFirst(Node var1) {
@@ -55,9 +55,9 @@ public class NodeDeque {
var1.previous.next = var1; // L: 28
} // L: 29
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Los;)V"
+ descriptor = "(Loh;)V"
)
@Export("addLast")
public void addLast(Node var1) {
@@ -71,9 +71,9 @@ public class NodeDeque {
var1.previous.next = var1; // L: 36
} // L: 37
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("removeLast")
public Node removeLast() {
@@ -86,9 +86,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("removeFirst")
public Node removeFirst() {
@@ -101,9 +101,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("last")
public Node last() {
@@ -117,9 +117,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("first")
public Node first() {
@@ -133,9 +133,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("previous")
public Node previous() {
@@ -149,9 +149,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("next")
public Node next() {
@@ -165,9 +165,9 @@ public class NodeDeque {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Los;Los;)V"
+ descriptor = "(Loh;Loh;)V"
)
@Export("NodeDeque_addBefore")
public static void NodeDeque_addBefore(Node var0, Node var1) {
diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java
index a0e818b549..0bcce564a8 100644
--- a/runescape-client/src/main/java/NodeHashTable.java
+++ b/runescape-client/src/main/java/NodeHashTable.java
@@ -3,31 +3,31 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pv")
+@ObfuscatedName("pm")
@Implements("NodeHashTable")
public final class NodeHashTable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("size")
int size;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "[Los;"
+ descriptor = "[Loh;"
)
@Export("buckets")
Node[] buckets;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("currentGet")
Node currentGet;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Los;"
+ descriptor = "Loh;"
)
@Export("current")
Node current;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("index")
int index;
@@ -44,9 +44,9 @@ public final class NodeHashTable {
} // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(J)Los;"
+ descriptor = "(J)Loh;"
)
@Export("get")
public Node get(long var1) {
@@ -64,9 +64,9 @@ public final class NodeHashTable {
return null; // L: 34
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Los;J)V"
+ descriptor = "(Loh;J)V"
)
@Export("put")
public void put(Node var1, long var2) {
@@ -82,9 +82,9 @@ public final class NodeHashTable {
var1.key = var2; // L: 44
} // L: 45
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("first")
public Node first() {
@@ -92,9 +92,9 @@ public final class NodeHashTable {
return this.next(); // L: 49
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "()Los;"
+ descriptor = "()Loh;"
)
@Export("next")
public Node next() {
diff --git a/runescape-client/src/main/java/OAuthApi.java b/runescape-client/src/main/java/OAuthApi.java
new file mode 100644
index 0000000000..9d020531bf
--- /dev/null
+++ b/runescape-client/src/main/java/OAuthApi.java
@@ -0,0 +1,20 @@
+import com.jagex.oldscape.pub.OtlTokenRequester;
+import com.jagex.oldscape.pub.RefreshAccessTokenRequester;
+import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@Implements("OAuthApi")
+@ObfuscatedName("com/jagex/oldscape/pub/OAuthApi")
+public interface OAuthApi {
+ boolean isOnLoginScreen();
+
+ long getAccountHash();
+
+ void setOtlTokenRequester(OtlTokenRequester var1);
+
+ @ObfuscatedSignature(
+ descriptor = "(Lcom/jagex/oldscape/pub/RefreshAccessTokenRequester;)V"
+ )
+ void setRefreshTokenRequester(RefreshAccessTokenRequester var1);
+}
diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java
index f0a95659f3..98cfe97e9c 100644
--- a/runescape-client/src/main/java/ObjectComposition.java
+++ b/runescape-client/src/main/java/ObjectComposition.java
@@ -1,263 +1,258 @@
+import java.awt.Component;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gy")
+@ObfuscatedName("gk")
@Implements("ObjectComposition")
public class ObjectComposition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("ObjectDefinition_isLowDetail")
static boolean ObjectDefinition_isLowDetail;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("ObjectDefinition_archive")
- static AbstractArchive ObjectDefinition_archive;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("ObjectDefinition_modelsArchive")
static AbstractArchive ObjectDefinition_modelsArchive;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ObjectDefinition_cached")
- public static EvictingDualNodeHashTable ObjectDefinition_cached;
- @ObfuscatedName("a")
+ static EvictingDualNodeHashTable ObjectDefinition_cached;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ObjectDefinition_cachedModelData")
public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ObjectDefinition_cachedEntities")
- public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities;
- @ObfuscatedName("p")
+ static EvictingDualNodeHashTable ObjectDefinition_cachedEntities;
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ObjectDefinition_cachedModels")
- public static EvictingDualNodeHashTable ObjectDefinition_cachedModels;
- @ObfuscatedName("s")
+ static EvictingDualNodeHashTable ObjectDefinition_cachedModels;
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "[Lgs;"
+ descriptor = "[Lgw;"
)
- static ModelData[] field2085;
- @ObfuscatedName("r")
+ static ModelData[] field2046;
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 429332721
+ intValue = -1742000735
)
@Export("id")
public int id;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("modelIds")
int[] modelIds;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("models")
int[] models;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("name")
public String name;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("recolorFrom")
short[] recolorFrom;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("recolorTo")
short[] recolorTo;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("retextureFrom")
short[] retextureFrom;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("retextureTo")
short[] retextureTo;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = 183520013
+ intValue = 1037896673
)
@Export("sizeX")
public int sizeX;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = -5146313
+ intValue = -309599979
)
@Export("sizeY")
public int sizeY;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 1008016331
+ intValue = 1585435431
)
@Export("interactType")
public int interactType;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("boolean1")
public boolean boolean1;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = -300793899
+ intValue = 2124439429
)
@Export("int1")
public int int1;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 414217251
+ intValue = 300128547
)
@Export("clipType")
int clipType;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@Export("nonFlatShading")
boolean nonFlatShading;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("modelClipped")
public boolean modelClipped;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = 900942841
+ intValue = -618063313
)
@Export("animationId")
public int animationId;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = -495384223
+ intValue = 695291791
)
@Export("int2")
public int int2;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@ObfuscatedGetter(
- intValue = 1077699639
+ intValue = -376621693
)
@Export("ambient")
int ambient;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@ObfuscatedGetter(
- intValue = -1494486919
+ intValue = -1901487179
)
@Export("contrast")
int contrast;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("actions")
public String[] actions;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@ObfuscatedGetter(
- intValue = 1927190147
+ intValue = -1508458181
)
@Export("mapIconId")
public int mapIconId;
@ObfuscatedName("ab")
@ObfuscatedGetter(
- intValue = -1184310053
+ intValue = -367744149
)
@Export("mapSceneId")
public int mapSceneId;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@Export("isRotated")
boolean isRotated;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("clipped")
public boolean clipped;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@ObfuscatedGetter(
- intValue = 1447845467
+ intValue = -345999905
)
@Export("modelSizeX")
int modelSizeX;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = -561351305
+ intValue = 461344115
)
@Export("modelHeight")
int modelHeight;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = -1485595305
+ intValue = -810719341
)
@Export("modelSizeY")
int modelSizeY;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = 562270847
+ intValue = 1329633289
)
@Export("offsetX")
int offsetX;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@ObfuscatedGetter(
- intValue = 1875918697
+ intValue = -128908105
)
@Export("offsetHeight")
int offsetHeight;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = 1644689347
+ intValue = -938812699
)
@Export("offsetY")
int offsetY;
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@Export("boolean2")
public boolean boolean2;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@Export("isSolid")
boolean isSolid;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@ObfuscatedGetter(
- intValue = 1954919343
+ intValue = 2035670131
)
@Export("int3")
public int int3;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@Export("transforms")
public int[] transforms;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@ObfuscatedGetter(
- intValue = 1903420193
+ intValue = -1220162285
)
@Export("transformVarbit")
int transformVarbit;
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@ObfuscatedGetter(
- intValue = 735656301
+ intValue = 769818309
)
@Export("transformVarp")
int transformVarp;
- @ObfuscatedName("ao")
+ @ObfuscatedName("az")
@ObfuscatedGetter(
- intValue = -358109515
+ intValue = 437630537
)
@Export("ambientSoundId")
public int ambientSoundId;
@ObfuscatedName("av")
@ObfuscatedGetter(
- intValue = -938201117
+ intValue = -173069521
)
@Export("int7")
public int int7;
- @ObfuscatedName("ai")
+ @ObfuscatedName("aw")
@ObfuscatedGetter(
- intValue = -2049921577
+ intValue = -1931671447
)
@Export("int5")
public int int5;
- @ObfuscatedName("ay")
+ @ObfuscatedName("au")
@ObfuscatedGetter(
- intValue = -1600091331
+ intValue = -658821357
)
@Export("int6")
public int int6;
@ObfuscatedName("aa")
@Export("soundEffectIds")
public int[] soundEffectIds;
- @ObfuscatedName("ax")
+ @ObfuscatedName("ay")
@Export("boolean3")
public boolean boolean3;
- @ObfuscatedName("at")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Lpb;"
)
@Export("params")
IterableNodeHashTable params;
@@ -268,7 +263,7 @@ public class ObjectComposition extends DualNode {
ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21
ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22
ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23
- field2085 = new ModelData[4]; // L: 24
+ field2046 = new ModelData[4]; // L: 24
}
ObjectComposition() {
@@ -308,10 +303,10 @@ public class ObjectComposition extends DualNode {
this.boolean3 = true; // L: 67
} // L: 70
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-23"
+ garbageValue = "0"
)
@Export("postDecode")
void postDecode() {
@@ -334,10 +329,10 @@ public class ObjectComposition extends DualNode {
} // L: 101
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "805835073"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "54"
)
@Export("decode")
void decode(Buffer var1) {
@@ -351,10 +346,10 @@ public class ObjectComposition extends DualNode {
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1407305271"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-514347442"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
@@ -364,7 +359,7 @@ public class ObjectComposition extends DualNode {
var3 = var1.readUnsignedByte(); // L: 113
if (var3 > 0) { // L: 114
if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115
- var1.offset += 3 * var3; // L: 123
+ var1.offset += var3 * 3; // L: 123
} else {
this.models = new int[var3]; // L: 116
this.modelIds = new int[var3]; // L: 117
@@ -426,10 +421,10 @@ public class ObjectComposition extends DualNode {
if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159
this.actions[var2 - 30] = null;
}
- } else if (var2 == 40) { // L: 161
- var3 = var1.readUnsignedByte(); // L: 162
- this.recolorFrom = new short[var3]; // L: 163
- this.recolorTo = new short[var3]; // L: 164
+ } else if (var2 == 40) {
+ var3 = var1.readUnsignedByte();
+ this.recolorFrom = new short[var3];
+ this.recolorTo = new short[var3];
for (var4 = 0; var4 < var3; ++var4) { // L: 165
this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166
@@ -493,7 +488,7 @@ public class ObjectComposition extends DualNode {
} else if (var2 == 89) { // L: 229
this.boolean3 = false;
} else if (var2 == 249) { // L: 230
- this.params = JagexCache.readStringIntParameters(var1, this.params);
+ this.params = LoginScreenAnimation.readStringIntParameters(var1, this.params);
}
} else {
this.transformVarbit = var1.readUnsignedShort(); // L: 198
@@ -529,12 +524,12 @@ public class ObjectComposition extends DualNode {
} // L: 232
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(IB)Z",
- garbageValue = "14"
+ garbageValue = "2"
)
- public final boolean method3589(int var1) {
+ public final boolean method3658(int var1) {
if (this.models != null) { // L: 235
for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 245
if (this.models[var4] == var1) { // L: 246
@@ -558,10 +553,10 @@ public class ObjectComposition extends DualNode {
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "1"
+ descriptor = "(I)Z",
+ garbageValue = "1902282651"
)
@Export("needsModelFiles")
public final boolean needsModelFiles() {
@@ -578,10 +573,10 @@ public class ObjectComposition extends DualNode {
}
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(II[[IIIII)Lgx;",
- garbageValue = "-491315765"
+ descriptor = "(II[[IIIII)Lgj;",
+ garbageValue = "-1277673655"
)
@Export("getEntity")
public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
@@ -619,17 +614,17 @@ public class ObjectComposition extends DualNode {
if (var9 instanceof Model) { // L: 282
var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType);
} else if (var9 instanceof ModelData) {
- var9 = ((ModelData)var9).method3847(var3, var4, var5, var6, true, this.clipType); // L: 283
+ var9 = ((ModelData)var9).method3921(var3, var4, var5, var6, true, this.clipType); // L: 283
}
}
return (Renderable)var9; // L: 285
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(II[[IIIII)Lhv;",
- garbageValue = "1913626278"
+ descriptor = "(II[[IIIII)Lhy;",
+ garbageValue = "1709740208"
)
@Export("getModel")
public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
@@ -652,30 +647,30 @@ public class ObjectComposition extends DualNode {
}
if (this.clipType >= 0) {
- var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299
+ var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType);
}
- return var9; // L: 300
+ return var9;
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(II[[IIIILgq;IB)Lhv;",
- garbageValue = "2"
+ descriptor = "(II[[IIIILgc;II)Lhy;",
+ garbageValue = "1963934887"
)
@Export("getModelDynamic")
public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) {
long var9;
- if (this.models == null) { // L: 305
+ if (this.models == null) {
var9 = (long)(var2 + (this.id << 10));
} else {
var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306
}
Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 307
- if (var11 == null) { // L: 308
- ModelData var12 = this.getModelData(var1, var2); // L: 309
- if (var12 == null) { // L: 310
+ if (var11 == null) {
+ ModelData var12 = this.getModelData(var1, var2);
+ if (var12 == null) {
return null;
}
@@ -683,13 +678,13 @@ public class ObjectComposition extends DualNode {
ObjectDefinition_cachedModels.put(var11, var9); // L: 312
}
- if (var7 == null && this.clipType == -1) { // L: 314
- return var11;
+ if (var7 == null && this.clipType == -1) {
+ return var11; // L: 314
} else {
- if (var7 != null) { // L: 315
- var11 = var7.transformObjectModel(var11, var8, var2); // L: 316
+ if (var7 != null) {
+ var11 = var7.transformObjectModel(var11, var8, var2);
} else {
- var11 = var11.toSharedSequenceModel(true); // L: 318
+ var11 = var11.toSharedSequenceModel(true);
}
if (this.clipType >= 0) { // L: 319
@@ -700,10 +695,10 @@ public class ObjectComposition extends DualNode {
}
}
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(III)Lgs;",
- garbageValue = "732231403"
+ descriptor = "(III)Lgw;",
+ garbageValue = "2066734728"
)
@Export("getModelData")
final ModelData getModelData(int var1, int var2) {
@@ -741,19 +736,19 @@ public class ObjectComposition extends DualNode {
}
if (var4) { // L: 338
- var3.method3841();
+ var3.method3973();
}
ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339
}
if (var5 > 1) { // L: 341
- field2085[var6] = var3;
+ field2046[var6] = var3;
}
}
if (var5 > 1) { // L: 343
- var3 = new ModelData(field2085, var5);
+ var3 = new ModelData(field2046, var5);
}
} else {
int var9 = -1; // L: 346
@@ -783,7 +778,7 @@ public class ObjectComposition extends DualNode {
}
if (var10) { // L: 361
- var3.method3841();
+ var3.method3973();
}
ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362
@@ -803,19 +798,19 @@ public class ObjectComposition extends DualNode {
var11 = true;
}
- ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); // L: 371
+ ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 371
if (var1 == 4 && var2 > 3) { // L: 372
- var8.method3823(256); // L: 373
+ var8.method3935(256); // L: 373
var8.changeOffset(45, 0, -45); // L: 374
}
var2 &= 3; // L: 376
if (var2 == 1) { // L: 377
- var8.method3820();
+ var8.method3932();
} else if (var2 == 2) { // L: 378
- var8.method3854();
+ var8.method3933();
} else if (var2 == 3) { // L: 379
- var8.method3822();
+ var8.method3942();
}
if (this.recolorFrom != null) { // L: 380
@@ -841,16 +836,16 @@ public class ObjectComposition extends DualNode {
return var8; // L: 392
}
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(B)Lgy;",
- garbageValue = "-6"
+ descriptor = "(I)Lgk;",
+ garbageValue = "-2142713479"
)
@Export("transform")
public final ObjectComposition transform() {
int var1 = -1; // L: 396
if (this.transformVarbit != -1) { // L: 397
- var1 = class18.getVarbit(this.transformVarbit);
+ var1 = class388.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { // L: 398
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -862,49 +857,99 @@ public class ObjectComposition extends DualNode {
var2 = this.transforms[this.transforms.length - 1];
}
- return var2 != -1 ? class82.getObjectDefinition(var2) : null; // L: 402 403
+ return var2 != -1 ? class162.getObjectDefinition(var2) : null; // L: 402 403
}
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1202873066"
+ descriptor = "(IIB)I",
+ garbageValue = "-31"
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- return class154.method3061(this.params, var1, var2); // L: 407
+ return class124.method2818(this.params, var1, var2); // L: 407
}
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
- garbageValue = "1010860947"
+ descriptor = "(ILjava/lang/String;S)Ljava/lang/String;",
+ garbageValue = "-1891"
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
- return AttackOption.method2393(this.params, var1, var2); // L: 411
+ IterableNodeHashTable var4 = this.params; // L: 412
+ String var3;
+ if (var4 == null) { // L: 414
+ var3 = var2; // L: 415
+ } else {
+ ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 418
+ if (var5 == null) { // L: 419
+ var3 = var2; // L: 420
+ } else {
+ var3 = (String)var5.obj; // L: 423
+ }
+ }
+
+ return var3; // L: 425
}
- @ObfuscatedName("t")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-1092849853"
+ garbageValue = "143735341"
)
@Export("hasSound")
public boolean hasSound() {
- if (this.transforms == null) { // L: 415
+ if (this.transforms == null) { // L: 436
return this.ambientSoundId != -1 || this.soundEffectIds != null;
} else {
- for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 416
- if (this.transforms[var1] != -1) { // L: 417
- ObjectComposition var2 = class82.getObjectDefinition(this.transforms[var1]); // L: 418
- if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 419
+ for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 437
+ if (this.transforms[var1] != -1) { // L: 438
+ ObjectComposition var2 = class162.getObjectDefinition(this.transforms[var1]); // L: 439
+ if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 440
return true;
}
}
}
- return false; // L: 422
+ return false; // L: 443
}
}
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/awt/Component;I)V",
+ garbageValue = "-903432716"
+ )
+ static void method3709(Component var0) {
+ var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 161
+ var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 162
+ KeyHandler.field140 = -1; // L: 163
+ } // L: 164
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V",
+ garbageValue = "-1410664147"
+ )
+ static void method3690(Float var0, Float var1) {
+ if (var0 + class114.field1429 < 1.3333334F) { // L: 299
+ float var2 = var0 - 2.0F; // L: 300
+ float var3 = var0 - 1.0F; // L: 301
+ float var4 = (float)Math.sqrt((double)(var2 * var2 - var3 * 4.0F * var3)); // L: 302
+ float var5 = (-var2 + var4) * 0.5F; // L: 303
+ if (var1 + class114.field1429 > var5) { // L: 304
+ var1 = var5 - class114.field1429; // L: 305
+ } else {
+ var5 = (-var2 - var4) * 0.5F; // L: 308
+ if (var1 < class114.field1429 + var5) { // L: 309
+ var1 = class114.field1429 + var5; // L: 310
+ }
+ }
+ } else {
+ var0 = 1.3333334F - class114.field1429; // L: 315
+ var1 = 0.33333334F - class114.field1429; // L: 316
+ }
+
+ } // L: 318
}
diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java
index 85eb81a0e1..430a44dd0a 100644
--- a/runescape-client/src/main/java/ObjectNode.java
+++ b/runescape-client/src/main/java/ObjectNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("oj")
+@ObfuscatedName("oa")
@Implements("ObjectNode")
public class ObjectNode extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("obj")
public final Object obj;
diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java
index dbe05378a8..285d3fb5bc 100644
--- a/runescape-client/src/main/java/ObjectSound.java
+++ b/runescape-client/src/main/java/ObjectSound.java
@@ -4,110 +4,113 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bj")
+@ObfuscatedName("bv")
@Implements("ObjectSound")
public final class ObjectSound extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("objectSounds")
static NodeDeque objectSounds;
- @ObfuscatedName("el")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Lqt;"
)
- @Export("archive10")
- static Archive archive10;
- @ObfuscatedName("q")
+ @Export("NetCache_responseArchiveBuffer")
+ public static Buffer NetCache_responseArchiveBuffer;
+ @ObfuscatedName("hz")
+ @Export("regionLandArchiveIds")
+ static int[] regionLandArchiveIds;
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 732254663
+ intValue = 383647409
)
@Export("plane")
int plane;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1987323191
+ intValue = -452601419
)
@Export("x")
int x;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 353993277
+ intValue = -1502495581
)
@Export("y")
int y;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 2069201157
+ intValue = -440386389
)
@Export("maxX")
int maxX;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1537948889
+ intValue = 1252508363
)
@Export("maxY")
int maxY;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 209965041
+ intValue = -1534240837
)
- int field817;
- @ObfuscatedName("s")
+ int field812;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -222773955
- )
- int field813;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Lgy;"
- )
- @Export("obj")
- ObjectComposition obj;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = -1832672013
+ intValue = -1052748779
)
@Export("soundEffectId")
int soundEffectId;
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Lah;"
+ descriptor = "Lai;"
)
@Export("stream1")
RawPcmStream stream1;
- @ObfuscatedName("c")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 727974151
+ intValue = -780332289
)
- int field808;
- @ObfuscatedName("w")
+ int field819;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = -26226485
+ )
+ int field811;
+ @ObfuscatedName("t")
@Export("soundEffectIds")
int[] soundEffectIds;
- @ObfuscatedName("b")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 10408455
+ intValue = 2025868067
)
- int field810;
- @ObfuscatedName("t")
+ int field809;
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Lah;"
+ descriptor = "Lgk;"
+ )
+ @Export("obj")
+ ObjectComposition obj;
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "Lai;"
)
@Export("stream2")
RawPcmStream stream2;
static {
- objectSounds = new NodeDeque(); // L: 11
+ objectSounds = new NodeDeque();
}
ObjectSound() {
} // L: 27
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "2026640853"
+ garbageValue = "-1121489071"
)
@Export("set")
void set() {
@@ -115,45 +118,128 @@ public final class ObjectSound extends Node {
ObjectComposition var2 = this.obj.transform(); // L: 45
if (var2 != null) { // L: 46
this.soundEffectId = var2.ambientSoundId; // L: 47
- this.field817 = var2.int7 * 128; // L: 48
- this.field813 = var2.int5; // L: 49
- this.field808 = var2.int6; // L: 50
+ this.field812 = var2.int7 * 128; // L: 48
+ this.field819 = var2.int5; // L: 49
+ this.field811 = var2.int6; // L: 50
this.soundEffectIds = var2.soundEffectIds; // L: 51
} else {
this.soundEffectId = -1; // L: 54
- this.field817 = 0; // L: 55
- this.field813 = 0; // L: 56
- this.field808 = 0; // L: 57
+ this.field812 = 0; // L: 55
+ this.field819 = 0; // L: 56
+ this.field811 = 0; // L: 57
this.soundEffectIds = null; // L: 58
}
if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60
- class122.pcmStreamMixer.removeSubStream(this.stream1); // L: 61
+ class21.pcmStreamMixer.removeSubStream(this.stream1); // L: 61
this.stream1 = null; // L: 62
}
} // L: 64
- @ObfuscatedName("l")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-9"
+ descriptor = "(IB)Lfx;",
+ garbageValue = "84"
)
- public static int method1734() {
- return KeyHandler.KeyHandler_idleCycles; // L: 142
+ @Export("SpotAnimationDefinition_get")
+ public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
+ SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
+ if (var1 != null) {
+ return var1;
+ } else {
+ byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
+ var1 = new SpotAnimationDefinition(); // L: 35
+ var1.id = var0;
+ if (var2 != null) { // L: 37
+ var1.decode(new Buffer(var2));
+ }
+
+ SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38
+ return var1; // L: 39
+ }
}
- @ObfuscatedName("fu")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "2109603976"
+ descriptor = "([Ljava/lang/String;[SIII)V",
+ garbageValue = "-1948932811"
)
- static final void method1730(boolean var0) {
- if (var0) { // L: 3064
- Client.field615 = Login.field900 ? class124.field1557 : class124.field1551; // L: 3065
- } else {
- Client.field615 = class12.clientPreferences.parameters.containsKey(class239.method4810(Login.Login_username)) ? class124.field1556 : class124.field1553; // L: 3068
+ @Export("sortItemsByName")
+ public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
+ if (var2 < var3) { // L: 9
+ int var4 = (var3 + var2) / 2; // L: 10
+ int var5 = var2; // L: 11
+ String var6 = var0[var4]; // L: 12
+ var0[var4] = var0[var3]; // L: 13
+ var0[var3] = var6; // L: 14
+ short var7 = var1[var4]; // L: 15
+ var1[var4] = var1[var3]; // L: 16
+ var1[var3] = var7; // L: 17
+
+ for (int var8 = var2; var8 < var3; ++var8) { // L: 18
+ if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19
+ String var9 = var0[var8]; // L: 20
+ var0[var8] = var0[var5]; // L: 21
+ var0[var5] = var9; // L: 22
+ short var10 = var1[var8]; // L: 23
+ var1[var8] = var1[var5]; // L: 24
+ var1[var5++] = var10; // L: 25
+ }
+ }
+
+ var0[var3] = var0[var5]; // L: 29
+ var0[var5] = var6; // L: 30
+ var1[var3] = var1[var5]; // L: 31
+ var1[var5] = var7; // L: 32
+ sortItemsByName(var0, var1, var2, var5 - 1); // L: 33
+ sortItemsByName(var0, var1, var5 + 1, var3); // L: 34
}
- } // L: 3070
+ } // L: 36
+
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1730846792"
+ )
+ public static void method1702() {
+ ItemComposition.ItemDefinition_cached.clear(); // L: 563
+ ItemComposition.ItemDefinition_cachedModels.clear(); // L: 564
+ ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 565
+ } // L: 566
+
+ @ObfuscatedName("je")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;B)Z",
+ garbageValue = "103"
+ )
+ @Export("runCs1")
+ static final boolean runCs1(Widget var0) {
+ if (var0.cs1Comparisons == null) { // L: 10769
+ return false;
+ } else {
+ for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10770
+ int var2 = Canvas.method319(var0, var1); // L: 10771
+ int var3 = var0.cs1ComparisonValues[var1]; // L: 10772
+ if (var0.cs1Comparisons[var1] == 2) { // L: 10773
+ if (var2 >= var3) { // L: 10774
+ return false;
+ }
+ } else if (var0.cs1Comparisons[var1] == 3) { // L: 10776
+ if (var2 <= var3) { // L: 10777
+ return false;
+ }
+ } else if (var0.cs1Comparisons[var1] == 4) { // L: 10779
+ if (var2 == var3) { // L: 10780
+ return false;
+ }
+ } else if (var2 != var3) { // L: 10782
+ return false;
+ }
+ }
+
+ return true; // L: 10784
+ }
+ }
}
diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java
index 948d2fde88..718c778bb8 100644
--- a/runescape-client/src/main/java/Occluder.java
+++ b/runescape-client/src/main/java/Occluder.java
@@ -4,489 +4,141 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hy")
+@ObfuscatedName("gb")
@Implements("Occluder")
public final class Occluder {
- @ObfuscatedName("o")
+ @ObfuscatedName("uw")
+ @ObfuscatedSignature(
+ descriptor = "Los;"
+ )
+ @Export("platformInfo")
+ static PlatformInfo platformInfo;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1667496443
+ intValue = -1913259521
)
@Export("minTileX")
int minTileX;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1607339701
+ intValue = -743836359
)
@Export("maxTileX")
int maxTileX;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1327290645
+ intValue = -1643298167
)
@Export("minTileY")
int minTileY;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1032573123
+ intValue = -1894194977
)
@Export("maxTileY")
int maxTileY;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1960990691
+ intValue = -741467087
)
@Export("type")
int type;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1746160959
+ intValue = 360875993
)
@Export("minX")
int minX;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1167261617
+ intValue = -1324054405
)
@Export("maxX")
int maxX;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1218503837
+ intValue = 1977577685
)
@Export("minZ")
int minZ;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 1421337339
+ intValue = 690008559
)
@Export("maxZ")
int maxZ;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 2056353609
+ intValue = 638283975
)
@Export("minY")
int minY;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = 621909479
+ intValue = 1747045819
)
@Export("maxY")
int maxY;
- @ObfuscatedName("c")
- @ObfuscatedGetter(
- intValue = 880103251
- )
- int field2510;
- @ObfuscatedName("w")
- @ObfuscatedGetter(
- intValue = -1489264085
- )
- int field2507;
- @ObfuscatedName("b")
- @ObfuscatedGetter(
- intValue = -2075749697
- )
- int field2508;
@ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 1502323289
+ intValue = -1792742847
)
- int field2509;
- @ObfuscatedName("g")
+ int field2470;
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 1403810903
+ intValue = 963802065
)
- int field2495;
+ int field2472;
+ @ObfuscatedName("r")
+ @ObfuscatedGetter(
+ intValue = -1423983461
+ )
+ int field2466;
+ @ObfuscatedName("u")
+ @ObfuscatedGetter(
+ intValue = 942298147
+ )
+ int field2467;
+ @ObfuscatedName("k")
+ @ObfuscatedGetter(
+ intValue = -740983489
+ )
+ int field2468;
+ @ObfuscatedName("h")
+ @ObfuscatedGetter(
+ intValue = 336673989
+ )
+ int field2462;
@ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = -340736711
+ intValue = 680765335
)
- int field2506;
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = 1370877385
- )
- int field2511;
+ int field2473;
Occluder() {
- }
+ } // L: 23
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "([Ljava/lang/String;[SIIB)V",
- garbageValue = "0"
- )
- @Export("sortItemsByName")
- public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
- if (var2 < var3) { // L: 9
- int var4 = (var3 + var2) / 2; // L: 10
- int var5 = var2; // L: 11
- String var6 = var0[var4]; // L: 12
- var0[var4] = var0[var3]; // L: 13
- var0[var3] = var6; // L: 14
- short var7 = var1[var4]; // L: 15
- var1[var4] = var1[var3]; // L: 16
- var1[var3] = var7; // L: 17
-
- for (int var8 = var2; var8 < var3; ++var8) { // L: 18
- if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19
- String var9 = var0[var8]; // L: 20
- var0[var8] = var0[var5]; // L: 21
- var0[var5] = var9; // L: 22
- short var10 = var1[var8]; // L: 23
- var1[var8] = var1[var5]; // L: 24
- var1[var5++] = var10; // L: 25
- }
- }
-
- var0[var3] = var0[var5]; // L: 29
- var0[var5] = var6; // L: 30
- var1[var3] = var1[var5]; // L: 31
- var1[var5] = var7; // L: 32
- sortItemsByName(var0, var1, var2, var5 - 1); // L: 33
- sortItemsByName(var0, var1, var5 + 1, var3); // L: 34
- }
-
- } // L: 36
-
- @ObfuscatedName("k")
+ @ObfuscatedName("kc")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-2100168808"
+ garbageValue = "-49313522"
)
- public static void method4221() {
- synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 107
- if (ArchiveDiskActionHandler.field3998 != 0) { // L: 108
- ArchiveDiskActionHandler.field3998 = 1; // L: 109
+ static final void method4354() {
+ PacketBufferNode var0 = EnumComposition.getPacketBufferNode(ClientPacket.field2987, Client.packetWriter.isaacCipher); // L: 11980
+ Client.packetWriter.addNode(var0); // L: 11981
+ Interpreter.field842 = true; // L: 11982
- try {
- ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 111
- } catch (InterruptedException var3) { // L: 113
- }
- }
-
- }
- } // L: 116
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "1785001872"
- )
- public static int method4220(int var0) {
- return class402.field4445[var0 & 16383]; // L: 37
- }
-
- @ObfuscatedName("hb")
- @ObfuscatedSignature(
- descriptor = "(Lja;I)V",
- garbageValue = "791986228"
- )
- static final void method4222(class263 var0) {
- PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7547
- int var2;
- int var3;
- int var4;
- int var5;
- int var6;
- int var7;
- int var8;
- int var9;
- int var10;
- if (class263.field3064 == var0) { // L: 7548
- var2 = var1.readUnsignedShort(); // L: 7549
- var3 = var1.readUnsignedByte(); // L: 7550
- var4 = (var3 >> 4 & 7) + class145.field1690; // L: 7551
- var5 = (var3 & 7) + class321.field4076; // L: 7552
- var6 = var1.method7545(); // L: 7553
- var7 = var6 >> 4 & 15; // L: 7554
- var8 = var6 & 7; // L: 7555
- var9 = var1.method7593(); // L: 7556
- if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7557
- var10 = var7 + 1; // L: 7558
- if (ModelData0.localPlayer.pathX[0] >= var4 - var10 && ModelData0.localPlayer.pathX[0] <= var10 + var4 && ModelData0.localPlayer.pathY[0] >= var5 - var10 && ModelData0.localPlayer.pathY[0] <= var10 + var5 && class12.clientPreferences.method2239() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7559 7560
- Client.soundEffectIds[Client.soundEffectCount] = var2; // L: 7561
- Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7562
- Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; // L: 7563
- Client.soundEffects[Client.soundEffectCount] = null; // L: 7564
- Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7565
- ++Client.soundEffectCount; // L: 7566
- }
+ for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11983
+ if (var1.type == 0 || var1.type == 3) { // L: 11984
+ MusicPatchPcmStream.closeInterface(var1, true);
}
}
- TileItem var35;
- if (class263.field3066 == var0) { // L: 7571
- var2 = var1.method7593(); // L: 7572
- var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7573
- var4 = (var2 & 7) + class321.field4076; // L: 7574
- var5 = var1.method7554(); // L: 7575
- var6 = var1.method7716(); // L: 7576
- if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7577
- var35 = new TileItem(); // L: 7578
- var35.id = var6; // L: 7579
- var35.quantity = var5; // L: 7580
- if (Client.groundItems[class128.Client_plane][var3][var4] == null) { // L: 7581
- Client.groundItems[class128.Client_plane][var3][var4] = new NodeDeque();
- }
-
- Client.groundItems[class128.Client_plane][var3][var4].addFirst(var35); // L: 7582
- Frames.updateItemPile(var3, var4); // L: 7583
- }
-
- } else if (class263.field3068 == var0) { // L: 7587
- var2 = var1.readUnsignedShort(); // L: 7588
- var3 = var1.method7593(); // L: 7589
- var4 = var3 >> 2; // L: 7590
- var5 = var3 & 3; // L: 7591
- var6 = Client.field553[var4]; // L: 7592
- var7 = var1.readUnsignedByte(); // L: 7593
- var8 = (var7 >> 4 & 7) + class145.field1690; // L: 7594
- var9 = (var7 & 7) + class321.field4076; // L: 7595
- if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 7596
- class221.updatePendingSpawn(class128.Client_plane, var8, var9, var6, var2, var4, var5, 0, -1); // L: 7597
- }
-
- } else if (class263.field3058 == var0) { // L: 7601
- var2 = var1.method7545(); // L: 7602
- var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7603
- var4 = (var2 & 7) + class321.field4076; // L: 7604
- var5 = var1.readUnsignedShort(); // L: 7605
- var6 = var1.method7576(); // L: 7606
- var7 = var1.method7576(); // L: 7607
- if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7608
- NodeDeque var43 = Client.groundItems[class128.Client_plane][var3][var4]; // L: 7609
- if (var43 != null) { // L: 7610
- for (TileItem var36 = (TileItem)var43.last(); var36 != null; var36 = (TileItem)var43.previous()) { // L: 7611 7612 7617
- if ((var7 & 32767) == var36.id && var6 == var36.quantity) { // L: 7613
- var36.quantity = var5; // L: 7614
- break;
- }
- }
-
- Frames.updateItemPile(var3, var4); // L: 7619
- }
- }
-
- } else if (class263.field3063 == var0) { // L: 7624
- var2 = var1.method7716(); // L: 7625
- var3 = var1.method7545(); // L: 7626
- var4 = (var3 >> 4 & 7) + class145.field1690; // L: 7627
- var5 = (var3 & 7) + class321.field4076; // L: 7628
- if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7629
- NodeDeque var34 = Client.groundItems[class128.Client_plane][var4][var5]; // L: 7630
- if (var34 != null) { // L: 7631
- for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { // L: 7632 7633 7638
- if ((var2 & 32767) == var35.id) { // L: 7634
- var35.remove(); // L: 7635
- break;
- }
- }
-
- if (var34.last() == null) { // L: 7640
- Client.groundItems[class128.Client_plane][var4][var5] = null;
- }
-
- Frames.updateItemPile(var4, var5); // L: 7641
- }
- }
-
- } else if (class263.field3059 == var0) { // L: 7646
- var2 = var1.method7545(); // L: 7647
- var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7648
- var4 = (var2 & 7) + class321.field4076; // L: 7649
- var5 = var1.method7593(); // L: 7650
- var6 = var5 >> 2; // L: 7651
- var7 = var5 & 3; // L: 7652
- var8 = Client.field553[var6]; // L: 7653
- if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7654
- class221.updatePendingSpawn(class128.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7655
- }
-
- } else if (class263.field3071 == var0) { // L: 7659
- var2 = var1.method7546(); // L: 7660
- var3 = (var2 >> 4 & 7) + class145.field1690; // L: 7661
- var4 = (var2 & 7) + class321.field4076; // L: 7662
- var5 = var1.method7545(); // L: 7663
- var6 = var1.method7716(); // L: 7664
- var7 = var1.method7716(); // L: 7665
- if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7666
- var3 = var3 * 128 + 64; // L: 7667
- var4 = var4 * 128 + 64; // L: 7668
- GraphicsObject var33 = new GraphicsObject(var7, class128.Client_plane, var3, var4, class202.getTileHeight(var3, var4, class128.Client_plane) - var5, var6, Client.cycle); // L: 7669
- Client.graphicsObjects.addFirst(var33); // L: 7670
- }
-
- } else {
- int var11;
- int var12;
- int var13;
- int var14;
- byte var37;
- if (class263.field3060 == var0) { // L: 7674
- var2 = var1.method7556(); // L: 7675
- var3 = var1.method7716(); // L: 7676
- var37 = var1.method7549(); // L: 7677
- var5 = var1.method7545(); // L: 7678
- var6 = (var5 >> 4 & 7) + class145.field1690; // L: 7679
- var7 = (var5 & 7) + class321.field4076; // L: 7680
- var8 = var1.method7576(); // L: 7681
- var9 = var1.readUnsignedShort(); // L: 7682
- var10 = var1.readUnsignedByte() * 4; // L: 7683
- var11 = var1.method7546(); // L: 7684
- var12 = var1.method7545() * 4; // L: 7685
- var13 = var1.method7546(); // L: 7686
- byte var39 = var1.method7549(); // L: 7687
- var14 = var39 + var6; // L: 7688
- var4 = var37 + var7; // L: 7689
- if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var14 >= 0 && var4 >= 0 && var14 < 104 && var4 < 104 && var3 != 65535) { // L: 7690
- var6 = var6 * 128 + 64; // L: 7691
- var7 = var7 * 128 + 64; // L: 7692
- var14 = var14 * 128 + 64; // L: 7693
- var4 = var4 * 128 + 64; // L: 7694
- Projectile var32 = new Projectile(var3, class128.Client_plane, var6, var7, class202.getTileHeight(var6, var7, class128.Client_plane) - var12, var8 + Client.cycle, var9 + Client.cycle, var13, var11, var2, var10); // L: 7695
- var32.setDestination(var14, var4, class202.getTileHeight(var14, var4, class128.Client_plane) - var10, var8 + Client.cycle); // L: 7696
- Client.projectiles.addFirst(var32); // L: 7697
- }
-
- } else {
- if (class263.field3062 == var0) { // L: 7701
- var2 = var1.method7554(); // L: 7702
- var3 = var1.method7716(); // L: 7703
- var37 = var1.method7547(); // L: 7704
- var5 = var1.method7546(); // L: 7705
- var6 = (var5 >> 4 & 7) + class145.field1690; // L: 7706
- var7 = (var5 & 7) + class321.field4076; // L: 7707
- var8 = var1.method7554(); // L: 7708
- var9 = var1.readUnsignedShort(); // L: 7709
- byte var38 = var1.method7547(); // L: 7710
- var11 = var1.readUnsignedByte(); // L: 7711
- var12 = var11 >> 2; // L: 7712
- var13 = var11 & 3; // L: 7713
- var14 = Client.field553[var12]; // L: 7714
- byte var15 = var1.method7547(); // L: 7715
- byte var16 = var1.method7547(); // L: 7716
- Player var17;
- if (var2 == Client.localPlayerIndex) { // L: 7718
- var17 = ModelData0.localPlayer;
- } else {
- var17 = Client.players[var2]; // L: 7719
- }
-
- if (var17 != null) { // L: 7720
- ObjectComposition var18 = class82.getObjectDefinition(var3); // L: 7721
- int var19;
- int var20;
- if (var13 != 1 && var13 != 3) { // L: 7724
- var19 = var18.sizeX; // L: 7729
- var20 = var18.sizeY; // L: 7730
- } else {
- var19 = var18.sizeY; // L: 7725
- var20 = var18.sizeX; // L: 7726
- }
-
- int var21 = var6 + (var19 >> 1); // L: 7732
- int var22 = var6 + (var19 + 1 >> 1); // L: 7733
- int var23 = var7 + (var20 >> 1); // L: 7734
- int var24 = var7 + (var20 + 1 >> 1); // L: 7735
- int[][] var25 = Tiles.Tiles_heights[class128.Client_plane]; // L: 7736
- int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2; // L: 7737
- int var27 = (var6 << 7) + (var19 << 6); // L: 7738
- int var28 = (var7 << 7) + (var20 << 6); // L: 7739
- Model var29 = var18.getModel(var12, var13, var25, var27, var26, var28); // L: 7740
- if (var29 != null) { // L: 7741
- class221.updatePendingSpawn(class128.Client_plane, var6, var7, var14, -1, 0, 0, var9 + 1, var8 + 1); // L: 7742
- var17.animationCycleStart = var9 + Client.cycle; // L: 7743
- var17.animationCycleEnd = var8 + Client.cycle; // L: 7744
- var17.model0 = var29; // L: 7745
- var17.field1104 = var19 * 64 + var6 * 128; // L: 7746
- var17.field1106 = var20 * 64 + var7 * 128; // L: 7747
- var17.tileHeight2 = var26; // L: 7748
- byte var30;
- if (var38 > var16) { // L: 7749
- var30 = var38; // L: 7750
- var38 = var16; // L: 7751
- var16 = var30; // L: 7752
- }
-
- if (var37 > var15) { // L: 7754
- var30 = var37; // L: 7755
- var37 = var15; // L: 7756
- var15 = var30; // L: 7757
- }
-
- var17.minX = var6 + var38; // L: 7759
- var17.maxX = var16 + var6; // L: 7760
- var17.minY = var37 + var7; // L: 7761
- var17.maxY = var7 + var15; // L: 7762
- }
- }
- }
-
- if (class263.field3067 == var0) { // L: 7766
- var2 = var1.method7593(); // L: 7767
- var3 = var2 >> 2; // L: 7768
- var4 = var2 & 3; // L: 7769
- var5 = Client.field553[var3]; // L: 7770
- var6 = var1.method7546(); // L: 7771
- var7 = (var6 >> 4 & 7) + class145.field1690; // L: 7772
- var8 = (var6 & 7) + class321.field4076; // L: 7773
- var9 = var1.method7554(); // L: 7774
- if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { // L: 7775
- if (var5 == 0) { // L: 7776
- BoundaryObject var31 = class175.scene.method4147(class128.Client_plane, var7, var8); // L: 7777
- if (var31 != null) { // L: 7778
- var11 = NetSocket.Entity_unpackID(var31.tag); // L: 7779
- if (var3 == 2) { // L: 7780
- var31.renderable1 = new DynamicObject(var11, 2, var4 + 4, class128.Client_plane, var7, var8, var9, false, var31.renderable1); // L: 7781
- var31.renderable2 = new DynamicObject(var11, 2, var4 + 1 & 3, class128.Client_plane, var7, var8, var9, false, var31.renderable2); // L: 7782
- } else {
- var31.renderable1 = new DynamicObject(var11, var3, var4, class128.Client_plane, var7, var8, var9, false, var31.renderable1); // L: 7784
- }
- }
- }
-
- if (var5 == 1) { // L: 7787
- WallDecoration var40 = class175.scene.method4049(class128.Client_plane, var7, var8); // L: 7788
- if (var40 != null) { // L: 7789
- var11 = NetSocket.Entity_unpackID(var40.tag); // L: 7790
- if (var3 != 4 && var3 != 5) { // L: 7791
- if (var3 == 6) { // L: 7792
- var40.renderable1 = new DynamicObject(var11, 4, var4 + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable1);
- } else if (var3 == 7) { // L: 7793
- var40.renderable1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable1);
- } else if (var3 == 8) { // L: 7794
- var40.renderable1 = new DynamicObject(var11, 4, var4 + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable1); // L: 7795
- var40.renderable2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, class128.Client_plane, var7, var8, var9, false, var40.renderable2); // L: 7796
- }
- } else {
- var40.renderable1 = new DynamicObject(var11, 4, var4, class128.Client_plane, var7, var8, var9, false, var40.renderable1);
- }
- }
- }
-
- if (var5 == 2) { // L: 7800
- GameObject var41 = class175.scene.getGameObject(class128.Client_plane, var7, var8); // L: 7801
- if (var3 == 11) { // L: 7802
- var3 = 10;
- }
-
- if (var41 != null) { // L: 7803
- var41.renderable = new DynamicObject(NetSocket.Entity_unpackID(var41.tag), var3, var4, class128.Client_plane, var7, var8, var9, false, var41.renderable);
- }
- }
-
- if (var5 == 3) { // L: 7805
- FloorDecoration var42 = class175.scene.getFloorDecoration(class128.Client_plane, var7, var8); // L: 7806
- if (var42 != null) { // L: 7807
- var42.renderable = new DynamicObject(NetSocket.Entity_unpackID(var42.tag), 22, var4, class128.Client_plane, var7, var8, var9, false, var42.renderable);
- }
- }
- }
-
- }
- }
+ if (Client.meslayerContinueWidget != null) { // L: 11986
+ ChatChannel.invalidateWidget(Client.meslayerContinueWidget); // L: 11987
+ Client.meslayerContinueWidget = null; // L: 11988
}
- } // L: 7585 7599 7622 7644 7657 7672 7699 7810 7812
+
+ Interpreter.field842 = false; // L: 11990
+ } // L: 11991
}
diff --git a/runescape-client/src/main/java/OtlTokenResponse.java b/runescape-client/src/main/java/OtlTokenResponse.java
deleted file mode 100644
index 98c3bc8f47..0000000000
--- a/runescape-client/src/main/java/OtlTokenResponse.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedName;
-
-@Implements("OtlTokenResponse")
-@ObfuscatedName("com/jagex/oldscape/pub/RefreshAccessTokenResponse")
-public interface OtlTokenResponse {
- boolean isSuccess();
-
- String getAccessToken();
-
- String getRefreshToken();
-}
diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java
index e5608d4cf5..138c0a3de1 100644
--- a/runescape-client/src/main/java/PacketBuffer.java
+++ b/runescape-client/src/main/java/PacketBuffer.java
@@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pc")
+@ObfuscatedName("pq")
@Implements("PacketBuffer")
public class PacketBuffer extends Buffer {
- @ObfuscatedName("q")
- static final int[] field4675;
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
+ static final int[] field4692;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lqh;"
+ descriptor = "Lqv;"
)
@Export("isaacCipher")
IsaacCipher isaacCipher;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1367739327
+ intValue = -799844397
)
@Export("bitIndex")
int bitIndex;
static {
- field4675 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7
+ field4692 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7
}
public PacketBuffer(int var1) {
super(var1); // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([IB)V",
- garbageValue = "36"
+ descriptor = "([II)V",
+ garbageValue = "1774744385"
)
@Export("newIsaacCipher")
public void newIsaacCipher(int[] var1) {
this.isaacCipher = new IsaacCipher(var1); // L: 15
} // L: 16
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lqh;I)V",
- garbageValue = "-1716220711"
+ descriptor = "(Lqv;B)V",
+ garbageValue = "-54"
)
@Export("setIsaacCipher")
public void setIsaacCipher(IsaacCipher var1) {
this.isaacCipher = var1; // L: 19
} // L: 20
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IB)V",
- garbageValue = "9"
+ garbageValue = "12"
)
@Export("writeByteIsaac")
public void writeByteIsaac(int var1) {
super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23
} // L: 24
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "88"
+ descriptor = "(I)I",
+ garbageValue = "-817493897"
)
@Export("readByteIsaac")
public int readByteIsaac() {
return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1904848037"
+ garbageValue = "1961058583"
)
- public boolean method7495() {
- int var1 = super.array[super.offset] - this.isaacCipher.method8108() & 255; // L: 31
+ public boolean method7674() {
+ int var1 = super.array[super.offset] - this.isaacCipher.method8300() & 255; // L: 31
return var1 >= 128; // L: 32
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1838826462"
+ garbageValue = "1989168325"
)
@Export("readSmartByteShortIsaac")
public int readSmartByteShortIsaac() {
@@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer {
return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "([BIIB)V",
- garbageValue = "102"
+ descriptor = "([BIII)V",
+ garbageValue = "-1345438581"
)
- public void method7460(byte[] var1, int var2, int var3) {
+ public void method7711(byte[] var1, int var2, int var3) {
for (int var4 = 0; var4 < var3; ++var4) { // L: 43
var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt());
}
} // L: 44
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "257249853"
+ descriptor = "(B)V",
+ garbageValue = "11"
)
@Export("importIndex")
public void importIndex() {
this.bitIndex = super.offset * 8; // L: 47
} // L: 48
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
descriptor = "(II)I",
- garbageValue = "1769393200"
+ garbageValue = "-1646577810"
)
@Export("readBits")
public int readBits(int var1) {
@@ -125,36 +125,54 @@ public class PacketBuffer extends Buffer {
int var4 = 0; // L: 53
for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58
- var4 += (super.array[var2++] & field4675[var3]) << var1 - var3; // L: 56
+ var4 += (super.array[var2++] & field4692[var3]) << var1 - var3; // L: 56
var1 -= var3; // L: 57
}
if (var3 == var1) { // L: 60
- var4 += super.array[var2] & field4675[var3];
+ var4 += super.array[var2] & field4692[var3];
} else {
- var4 += super.array[var2] >> var3 - var1 & field4675[var1]; // L: 61
+ var4 += super.array[var2] >> var3 - var1 & field4692[var1]; // L: 61
}
return var4; // L: 62
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "103"
+ descriptor = "(I)V",
+ garbageValue = "-1306236975"
)
@Export("exportIndex")
public void exportIndex() {
super.offset = (this.bitIndex + 7) / 8; // L: 66
} // L: 67
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-2036713962"
+ descriptor = "(IB)I",
+ garbageValue = "24"
)
@Export("bitsRemaining")
public int bitsRemaining(int var1) {
return var1 * 8 - this.bitIndex; // L: 70
}
+
+ @ObfuscatedName("gc")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "160587880"
+ )
+ static final void method7714() {
+ int var0 = Players.Players_count; // L: 3998
+ int[] var1 = Players.Players_indices; // L: 3999
+
+ for (int var2 = 0; var2 < var0; ++var2) { // L: 4000
+ Player var3 = Client.players[var1[var2]]; // L: 4001
+ if (var3 != null) { // L: 4002
+ class285.updateActorSequence(var3, 1); // L: 4003
+ }
+ }
+
+ } // L: 4006
}
diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java
index 7ea609e9b8..e014ef0bbe 100644
--- a/runescape-client/src/main/java/PacketBufferNode.java
+++ b/runescape-client/src/main/java/PacketBufferNode.java
@@ -4,47 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jm")
+@ObfuscatedName("jt")
@Implements("PacketBufferNode")
public class PacketBufferNode extends Node {
- @ObfuscatedName("tc")
- @ObfuscatedGetter(
- intValue = -1437445359
- )
- static int field3083;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "[Ljm;"
+ descriptor = "[Ljt;"
)
@Export("PacketBufferNode_packetBufferNodes")
- static PacketBufferNode[] PacketBufferNode_packetBufferNodes;
- @ObfuscatedName("m")
+ public static PacketBufferNode[] PacketBufferNode_packetBufferNodes;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1074664569
+ intValue = 24720885
)
@Export("PacketBufferNode_packetBufferNodeCount")
- static int PacketBufferNode_packetBufferNodeCount;
- @ObfuscatedName("o")
+ public static int PacketBufferNode_packetBufferNodeCount;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = -1221486625
+ )
+ @Export("ItemDefinition_fileCount")
+ public static int ItemDefinition_fileCount;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ljj;"
+ descriptor = "Lju;"
)
@Export("clientPacket")
- ClientPacket clientPacket;
- @ObfuscatedName("q")
+ public ClientPacket clientPacket;
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 974252711
+ intValue = -668428043
)
@Export("clientPacketLength")
- int clientPacketLength;
- @ObfuscatedName("l")
+ public int clientPacketLength;
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpc;"
+ descriptor = "Lpq;"
)
@Export("packetBuffer")
public PacketBuffer packetBuffer;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1838555649
+ intValue = -515140623
)
@Export("index")
public int index;
@@ -54,49 +55,155 @@ public class PacketBufferNode extends Node {
PacketBufferNode_packetBufferNodeCount = 0; // L: 14
}
- PacketBufferNode() {
- } // L: 19
-
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "11589"
+ descriptor = "(B)V",
+ garbageValue = "-10"
)
@Export("release")
public void release() {
- if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 50
- PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 51
+ if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 61
+ PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 62
}
- } // L: 52
+ } // L: 63
- @ObfuscatedName("k")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([BIIII[Lgh;I)V",
- garbageValue = "-148866965"
+ descriptor = "(I)V",
+ garbageValue = "-1959147234"
)
- static final void method5009(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
- int var7;
- int var8;
- for (int var6 = 0; var6 < 4; ++var6) { // L: 93
- for (var7 = 0; var7 < 64; ++var7) { // L: 94
- for (var8 = 0; var8 < 64; ++var8) { // L: 95
- if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96
- int[] var10000 = var5[var6].flags[var7 + var1];
- var10000[var8 + var2] &= -16777217;
- }
- }
- }
+ public static void method5202() {
+ class33.reflectionChecks = new IterableNodeDeque(); // L: 24
+ } // L: 25
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "-1179746293"
+ )
+ public static void method5200(int var0, int var1) {
+ VarbitComposition var2 = WorldMapCacheName.method5054(var0); // L: 33
+ int var3 = var2.baseVar; // L: 34
+ int var4 = var2.startBit; // L: 35
+ int var5 = var2.endBit; // L: 36
+ int var6 = Varps.Varps_masks[var5 - var4]; // L: 37
+ if (var1 < 0 || var1 > var6) { // L: 38
+ var1 = 0;
}
- Buffer var10 = new Buffer(var0); // L: 100
+ var6 <<= var4; // L: 39
+ Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40
+ } // L: 41
- for (var7 = 0; var7 < 4; ++var7) { // L: 101
- for (var8 = 0; var8 < 64; ++var8) { // L: 102
- for (int var9 = 0; var9 < 64; ++var9) { // L: 103
- class67.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104
- }
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(CI)C",
+ garbageValue = "-936573581"
+ )
+ static char method5203(char var0) {
+ switch(var0) { // L: 93
+ case ' ':
+ case '-':
+ case '_':
+ case ' ':
+ return '_'; // L: 145
+ case '#':
+ case '[':
+ case ']':
+ return var0; // L: 157
+ case 'À':
+ case 'Á':
+ case 'Â':
+ case 'Ã':
+ case 'Ä':
+ case 'à':
+ case 'á':
+ case 'â':
+ case 'ã':
+ case 'ä':
+ return 'a'; // L: 104
+ case 'Ç':
+ case 'ç':
+ return 'c'; // L: 153
+ case 'È':
+ case 'É':
+ case 'Ê':
+ case 'Ë':
+ case 'è':
+ case 'é':
+ case 'ê':
+ case 'ë':
+ return 'e'; // L: 129
+ case 'Í':
+ case 'Î':
+ case 'Ï':
+ case 'í':
+ case 'î':
+ case 'ï':
+ return 'i'; // L: 120
+ case 'Ñ':
+ case 'ñ':
+ return 'n'; // L: 160
+ case 'Ò':
+ case 'Ó':
+ case 'Ô':
+ case 'Õ':
+ case 'Ö':
+ case 'ò':
+ case 'ó':
+ case 'ô':
+ case 'õ':
+ case 'ö':
+ return 'o'; // L: 140
+ case 'Ù':
+ case 'Ú':
+ case 'Û':
+ case 'Ü':
+ case 'ù':
+ case 'ú':
+ case 'û':
+ case 'ü':
+ return 'u'; // L: 113
+ case 'ß':
+ return 'b'; // L: 147
+ case 'ÿ':
+ case 'Ÿ':
+ return 'y'; // L: 150
+ default:
+ return Character.toLowerCase(var0); // L: 162
+ }
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-21851942"
+ )
+ public static void method5194() {
+ NPCComposition.NpcDefinition_cached.clear(); // L: 291
+ NPCComposition.NpcDefinition_cachedModels.clear(); // L: 292
+ } // L: 293
+
+ @ObfuscatedName("kh")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-1529183895"
+ )
+ static final void method5196(int var0) {
+ var0 = Math.min(Math.max(var0, 0), 255); // L: 11840
+ if (var0 != class19.clientPreferences.method2258()) { // L: 11841
+ if (class19.clientPreferences.method2258() == 0 && Client.currentTrackGroupId != -1) { // L: 11842
+ AttackOption.method2410(class121.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11843
+ Client.playingJingle = false; // L: 11844
+ } else if (var0 == 0) { // L: 11846
+ ReflectionCheck.method579(); // L: 11847
+ Client.playingJingle = false; // L: 11848
+ } else {
+ Decimator.method1005(var0); // L: 11850
}
+
+ class19.clientPreferences.method2297(var0); // L: 11851
}
- } // L: 108
+ } // L: 11853
}
diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java
index 4060a37980..dd93870a14 100644
--- a/runescape-client/src/main/java/PacketWriter.java
+++ b/runescape-client/src/main/java/PacketWriter.java
@@ -5,85 +5,91 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cz")
+@ObfuscatedName("cs")
@Implements("PacketWriter")
public class PacketWriter {
- @ObfuscatedName("o")
+ @ObfuscatedName("ll")
+ @ObfuscatedGetter(
+ intValue = 85190489
+ )
+ @Export("Client_plane")
+ static int Client_plane;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lnf;"
+ descriptor = "Lnl;"
)
@Export("socket")
AbstractSocket socket;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "Llk;"
)
@Export("packetBufferNodes")
IterableNodeDeque packetBufferNodes;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -644004197
+ intValue = 1705844849
)
@Export("bufferSize")
int bufferSize;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "Lqt;"
)
@Export("buffer")
Buffer buffer;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lqh;"
+ descriptor = "Lqv;"
)
@Export("isaacCipher")
public IsaacCipher isaacCipher;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lpc;"
+ descriptor = "Lpq;"
)
@Export("packetBuffer")
PacketBuffer packetBuffer;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
@Export("serverPacket")
ServerPacket serverPacket;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1393417271
+ intValue = -438499277
)
@Export("serverPacketLength")
int serverPacketLength;
- @ObfuscatedName("r")
- boolean field1348;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = 2050999841
- )
- int field1349;
@ObfuscatedName("y")
+ boolean field1341;
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1635279751
+ intValue = 482936903
+ )
+ int field1342;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = 1898199617
)
@Export("pendingWrites")
int pendingWrites;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- ServerPacket field1351;
- @ObfuscatedName("w")
+ ServerPacket field1350;
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- ServerPacket field1340;
- @ObfuscatedName("b")
+ ServerPacket field1347;
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- ServerPacket field1345;
+ ServerPacket field1352;
PacketWriter() {
this.packetBufferNodes = new IterableNodeDeque(); // L: 15
@@ -92,15 +98,15 @@ public class PacketWriter {
this.packetBuffer = new PacketBuffer(40000); // L: 19
this.serverPacket = null; // L: 20
this.serverPacketLength = 0; // L: 21
- this.field1348 = true; // L: 22
- this.field1349 = 0; // L: 23
+ this.field1341 = true; // L: 22
+ this.field1342 = 0; // L: 23
this.pendingWrites = 0; // L: 24
} // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-564347144"
+ garbageValue = "1277685397"
)
@Export("clearBuffer")
final void clearBuffer() {
@@ -108,10 +114,10 @@ public class PacketWriter {
this.bufferSize = 0; // L: 33
} // L: 34
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1796136378"
+ garbageValue = "885234902"
)
@Export("flush")
final void flush() throws IOException {
@@ -136,10 +142,10 @@ public class PacketWriter {
} // L: 52
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Ljm;B)V",
- garbageValue = "0"
+ descriptor = "(Ljt;B)V",
+ garbageValue = "-46"
)
@Export("addNode")
public final void addNode(PacketBufferNode var1) {
@@ -149,20 +155,20 @@ public class PacketWriter {
this.bufferSize += var1.index; // L: 58
} // L: 59
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lnf;I)V",
- garbageValue = "1112545790"
+ descriptor = "(Lnl;I)V",
+ garbageValue = "-1968764439"
)
@Export("setSocket")
void setSocket(AbstractSocket var1) {
this.socket = var1; // L: 62
} // L: 63
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-658822811"
+ garbageValue = "-2070187507"
)
@Export("close")
void close() {
@@ -173,145 +179,34 @@ public class PacketWriter {
} // L: 70
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "92"
+ garbageValue = "-59"
)
@Export("removeSocket")
void removeSocket() {
- this.socket = null; // L: 73
- } // L: 74
+ this.socket = null;
+ }
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(S)Lnf;",
- garbageValue = "255"
+ descriptor = "(S)Lnl;",
+ garbageValue = "-13159"
)
@Export("getSocket")
AbstractSocket getSocket() {
return this.socket; // L: 77
}
- @ObfuscatedName("y")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIIIIZB)Lqr;",
- garbageValue = "5"
+ descriptor = "(Llh;Llh;ZI)V",
+ garbageValue = "-1796247845"
)
- @Export("getItemSprite")
- public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
- if (var1 == -1) { // L: 357
- var4 = 0;
- } else if (var4 == 2 && var1 != 1) { // L: 358
- var4 = 1;
- }
-
- long var6 = ((long)var3 << 42) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40); // L: 359
- SpritePixels var8;
- if (!var5) { // L: 361
- var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362
- if (var8 != null) { // L: 363
- return var8;
- }
- }
-
- ItemComposition var9 = FileSystem.ItemDefinition_get(var0); // L: 365
- if (var1 > 1 && var9.countobj != null) { // L: 366
- int var10 = -1; // L: 367
-
- for (int var11 = 0; var11 < 10; ++var11) { // L: 368
- if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369
- var10 = var9.countobj[var11];
- }
- }
-
- if (var10 != -1) { // L: 371
- var9 = FileSystem.ItemDefinition_get(var10);
- }
- }
-
- Model var19 = var9.getModel(1); // L: 373
- if (var19 == null) { // L: 374
- return null;
- } else {
- SpritePixels var20 = null; // L: 375
- if (var9.noteTemplate != -1) { // L: 376
- var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377
- if (var20 == null) { // L: 378
- return null;
- }
- } else if (var9.notedId != -1) { // L: 380
- var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381
- if (var20 == null) { // L: 382
- return null;
- }
- } else if (var9.placeholderTemplate != -1) { // L: 384
- var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385
- if (var20 == null) { // L: 386
- return null;
- }
- }
-
- int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 388
- int var13 = Rasterizer2D.Rasterizer2D_width; // L: 389
- int var14 = Rasterizer2D.Rasterizer2D_height; // L: 390
- int[] var15 = new int[4]; // L: 391
- Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 392
- var8 = new SpritePixels(36, 32); // L: 393
- Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 394
- Rasterizer2D.Rasterizer2D_clear(); // L: 395
- Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 396
- Rasterizer3D.method3939(16, 16); // L: 397
- Rasterizer3D.field2379 = false; // L: 398
- if (var9.placeholderTemplate != -1) { // L: 399
- var20.drawTransBgAt(0, 0);
- }
-
- int var16 = var9.zoom2d; // L: 400
- if (var5) { // L: 401
- var16 = (int)((double)var16 * 1.5D);
- } else if (var2 == 2) { // L: 402
- var16 = (int)(1.04D * (double)var16);
- }
-
- int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403
- int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404
- var19.calculateBoundsCylinder(); // L: 405
- var19.method4272(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406
- if (var9.notedId != -1) { // L: 407
- var20.drawTransBgAt(0, 0);
- }
-
- if (var2 >= 1) { // L: 408
- var8.outline(1);
- }
-
- if (var2 >= 2) { // L: 409
- var8.outline(16777215);
- }
-
- if (var3 != 0) { // L: 410
- var8.shadow(var3);
- }
-
- Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411
- if (var9.noteTemplate != -1) { // L: 412
- var20.drawTransBgAt(0, 0);
- }
-
- if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413
- class146.ItemDefinition_fontPlain11.draw(class301.method5583(var1), 0, 9, 16776960, 1); // L: 414
- }
-
- if (!var5) { // L: 416
- ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
- }
-
- Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 417
- Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 418
- Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 419
- Rasterizer3D.field2379 = true; // L: 420
- return var8; // L: 421
- }
- }
+ public static void method2517(AbstractArchive var0, AbstractArchive var1, boolean var2) {
+ class328.ObjectDefinition_archive = var0; // L: 73
+ ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74
+ ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75
+ } // L: 76
}
diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java
index 267992783f..1db62a404e 100644
--- a/runescape-client/src/main/java/ParamComposition.java
+++ b/runescape-client/src/main/java/ParamComposition.java
@@ -3,35 +3,36 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("gv")
+@ObfuscatedName("gf")
@Implements("ParamComposition")
public class ParamComposition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("ParamDefinition_archive")
- static AbstractArchive ParamDefinition_archive;
- @ObfuscatedName("q")
+ public static AbstractArchive ParamDefinition_archive;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("ParamDefinition_cached")
- public static EvictingDualNodeHashTable ParamDefinition_cached;
- @ObfuscatedName("l")
+ static EvictingDualNodeHashTable ParamDefinition_cached;
+ @ObfuscatedName("q")
@Export("type")
char type;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 498498589
+ intValue = -480942967
)
@Export("defaultInt")
public int defaultInt;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("defaultStr")
public String defaultStr;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("autoDisable")
boolean autoDisable;
@@ -43,102 +44,306 @@ public class ParamComposition extends DualNode {
this.autoDisable = true; // L: 16
} // L: 18
- @ObfuscatedName("l")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(B)V",
garbageValue = "20"
)
@Export("postDecode")
void postDecode() {
- } // L: 35
+ } // L: 31
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "892504749"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "0"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 39
- if (var2 == 0) { // L: 40
- return; // L: 43
+ int var2 = var1.readUnsignedByte(); // L: 35
+ if (var2 == 0) { // L: 36
+ return; // L: 39
}
- this.decodeNext(var1, var2); // L: 41
+ this.decodeNext(var1, var2); // L: 37
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;IS)V",
- garbageValue = "-13"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-1779670866"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 1) { // L: 46
- byte var4 = var1.readByte(); // L: 48
- int var5 = var4 & 255; // L: 50
- if (var5 == 0) { // L: 51
- throw new IllegalArgumentException("" + Integer.toString(var5, 16));
- }
-
- if (var5 >= 128 && var5 < 160) { // L: 52
- char var6 = class341.cp1252AsciiExtension[var5 - 128]; // L: 53
- if (var6 == 0) { // L: 54
- var6 = '?';
- }
-
- var5 = var6; // L: 55
- }
-
- char var3 = (char)var5; // L: 57
- this.type = var3; // L: 59
- } else if (var2 == 2) { // L: 61
+ if (var2 == 1) { // L: 42
+ this.type = class289.method5560(var1.readByte()); // L: 43
+ } else if (var2 == 2) { // L: 45
this.defaultInt = var1.readInt();
- } else if (var2 == 4) { // L: 62
- this.autoDisable = false;
- } else if (var2 == 5) { // L: 63
+ } else if (var2 == 4) {
+ this.autoDisable = false; // L: 46
+ } else if (var2 == 5) { // L: 47
this.defaultStr = var1.readStringCp1252NullTerminated();
}
- } // L: 65
+ } // L: 49
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1184003682"
+ descriptor = "(B)Z",
+ garbageValue = "35"
)
@Export("isString")
public boolean isString() {
- return this.type == 's'; // L: 68
+ return this.type == 's'; // L: 52
}
- @ObfuscatedName("e")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "-1438279365"
+ descriptor = "(II)Lgh;",
+ garbageValue = "273043499"
)
- static final int method3505(int var0, int var1) {
- if (var0 == -2) { // L: 977
- return 12345678;
- } else if (var0 == -1) { // L: 978
- if (var1 < 2) { // L: 979
- var1 = 2;
- } else if (var1 > 126) { // L: 980
- var1 = 126;
- }
-
- return var1; // L: 981
+ @Export("getFrames")
+ static Frames getFrames(int var0) {
+ Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 358
+ if (var1 != null) { // L: 359
+ return var1;
} else {
- var1 = (var0 & 127) * var1 / 128; // L: 983
- if (var1 < 2) { // L: 984
- var1 = 2;
- } else if (var1 > 126) { // L: 985
- var1 = 126;
+ var1 = Calendar.method5499(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 360
+ if (var1 != null) { // L: 361
+ SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0);
}
- return (var0 & 65408) + var1; // L: 986
+ return var1; // L: 362
}
}
+
+ @ObfuscatedName("aq")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "126"
+ )
+ static int method3574(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3927
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class136.loadWorlds() ? 1 : 0; // L: 3928
+ return 1; // L: 3929
+ } else {
+ World var9;
+ if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3931
+ var9 = class151.worldListStart(); // L: 3932
+ if (var9 != null) { // L: 3933
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.id; // L: 3934
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.properties; // L: 3935
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3936
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.location; // L: 3937
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.population; // L: 3938
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3939
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3942
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3943
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3944
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3945
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3946
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3947
+ }
+
+ return 1; // L: 3949
+ } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3951
+ var9 = Interpreter.getNextWorldListWorld(); // L: 3952
+ if (var9 != null) { // L: 3953
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.id; // L: 3954
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.properties; // L: 3955
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3956
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.location; // L: 3957
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.population; // L: 3958
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3959
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3962
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3963
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3964
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3965
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3966
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3967
+ }
+
+ return 1; // L: 3969
+ } else {
+ int var3;
+ World var7;
+ int var8;
+ if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3971
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3972
+ var7 = null; // L: 3973
+
+ for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3974
+ if (var3 == class362.World_worlds[var8].id) { // L: 3975
+ var7 = class362.World_worlds[var8]; // L: 3976
+ break;
+ }
+ }
+
+ if (var7 != null) { // L: 3980
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.id; // L: 3981
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.properties; // L: 3982
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3983
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.location; // L: 3984
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.population; // L: 3985
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3986
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3989
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3990
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3991
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3992
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3993
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3994
+ }
+
+ return 1; // L: 3996
+ } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3998
+ class446.Interpreter_intStackSize -= 4; // L: 3999
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4000
+ boolean var10 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1] == 1; // L: 4001
+ var8 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 4002
+ boolean var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3] == 1; // L: 4003
+ class138.sortWorldList(var3, var10, var8, var6); // L: 4004
+ return 1; // L: 4005
+ } else if (var0 != 6511) { // L: 4007
+ if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4028
+ Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 4029
+ return 1; // L: 4030
+ } else {
+ int var4;
+ ParamComposition var5;
+ if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4032
+ class446.Interpreter_intStackSize -= 2; // L: 4033
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4034
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 4035
+ var5 = class174.getParamDefinition(var4); // L: 4036
+ if (var5.isString()) { // L: 4037
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = BuddyRankComparator.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4038
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = BuddyRankComparator.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4041
+ }
+
+ return 1; // L: 4043
+ } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4045
+ class446.Interpreter_intStackSize -= 2; // L: 4046
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4047
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 4048
+ var5 = class174.getParamDefinition(var4); // L: 4049
+ if (var5.isString()) { // L: 4050
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class162.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4051
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class162.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4054
+ }
+
+ return 1; // L: 4056
+ } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4058
+ class446.Interpreter_intStackSize -= 2; // L: 4059
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4060
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 4061
+ var5 = class174.getParamDefinition(var4); // L: 4062
+ if (var5.isString()) { // L: 4063
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = EnumComposition.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4064
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = EnumComposition.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4067
+ }
+
+ return 1; // L: 4069
+ } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4071
+ class446.Interpreter_intStackSize -= 2; // L: 4072
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4073
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 4074
+ var5 = class174.getParamDefinition(var4); // L: 4075
+ if (var5.isString()) { // L: 4076
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapIcon_1.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4077
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapIcon_1.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4080
+ }
+
+ return 1; // L: 4082
+ } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4084
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4085
+ return 1; // L: 4086
+ } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4088
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.clientType; // L: 4089
+ return 1; // L: 4090
+ } else if (var0 == 6520) { // L: 4092
+ return 1; // L: 4093
+ } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4095
+ return 1; // L: 4096
+ } else if (var0 == 6522) { // L: 4098
+ --Interpreter.Interpreter_stringStackSize; // L: 4099
+ --class446.Interpreter_intStackSize; // L: 4100
+ return 1; // L: 4101
+ } else if (var0 == 6523) { // L: 4103
+ --Interpreter.Interpreter_stringStackSize; // L: 4104
+ --class446.Interpreter_intStackSize; // L: 4105
+ return 1; // L: 4106
+ } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4108
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4109
+ return 1; // L: 4110
+ } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4112
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 4113
+ return 1; // L: 4114
+ } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4116
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1; // L: 4117
+ return 1; // L: 4118
+ } else if (var0 == 6527) { // L: 4120
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.field484; // L: 4121
+ return 1; // L: 4122
+ } else {
+ return 2; // L: 4124
+ }
+ }
+ } else {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4008
+ if (var3 >= 0 && var3 < World.World_count) { // L: 4009
+ var7 = class362.World_worlds[var3]; // L: 4010
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.id; // L: 4011
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.properties; // L: 4012
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 4013
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.location; // L: 4014
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.population; // L: 4015
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 4016
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4019
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4020
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4021
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4022
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4023
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4024
+ }
+
+ return 1; // L: 4026
+ }
+ }
+ }
+ }
+
+ @ObfuscatedName("kl")
+ @ObfuscatedSignature(
+ descriptor = "(IIIILqe;Lkp;I)V",
+ garbageValue = "1077753678"
+ )
+ @Export("drawSpriteOnMinimap")
+ static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
+ if (var4 != null) { // L: 12181
+ int var6 = Client.camAngleY & 2047; // L: 12182
+ int var7 = var3 * var3 + var2 * var2; // L: 12183
+ if (var7 <= 6400) { // L: 12184
+ int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12185
+ int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12186
+ int var10 = var3 * var8 + var9 * var2 >> 16; // L: 12187
+ int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12188
+ if (var7 > 2500) {
+ var4.method8270(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 12189
+ } else {
+ var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12190
+ }
+
+ }
+ }
+ } // L: 12191
}
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index 5e3df2f2a6..eacbdd2f69 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -1,803 +1,578 @@
+import java.util.concurrent.ScheduledExecutorService;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("al")
+@ObfuscatedName("ar")
@Implements("PcmPlayer")
public class PcmPlayer {
- @ObfuscatedName("rg")
- @ObfuscatedSignature(
- descriptor = "Lnx;"
- )
- @Export("friendsChat")
- static FriendsChat friendsChat;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1724087219
+ intValue = 1517063499
)
- public static int field300;
+ public static int field287;
@ObfuscatedName("w")
+ @Export("soundSystemExecutor")
+ static ScheduledExecutorService soundSystemExecutor;
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Lai;"
+ descriptor = "Lag;"
)
- @Export("pcmPlayerProvider")
- public static class47 pcmPlayerProvider;
- @ObfuscatedName("lg")
+ @Export("soundSystem")
+ static SoundSystem soundSystem;
+ @ObfuscatedName("aa")
@ObfuscatedSignature(
- descriptor = "Lht;"
+ descriptor = "Lns;"
)
- @Export("textureProvider")
- static TextureProvider textureProvider;
- @ObfuscatedName("np")
- @ObfuscatedGetter(
- intValue = 2000163897
- )
- @Export("selectedItemSlot")
- static int selectedItemSlot;
- @ObfuscatedName("b")
+ static Bounds field294;
+ @ObfuscatedName("hw")
+ @Export("regionMapArchiveIds")
+ static int[] regionMapArchiveIds;
+ @ObfuscatedName("r")
@Export("samples")
protected int[] samples;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Lao;"
+ descriptor = "Laz;"
)
@Export("stream")
PcmStream stream;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = -340177369
+ intValue = -1871567331
)
- int field284;
- @ObfuscatedName("x")
+ int field274;
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- longValue = 5049222240699791159L
+ longValue = -199998738011106139L
)
@Export("timeMs")
long timeMs;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = 579110347
+ intValue = -387059293
)
@Export("capacity")
int capacity;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 1078400585
- )
- int field287;
- @ObfuscatedName("h")
- @ObfuscatedGetter(
- intValue = -1185294269
- )
- int field288;
- @ObfuscatedName("f")
- @ObfuscatedGetter(
- longValue = 6299016637519592913L
- )
- long field289;
- @ObfuscatedName("d")
- @ObfuscatedGetter(
- intValue = -1779244015
- )
- int field294;
- @ObfuscatedName("j")
- @ObfuscatedGetter(
- intValue = 757484531
+ intValue = 266426517
)
int field282;
- @ObfuscatedName("z")
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 15281057
+ intValue = 890315289
)
- int field292;
- @ObfuscatedName("i")
+ int field283;
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- longValue = -315826732775221247L
+ longValue = 7385207387876044501L
)
- long field293;
- @ObfuscatedName("u")
- boolean field281;
- @ObfuscatedName("aj")
+ long field284;
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = -1579013191
+ intValue = -284119641
)
- int field295;
+ int field285;
+ @ObfuscatedName("n")
+ @ObfuscatedGetter(
+ intValue = 1652209615
+ )
+ int field286;
+ @ObfuscatedName("o")
+ @ObfuscatedGetter(
+ intValue = 218560279
+ )
+ int field296;
+ @ObfuscatedName("m")
+ @ObfuscatedGetter(
+ longValue = 3493257443098912669L
+ )
+ long field288;
+ @ObfuscatedName("d")
+ boolean field293;
+ @ObfuscatedName("ap")
+ @ObfuscatedGetter(
+ intValue = -1315224697
+ )
+ int field291;
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "[Laz;"
+ )
+ PcmStream[] field289;
@ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "[Lao;"
+ descriptor = "[Laz;"
)
- PcmStream[] field296;
- @ObfuscatedName("az")
- @ObfuscatedSignature(
- descriptor = "[Lao;"
- )
- PcmStream[] field297;
+ PcmStream[] field292;
protected PcmPlayer() {
- this.field284 = 32; // L: 22
- this.timeMs = class113.method2624(); // L: 23
- this.field289 = 0L; // L: 27
- this.field294 = 0; // L: 28
- this.field282 = 0; // L: 29
- this.field292 = 0; // L: 30
- this.field293 = 0L; // L: 31
- this.field281 = true; // L: 32
- this.field295 = 0; // L: 38
- this.field296 = new PcmStream[8]; // L: 39
- this.field297 = new PcmStream[8]; // L: 40
- } // L: 42
+ this.field274 = 32;
+ this.timeMs = class115.method2692();
+ this.field284 = 0L;
+ this.field285 = 0;
+ this.field286 = 0;
+ this.field296 = 0;
+ this.field288 = 0L;
+ this.field293 = true;
+ this.field291 = 0;
+ this.field289 = new PcmStream[8];
+ this.field292 = new PcmStream[8];
+ }
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-125708948"
+ garbageValue = "-609921240"
)
@Export("init")
protected void init() throws Exception {
- } // L: 280
+ } // L: 284
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IS)V",
- garbageValue = "-30840"
+ descriptor = "(II)V",
+ garbageValue = "1372651644"
)
@Export("open")
protected void open(int var1) throws Exception {
- } // L: 281
+ } // L: 285
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "181"
+ descriptor = "(I)I",
+ garbageValue = "2144118703"
)
@Export("position")
protected int position() throws Exception {
- return this.capacity; // L: 284
+ return this.capacity; // L: 288
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("write")
protected void write() throws Exception {
- } // L: 287
+ } // L: 291
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "25"
+ garbageValue = "-49"
)
@Export("close")
protected void close() {
- } // L: 288
+ } // L: 292
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "207475579"
+ descriptor = "(B)V",
+ garbageValue = "35"
)
@Export("discard")
protected void discard() throws Exception {
- } // L: 289
+ } // L: 293
- @ObfuscatedName("z")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "(Lao;I)V",
- garbageValue = "1991751814"
+ descriptor = "(Laz;I)V",
+ garbageValue = "-2073910324"
)
@Export("setStream")
public final synchronized void setStream(PcmStream var1) {
- this.stream = var1; // L: 79
- } // L: 80
+ this.stream = var1; // L: 83
+ } // L: 84
- @ObfuscatedName("i")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "631128625"
+ garbageValue = "-987567305"
)
@Export("run")
public final synchronized void run() {
- if (this.samples != null) { // L: 83
- long var1 = class113.method2624(); // L: 84
+ if (this.samples != null) { // L: 87
+ long var1 = class115.method2692(); // L: 88
try {
- if (this.field289 != 0L) { // L: 86
- if (var1 < this.field289) { // L: 87
+ if (this.field284 != 0L) { // L: 90
+ if (var1 < this.field284) { // L: 91
return;
}
- this.open(this.capacity); // L: 88
- this.field289 = 0L; // L: 89
- this.field281 = true; // L: 90
+ this.open(this.capacity); // L: 92
+ this.field284 = 0L; // L: 93
+ this.field293 = true; // L: 94
}
- int var3 = this.position(); // L: 92
- if (this.field292 - var3 > this.field294) { // L: 93
- this.field294 = this.field292 - var3;
+ int var3 = this.position(); // L: 96
+ if (this.field296 - var3 > this.field285) { // L: 97
+ this.field285 = this.field296 - var3;
}
- int var4 = this.field287 + this.field288; // L: 94
- if (var4 + 256 > 16384) { // L: 95
+ int var4 = this.field283 + this.field282; // L: 98
+ if (var4 + 256 > 16384) { // L: 99
var4 = 16128;
}
- if (var4 + 256 > this.capacity) { // L: 96
- this.capacity += 1024; // L: 97
- if (this.capacity > 16384) { // L: 98
+ if (var4 + 256 > this.capacity) { // L: 100
+ this.capacity += 1024; // L: 101
+ if (this.capacity > 16384) { // L: 102
this.capacity = 16384;
}
- this.close(); // L: 99
- this.open(this.capacity); // L: 100
- var3 = 0; // L: 101
- this.field281 = true; // L: 102
- if (var4 + 256 > this.capacity) { // L: 103
- var4 = this.capacity - 256; // L: 104
- this.field288 = var4 - this.field287; // L: 105
+ this.close(); // L: 103
+ this.open(this.capacity); // L: 104
+ var3 = 0; // L: 105
+ this.field293 = true; // L: 106
+ if (var4 + 256 > this.capacity) { // L: 107
+ var4 = this.capacity - 256; // L: 108
+ this.field283 = var4 - this.field282; // L: 109
}
}
- while (var3 < var4) { // L: 108
- this.fill(this.samples, 256); // L: 109
- this.write(); // L: 110
- var3 += 256; // L: 111
+ while (var3 < var4) { // L: 112
+ this.fill(this.samples, 256); // L: 113
+ this.write(); // L: 114
+ var3 += 256; // L: 115
}
- if (var1 > this.field293) {
- if (!this.field281) {
- if (this.field294 == 0 && this.field282 == 0) {
- this.close();
- this.field289 = 2000L + var1;
- return;
+ if (var1 > this.field288) { // L: 117
+ if (!this.field293) { // L: 118
+ if (this.field285 == 0 && this.field286 == 0) { // L: 119
+ this.close(); // L: 120
+ this.field284 = var1 + 2000L; // L: 121
+ return; // L: 122
}
- this.field288 = Math.min(this.field282, this.field294);
- this.field282 = this.field294;
+ this.field283 = Math.min(this.field286, this.field285); // L: 124
+ this.field286 = this.field285; // L: 125
} else {
- this.field281 = false;
+ this.field293 = false; // L: 127
}
- this.field294 = 0;
- this.field293 = var1 + 2000L;
+ this.field285 = 0; // L: 128
+ this.field288 = var1 + 2000L; // L: 129
}
- this.field292 = var3;
- } catch (Exception var7) {
- this.close();
- this.field289 = 2000L + var1;
+ this.field296 = var3; // L: 131
+ } catch (Exception var7) { // L: 133
+ this.close(); // L: 134
+ this.field284 = var1 + 2000L; // L: 135
}
try {
- if (var1 > this.timeMs + 500000L) { // L: 134
+ if (var1 > 500000L + this.timeMs) { // L: 138
var1 = this.timeMs;
}
- while (var1 > 5000L + this.timeMs) { // L: 135
- this.skip(256);
- this.timeMs += (long)(256000 / field300);
+ while (var1 > this.timeMs + 5000L) { // L: 139
+ this.skip(256); // L: 140
+ this.timeMs += (long)(256000 / field287); // L: 141
}
- } catch (Exception var6) {
- this.timeMs = var1;
+ } catch (Exception var6) { // L: 144
+ this.timeMs = var1; // L: 145
}
}
- }
+ } // L: 147
- @ObfuscatedName("u")
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "2012802257"
+ garbageValue = "-2134156100"
)
- public final void method739() {
- this.field281 = true;
- }
+ public final void method715() {
+ this.field293 = true; // L: 150
+ } // L: 151
- @ObfuscatedName("ag")
+ @ObfuscatedName("al")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1905716699"
+ garbageValue = "-643520817"
)
@Export("tryDiscard")
public final synchronized void tryDiscard() {
- this.field281 = true;
+ this.field293 = true; // L: 154
try {
- this.discard(); // L: 152
- } catch (Exception var2) { // L: 154
- this.close(); // L: 155
- this.field289 = class113.method2624() + 2000L; // L: 156
+ this.discard(); // L: 156
+ } catch (Exception var2) { // L: 158
+ this.close(); // L: 159
+ this.field284 = class115.method2692() + 2000L; // L: 160
}
- } // L: 158
+ } // L: 162
- @ObfuscatedName("ar")
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "26"
+ garbageValue = "2"
)
@Export("shutdown")
public final synchronized void shutdown() {
- if (MusicPatchPcmStream.soundSystem != null) { // L: 161
- boolean var1 = true; // L: 162
+ if (soundSystem != null) { // L: 165
+ boolean var1 = true; // L: 166
- for (int var2 = 0; var2 < 2; ++var2) { // L: 163
- if (this == MusicPatchPcmStream.soundSystem.players[var2]) {
- MusicPatchPcmStream.soundSystem.players[var2] = null; // L: 164
+ for (int var2 = 0; var2 < 2; ++var2) { // L: 167
+ if (this == soundSystem.players[var2]) {
+ soundSystem.players[var2] = null; // L: 168
}
- if (MusicPatchPcmStream.soundSystem.players[var2] != null) { // L: 165
+ if (soundSystem.players[var2] != null) { // L: 169
var1 = false;
}
}
- if (var1) { // L: 167
- InterfaceParent.soundSystemExecutor.shutdownNow(); // L: 168
- InterfaceParent.soundSystemExecutor = null; // L: 169
- MusicPatchPcmStream.soundSystem = null; // L: 170
+ if (var1) { // L: 171
+ soundSystemExecutor.shutdownNow(); // L: 172
+ soundSystemExecutor = null; // L: 173
+ soundSystem = null; // L: 174
}
}
- this.close(); // L: 173
- this.samples = null; // L: 174
- } // L: 175
+ this.close(); // L: 177
+ this.samples = null; // L: 178
+ } // L: 179
- @ObfuscatedName("am")
+ @ObfuscatedName("ab")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "1357307630"
+ garbageValue = "1021979490"
)
@Export("skip")
final void skip(int var1) {
- this.field295 -= var1; // L: 178
- if (this.field295 < 0) {
- this.field295 = 0; // L: 179
+ this.field291 -= var1; // L: 182
+ if (this.field291 < 0) {
+ this.field291 = 0; // L: 183
}
if (this.stream != null) {
- this.stream.skip(var1); // L: 180
+ this.stream.skip(var1); // L: 184
}
- } // L: 181
+ } // L: 185
- @ObfuscatedName("ac")
+ @ObfuscatedName("ap")
@Export("fill")
final void fill(int[] var1, int var2) {
- int var3 = var2; // L: 185
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 186
+ int var3 = var2; // L: 189
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 190
var3 = var2 << 1;
}
- class351.clearIntArray(var1, 0, var3); // L: 187
- this.field295 -= var2; // L: 188
- if (this.stream != null && this.field295 <= 0) { // L: 189
- this.field295 += field300 >> 4; // L: 190
- World.PcmStream_disable(this.stream); // L: 191
- this.method700(this.stream, this.stream.vmethod951()); // L: 192
- int var4 = 0; // L: 193
- int var5 = 255; // L: 194
+ class350.clearIntArray(var1, 0, var3); // L: 191
+ this.field291 -= var2; // L: 192
+ if (this.stream != null && this.field291 <= 0) { // L: 193
+ this.field291 += field287 >> 4; // L: 194
+ Language.PcmStream_disable(this.stream); // L: 195
+ this.method673(this.stream, this.stream.vmethod948()); // L: 196
+ int var4 = 0; // L: 197
+ int var5 = 255; // L: 198
int var6;
PcmStream var10;
label108:
- for (var6 = 7; var5 != 0; --var6) { // L: 195
+ for (var6 = 7; var5 != 0; --var6) { // L: 199
int var7;
int var8;
- if (var6 < 0) { // L: 198
- var7 = var6 & 3; // L: 199
- var8 = -(var6 >> 2); // L: 200
+ if (var6 < 0) { // L: 202
+ var7 = var6 & 3; // L: 203
+ var8 = -(var6 >> 2); // L: 204
} else {
- var7 = var6; // L: 203
- var8 = 0; // L: 204
+ var7 = var6; // L: 207
+ var8 = 0; // L: 208
}
- for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 206 208
- if ((var9 & 1) != 0) { // L: 211
- var5 &= ~(1 << var7); // L: 214
- var10 = null; // L: 215
- PcmStream var11 = this.field296[var7]; // L: 216
+ for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 210 212
+ if ((var9 & 1) != 0) { // L: 215
+ var5 &= ~(1 << var7); // L: 218
+ var10 = null; // L: 219
+ PcmStream var11 = this.field289[var7]; // L: 220
label102:
while (true) {
while (true) {
- if (var11 == null) { // L: 217
+ if (var11 == null) { // L: 221
break label102;
}
- AbstractSound var12 = var11.sound; // L: 218
- if (var12 != null && var12.position > var8) { // L: 219
- var5 |= 1 << var7; // L: 220
- var10 = var11; // L: 221
- var11 = var11.after; // L: 222
+ AbstractSound var12 = var11.sound; // L: 222
+ if (var12 != null && var12.position > var8) { // L: 223
+ var5 |= 1 << var7; // L: 224
+ var10 = var11; // L: 225
+ var11 = var11.after; // L: 226
} else {
- var11.active = true; // L: 225
- int var13 = var11.vmethod5295(); // L: 226
- var4 += var13; // L: 227
+ var11.active = true; // L: 229
+ int var13 = var11.vmethod5437(); // L: 230
+ var4 += var13; // L: 231
if (var12 != null) {
- var12.position += var13; // L: 228
+ var12.position += var13; // L: 232
}
- if (var4 >= this.field284) { // L: 229
+ if (var4 >= this.field274) { // L: 233
break label108;
}
- PcmStream var14 = var11.firstSubStream(); // L: 230
- if (var14 != null) { // L: 231
- for (int var15 = var11.field348; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235
- this.method700(var14, var15 * var14.vmethod951() >> 8); // L: 234
+ PcmStream var14 = var11.firstSubStream(); // L: 234
+ if (var14 != null) { // L: 235
+ for (int var15 = var11.field346; var14 != null; var14 = var11.nextSubStream()) { // L: 236 237 239
+ this.method673(var14, var15 * var14.vmethod948() >> 8); // L: 238
}
}
- PcmStream var18 = var11.after; // L: 238
- var11.after = null; // L: 239
- if (var10 == null) { // L: 240
- this.field296[var7] = var18;
+ PcmStream var18 = var11.after; // L: 242
+ var11.after = null; // L: 243
+ if (var10 == null) { // L: 244
+ this.field289[var7] = var18;
} else {
- var10.after = var18; // L: 241
+ var10.after = var18; // L: 245
}
- if (var18 == null) { // L: 242
- this.field297[var7] = var10;
+ if (var18 == null) { // L: 246
+ this.field292[var7] = var10;
}
- var11 = var18; // L: 243
+ var11 = var18; // L: 247
}
}
}
}
- var7 += 4; // L: 207
+ var7 += 4; // L: 211
++var8;
}
}
- for (var6 = 0; var6 < 8; ++var6) { // L: 247
- PcmStream var16 = this.field296[var6]; // L: 248
- PcmStream[] var17 = this.field296; // L: 249
- this.field297[var6] = null; // L: 251
+ for (var6 = 0; var6 < 8; ++var6) { // L: 251
+ PcmStream var16 = this.field289[var6]; // L: 252
+ PcmStream[] var17 = this.field289; // L: 253
+ this.field292[var6] = null; // L: 255
- for (var17[var6] = null; var16 != null; var16 = var10) { // L: 252 253 256
- var10 = var16.after; // L: 254
- var16.after = null; // L: 255
+ for (var17[var6] = null; var16 != null; var16 = var10) { // L: 256 257 260
+ var10 = var16.after; // L: 258
+ var16.after = null; // L: 259
}
}
}
- if (this.field295 < 0) { // L: 260
- this.field295 = 0;
+ if (this.field291 < 0) { // L: 264
+ this.field291 = 0;
}
- if (this.stream != null) {
- this.stream.fill(var1, 0, var2); // L: 261
+ if (this.stream != null) { // L: 265
+ this.stream.fill(var1, 0, var2);
}
- this.timeMs = class113.method2624(); // L: 262
- } // L: 263
+ this.timeMs = class115.method2692(); // L: 266
+ } // L: 267
- @ObfuscatedName("aj")
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "(Lao;IB)V",
- garbageValue = "52"
+ descriptor = "(Laz;II)V",
+ garbageValue = "-2042142637"
)
- final void method700(PcmStream var1, int var2) {
- int var3 = var2 >> 5; // L: 272
- PcmStream var4 = this.field297[var3]; // L: 273
- if (var4 == null) { // L: 274
- this.field296[var3] = var1;
+ final void method673(PcmStream var1, int var2) {
+ int var3 = var2 >> 5; // L: 276
+ PcmStream var4 = this.field292[var3]; // L: 277
+ if (var4 == null) { // L: 278
+ this.field289[var3] = var1;
} else {
- var4.after = var1; // L: 275
+ var4.after = var1; // L: 279
}
- this.field297[var3] = var1; // L: 276
- var1.field348 = var2; // L: 277
- } // L: 278
+ this.field292[var3] = var1; // L: 280
+ var1.field346 = var2; // L: 281
+ } // L: 282
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "-706080799"
+ descriptor = "(Lqt;Ljava/lang/String;I)I",
+ garbageValue = "347450782"
)
- public static int method744(int var0, int var1) {
- return (var0 << 8) + var1; // L: 13
+ public static int method720(Buffer var0, String var1) {
+ int var2 = var0.offset; // L: 14
+ int var4 = var1.length(); // L: 17
+ byte[] var5 = new byte[var4]; // L: 18
+
+ for (int var6 = 0; var6 < var4; ++var6) { // L: 19
+ char var7 = var1.charAt(var6); // L: 20
+ if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 21
+ var5[var6] = (byte)var7;
+ } else if (var7 == 8364) { // L: 22
+ var5[var6] = -128;
+ } else if (var7 == 8218) { // L: 23
+ var5[var6] = -126;
+ } else if (var7 == 402) { // L: 24
+ var5[var6] = -125;
+ } else if (var7 == 8222) { // L: 25
+ var5[var6] = -124;
+ } else if (var7 == 8230) { // L: 26
+ var5[var6] = -123;
+ } else if (var7 == 8224) { // L: 27
+ var5[var6] = -122;
+ } else if (var7 == 8225) { // L: 28
+ var5[var6] = -121;
+ } else if (var7 == 710) { // L: 29
+ var5[var6] = -120;
+ } else if (var7 == 8240) { // L: 30
+ var5[var6] = -119;
+ } else if (var7 == 352) { // L: 31
+ var5[var6] = -118;
+ } else if (var7 == 8249) { // L: 32
+ var5[var6] = -117;
+ } else if (var7 == 338) { // L: 33
+ var5[var6] = -116;
+ } else if (var7 == 381) { // L: 34
+ var5[var6] = -114;
+ } else if (var7 == 8216) { // L: 35
+ var5[var6] = -111;
+ } else if (var7 == 8217) { // L: 36
+ var5[var6] = -110;
+ } else if (var7 == 8220) { // L: 37
+ var5[var6] = -109;
+ } else if (var7 == 8221) { // L: 38
+ var5[var6] = -108;
+ } else if (var7 == 8226) { // L: 39
+ var5[var6] = -107;
+ } else if (var7 == 8211) { // L: 40
+ var5[var6] = -106;
+ } else if (var7 == 8212) { // L: 41
+ var5[var6] = -105;
+ } else if (var7 == 732) { // L: 42
+ var5[var6] = -104;
+ } else if (var7 == 8482) { // L: 43
+ var5[var6] = -103;
+ } else if (var7 == 353) { // L: 44
+ var5[var6] = -102;
+ } else if (var7 == 8250) { // L: 45
+ var5[var6] = -101;
+ } else if (var7 == 339) { // L: 46
+ var5[var6] = -100;
+ } else if (var7 == 382) { // L: 47
+ var5[var6] = -98;
+ } else if (var7 == 376) { // L: 48
+ var5[var6] = -97;
+ } else {
+ var5[var6] = 63; // L: 49
+ }
+ }
+
+ var0.writeSmartByteShort(var5.length); // L: 54
+ var0.offset += class281.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 55
+ return var0.offset - var2; // L: 56
}
- @ObfuscatedName("q")
+ @ObfuscatedName("fd")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1739109574"
+ descriptor = "(IIB)V",
+ garbageValue = "-101"
)
- static void method753() {
- Tiles.Tiles_underlays = null; // L: 64
- Tiles.Tiles_overlays = null; // L: 65
- Tiles.Tiles_shapes = null; // L: 66
- RunException.field4812 = null; // L: 67
- VerticalAlignment.field1993 = null; // L: 68
- NPC.field1259 = null; // L: 69
- Interpreter.field839 = null; // L: 70
- class154.Tiles_hue = null; // L: 71
- MusicPatch.Tiles_saturation = null; // L: 72
- WallDecoration.Tiles_lightness = null; // L: 73
- Tiles.Tiles_hueMultiplier = null; // L: 74
- MenuAction.field866 = null; // L: 75
- } // L: 76
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "([BI)Lbb;",
- garbageValue = "1083812736"
- )
- @Export("newScript")
- static Script newScript(byte[] var0) {
- Script var1 = new Script(); // L: 112
- Buffer var2 = new Buffer(var0); // L: 113
- var2.offset = var2.array.length - 2; // L: 114
- int var3 = var2.readUnsignedShort(); // L: 115
- int var4 = var2.array.length - 2 - var3 - 12; // L: 116
- var2.offset = var4; // L: 117
- int var5 = var2.readInt(); // L: 118
- var1.localIntCount = var2.readUnsignedShort(); // L: 119
- var1.localStringCount = var2.readUnsignedShort(); // L: 120
- var1.intArgumentCount = var2.readUnsignedShort(); // L: 121
- var1.stringArgumentCount = var2.readUnsignedShort(); // L: 122
- int var6 = var2.readUnsignedByte(); // L: 123
- int var7;
- int var8;
- if (var6 > 0) { // L: 124
- var1.switches = var1.newIterableNodeHashTable(var6); // L: 125
-
- for (var7 = 0; var7 < var6; ++var7) { // L: 126
- var8 = var2.readUnsignedShort(); // L: 127
- IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? FontName.method7228(var8) : 1); // L: 128
- var1.switches[var7] = var9; // L: 129
-
- while (var8-- > 0) { // L: 130
- int var10 = var2.readInt(); // L: 131
- int var11 = var2.readInt(); // L: 132
- var9.put(new IntegerNode(var11), (long)var10); // L: 133
- }
- }
+ static void method719(int var0, int var1) {
+ if (class19.clientPreferences.method2258() != 0 && var0 != -1) { // L: 3778
+ AttackOption.method2410(UserComparator7.field1383, var0, 0, class19.clientPreferences.method2258(), false); // L: 3779
+ Client.playingJingle = true; // L: 3780
}
- var2.offset = 0;
- var1.field949 = var2.readStringCp1252NullTerminatedOrNull(); // L: 138
- var1.opcodes = new int[var5]; // L: 139
- var1.intOperands = new int[var5]; // L: 140
- var1.stringOperands = new String[var5]; // L: 141
-
- for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 142 143 148
- var8 = var2.readUnsignedShort(); // L: 144
- if (var8 == 3) { // L: 145
- var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
- } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
- var1.intOperands[var7] = var2.readInt(); // L: 146
- } else {
- var1.intOperands[var7] = var2.readUnsignedByte(); // L: 147
- }
- }
-
- return var1; // L: 150
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(IIS)I",
- garbageValue = "12333"
- )
- static int method693(int var0, int var1) {
- for (int var2 = 0; var2 < 8; ++var2) { // L: 1035
- if (var1 <= var0 + 30) { // L: 1036
- return var2; // L: 1037
- }
-
- var0 += 30; // L: 1039
- var0 += var2 != 1 && var2 != 3 ? 5 : 20; // L: 1040
- }
-
- return 0; // L: 1042
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1845671157"
- )
- public static void method757() {
- KitDefinition.KitDefinition_cached.clear(); // L: 136
- } // L: 137
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "-1912643787"
- )
- @Export("Login_promptCredentials")
- static void Login_promptCredentials(boolean var0) {
- if (!class82.client.method1128() && !class82.client.method1520()) { // L: 1046
- Login.Login_response1 = ""; // L: 1050
- Login.Login_response2 = "Enter your username/email & password."; // L: 1051
- Login.Login_response3 = ""; // L: 1052
- class126.method2799(2); // L: 1053
- if (var0) { // L: 1054
- Login.Login_password = "";
- }
-
- if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1056
- if (class12.clientPreferences.method2241() != null) { // L: 1057
- Login.Login_username = class12.clientPreferences.method2241(); // L: 1058
- Client.Login_isUsernameRemembered = true; // L: 1059
- } else {
- Client.Login_isUsernameRemembered = false; // L: 1061
- }
- }
-
- if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1064
- Login.currentLoginField = 1; // L: 1065
- } else {
- Login.currentLoginField = 0; // L: 1068
- }
-
- } else {
- class126.method2799(10); // L: 1047
- }
- } // L: 1048 1071
-
- @ObfuscatedName("fi")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "24"
- )
- @Export("getLoginError")
- static void getLoginError(int var0) {
- int var1 = Login.loginIndex; // L: 2842
- if (var0 == -3) { // L: 2845
- class345.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
- } else if (var0 == -2) { // L: 2846
- class345.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
- } else if (var0 == -1) { // L: 2847
- class345.setLoginResponseString("No response from server.", "Please try using a different world.", "");
- } else if (var0 == 3) { // L: 2848
- class126.method2799(3); // L: 2849
- Login.field907 = 1; // L: 2850
- } else if (var0 == 4) { // L: 2852
- class400.method6957(0); // L: 2853
- } else if (var0 == 5) { // L: 2855
- Login.field907 = 2; // L: 2856
- class345.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2857
- } else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 2859
- class345.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2860
- } else if (var0 == 7) { // L: 2862
- class345.setLoginResponseString("This world is full.", "Please use a different world.", "");
- } else if (var0 == 8) { // L: 2863
- class345.setLoginResponseString("Unable to connect.", "Login server offline.", "");
- } else if (var0 == 9) { // L: 2864
- class345.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
- } else if (var0 == 10) { // L: 2865
- class345.setLoginResponseString("Unable to connect.", "Bad session id.", "");
- } else if (var0 == 11) { // L: 2866
- class345.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
- } else if (var0 == 12) { // L: 2867
- class345.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
- } else if (var0 == 13) { // L: 2868
- class345.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
- } else if (var0 == 14) { // L: 2869
- class345.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
- } else if (var0 == 16) { // L: 2870
- class345.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
- } else if (var0 == 17) { // L: 2871
- class345.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
- } else if (var0 == 18) { // L: 2872
- class400.method6957(1); // L: 2873
- } else if (var0 == 19) { // L: 2875
- class345.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
- } else if (var0 == 20) { // L: 2876
- class345.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
- } else if (var0 == 22) { // L: 2877
- class345.setLoginResponseString("Malformed login packet.", "Please try again.", "");
- } else if (var0 == 23) { // L: 2878
- class345.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
- } else if (var0 == 24) { // L: 2879
- class345.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
- } else if (var0 == 25) { // L: 2880
- class345.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
- } else if (var0 == 26) { // L: 2881
- class345.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
- } else if (var0 == 27) { // L: 2882
- class345.setLoginResponseString("", "Service unavailable.", "");
- } else if (var0 == 31) { // L: 2883
- class345.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game.");
- } else if (var0 == 32) { // L: 2884
- class345.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system.");
- } else if (var0 == 37) { // L: 2885
- class345.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
- } else if (var0 == 38) { // L: 2886
- class345.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
- } else if (var0 == 55) { // L: 2887
- class126.method2799(8); // L: 2888
- } else {
- if (var0 == 56) { // L: 2890
- class345.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2891
- PendingSpawn.updateGameState(11); // L: 2892
- return; // L: 2893
- }
-
- if (var0 == 57) { // L: 2895
- class345.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2896
- PendingSpawn.updateGameState(11); // L: 2897
- return; // L: 2898
- }
-
- if (var0 == 61) { // L: 2900
- class345.setLoginResponseString("", "Please enter your date of birth (DD/MM/YYYY)", ""); // L: 2901
- class126.method2799(7); // L: 2902
- } else {
- if (var0 == 62) { // L: 2904
- PendingSpawn.updateGameState(10); // L: 2905
- class126.method2799(9); // L: 2906
- class345.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 2907
- return; // L: 2908
- }
-
- if (var0 == 63) { // L: 2910
- PendingSpawn.updateGameState(10); // L: 2911
- class126.method2799(9); // L: 2912
- class345.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 2913
- return; // L: 2914
- }
-
- if (var0 == 65 || var0 == 67) { // L: 2916
- PendingSpawn.updateGameState(10); // L: 2917
- class126.method2799(9); // L: 2918
- class345.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 2919
- return; // L: 2920
- }
-
- if (var0 == 71) { // L: 2922
- PendingSpawn.updateGameState(10); // L: 2923
- class126.method2799(7); // L: 2924
- class345.setLoginResponseString("There was a problem updating your DOB.", "Please try again later. If the problem ", "persists, please contact Jagex Support."); // L: 2925
- } else if (var0 == 73) { // L: 2927
- PendingSpawn.updateGameState(10); // L: 2928
- class126.method2799(6); // L: 2929
- class345.setLoginResponseString("Your date of birth information is waiting", "to be reviewed by our staff.", "It will be processed shortly."); // L: 2930
- } else if (var0 == 72) { // L: 2932
- PendingSpawn.updateGameState(10); // L: 2933
- class126.method2799(26); // L: 2934
- } else {
- class345.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2936
- }
- }
- }
-
- PendingSpawn.updateGameState(10); // L: 2937
- int var4 = Login.loginIndex; // L: 2941
- boolean var5 = var4 != var1; // L: 2943
- if (!var5 && Client.field517.method7790()) { // L: 2944
- class126.method2799(9); // L: 2945
- }
-
- } // L: 2947
-
- @ObfuscatedName("kz")
- @ObfuscatedSignature(
- descriptor = "(IIIILqr;Lka;I)V",
- garbageValue = "-1306286729"
- )
- @Export("drawSpriteOnMinimap")
- static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
- if (var4 != null) { // L: 12398
- int var6 = Client.camAngleY & 2047; // L: 12399
- int var7 = var3 * var3 + var2 * var2; // L: 12400
- if (var7 <= 6400) { // L: 12401
- int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12402
- int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12403
- int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12404
- int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12405
- if (var7 > 2500) {
- var4.method7947(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 12406
- } else {
- var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12407
- }
-
- }
- }
- } // L: 12408
+ } // L: 3782
}
diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java
index 3a0693681e..ded083f206 100644
--- a/runescape-client/src/main/java/PcmStream.java
+++ b/runescape-client/src/main/java/PcmStream.java
@@ -3,23 +3,23 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ao")
+@ObfuscatedName("az")
@Implements("PcmStream")
public abstract class PcmStream extends Node {
@ObfuscatedName("w")
@Export("active")
volatile boolean active;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "Lao;"
+ descriptor = "Laz;"
)
@Export("after")
PcmStream after;
- @ObfuscatedName("n")
- int field348;
- @ObfuscatedName("e")
+ @ObfuscatedName("x")
+ int field346;
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "Lbi;"
+ descriptor = "Lbf;"
)
@Export("sound")
AbstractSound sound;
@@ -28,37 +28,37 @@ public abstract class PcmStream extends Node {
this.active = true; // L: 11
} // L: 13
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("firstSubStream")
protected abstract PcmStream firstSubStream();
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("nextSubStream")
protected abstract PcmStream nextSubStream();
- @ObfuscatedName("s")
- protected abstract int vmethod5295();
+ @ObfuscatedName("w")
+ protected abstract int vmethod5437();
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("fill")
protected abstract void fill(int[] var1, int var2, int var3);
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("skip")
protected abstract void skip(int var1);
- @ObfuscatedName("al")
- int vmethod951() {
+ @ObfuscatedName("at")
+ int vmethod948() {
return 255; // L: 16
}
- @ObfuscatedName("fy")
+ @ObfuscatedName("es")
@Export("update")
final void update(int[] var1, int var2, int var3) {
if (this.active) { // L: 24
diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java
index 7980935ebc..83109e6098 100644
--- a/runescape-client/src/main/java/PcmStreamMixer.java
+++ b/runescape-client/src/main/java/PcmStreamMixer.java
@@ -3,152 +3,152 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("as")
+@ObfuscatedName("am")
@Implements("PcmStreamMixer")
public class PcmStreamMixer extends PcmStream {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("subStreams")
NodeDeque subStreams;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
- NodeDeque field254;
- @ObfuscatedName("l")
- int field255;
- @ObfuscatedName("k")
- int field257;
+ NodeDeque field249;
+ @ObfuscatedName("q")
+ int field251;
+ @ObfuscatedName("f")
+ int field252;
public PcmStreamMixer() {
this.subStreams = new NodeDeque(); // L: 9
- this.field254 = new NodeDeque(); // L: 10
- this.field255 = 0; // L: 11
- this.field257 = -1; // L: 12
+ this.field249 = new NodeDeque(); // L: 10
+ this.field251 = 0; // L: 11
+ this.field252 = -1; // L: 12
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lao;)V"
+ descriptor = "(Laz;)V"
)
@Export("addSubStream")
public final synchronized void addSubStream(PcmStream var1) {
this.subStreams.addLast(var1); // L: 15
} // L: 16
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lao;)V"
+ descriptor = "(Laz;)V"
)
@Export("removeSubStream")
public final synchronized void removeSubStream(PcmStream var1) {
var1.remove(); // L: 19
} // L: 20
- @ObfuscatedName("l")
- void method605() {
- if (this.field255 > 0) { // L: 23
- for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field254.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field254.previous()) { // L: 24
- var1.field396 -= this.field255; // L: 25
+ @ObfuscatedName("q")
+ void method583() {
+ if (this.field251 > 0) { // L: 23
+ for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field249.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field249.previous()) { // L: 24
+ var1.field395 -= this.field251; // L: 25
}
- this.field257 -= this.field255; // L: 27
- this.field255 = 0; // L: 28
+ this.field252 -= this.field251; // L: 27
+ this.field251 = 0; // L: 28
}
} // L: 30
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Los;Lat;)V"
+ descriptor = "(Loh;Las;)V"
)
- void method629(Node var1, PcmStreamMixerListener var2) {
- while (this.field254.sentinel != var1 && ((PcmStreamMixerListener)var1).field396 <= var2.field396) { // L: 33
+ void method584(Node var1, PcmStreamMixerListener var2) {
+ while (this.field249.sentinel != var1 && ((PcmStreamMixerListener)var1).field395 <= var2.field395) { // L: 33
var1 = var1.previous;
}
NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34
- this.field257 = ((PcmStreamMixerListener)this.field254.sentinel.previous).field396; // L: 35
+ this.field252 = ((PcmStreamMixerListener)this.field249.sentinel.previous).field395; // L: 35
} // L: 36
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lat;)V"
+ descriptor = "(Las;)V"
)
- void method607(PcmStreamMixerListener var1) {
+ void method580(PcmStreamMixerListener var1) {
var1.remove(); // L: 39
var1.remove2(); // L: 40
- Node var2 = this.field254.sentinel.previous; // L: 41
- if (var2 == this.field254.sentinel) {
- this.field257 = -1; // L: 42
+ Node var2 = this.field249.sentinel.previous; // L: 41
+ if (var2 == this.field249.sentinel) {
+ this.field252 = -1; // L: 42
} else {
- this.field257 = ((PcmStreamMixerListener)var2).field396; // L: 43
+ this.field252 = ((PcmStreamMixerListener)var2).field395; // L: 43
}
} // L: 44
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("firstSubStream")
protected PcmStream firstSubStream() {
return (PcmStream)this.subStreams.last(); // L: 47
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("nextSubStream")
protected PcmStream nextSubStream() {
return (PcmStream)this.subStreams.previous(); // L: 51
}
- @ObfuscatedName("s")
- protected int vmethod5295() {
+ @ObfuscatedName("w")
+ protected int vmethod5437() {
return 0; // L: 55
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("fill")
public final synchronized void fill(int[] var1, int var2, int var3) {
do {
- if (this.field257 < 0) { // L: 60
+ if (this.field252 < 0) { // L: 60
this.updateSubStreams(var1, var2, var3); // L: 61
return; // L: 62
}
- if (var3 + this.field255 < this.field257) { // L: 64
- this.field255 += var3; // L: 65
+ if (var3 + this.field251 < this.field252) { // L: 64
+ this.field251 += var3; // L: 65
this.updateSubStreams(var1, var2, var3); // L: 66
return; // L: 67
}
- int var4 = this.field257 - this.field255; // L: 69
+ int var4 = this.field252 - this.field251; // L: 69
this.updateSubStreams(var1, var2, var4); // L: 70
var2 += var4; // L: 71
var3 -= var4; // L: 72
- this.field255 += var4; // L: 73
- this.method605(); // L: 74
- PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field254.last(); // L: 75
+ this.field251 += var4; // L: 73
+ this.method583(); // L: 74
+ PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field249.last(); // L: 75
synchronized(var5) { // L: 76
int var7 = var5.update(); // L: 77
if (var7 < 0) { // L: 78
- var5.field396 = 0; // L: 79
- this.method607(var5); // L: 80
+ var5.field395 = 0; // L: 79
+ this.method580(var5); // L: 80
} else {
- var5.field396 = var7; // L: 83
- this.method629(var5.previous, var5); // L: 84
+ var5.field395 = var7; // L: 83
+ this.method584(var5.previous, var5); // L: 84
}
}
} while(var3 != 0); // L: 87
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("updateSubStreams")
void updateSubStreams(int[] var1, int var2, int var3) {
for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92
@@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream {
} // L: 95
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("skip")
public final synchronized void skip(int var1) {
do {
- if (this.field257 < 0) { // L: 99
+ if (this.field252 < 0) { // L: 99
this.skipSubStreams(var1); // L: 100
return; // L: 101
}
- if (this.field255 + var1 < this.field257) { // L: 103
- this.field255 += var1; // L: 104
+ if (this.field251 + var1 < this.field252) { // L: 103
+ this.field251 += var1; // L: 104
this.skipSubStreams(var1); // L: 105
return; // L: 106
}
- int var2 = this.field257 - this.field255; // L: 108
+ int var2 = this.field252 - this.field251; // L: 108
this.skipSubStreams(var2); // L: 109
var1 -= var2; // L: 110
- this.field255 += var2; // L: 111
- this.method605(); // L: 112
- PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field254.last(); // L: 113
+ this.field251 += var2; // L: 111
+ this.method583(); // L: 112
+ PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field249.last(); // L: 113
synchronized(var3) { // L: 114
int var5 = var3.update(); // L: 115
if (var5 < 0) { // L: 116
- var3.field396 = 0; // L: 117
- this.method607(var3); // L: 118
+ var3.field395 = 0; // L: 117
+ this.method580(var3); // L: 118
} else {
- var3.field396 = var5; // L: 121
- this.method629(var3.previous, var3); // L: 122
+ var3.field395 = var5; // L: 121
+ this.method584(var3.previous, var3); // L: 122
}
}
} while(var1 != 0); // L: 125
}
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("skipSubStreams")
void skipSubStreams(int var1) {
for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130
diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java
index c142441915..2ea28ca0eb 100644
--- a/runescape-client/src/main/java/PcmStreamMixerListener.java
+++ b/runescape-client/src/main/java/PcmStreamMixerListener.java
@@ -3,19 +3,19 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("at")
+@ObfuscatedName("as")
@Implements("PcmStreamMixerListener")
public abstract class PcmStreamMixerListener extends Node {
- @ObfuscatedName("o")
- int field396;
+ @ObfuscatedName("c")
+ int field395;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("remove2")
abstract void remove2();
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Las;)I"
+ descriptor = "(Lam;)I"
)
@Export("update")
abstract int update();
diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java
index 93e4451370..f44a83ef68 100644
--- a/runescape-client/src/main/java/PendingSpawn.java
+++ b/runescape-client/src/main/java/PendingSpawn.java
@@ -1,84 +1,79 @@
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("ci")
+@ObfuscatedName("cg")
@Implements("PendingSpawn")
public final class PendingSpawn extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1548569011
+ intValue = -1077280707
)
@Export("plane")
int plane;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1470200335
+ intValue = -1648453221
)
@Export("type")
int type;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 706964479
+ intValue = -1684914079
)
@Export("x")
int x;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 307238289
+ intValue = 841494057
)
@Export("y")
int y;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -360543025
+ intValue = 332033545
)
@Export("objectId")
int objectId;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 265612905
+ intValue = 1740672261
)
- int field1131;
- @ObfuscatedName("p")
+ int field1121;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -539992975
+ intValue = 1499374413
)
- int field1129;
- @ObfuscatedName("s")
+ int field1122;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -420912825
+ intValue = 1955707387
)
@Export("id")
int id;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -1623947917
+ intValue = -1729906445
)
@Export("orientation")
int orientation;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1200611791
+ intValue = -1250065699
)
- int field1126;
- @ObfuscatedName("y")
+ int field1125;
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -997627389
+ intValue = 1981751259
)
@Export("delay")
int delay;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -1963124653
+ intValue = 832910611
)
@Export("hitpoints")
int hitpoints;
@@ -88,392 +83,64 @@ public final class PendingSpawn extends Node {
this.hitpoints = -1; // L: 17
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;IZI)Lds;",
- garbageValue = "1523171392"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "630642952"
)
- public static class122 method2161(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
- boolean var4 = true; // L: 23
- byte[] var5 = var0.takeFile(var2 >> 16 & 65535, var2 & 65535); // L: 24
- if (var5 == null) { // L: 25
- var4 = false; // L: 26
- return null; // L: 27
+ static int method2180(int var0, Script var1, boolean var2) {
+ int var3 = -1; // L: 571
+ Widget var4;
+ if (var0 >= 2000) { // L: 573
+ var0 -= 1000; // L: 574
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 575
+ var4 = class140.getWidget(var3); // L: 576
} else {
- int var6 = (var5[1] & 255) << 8 | var5[2] & 255; // L: 29
- byte[] var7;
- if (var3) {
- var7 = var1.getFile(0, var6); // L: 31
- } else {
- var7 = var1.getFile(var6, 0); // L: 32
- }
-
- if (var7 == null) { // L: 33
- var4 = false;
- }
-
- if (!var4) { // L: 34
- return null;
- } else {
- try {
- return new class122(var0, var1, var2, var3); // L: 36
- } catch (Exception var9) { // L: 38
- return null; // L: 39
- }
- }
- }
- }
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V",
- garbageValue = "373101383"
- )
- public static void method2160(String var0, String var1, int var2, int var3) throws IOException {
- UserComparator6.idxCount = var3; // L: 40
- class11.cacheGamebuild = var2; // L: 41
-
- try {
- JagexCache.operatingSystemName = System.getProperty("os.name");
- } catch (Exception var18) { // L: 45
- JagexCache.operatingSystemName = "Unknown"; // L: 46
+ var4 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 578
}
- WorldMapArea.formattedOperatingSystemName = JagexCache.operatingSystemName.toLowerCase(); // L: 48
-
- try {
- BufferedSource.userHomeDirectory = System.getProperty("user.home"); // L: 50
- if (BufferedSource.userHomeDirectory != null) { // L: 51
- BufferedSource.userHomeDirectory = BufferedSource.userHomeDirectory + "/";
- }
- } catch (Exception var17) { // L: 53
- }
-
- try {
- if (WorldMapArea.formattedOperatingSystemName.startsWith("win")) { // L: 55
- if (BufferedSource.userHomeDirectory == null) { // L: 56
- BufferedSource.userHomeDirectory = System.getenv("USERPROFILE");
- }
- } else if (BufferedSource.userHomeDirectory == null) {
- BufferedSource.userHomeDirectory = System.getenv("HOME");
+ if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 579
+ class446.Interpreter_intStackSize -= 4; // L: 580
+ var4.rawX = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 581
+ var4.rawY = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 582
+ var4.xAlignment = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 583
+ var4.yAlignment = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 584
+ ChatChannel.invalidateWidget(var4); // L: 585
+ class353.client.alignWidget(var4); // L: 586
+ if (var3 != -1 && var4.type == 0) { // L: 587
+ BufferedNetSocket.revalidateWidgetScroll(SoundCache.Widget_interfaceComponents[var3 >> 16], var4, false);
}
- if (BufferedSource.userHomeDirectory != null) { // L: 61
- BufferedSource.userHomeDirectory = BufferedSource.userHomeDirectory + "/";
- }
- } catch (Exception var16) { // L: 63
- }
-
- if (BufferedSource.userHomeDirectory == null) { // L: 64
- BufferedSource.userHomeDirectory = "~/";
- }
-
- SecureRandomCallable.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", BufferedSource.userHomeDirectory, "/tmp/", ""}; // L: 65
- class83.cacheSubPaths = new String[]{".jagex_cache_" + class11.cacheGamebuild, ".file_store_" + class11.cacheGamebuild}; // L: 66
- int var12 = 0;
-
- int var7;
- File var8;
- label141:
- while (var12 < 4) {
- JagexCache.cacheDir = SequenceDefinition.method3717(var0, var1, var12); // L: 68
- if (!JagexCache.cacheDir.exists()) { // L: 69
- JagexCache.cacheDir.mkdirs();
+ return 1; // L: 588
+ } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 590
+ class446.Interpreter_intStackSize -= 4; // L: 591
+ var4.rawWidth = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 592
+ var4.rawHeight = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 593
+ var4.widthAlignment = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 594
+ var4.heightAlignment = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 595
+ ChatChannel.invalidateWidget(var4); // L: 596
+ class353.client.alignWidget(var4); // L: 597
+ if (var3 != -1 && var4.type == 0) { // L: 598
+ BufferedNetSocket.revalidateWidgetScroll(SoundCache.Widget_interfaceComponents[var3 >> 16], var4, false);
}
- File[] var5 = JagexCache.cacheDir.listFiles(); // L: 70
- if (var5 == null) { // L: 71
- break;
+ return 1; // L: 599
+ } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 601
+ boolean var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 602
+ if (var5 != var4.isHidden) { // L: 603
+ var4.isHidden = var5; // L: 604
+ ChatChannel.invalidateWidget(var4); // L: 605
}
- File[] var6 = var5; // L: 73
- var7 = 0;
-
- while (true) {
- if (var7 >= var6.length) {
- break label141;
- }
-
- var8 = var6[var7]; // L: 75
-
- boolean var9;
- try {
- RandomAccessFile var10 = new RandomAccessFile(var8, "rw"); // L: 80
- int var11 = var10.read(); // L: 81
- var10.seek(0L); // L: 82
- var10.write(var11); // L: 83
- var10.seek(0L); // L: 84
- var10.close(); // L: 85
- var9 = true; // L: 87
- } catch (Exception var15) { // L: 89
- var9 = false; // L: 90
- }
-
- if (!var9) { // L: 93
- ++var12; // L: 67
- break;
- }
-
- ++var7; // L: 74
- }
- }
-
- File var4 = JagexCache.cacheDir; // L: 100
- FileSystem.FileSystem_cacheDir = var4; // L: 102
- if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 103
- throw new RuntimeException("");
+ return 1; // L: 607
+ } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 609
+ var4.noClickThrough = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 610
+ return 1; // L: 611
+ } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 613
+ var4.noScrollThrough = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 614
+ return 1; // L: 615
} else {
- FileSystem.FileSystem_hasPermissions = true; // L: 104
-
- try {
- File var20 = new File(BufferedSource.userHomeDirectory, "random.dat"); // L: 108
- if (var20.exists()) { // L: 109
- JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var20, "rw", 25L), 24, 0); // L: 110
- } else {
- label120:
- for (int var13 = 0; var13 < class83.cacheSubPaths.length; ++var13) { // L: 113
- for (var7 = 0; var7 < SecureRandomCallable.cacheParentPaths.length; ++var7) { // L: 114
- var8 = new File(SecureRandomCallable.cacheParentPaths[var7] + class83.cacheSubPaths[var13] + File.separatorChar + "random.dat"); // L: 115
- if (var8.exists()) { // L: 116
- JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); // L: 117
- break label120; // L: 118
- }
- }
- }
- }
-
- if (JagexCache.JagexCache_randomDat == null) {
- RandomAccessFile var21 = new RandomAccessFile(var20, "rw");
- var7 = var21.read();
- var21.seek(0L);
- var21.write(var7);
- var21.seek(0L);
- var21.close();
- JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var20, "rw", 25L), 24, 0);
- }
- } catch (IOException var19) { // L: 133
- }
-
- JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(VarpDefinition.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
- JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(VarpDefinition.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
- JagexCache.JagexCache_idxFiles = new BufferedFile[UserComparator6.idxCount];
-
- for (int var14 = 0; var14 < UserComparator6.idxCount; ++var14) {
- JagexCache.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(VarpDefinition.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0);
- }
-
+ return 2; // L: 617
}
}
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1995968561"
- )
- @Export("readReflectionCheck")
- public static void readReflectionCheck(Buffer var0, int var1) {
- ReflectionCheck var2 = new ReflectionCheck(); // L: 123
- var2.size = var0.readUnsignedByte(); // L: 124
- var2.id = var0.readInt(); // L: 125
- var2.operations = new int[var2.size]; // L: 126
- var2.creationErrors = new int[var2.size]; // L: 127
- var2.fields = new Field[var2.size]; // L: 128
- var2.intReplaceValues = new int[var2.size]; // L: 129
- var2.methods = new Method[var2.size]; // L: 130
- var2.arguments = new byte[var2.size][][]; // L: 131
-
- for (int var3 = 0; var3 < var2.size; ++var3) { // L: 132
- try {
- int var4 = var0.readUnsignedByte(); // L: 134
- String var5;
- String var6;
- int var7;
- if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 135
- if (var4 == 3 || var4 == 4) { // L: 145
- var5 = var0.readStringCp1252NullTerminated(); // L: 146
- var6 = var0.readStringCp1252NullTerminated(); // L: 147
- var7 = var0.readUnsignedByte(); // L: 148
- String[] var8 = new String[var7]; // L: 149
-
- for (int var9 = 0; var9 < var7; ++var9) { // L: 150
- var8[var9] = var0.readStringCp1252NullTerminated();
- }
-
- String var20 = var0.readStringCp1252NullTerminated(); // L: 151
- byte[][] var10 = new byte[var7][]; // L: 152
- int var12;
- if (var4 == 3) { // L: 153
- for (int var11 = 0; var11 < var7; ++var11) { // L: 154
- var12 = var0.readInt(); // L: 155
- var10[var11] = new byte[var12]; // L: 156
- var0.readBytes(var10[var11], 0, var12); // L: 157
- }
- }
-
- var2.operations[var3] = var4; // L: 160
- Class[] var21 = new Class[var7]; // L: 161
-
- for (var12 = 0; var12 < var7; ++var12) { // L: 162
- var21[var12] = WorldMapSection1.loadClassFromDescriptor(var8[var12]);
- }
-
- Class var22 = WorldMapSection1.loadClassFromDescriptor(var20); // L: 163
- if (WorldMapSection1.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 164
- throw new SecurityException();
- }
-
- Method[] var13 = WorldMapSection1.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 165
- Method[] var14 = var13; // L: 167
-
- for (int var15 = 0; var15 < var14.length; ++var15) { // L: 168
- Method var16 = var14[var15]; // L: 169
- if (Reflection.getMethodName(var16).equals(var6)) { // L: 171
- Class[] var17 = Reflection.getParameterTypes(var16); // L: 172
- if (var21.length == var17.length) { // L: 173
- boolean var18 = true; // L: 174
-
- for (int var19 = 0; var19 < var21.length; ++var19) { // L: 175
- if (var17[var19] != var21[var19]) { // L: 176
- var18 = false; // L: 177
- break; // L: 178
- }
- }
-
- if (var18 && var22 == var16.getReturnType()) { // L: 181
- var2.methods[var3] = var16; // L: 182
- }
- }
- }
- }
-
- var2.arguments[var3] = var10; // L: 189
- }
- } else {
- var5 = var0.readStringCp1252NullTerminated(); // L: 136
- var6 = var0.readStringCp1252NullTerminated(); // L: 137
- var7 = 0; // L: 138
- if (var4 == 1) { // L: 139
- var7 = var0.readInt();
- }
-
- var2.operations[var3] = var4; // L: 140
- var2.intReplaceValues[var3] = var7; // L: 141
- if (WorldMapSection1.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 142
- throw new SecurityException();
- }
-
- var2.fields[var3] = Reflection.findField(WorldMapSection1.loadClassFromDescriptor(var5), var6); // L: 143
- }
- } catch (ClassNotFoundException var24) { // L: 192
- var2.creationErrors[var3] = -1; // L: 193
- } catch (SecurityException var25) { // L: 195
- var2.creationErrors[var3] = -2; // L: 196
- } catch (NullPointerException var26) { // L: 198
- var2.creationErrors[var3] = -3; // L: 199
- } catch (Exception var27) { // L: 201
- var2.creationErrors[var3] = -4; // L: 202
- } catch (Throwable var28) { // L: 204
- var2.creationErrors[var3] = -5; // L: 205
- }
- }
-
- class33.reflectionChecks.addFirst(var2); // L: 208
- } // L: 209
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "-1"
- )
- public static boolean method2164(int var0) {
- return var0 >= WorldMapDecorationType.field3571.id && var0 <= WorldMapDecorationType.field3559.id || var0 == WorldMapDecorationType.field3560.id; // L: 43
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "191115673"
- )
- static int method2163(int var0) {
- Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 57
- if (var1 == null) { // L: 58
- return -1;
- } else {
- return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 59 60
- }
- }
-
- @ObfuscatedName("fy")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1563631744"
- )
- @Export("updateGameState")
- static void updateGameState(int var0) {
- if (var0 != Client.gameState) { // L: 1144
- if (Client.gameState == 0) { // L: 1145
- class82.client.method438();
- }
-
- if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1146
- Canvas.method347(0); // L: 1147
- Client.field626 = 0; // L: 1148
- Client.field514 = 0; // L: 1149
- Client.timer.method6369(var0); // L: 1150
- if (var0 != 20) { // L: 1151
- ObjectSound.method1730(false);
- }
- }
-
- if (var0 != 20 && var0 != 40 && DirectByteArrayCopier.field3337 != null) { // L: 1153 1154
- DirectByteArrayCopier.field3337.close(); // L: 1155
- DirectByteArrayCopier.field3337 = null; // L: 1156
- }
-
- if (Client.gameState == 25) { // L: 1159
- Client.field597 = 0; // L: 1160
- Client.field545 = 0; // L: 1161
- Client.field546 = 1; // L: 1162
- Client.field570 = 0; // L: 1163
- Client.field548 = 1; // L: 1164
- }
-
- int var1;
- if (var0 != 5 && var0 != 10) { // L: 1166
- if (var0 == 20) { // L: 1170
- var1 = Client.gameState == 11 ? 4 : 0; // L: 1171
- AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, false, var1); // L: 1172
- } else if (var0 == 11) { // L: 1174
- AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, false, 4); // L: 1175
- } else if (var0 == 50) { // L: 1177
- class345.setLoginResponseString("", "Updating date of birth...", ""); // L: 1178
- AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, false, 7); // L: 1179
- } else if (Login.clearLoginScreen) { // L: 1182
- Login.titleboxSprite = null; // L: 1183
- Login.titlebuttonSprite = null; // L: 1184
- Login.runesSprite = null; // L: 1185
- UserComparator6.leftTitleSprite = null; // L: 1186
- SecureRandomCallable.rightTitleSprite = null; // L: 1187
- Clock.logoSprite = null; // L: 1188
- class358.title_muteSprite = null; // L: 1189
- class67.options_buttons_0Sprite = null; // L: 1190
- class101.options_buttons_2Sprite = null; // L: 1191
- GameEngine.worldSelectBackSprites = null; // L: 1192
- class260.worldSelectFlagSprites = null; // L: 1193
- class114.worldSelectArrows = null; // L: 1194
- class267.worldSelectStars = null; // L: 1195
- ArchiveDiskAction.field3997 = null; // L: 1196
- class193.loginScreenRunesAnimation.method2214(); // L: 1197
- UrlRequester.method2538(2); // L: 1198
- MouseRecorder.method2088(true); // L: 1199
- Login.clearLoginScreen = false; // L: 1200
- }
- } else {
- var1 = class118.method2721() ? 0 : 12; // L: 1167
- AbstractWorldMapData.method4800(ObjectSound.archive10, class305.archive8, true, var1); // L: 1168
- }
-
- Client.gameState = var0; // L: 1202
- }
- } // L: 1203
}
diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java
index 96f29e769d..cc3f5234a8 100644
--- a/runescape-client/src/main/java/PlatformInfo.java
+++ b/runescape-client/src/main/java/PlatformInfo.java
@@ -4,202 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("om")
+@ObfuscatedName("os")
@Implements("PlatformInfo")
public class PlatformInfo extends Node {
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@ObfuscatedGetter(
- intValue = -352723525
- )
- int field4493;
- @ObfuscatedName("az")
- boolean field4484;
- @ObfuscatedName("ap")
- @ObfuscatedGetter(
- intValue = 67717751
- )
- int field4485;
- @ObfuscatedName("as")
- @ObfuscatedGetter(
- intValue = 514361411
+ intValue = 1580091961
)
int field4486;
- @ObfuscatedName("au")
+ @ObfuscatedName("ae")
+ boolean field4480;
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = -1922265923
+ intValue = -1628861631
)
- int field4494;
- @ObfuscatedName("ak")
+ int field4481;
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = 1001039591
- )
- int field4488;
- @ObfuscatedName("af")
- @ObfuscatedGetter(
- intValue = 1803225865
- )
- int field4504;
- @ObfuscatedName("al")
- boolean field4490;
- @ObfuscatedName("aq")
- @ObfuscatedGetter(
- intValue = -1919314793
- )
- int field4491;
- @ObfuscatedName("ad")
- @ObfuscatedGetter(
- intValue = 1063380295
- )
- int field4498;
- @ObfuscatedName("aw")
- @ObfuscatedGetter(
- intValue = 1620119563
- )
- int field4489;
- @ObfuscatedName("ah")
- @ObfuscatedGetter(
- intValue = 1010736361
+ intValue = 1799182673
)
int field4487;
- @ObfuscatedName("ao")
- String field4495;
- @ObfuscatedName("av")
- String field4496;
- @ObfuscatedName("ai")
- String field4497;
- @ObfuscatedName("ay")
- String field4483;
- @ObfuscatedName("aa")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = 244652383
+ intValue = 1323987311
)
- int field4499;
+ int field4483;
+ @ObfuscatedName("af")
+ @ObfuscatedGetter(
+ intValue = -1460214999
+ )
+ int field4484;
@ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = -1643044807
+ intValue = 2121235893
)
- int field4500;
+ int field4485;
+ @ObfuscatedName("ar")
+ boolean field4476;
@ObfuscatedName("at")
@ObfuscatedGetter(
- intValue = 1832945347
+ intValue = -1677230917
)
- int field4501;
- @ObfuscatedName("br")
+ int field4499;
+ @ObfuscatedName("ag")
@ObfuscatedGetter(
- intValue = 653746079
+ intValue = 1325520739
+ )
+ int field4488;
+ @ObfuscatedName("ah")
+ @ObfuscatedGetter(
+ intValue = -1528943489
+ )
+ int field4489;
+ @ObfuscatedName("ai")
+ @ObfuscatedGetter(
+ intValue = -819514533
+ )
+ int field4471;
+ @ObfuscatedName("az")
+ String field4491;
+ @ObfuscatedName("av")
+ String field4492;
+ @ObfuscatedName("aw")
+ String field4493;
+ @ObfuscatedName("au")
+ String field4494;
+ @ObfuscatedName("aa")
+ @ObfuscatedGetter(
+ intValue = -2110844387
+ )
+ int field4495;
+ @ObfuscatedName("ay")
+ @ObfuscatedGetter(
+ intValue = -698136029
+ )
+ int field4496;
+ @ObfuscatedName("as")
+ @ObfuscatedGetter(
+ intValue = 1588093075
+ )
+ int field4497;
+ @ObfuscatedName("be")
+ @ObfuscatedGetter(
+ intValue = 488512067
+ )
+ int field4498;
+ @ObfuscatedName("bz")
+ String field4479;
+ @ObfuscatedName("bp")
+ String field4500;
+ @ObfuscatedName("bf")
+ int[] field4501;
+ @ObfuscatedName("bg")
+ @ObfuscatedGetter(
+ intValue = 306566493
)
int field4502;
- @ObfuscatedName("ba")
+ @ObfuscatedName("br")
String field4503;
- @ObfuscatedName("bk")
- String field4477;
- @ObfuscatedName("bi")
- int[] field4505;
- @ObfuscatedName("bc")
- @ObfuscatedGetter(
- intValue = -826466447
- )
- int field4506;
- @ObfuscatedName("bo")
- String field4507;
PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) {
- this.field4505 = new int[3]; // L: 62
- this.field4493 = var1; // L: 67
- this.field4484 = var2; // L: 68
- this.field4485 = var3; // L: 69
- this.field4486 = var4; // L: 70
- this.field4494 = var5; // L: 71
- this.field4488 = var6; // L: 72
- this.field4504 = var7; // L: 73
- this.field4490 = var8; // L: 74
- this.field4491 = var9; // L: 75
- this.field4498 = var10; // L: 76
+ this.field4501 = new int[3]; // L: 62
+ this.field4486 = var1; // L: 67
+ this.field4480 = var2; // L: 68
+ this.field4481 = var3; // L: 69
+ this.field4487 = var4; // L: 70
+ this.field4483 = var5; // L: 71
+ this.field4484 = var6; // L: 72
+ this.field4485 = var7; // L: 73
+ this.field4476 = var8; // L: 74
+ this.field4499 = var9; // L: 75
+ this.field4488 = var10; // L: 76
this.field4489 = var11; // L: 77
- this.field4487 = var12; // L: 78
- this.field4495 = var13; // L: 79
- this.field4496 = var14; // L: 80
- this.field4497 = var15; // L: 81
- this.field4483 = var16; // L: 82
- this.field4499 = var17; // L: 83
- this.field4500 = var18; // L: 84
- this.field4501 = var19; // L: 85
- this.field4502 = var20; // L: 86
- this.field4503 = var21; // L: 87
- this.field4477 = var22; // L: 88
- this.field4505 = var23; // L: 89
- this.field4506 = var24; // L: 90
- this.field4507 = var25; // L: 91
+ this.field4471 = var12; // L: 78
+ this.field4491 = var13; // L: 79
+ this.field4492 = var14; // L: 80
+ this.field4493 = var15; // L: 81
+ this.field4494 = var16; // L: 82
+ this.field4495 = var17; // L: 83
+ this.field4496 = var18; // L: 84
+ this.field4497 = var19; // L: 85
+ this.field4498 = var20; // L: 86
+ this.field4479 = var21; // L: 87
+ this.field4500 = var22; // L: 88
+ this.field4501 = var23; // L: 89
+ this.field4502 = var24; // L: 90
+ this.field4503 = var25; // L: 91
} // L: 92
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;S)V",
- garbageValue = "12185"
+ descriptor = "(Lqt;S)V",
+ garbageValue = "-6227"
)
@Export("write")
public void write(Buffer var1) {
var1.writeByte(8); // L: 95
- var1.writeByte(this.field4493); // L: 96
- var1.writeByte(this.field4484 ? 1 : 0); // L: 97
- var1.writeShort(this.field4485); // L: 98
- var1.writeByte(this.field4486); // L: 99
- var1.writeByte(this.field4494); // L: 100
- var1.writeByte(this.field4488); // L: 101
- var1.writeByte(this.field4504); // L: 102
- var1.writeByte(this.field4490 ? 1 : 0); // L: 103
- var1.writeShort(this.field4491); // L: 104
- var1.writeByte(this.field4498); // L: 105
+ var1.writeByte(this.field4486); // L: 96
+ var1.writeByte(this.field4480 ? 1 : 0); // L: 97
+ var1.writeShort(this.field4481); // L: 98
+ var1.writeByte(this.field4487); // L: 99
+ var1.writeByte(this.field4483); // L: 100
+ var1.writeByte(this.field4484); // L: 101
+ var1.writeByte(this.field4485); // L: 102
+ var1.writeByte(this.field4476 ? 1 : 0); // L: 103
+ var1.writeShort(this.field4499); // L: 104
+ var1.writeByte(this.field4488); // L: 105
var1.writeMedium(this.field4489); // L: 106
- var1.writeShort(this.field4487); // L: 107
- var1.writeStringCp1252NullCircumfixed(this.field4495); // L: 108
- var1.writeStringCp1252NullCircumfixed(this.field4496); // L: 109
- var1.writeStringCp1252NullCircumfixed(this.field4497); // L: 110
- var1.writeStringCp1252NullCircumfixed(this.field4483); // L: 111
- var1.writeByte(this.field4500); // L: 112
- var1.writeShort(this.field4499); // L: 113
- var1.writeStringCp1252NullCircumfixed(this.field4503); // L: 114
- var1.writeStringCp1252NullCircumfixed(this.field4477); // L: 115
- var1.writeByte(this.field4501); // L: 116
- var1.writeByte(this.field4502); // L: 117
+ var1.writeShort(this.field4471); // L: 107
+ var1.writeStringCp1252NullCircumfixed(this.field4491); // L: 108
+ var1.writeStringCp1252NullCircumfixed(this.field4492); // L: 109
+ var1.writeStringCp1252NullCircumfixed(this.field4493); // L: 110
+ var1.writeStringCp1252NullCircumfixed(this.field4494); // L: 111
+ var1.writeByte(this.field4496); // L: 112
+ var1.writeShort(this.field4495); // L: 113
+ var1.writeStringCp1252NullCircumfixed(this.field4479); // L: 114
+ var1.writeStringCp1252NullCircumfixed(this.field4500); // L: 115
+ var1.writeByte(this.field4497); // L: 116
+ var1.writeByte(this.field4498); // L: 117
- for (int var2 = 0; var2 < this.field4505.length; ++var2) { // L: 118
- var1.writeInt(this.field4505[var2]);
+ for (int var2 = 0; var2 < this.field4501.length; ++var2) { // L: 118
+ var1.writeInt(this.field4501[var2]);
}
- var1.writeInt(this.field4506); // L: 119
- var1.writeStringCp1252NullCircumfixed(this.field4507); // L: 120
+ var1.writeInt(this.field4502); // L: 119
+ var1.writeStringCp1252NullCircumfixed(this.field4503); // L: 120
} // L: 121
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1383471227"
+ garbageValue = "379416083"
)
@Export("size")
public int size() {
byte var1 = 39; // L: 124
- String var4 = this.field4495; // L: 127
- int var3 = var4.length() + 2; // L: 129
- int var23 = var1 + var3; // L: 131
- String var7 = this.field4496; // L: 134
- int var6 = var7.length() + 2; // L: 136
- var23 += var6; // L: 138
- String var10 = this.field4497; // L: 141
- int var9 = var10.length() + 2; // L: 143
- var23 += var9; // L: 145
- String var13 = this.field4483; // L: 148
- int var12 = var13.length() + 2; // L: 150
- var23 += var12; // L: 152
- String var16 = this.field4503; // L: 155
- int var15 = var16.length() + 2; // L: 157
- var23 += var15; // L: 159
- String var19 = this.field4477; // L: 162
- int var18 = var19.length() + 2; // L: 164
- var23 += var18; // L: 166
- String var22 = this.field4507; // L: 169
- int var21 = var22.length() + 2; // L: 171
- var23 += var21; // L: 173
- return var23; // L: 174
+ int var2 = var1 + BuddyRankComparator.method2620(this.field4491); // L: 125
+ var2 += BuddyRankComparator.method2620(this.field4492); // L: 126
+ var2 += BuddyRankComparator.method2620(this.field4493); // L: 127
+ var2 += BuddyRankComparator.method2620(this.field4494); // L: 128
+ var2 += BuddyRankComparator.method2620(this.field4479); // L: 129
+ var2 += BuddyRankComparator.method2620(this.field4500); // L: 130
+ var2 += BuddyRankComparator.method2620(this.field4503); // L: 131
+ return var2; // L: 132
}
}
diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java
index 322ef03e77..908908d920 100644
--- a/runescape-client/src/main/java/PlatformInfoProvider.java
+++ b/runescape-client/src/main/java/PlatformInfoProvider.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oi")
+@ObfuscatedName("od")
@Implements("PlatformInfoProvider")
public interface PlatformInfoProvider {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)Lom;",
- garbageValue = "-12"
+ descriptor = "(I)Los;",
+ garbageValue = "51821248"
)
@Export("get")
PlatformInfo get();
diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java
index ad31efc037..f481f0eef0 100644
--- a/runescape-client/src/main/java/Player.java
+++ b/runescape-client/src/main/java/Player.java
@@ -3,167 +3,178 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("ca")
+@ObfuscatedName("ci")
@Implements("Player")
public final class Player extends Actor {
- @ObfuscatedName("o")
+ @ObfuscatedName("ug")
@ObfuscatedSignature(
- descriptor = "Lqv;"
+ descriptor = "Lbl;"
+ )
+ @Export("friendSystem")
+ public static FriendSystem friendSystem;
+ @ObfuscatedName("mu")
+ @ObfuscatedGetter(
+ intValue = 1878220187
+ )
+ @Export("menuHeight")
+ static int menuHeight;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lqa;"
)
@Export("username")
Username username;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lkp;"
+ descriptor = "Lkt;"
)
@Export("appearance")
PlayerComposition appearance;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 207387843
+ intValue = -1076287933
)
@Export("headIconPk")
int headIconPk;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -2136235279
+ intValue = 1720053255
)
@Export("headIconPrayer")
int headIconPrayer;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("actions")
String[] actions;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1373676035
+ intValue = -1534122855
)
@Export("combatLevel")
int combatLevel;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 216850049
+ intValue = 351433381
)
@Export("skillLevel")
int skillLevel;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -982635953
+ intValue = 1504708523
)
@Export("tileHeight")
int tileHeight;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 583621725
+ intValue = -1066412829
)
@Export("animationCycleStart")
int animationCycleStart;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = 171882853
+ intValue = 2100929431
)
@Export("animationCycleEnd")
int animationCycleEnd;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 1199422479
+ intValue = -1217050523
)
- int field1104;
- @ObfuscatedName("w")
+ int field1095;
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = -776738565
+ intValue = 363139371
)
@Export("tileHeight2")
int tileHeight2;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = -934008587
+ intValue = -1513637527
)
- int field1106;
- @ObfuscatedName("t")
+ int field1108;
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Lhv;"
+ descriptor = "Lhy;"
)
@Export("model0")
Model model0;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = -1928979701
+ intValue = 458056289
)
@Export("minX")
int minX;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = 1892949157
+ intValue = 872094215
)
@Export("minY")
int minY;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = 738468853
+ intValue = -863733713
)
@Export("maxX")
int maxX;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = -73932831
+ intValue = -381044703
)
@Export("maxY")
int maxY;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("isUnanimated")
boolean isUnanimated;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = 98212949
+ intValue = 9198677
)
@Export("team")
int team;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("isHidden")
boolean isHidden;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedGetter(
- intValue = 2123212889
+ intValue = -1115427467
)
@Export("plane")
int plane;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = -1295799177
+ intValue = -1343839549
)
@Export("index")
int index;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("isFriendTriBool")
TriBool isFriendTriBool;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("isInFriendsChat")
TriBool isInFriendsChat;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("isInClanChat")
TriBool isInClanChat;
- @ObfuscatedName("ar")
- boolean field1095;
- @ObfuscatedName("am")
+ @ObfuscatedName("ak")
+ boolean field1088;
+ @ObfuscatedName("al")
@ObfuscatedGetter(
- intValue = -634902129
+ intValue = -335116009
)
@Export("tileX")
int tileX;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@ObfuscatedGetter(
- intValue = 375783777
+ intValue = 1610456875
)
@Export("tileY")
int tileY;
@@ -181,37 +192,37 @@ public final class Player extends Actor {
this.skillLevel = 0; // L: 30
this.animationCycleStart = 0; // L: 32
this.animationCycleEnd = 0; // L: 33
- this.isUnanimated = false;
- this.team = 0;
- this.isHidden = false;
- this.isFriendTriBool = TriBool.TriBool_unknown;
- this.isInFriendsChat = TriBool.TriBool_unknown;
- this.isInClanChat = TriBool.TriBool_unknown;
- this.field1095 = false;
- }
+ this.isUnanimated = false; // L: 42
+ this.team = 0; // L: 43
+ this.isHidden = false; // L: 44
+ this.isFriendTriBool = TriBool.TriBool_unknown; // L: 47
+ this.isInFriendsChat = TriBool.TriBool_unknown; // L: 48
+ this.isInClanChat = TriBool.TriBool_unknown; // L: 49
+ this.field1088 = false; // L: 50
+ } // L: 54
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "261913950"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "2050981456"
)
@Export("read")
final void read(Buffer var1) {
- var1.offset = 0;
- int var2 = var1.readUnsignedByte();
- this.headIconPk = var1.readByte();
- this.headIconPrayer = var1.readByte();
- int var3 = -1;
- this.team = 0;
- int[] var4 = new int[12];
+ var1.offset = 0; // L: 57
+ int var2 = var1.readUnsignedByte(); // L: 58
+ this.headIconPk = var1.readByte(); // L: 59
+ this.headIconPrayer = var1.readByte(); // L: 60
+ int var3 = -1; // L: 61
+ this.team = 0; // L: 62
+ int[] var4 = new int[12]; // L: 63
int var6;
int var7;
int var8;
- for (int var5 = 0; var5 < 12; ++var5) {
- var6 = var1.readUnsignedByte();
+ for (int var5 = 0; var5 < 12; ++var5) { // L: 64
+ var6 = var1.readUnsignedByte(); // L: 65
if (var6 == 0) { // L: 66
- var4[var5] = 0;
+ var4[var5] = 0; // L: 67
} else {
var7 = var1.readUnsignedByte(); // L: 70
var4[var5] = var7 + (var6 << 8); // L: 71
@@ -221,7 +232,7 @@ public final class Player extends Actor {
}
if (var4[var5] >= 512) { // L: 76
- var8 = FileSystem.ItemDefinition_get(var4[var5] - 512).team; // L: 77
+ var8 = EnumComposition.ItemDefinition_get(var4[var5] - 512).team; // L: 77
if (var8 != 0) { // L: 78
this.team = var8;
}
@@ -233,7 +244,7 @@ public final class Player extends Actor {
for (var6 = 0; var6 < 5; ++var6) { // L: 82
var7 = var1.readUnsignedByte(); // L: 83
- if (var7 < 0 || var7 >= DesktopPlatformInfoProvider.field4469[var6].length) { // L: 84
+ if (var7 < 0 || var7 >= PlayerComposition.field3342[var6].length) { // L: 84
var7 = 0;
}
@@ -276,11 +287,11 @@ public final class Player extends Actor {
super.runSequence = -1;
}
- this.username = new Username(var1.readStringCp1252NullTerminated(), class391.loginType); // L: 102
+ this.username = new Username(var1.readStringCp1252NullTerminated(), HealthBarDefinition.loginType); // L: 102
this.clearIsFriend(); // L: 103
this.clearIsInFriendsChat(); // L: 104
- this.method2114(); // L: 105
- if (this == ModelData0.localPlayer) { // L: 106
+ this.method2135(); // L: 105
+ if (this == class101.localPlayer) { // L: 106
RunException.localPlayerName = this.username.getName();
}
@@ -291,18 +302,18 @@ public final class Player extends Actor {
this.isHidden = false;
}
- class168[] var12 = null; // L: 111
+ class167[] var12 = null; // L: 111
boolean var13 = false; // L: 112
var8 = var1.readUnsignedShort(); // L: 113
var13 = (var8 >> 15 & 1) == 1; // L: 114
int var9;
if (var8 > 0 && var8 != 32768) { // L: 115
- var12 = new class168[12]; // L: 116
+ var12 = new class167[12]; // L: 116
for (var9 = 0; var9 < 12; ++var9) { // L: 117
int var10 = var8 >> 12 - var9 & 1; // L: 118
if (var10 == 1) { // L: 119
- var12[var9] = class127.method2807(var4[var9] - 512, var1); // L: 120
+ var12[var9] = UserComparator10.method2609(var4[var9] - 512, var1); // L: 120
}
}
}
@@ -317,21 +328,21 @@ public final class Player extends Actor {
this.appearance = new PlayerComposition();
}
- this.appearance.method5395(var4, var12, var13, var11, var2 == 1, var3); // L: 130
+ this.appearance.method5566(var4, var12, var13, var11, var2 == 1, var3); // L: 130
} // L: 131
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected final Model getModel() {
if (this.appearance == null) { // L: 194
return null;
} else {
- SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class114.SequenceDefinition_get(super.sequence) : null; // L: 195
- SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? class114.SequenceDefinition_get(super.movementSequence) : null; // L: 196
+ SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ScriptFrame.SequenceDefinition_get(super.sequence) : null; // L: 195
+ SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : ScriptFrame.SequenceDefinition_get(super.movementSequence); // L: 196
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 197
if (var3 == null) { // L: 198
return null;
@@ -341,7 +352,7 @@ public final class Player extends Actor {
Model var4;
Model[] var5;
if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 201
- var4 = class136.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 202
+ var4 = ObjectSound.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 202
if (var4 != null) { // L: 203
var4.offsetBy(0, -super.spotAnimationHeight, 0); // L: 204
var5 = new Model[]{var3, var4}; // L: 205
@@ -356,7 +367,7 @@ public final class Player extends Actor {
if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 211
var4 = this.model0; // L: 212
- var4.offsetBy(this.field1104 - super.x, this.tileHeight2 - this.tileHeight, this.field1106 - super.y); // L: 213
+ var4.offsetBy(this.field1095 - super.x, this.tileHeight2 - this.tileHeight, this.field1108 - super.y); // L: 213
if (super.orientation == 512) { // L: 214
var4.rotateY90Ccw(); // L: 215
var4.rotateY90Ccw(); // L: 216
@@ -381,16 +392,16 @@ public final class Player extends Actor {
var4.rotateY90Ccw(); // L: 234
}
- var4.offsetBy(super.x - this.field1104, this.tileHeight - this.tileHeight2, super.y - this.field1106); // L: 236
+ var4.offsetBy(super.x - this.field1095, this.tileHeight - this.tileHeight2, super.y - this.field1108); // L: 236
}
}
var3.isSingleTile = true; // L: 239
- if (super.field1140 != 0 && Client.cycle >= super.field1196 && Client.cycle < super.field1197) { // L: 240
- var3.overrideHue = super.field1143; // L: 241
- var3.overrideSaturation = super.field1199; // L: 242
- var3.overrideLuminance = super.field1153; // L: 243
- var3.overrideAmount = super.field1140; // L: 244
+ if (super.field1133 != 0 && Client.cycle >= super.field1189 && Client.cycle < super.field1135) { // L: 240
+ var3.overrideHue = super.field1191; // L: 241
+ var3.overrideSaturation = super.field1192; // L: 242
+ var3.overrideLuminance = super.field1193; // L: 243
+ var3.overrideAmount = super.field1133; // L: 244
} else {
var3.overrideAmount = 0; // L: 247
}
@@ -400,10 +411,10 @@ public final class Player extends Actor {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1628986356"
+ garbageValue = "541693037"
)
@Export("isFriend")
boolean isFriend() {
@@ -414,30 +425,30 @@ public final class Player extends Actor {
return this.isFriendTriBool == TriBool.TriBool_true; // L: 137
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "0"
+ descriptor = "(I)V",
+ garbageValue = "-842597449"
)
@Export("clearIsFriend")
void clearIsFriend() {
this.isFriendTriBool = TriBool.TriBool_unknown; // L: 141
} // L: 142
- @ObfuscatedName("r")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1844788103"
+ descriptor = "(B)V",
+ garbageValue = "82"
)
@Export("checkIsFriend")
void checkIsFriend() {
- this.isFriendTriBool = BufferedSource.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 145
+ this.isFriendTriBool = friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 145
} // L: 146
- @ObfuscatedName("v")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1086408777"
+ garbageValue = "1871762564"
)
@Export("isFriendsChatMember")
boolean isFriendsChatMember() {
@@ -450,33 +461,33 @@ public final class Player extends Actor {
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-55"
+ descriptor = "(I)V",
+ garbageValue = "-1664103781"
)
@Export("clearIsInFriendsChat")
void clearIsInFriendsChat() {
this.isInFriendsChat = TriBool.TriBool_unknown; // L: 156
} // L: 157
- @ObfuscatedName("c")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "199387675"
+ garbageValue = "-1421965855"
)
@Export("updateIsInFriendsChat")
void updateIsInFriendsChat() {
- this.isInFriendsChat = PcmPlayer.friendsChat != null && PcmPlayer.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160
+ this.isInFriendsChat = Huffman.friendsChat != null && Huffman.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160
} // L: 161
- @ObfuscatedName("w")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1914658106"
+ garbageValue = "1544435810"
)
@Export("updateIsInClanChat")
void updateIsInClanChat() {
for (int var1 = 0; var1 < 4; ++var1) { // L: 164
- if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2884(this.username.getName()) != -1 && var1 != 2) { // L: 165 166
+ if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2991(this.username.getName()) != -1 && var1 != 2) { // L: 165 166
this.isInClanChat = TriBool.TriBool_true; // L: 167
return; // L: 168
}
@@ -485,19 +496,19 @@ public final class Player extends Actor {
this.isInClanChat = TriBool.TriBool_false; // L: 172
} // L: 173
- @ObfuscatedName("b")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1431876622"
+ garbageValue = "-2144863199"
)
- void method2114() {
+ void method2135() {
this.isInClanChat = TriBool.TriBool_unknown; // L: 176
} // L: 177
- @ObfuscatedName("t")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1920996538"
+ garbageValue = "2071495153"
)
@Export("isClanMember")
boolean isClanMember() {
@@ -508,34 +519,34 @@ public final class Player extends Actor {
return this.isInClanChat == TriBool.TriBool_true; // L: 183
}
- @ObfuscatedName("g")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1044591641"
+ descriptor = "(B)I",
+ garbageValue = "20"
)
@Export("transformedSize")
int transformedSize() {
- return this.appearance != null && this.appearance.npcTransformId != -1 ? WorldMapSectionType.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 187 188 190
+ return this.appearance != null && this.appearance.npcTransformId != -1 ? BuddyRankComparator.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 187 188 190
}
- @ObfuscatedName("x")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(IILgd;I)V",
- garbageValue = "1708455011"
+ descriptor = "(IILgn;S)V",
+ garbageValue = "26658"
)
- final void method2117(int var1, int var2, class193 var3) {
- if (super.sequence != -1 && class114.SequenceDefinition_get(super.sequence).field2206 == 1) { // L: 253
+ final void method2139(int var1, int var2, class192 var3) {
+ if (super.sequence != -1 && ScriptFrame.SequenceDefinition_get(super.sequence).field2188 == 1) { // L: 253
super.sequence = -1;
}
- super.field1172 = -1; // L: 254
+ super.field1165 = -1; // L: 254
if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 255
if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 256
- if (var3 == class193.field2248) {
- UrlRequester.method2540(this, var1, var2, class193.field2248); // L: 258
+ if (var3 == class192.field2211) {
+ class306.method5765(this, var1, var2, class192.field2211); // L: 258
}
- this.method2119(var1, var2, var3); // L: 259
+ this.method2141(var1, var2, var3); // L: 259
} else {
this.resetPath(var1, var2);
}
@@ -545,29 +556,29 @@ public final class Player extends Actor {
} // L: 261
- @ObfuscatedName("n")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-2013717198"
+ descriptor = "(IIB)V",
+ garbageValue = "3"
)
@Export("resetPath")
void resetPath(int var1, int var2) {
super.pathLength = 0; // L: 264
- super.field1200 = 0; // L: 265
- super.field1194 = 0; // L: 266
+ super.field1203 = 0; // L: 265
+ super.field1202 = 0; // L: 266
super.pathX[0] = var1; // L: 267
super.pathY[0] = var2; // L: 268
int var3 = this.transformedSize(); // L: 269
super.x = var3 * 64 + super.pathX[0] * 128; // L: 270
- super.y = super.pathY[0] * 128 + var3 * 64; // L: 271
+ super.y = var3 * 64 + super.pathY[0] * 128; // L: 271
} // L: 272
- @ObfuscatedName("e")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(IILgd;I)V",
- garbageValue = "4079166"
+ descriptor = "(IILgn;I)V",
+ garbageValue = "829621719"
)
- final void method2119(int var1, int var2, class193 var3) {
+ final void method2141(int var1, int var2, class192 var3) {
if (super.pathLength < 9) { // L: 275
++super.pathLength;
}
@@ -583,203 +594,13 @@ public final class Player extends Actor {
super.pathTraversed[0] = var3; // L: 283
} // L: 284
- @ObfuscatedName("h")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-4"
+ descriptor = "(I)Z",
+ garbageValue = "9013641"
)
@Export("isVisible")
final boolean isVisible() {
return this.appearance != null; // L: 287
}
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lpc;B)V",
- garbageValue = "0"
- )
- @Export("updatePlayer")
- static final void updatePlayer(PacketBuffer var0) {
- var0.importIndex(); // L: 37
- int var1 = Client.localPlayerIndex; // L: 38
- Player var2 = ModelData0.localPlayer = Client.players[var1] = new Player(); // L: 39
- var2.index = var1; // L: 40
- int var3 = var0.readBits(30); // L: 41
- byte var4 = (byte)(var3 >> 28); // L: 42
- int var5 = var3 >> 14 & 16383; // L: 43
- int var6 = var3 & 16383; // L: 44
- var2.pathX[0] = var5 - SecureRandomCallable.baseX; // L: 45
- var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
- var2.pathY[0] = var6 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 47
- var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
- class128.Client_plane = var2.plane = var4; // L: 49
- if (Players.field1307[var1] != null) { // L: 50
- var2.read(Players.field1307[var1]);
- }
-
- Players.Players_count = 0; // L: 51
- Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
- Players.field1301[var1] = 0; // L: 53
- Players.Players_emptyIdxCount = 0; // L: 54
-
- for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
- if (var7 != var1) { // L: 56
- int var8 = var0.readBits(18); // L: 57
- int var9 = var8 >> 16; // L: 58
- int var10 = var8 >> 8 & 597; // L: 59
- int var11 = var8 & 597; // L: 60
- Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61
- Players.Players_orientations[var7] = 0; // L: 62
- Players.Players_targetIndices[var7] = -1; // L: 63
- Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64
- Players.field1301[var7] = 0; // L: 65
- }
- }
-
- var0.exportIndex(); // L: 67
- } // L: 68
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)[Lcs;",
- garbageValue = "-1603535940"
- )
- static class82[] method2159() {
- return new class82[]{class82.field1078, class82.field1073, class82.field1076, class82.field1075, class82.field1079}; // L: 16
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-86"
- )
- static int method2157(int var0, Script var1, boolean var2) {
- Widget var3;
- if (var0 >= 2000) { // L: 1031
- var0 -= 1000; // L: 1032
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1033
- } else {
- var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1035
- }
-
- String var4 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1036
- int[] var5 = null; // L: 1037
- if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1038
- int var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1039
- if (var6 > 0) { // L: 1040
- for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]) { // L: 1041 1042
- }
- }
-
- var4 = var4.substring(0, var4.length() - 1); // L: 1044
- }
-
- Object[] var8 = new Object[var4.length() + 1]; // L: 1046
-
- int var7;
- for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1047
- if (var4.charAt(var7 - 1) == 's') { // L: 1048
- var8[var7] = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize];
- } else {
- var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1049
- }
- }
-
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1051
- if (var7 != -1) { // L: 1052
- var8[0] = new Integer(var7);
- } else {
- var8 = null; // L: 1053
- }
-
- if (var0 == ScriptOpcodes.CC_SETONCLICK) {
- var3.onClick = var8; // L: 1054
- } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1055
- var3.onHold = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1056
- var3.onRelease = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1057
- var3.onMouseOver = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1058
- var3.onMouseLeave = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1059
- var3.onDrag = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1060
- var3.onTargetLeave = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1061
- var3.onVarTransmit = var8; // L: 1062
- var3.varTransmitTriggers = var5; // L: 1063
- } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1065
- var3.onTimer = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1066
- var3.onOp = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1067
- var3.onDragComplete = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1068
- var3.onClickRepeat = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1069
- var3.onMouseRepeat = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1070
- var3.onInvTransmit = var8; // L: 1071
- var3.invTransmitTriggers = var5; // L: 1072
- } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1074
- var3.onStatTransmit = var8; // L: 1075
- var3.statTransmitTriggers = var5; // L: 1076
- } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1078
- var3.onTargetEnter = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1079
- var3.onScroll = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1080
- var3.onChatTransmit = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1081
- var3.onKey = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1082
- var3.onFriendTransmit = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1083
- var3.onClanTransmit = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1084
- var3.onMiscTransmit = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1085
- var3.onDialogAbort = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1086
- var3.onSubChange = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1087
- var3.onStockTransmit = var8;
- } else if (var0 == 1426) { // L: 1088
- var3.field3520 = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1089
- var3.onResize = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1090
- var3.field3513 = var8;
- } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1091
- var3.field3456 = var8;
- } else if (var0 == 1430) { // L: 1092
- var3.field3443 = var8;
- } else if (var0 == 1431) { // L: 1093
- var3.field3510 = var8;
- } else {
- if (var0 != 1434) { // L: 1094
- return 2; // L: 1095
- }
-
- var3.field3460 = var8;
- }
-
- var3.hasListener = true; // L: 1096
- return 1; // L: 1097
- }
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2538543"
- )
- static void method2135() {
- if (ClientPreferences.loadWorlds()) { // L: 1949
- Login.worldSelectOpen = true; // L: 1950
- Login.worldSelectPage = 0; // L: 1951
- Login.worldSelectPagesCount = 0; // L: 1952
- }
-
- } // L: 1954
}
diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java
index 3d7b112571..a44cfbeae5 100644
--- a/runescape-client/src/main/java/PlayerComposition.java
+++ b/runescape-client/src/main/java/PlayerComposition.java
@@ -4,150 +4,159 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kp")
+@ObfuscatedName("kt")
@Implements("PlayerComposition")
public class PlayerComposition {
- @ObfuscatedName("c")
- public static short[][] field3366;
- @ObfuscatedName("w")
+ @ObfuscatedName("th")
+ @ObfuscatedGetter(
+ intValue = 882469973
+ )
+ static int field3346;
+ @ObfuscatedName("y")
+ public static short[] field3343;
+ @ObfuscatedName("i")
+ public static short[][] field3342;
+ @ObfuscatedName("t")
+ public static short[][] field3334;
+ @ObfuscatedName("z")
@Export("equipmentIndices")
static final int[] equipmentIndices;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
- @Export("PlayerAppearance_cachedModels")
- public static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
- @ObfuscatedName("o")
+ @Export("Widget_cachedSpriteMasks")
+ static EvictingDualNodeHashTable Widget_cachedSpriteMasks;
+ @ObfuscatedName("c")
@Export("equipment")
int[] equipment;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("bodyColors")
int[] bodyColors;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("isFemale")
public boolean isFemale;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 92752325
+ intValue = 855497951
)
@Export("npcTransformId")
public int npcTransformId;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- longValue = -7782152714703146163L
+ longValue = -4116623341203596551L
)
@Export("hash")
long hash;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- longValue = -9099438919226183133L
+ longValue = 5787532750931398799L
)
- long field3368;
- @ObfuscatedName("p")
+ long field3345;
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "[Lfn;"
+ descriptor = "[Lfy;"
)
- class168[] field3364;
- @ObfuscatedName("s")
- boolean field3365;
+ class167[] field3339;
+ @ObfuscatedName("w")
+ boolean field3341;
static {
equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26
- PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 27
+ Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(260);
}
public PlayerComposition() {
- this.field3365 = false; // L: 21
+ this.field3341 = false;
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([I[Lfn;Z[IZII)V",
- garbageValue = "2036477706"
+ descriptor = "([I[Lfy;Z[IZII)V",
+ garbageValue = "927894268"
)
- public void method5395(int[] var1, class168[] var2, boolean var3, int[] var4, boolean var5, int var6) {
- this.field3364 = var2; // L: 30
- this.field3365 = var3; // L: 31
- this.update(var1, var4, var5, var6); // L: 32
- } // L: 33
+ public void method5566(int[] var1, class167[] var2, boolean var3, int[] var4, boolean var5, int var6) {
+ this.field3339 = var2; // L: 30
+ this.field3341 = var3;
+ this.update(var1, var4, var5, var6);
+ }
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "([I[IZII)V",
- garbageValue = "-1891855467"
+ garbageValue = "-532197746"
)
@Export("update")
public void update(int[] var1, int[] var2, boolean var3, int var4) {
- if (var1 == null) { // L: 36
- var1 = new int[12]; // L: 37
+ if (var1 == null) {
+ var1 = new int[12];
for (int var5 = 0; var5 < 7; ++var5) { // L: 38
- for (int var6 = 0; var6 < class147.KitDefinition_fileCount; ++var6) { // L: 39
- KitDefinition var7 = Script.KitDefinition_get(var6); // L: 40
- if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { // L: 41
+ for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) {
+ KitDefinition var7 = SecureRandomFuture.KitDefinition_get(var6);
+ if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) {
var1[equipmentIndices[var5]] = var6 + 256; // L: 42
- break; // L: 43
+ break;
}
}
}
}
- this.equipment = var1; // L: 48
- this.bodyColors = var2; // L: 49
+ this.equipment = var1;
+ this.bodyColors = var2;
this.isFemale = var3; // L: 50
- this.npcTransformId = var4; // L: 51
- this.setHash(); // L: 52
- } // L: 53
+ this.npcTransformId = var4;
+ this.setHash();
+ }
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IZI)V",
- garbageValue = "983810736"
+ garbageValue = "-624055687"
)
@Export("changeAppearance")
public void changeAppearance(int var1, boolean var2) {
- if (var1 != 1 || !this.isFemale) { // L: 56
- int var3 = this.equipment[equipmentIndices[var1]]; // L: 57
+ if (var1 != 1 || !this.isFemale) {
+ int var3 = this.equipment[equipmentIndices[var1]];
if (var3 != 0) { // L: 58
- var3 -= 256; // L: 59
+ var3 -= 256;
KitDefinition var4;
do {
- if (!var2) { // L: 61
+ if (!var2) {
--var3; // L: 62
- if (var3 < 0) { // L: 63
- var3 = class147.KitDefinition_fileCount - 1;
+ if (var3 < 0) {
+ var3 = KitDefinition.KitDefinition_fileCount - 1;
}
} else {
++var3; // L: 66
- if (var3 >= class147.KitDefinition_fileCount) { // L: 67
+ if (var3 >= KitDefinition.KitDefinition_fileCount) {
var3 = 0;
}
}
- var4 = Script.KitDefinition_get(var3); // L: 69
+ var4 = SecureRandomFuture.KitDefinition_get(var3);
} while(var4 == null || var4.nonSelectable || (this.isFemale ? 7 : 0) + var1 != var4.bodypartID); // L: 70
- this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72
- this.setHash(); // L: 73
+ this.equipment[equipmentIndices[var1]] = var3 + 256;
+ this.setHash();
}
}
- } // L: 74
+ }
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(IZI)V",
- garbageValue = "-2104748199"
+ garbageValue = "-875424667"
)
- public void method5394(int var1, boolean var2) {
- int var3 = this.bodyColors[var1]; // L: 77
+ public void method5573(int var1, boolean var2) {
+ int var3 = this.bodyColors[var1];
boolean var4;
- if (!var2) { // L: 78
+ if (!var2) {
do {
--var3;
if (var3 < 0) {
- var3 = DesktopPlatformInfoProvider.field4469[var1].length - 1;
+ var3 = field3342[var1].length - 1;
}
if (var1 == 4 && var3 >= 8) {
@@ -155,54 +164,54 @@ public class PlayerComposition {
} else {
var4 = true;
}
- } while(!var4); // L: 92
+ } while(!var4);
} else {
do {
- ++var3; // L: 97
- if (var3 >= DesktopPlatformInfoProvider.field4469[var1].length) { // L: 98
+ ++var3;
+ if (var3 >= field3342[var1].length) {
var3 = 0;
}
- if (var1 == 4 && var3 >= 8) { // L: 101
- var4 = false; // L: 102
+ if (var1 == 4 && var3 >= 8) {
+ var4 = false;
} else {
- var4 = true; // L: 105
+ var4 = true;
}
} while(!var4); // L: 107
}
- this.bodyColors[var1] = var3; // L: 110
+ this.bodyColors[var1] = var3;
this.setHash(); // L: 111
- } // L: 112
+ }
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(ZB)V",
- garbageValue = "108"
+ descriptor = "(ZI)V",
+ garbageValue = "-610212168"
)
@Export("changeSex")
public void changeSex(boolean var1) {
if (this.isFemale != var1) { // L: 115
- this.update((int[])null, this.bodyColors, var1, -1); // L: 116
+ this.update((int[])null, this.bodyColors, var1, -1);
}
- } // L: 117
+ }
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1160486905"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-159809821"
)
@Export("write")
public void write(Buffer var1) {
var1.writeByte(this.isFemale ? 1 : 0); // L: 120
int var2;
- for (var2 = 0; var2 < 7; ++var2) { // L: 121
- int var3 = this.equipment[equipmentIndices[var2]]; // L: 122
- if (var3 == 0) { // L: 123
+ for (var2 = 0; var2 < 7; ++var2) {
+ int var3 = this.equipment[equipmentIndices[var2]];
+ if (var3 == 0) {
var1.writeByte(-1);
} else {
- var1.writeByte(var3 - 256); // L: 124
+ var1.writeByte(var3 - 256);
}
}
@@ -210,102 +219,102 @@ public class PlayerComposition {
var1.writeByte(this.bodyColors[var2]);
}
- } // L: 127
+ }
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "28"
+ descriptor = "(I)V",
+ garbageValue = "-288616983"
)
@Export("setHash")
void setHash() {
long var1 = this.hash; // L: 130
- int var3 = this.equipment[5]; // L: 131
- int var4 = this.equipment[9]; // L: 132
- this.equipment[5] = var4; // L: 133
+ int var3 = this.equipment[5];
+ int var4 = this.equipment[9];
+ this.equipment[5] = var4;
this.equipment[9] = var3; // L: 134
- this.hash = 0L; // L: 135
+ this.hash = 0L;
int var5;
- for (var5 = 0; var5 < 12; ++var5) { // L: 136
- this.hash <<= 4; // L: 137
+ for (var5 = 0; var5 < 12; ++var5) {
+ this.hash <<= 4;
if (this.equipment[var5] >= 256) { // L: 138
this.hash += (long)(this.equipment[var5] - 256);
}
}
- if (this.equipment[0] >= 256) { // L: 140
+ if (this.equipment[0] >= 256) {
this.hash += (long)(this.equipment[0] - 256 >> 4);
}
- if (this.equipment[1] >= 256) { // L: 141
+ if (this.equipment[1] >= 256) {
this.hash += (long)(this.equipment[1] - 256 >> 8);
}
for (var5 = 0; var5 < 5; ++var5) { // L: 142
- this.hash <<= 3; // L: 143
- this.hash += (long)this.bodyColors[var5]; // L: 144
+ this.hash <<= 3;
+ this.hash += (long)this.bodyColors[var5];
}
- this.hash <<= 1; // L: 146
+ this.hash <<= 1;
this.hash += (long)(this.isFemale ? 1 : 0); // L: 147
- this.equipment[5] = var3; // L: 148
- this.equipment[9] = var4; // L: 149
- if (var1 != 0L && var1 != this.hash || this.field3365) { // L: 150
- PlayerAppearance_cachedModels.remove(var1);
+ this.equipment[5] = var3;
+ this.equipment[9] = var4;
+ if (0L != var1 && this.hash != var1 || this.field3341) {
+ Widget_cachedSpriteMasks.remove(var1);
}
} // L: 151
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Lgq;ILgq;IB)Lhv;",
- garbageValue = "-45"
+ descriptor = "(Lgc;ILgc;II)Lhy;",
+ garbageValue = "-2130042803"
)
@Export("getModel")
public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
- if (this.npcTransformId != -1) { // L: 154
- return WorldMapSectionType.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155
+ if (this.npcTransformId != -1) {
+ return BuddyRankComparator.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155
} else {
- long var5 = this.hash; // L: 157
- int[] var7 = this.equipment; // L: 158
+ long var5 = this.hash;
+ int[] var7 = this.equipment;
if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 159
- var7 = new int[12]; // L: 160
+ var7 = new int[12];
- for (int var8 = 0; var8 < 12; ++var8) { // L: 161
+ for (int var8 = 0; var8 < 12; ++var8) {
var7[var8] = this.equipment[var8];
}
- if (var1.shield >= 0) { // L: 162
+ if (var1.shield >= 0) {
var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163
var7[5] = var1.shield; // L: 164
}
- if (var1.weapon >= 0) { // L: 166
- var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167
- var7[3] = var1.weapon; // L: 168
+ if (var1.weapon >= 0) {
+ var5 += (long)(var1.weapon - this.equipment[3] << 48);
+ var7[3] = var1.weapon;
}
}
- Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 171
- if (var18 == null) { // L: 172
+ Model var18 = (Model)Widget_cachedSpriteMasks.get(var5);
+ if (var18 == null) {
boolean var9 = false; // L: 173
int var11;
for (int var10 = 0; var10 < 12; ++var10) { // L: 174
var11 = var7[var10]; // L: 175
- if (var11 >= 256 && var11 < 512 && !Script.KitDefinition_get(var11 - 256).ready()) { // L: 176 177
+ if (var11 >= 256 && var11 < 512 && !SecureRandomFuture.KitDefinition_get(var11 - 256).ready()) { // L: 176 177
var9 = true;
}
- if (var11 >= 512 && !FileSystem.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180
+ if (var11 >= 512 && !EnumComposition.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180
var9 = true;
}
}
if (var9) { // L: 183
- if (this.field3368 != -1L) { // L: 184
- var18 = (Model)PlayerAppearance_cachedModels.get(this.field3368);
+ if (-1L != this.field3345) { // L: 184
+ var18 = (Model)Widget_cachedSpriteMasks.get(this.field3345);
}
if (var18 == null) { // L: 185
@@ -321,29 +330,29 @@ public class PlayerComposition {
for (int var12 = 0; var12 < 12; ++var12) { // L: 190
var13 = var7[var12]; // L: 191
if (var13 >= 256 && var13 < 512) { // L: 192
- ModelData var14 = Script.KitDefinition_get(var13 - 256).getModelData(); // L: 193
+ ModelData var14 = SecureRandomFuture.KitDefinition_get(var13 - 256).getModelData(); // L: 193
if (var14 != null) { // L: 194
var19[var11++] = var14;
}
}
if (var13 >= 512) { // L: 196
- ItemComposition var22 = FileSystem.ItemDefinition_get(var13 - 512); // L: 197
- ModelData var15 = var22.method3630(this.isFemale); // L: 198
+ ItemComposition var22 = EnumComposition.ItemDefinition_get(var13 - 512); // L: 197
+ ModelData var15 = var22.method3721(this.isFemale); // L: 198
if (var15 != null) { // L: 199
- if (this.field3364 != null) { // L: 200
- class168 var16 = this.field3364[var12]; // L: 201
+ if (this.field3339 != null) { // L: 200
+ class167 var16 = this.field3339[var12]; // L: 201
if (var16 != null) { // L: 202
int var17;
- if (var16.field1847 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1847.length) { // L: 203
+ if (var16.field1814 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1814.length) { // L: 203
for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204
- var15.recolor(var22.recolorTo[var17], var16.field1847[var17]); // L: 205
+ var15.recolor(var22.recolorTo[var17], var16.field1814[var17]); // L: 205
}
}
- if (var16.field1844 != null && var22.retextureFrom != null && var16.field1844.length == var22.retextureTo.length) { // L: 208
+ if (var16.field1815 != null && var22.retextureFrom != null && var16.field1815.length == var22.retextureTo.length) { // L: 208
for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209
- var15.retexture(var22.retextureTo[var17], var16.field1844[var17]); // L: 210
+ var15.retexture(var22.retextureTo[var17], var16.field1815[var17]); // L: 210
}
}
}
@@ -357,18 +366,18 @@ public class PlayerComposition {
ModelData var20 = new ModelData(var19, var11); // L: 219
for (var13 = 0; var13 < 5; ++var13) { // L: 220
- if (this.bodyColors[var13] < DesktopPlatformInfoProvider.field4469[var13].length) { // L: 221
- var20.recolor(Coord.field3352[var13], DesktopPlatformInfoProvider.field4469[var13][this.bodyColors[var13]]);
+ if (this.bodyColors[var13] < field3342[var13].length) { // L: 221
+ var20.recolor(field3343[var13], field3342[var13][this.bodyColors[var13]]);
}
- if (this.bodyColors[var13] < field3366[var13].length) { // L: 222
- var20.recolor(class340.field4156[var13], field3366[var13][this.bodyColors[var13]]);
+ if (this.bodyColors[var13] < field3334[var13].length) { // L: 222
+ var20.recolor(WorldMapSectionType.field2793[var13], field3334[var13][this.bodyColors[var13]]);
}
}
var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224
- PlayerAppearance_cachedModels.put(var18, var5); // L: 225
- this.field3368 = var5; // L: 226
+ Widget_cachedSpriteMasks.put(var18, var5); // L: 225
+ this.field3345 = var5; // L: 226
}
}
@@ -389,26 +398,26 @@ public class PlayerComposition {
}
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(B)Lgs;",
- garbageValue = "-25"
+ descriptor = "(B)Lgw;",
+ garbageValue = "67"
)
@Export("getModelData")
ModelData getModelData() {
if (this.npcTransformId != -1) { // L: 238
- return WorldMapSectionType.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
+ return BuddyRankComparator.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
} else {
boolean var1 = false; // L: 241
int var3;
for (int var2 = 0; var2 < 12; ++var2) { // L: 242
var3 = this.equipment[var2]; // L: 243
- if (var3 >= 256 && var3 < 512 && !Script.KitDefinition_get(var3 - 256).method3335()) { // L: 244 245
+ if (var3 >= 256 && var3 < 512 && !SecureRandomFuture.KitDefinition_get(var3 - 256).method3417()) { // L: 244 245
var1 = true;
}
- if (var3 >= 512 && !FileSystem.ItemDefinition_get(var3 - 512).method3631(this.isFemale)) { // L: 247 248
+ if (var3 >= 512 && !EnumComposition.ItemDefinition_get(var3 - 512).method3746(this.isFemale)) { // L: 247 248
var1 = true;
}
}
@@ -424,14 +433,14 @@ public class PlayerComposition {
var5 = this.equipment[var4]; // L: 255
ModelData var6;
if (var5 >= 256 && var5 < 512) { // L: 256
- var6 = Script.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
+ var6 = SecureRandomFuture.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
if (var6 != null) { // L: 258
var7[var3++] = var6;
}
}
if (var5 >= 512) { // L: 260
- var6 = FileSystem.ItemDefinition_get(var5 - 512).method3632(this.isFemale); // L: 261
+ var6 = EnumComposition.ItemDefinition_get(var5 - 512).method3723(this.isFemale); // L: 261
if (var6 != null) { // L: 262
var7[var3++] = var6;
}
@@ -441,12 +450,12 @@ public class PlayerComposition {
ModelData var8 = new ModelData(var7, var3); // L: 265
for (var5 = 0; var5 < 5; ++var5) { // L: 266
- if (this.bodyColors[var5] < DesktopPlatformInfoProvider.field4469[var5].length) { // L: 267
- var8.recolor(Coord.field3352[var5], DesktopPlatformInfoProvider.field4469[var5][this.bodyColors[var5]]);
+ if (this.bodyColors[var5] < field3342[var5].length) { // L: 267
+ var8.recolor(field3343[var5], field3342[var5][this.bodyColors[var5]]);
}
- if (this.bodyColors[var5] < field3366[var5].length) { // L: 268
- var8.recolor(class340.field4156[var5], field3366[var5][this.bodyColors[var5]]);
+ if (this.bodyColors[var5] < field3334[var5].length) { // L: 268
+ var8.recolor(WorldMapSectionType.field2793[var5], field3334[var5][this.bodyColors[var5]]);
}
}
@@ -455,44 +464,148 @@ public class PlayerComposition {
}
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "695614719"
+ garbageValue = "813764515"
)
@Export("getChatHeadId")
public int getChatHeadId() {
- return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + WorldMapSectionType.getNpcDefinition(this.npcTransformId).id; // L: 274 275
+ return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + BuddyRankComparator.getNpcDefinition(this.npcTransformId).id; // L: 274 275
}
- @ObfuscatedName("l")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIIIB)V",
- garbageValue = "-10"
+ descriptor = "(ILjava/lang/String;Llb;II)Ljt;",
+ garbageValue = "-1658860348"
)
- static final void method5408(int var0, int var1, int var2, int var3) {
- for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79
- for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80
- if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81
- NPC.field1259[0][var5][var4] = 127; // L: 82
- if (var0 == var5 && var5 > 0) { // L: 83
- Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
- }
-
- if (var5 == var0 + var2 && var5 < 103) { // L: 84
- Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
- }
-
- if (var4 == var1 && var4 > 0) { // L: 85
- Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
- }
-
- if (var3 + var1 == var4 && var4 < 103) { // L: 86
- Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
- }
- }
+ public static PacketBufferNode method5600(int var0, String var1, Language var2, int var3) {
+ PacketBufferNode var4 = EnumComposition.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 17
+ var4.packetBuffer.writeByte(0); // L: 18
+ int var5 = var4.packetBuffer.offset; // L: 19
+ var4.packetBuffer.writeByte(var0); // L: 20
+ String var6 = var1.toLowerCase(); // L: 21
+ byte var7 = 0; // L: 22
+ if (var6.startsWith("yellow:")) { // L: 23
+ var7 = 0; // L: 24
+ var1 = var1.substring("yellow:".length()); // L: 25
+ } else if (var6.startsWith("red:")) { // L: 27
+ var7 = 1; // L: 28
+ var1 = var1.substring("red:".length()); // L: 29
+ } else if (var6.startsWith("green:")) { // L: 31
+ var7 = 2; // L: 32
+ var1 = var1.substring("green:".length()); // L: 33
+ } else if (var6.startsWith("cyan:")) { // L: 35
+ var7 = 3; // L: 36
+ var1 = var1.substring("cyan:".length()); // L: 37
+ } else if (var6.startsWith("purple:")) { // L: 39
+ var7 = 4; // L: 40
+ var1 = var1.substring("purple:".length()); // L: 41
+ } else if (var6.startsWith("white:")) { // L: 43
+ var7 = 5; // L: 44
+ var1 = var1.substring("white:".length()); // L: 45
+ } else if (var6.startsWith("flash1:")) { // L: 47
+ var7 = 6; // L: 48
+ var1 = var1.substring("flash1:".length()); // L: 49
+ } else if (var6.startsWith("flash2:")) { // L: 51
+ var7 = 7; // L: 52
+ var1 = var1.substring("flash2:".length()); // L: 53
+ } else if (var6.startsWith("flash3:")) { // L: 55
+ var7 = 8; // L: 56
+ var1 = var1.substring("flash3:".length()); // L: 57
+ } else if (var6.startsWith("glow1:")) { // L: 59
+ var7 = 9; // L: 60
+ var1 = var1.substring("glow1:".length()); // L: 61
+ } else if (var6.startsWith("glow2:")) { // L: 63
+ var7 = 10; // L: 64
+ var1 = var1.substring("glow2:".length()); // L: 65
+ } else if (var6.startsWith("glow3:")) { // L: 67
+ var7 = 11; // L: 68
+ var1 = var1.substring("glow3:".length()); // L: 69
+ } else if (var2 != Language.Language_EN) { // L: 71
+ if (var6.startsWith("yellow:")) { // L: 72
+ var7 = 0; // L: 73
+ var1 = var1.substring("yellow:".length()); // L: 74
+ } else if (var6.startsWith("red:")) { // L: 76
+ var7 = 1; // L: 77
+ var1 = var1.substring("red:".length()); // L: 78
+ } else if (var6.startsWith("green:")) { // L: 80
+ var7 = 2; // L: 81
+ var1 = var1.substring("green:".length()); // L: 82
+ } else if (var6.startsWith("cyan:")) { // L: 84
+ var7 = 3; // L: 85
+ var1 = var1.substring("cyan:".length()); // L: 86
+ } else if (var6.startsWith("purple:")) { // L: 88
+ var7 = 4; // L: 89
+ var1 = var1.substring("purple:".length()); // L: 90
+ } else if (var6.startsWith("white:")) { // L: 92
+ var7 = 5; // L: 93
+ var1 = var1.substring("white:".length()); // L: 94
+ } else if (var6.startsWith("flash1:")) { // L: 96
+ var7 = 6; // L: 97
+ var1 = var1.substring("flash1:".length()); // L: 98
+ } else if (var6.startsWith("flash2:")) { // L: 100
+ var7 = 7; // L: 101
+ var1 = var1.substring("flash2:".length()); // L: 102
+ } else if (var6.startsWith("flash3:")) { // L: 104
+ var7 = 8; // L: 105
+ var1 = var1.substring("flash3:".length()); // L: 106
+ } else if (var6.startsWith("glow1:")) { // L: 108
+ var7 = 9; // L: 109
+ var1 = var1.substring("glow1:".length()); // L: 110
+ } else if (var6.startsWith("glow2:")) { // L: 112
+ var7 = 10; // L: 113
+ var1 = var1.substring("glow2:".length()); // L: 114
+ } else if (var6.startsWith("glow3:")) { // L: 116
+ var7 = 11; // L: 117
+ var1 = var1.substring("glow3:".length()); // L: 118
}
}
- } // L: 90
+ var6 = var1.toLowerCase(); // L: 121
+ byte var8 = 0; // L: 122
+ if (var6.startsWith("wave:")) { // L: 123
+ var8 = 1; // L: 124
+ var1 = var1.substring("wave:".length()); // L: 125
+ } else if (var6.startsWith("wave2:")) { // L: 127
+ var8 = 2; // L: 128
+ var1 = var1.substring("wave2:".length()); // L: 129
+ } else if (var6.startsWith("shake:")) { // L: 131
+ var8 = 3; // L: 132
+ var1 = var1.substring("shake:".length()); // L: 133
+ } else if (var6.startsWith("scroll:")) { // L: 135
+ var8 = 4; // L: 136
+ var1 = var1.substring("scroll:".length()); // L: 137
+ } else if (var6.startsWith("slide:")) { // L: 139
+ var8 = 5; // L: 140
+ var1 = var1.substring("slide:".length()); // L: 141
+ } else if (var2 != Language.Language_EN) { // L: 143
+ if (var6.startsWith("wave:")) { // L: 144
+ var8 = 1; // L: 145
+ var1 = var1.substring("wave:".length()); // L: 146
+ } else if (var6.startsWith("wave2:")) { // L: 148
+ var8 = 2; // L: 149
+ var1 = var1.substring("wave2:".length()); // L: 150
+ } else if (var6.startsWith("shake:")) { // L: 152
+ var8 = 3; // L: 153
+ var1 = var1.substring("shake:".length()); // L: 154
+ } else if (var6.startsWith("scroll:")) { // L: 156
+ var8 = 4; // L: 157
+ var1 = var1.substring("scroll:".length()); // L: 158
+ } else if (var6.startsWith("slide:")) { // L: 160
+ var8 = 5; // L: 161
+ var1 = var1.substring("slide:".length()); // L: 162
+ }
+ }
+
+ var4.packetBuffer.writeByte(var7); // L: 165
+ var4.packetBuffer.writeByte(var8); // L: 166
+ PcmPlayer.method720(var4.packetBuffer, var1); // L: 167
+ if (var0 == class295.field3528.rsOrdinal()) { // L: 168
+ var4.packetBuffer.writeByte(var3); // L: 169
+ }
+
+ var4.packetBuffer.method7935(var4.packetBuffer.offset - var5); // L: 171
+ return var4; // L: 172
+ }
}
diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java
index 915bccb1ec..18de533863 100644
--- a/runescape-client/src/main/java/PlayerType.java
+++ b/runescape-client/src/main/java/PlayerType.java
@@ -4,99 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kg")
+@ObfuscatedName("ky")
@Implements("PlayerType")
public enum PlayerType implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
@Export("PlayerType_normal")
PlayerType_normal(0, -1, true, false, true),
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
@Export("PlayerType_playerModerator")
PlayerType_playerModerator(1, 0, true, true, true),
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
@Export("PlayerType_jagexModerator")
PlayerType_jagexModerator(2, 1, true, true, false),
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
@Export("PlayerType_ironman")
PlayerType_ironman(3, 2, false, false, true),
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
@Export("PlayerType_ultimateIronman")
PlayerType_ultimateIronman(4, 3, false, false, true),
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
@Export("PlayerType_hardcoreIronman")
PlayerType_hardcoreIronman(5, 10, false, false, true),
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
- field3989(6, 22, false, false, true),
+ field3951(6, 22, false, false, true),
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3952(7, 41, false, false, true),
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3956(8, 42, false, false, true),
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3954(9, 43, false, false, true),
@ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
- field3984(7, 41, false, false, true),
+ field3949(10, 44, false, false, true),
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3945(11, 45, false, false, true),
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3957(12, 46, false, false, true),
@ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Lkg;"
+ descriptor = "Lky;"
)
- field3990(8, 42, false, false, true);
+ field3958(13, 47, false, false, true),
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3959(14, 48, false, false, true),
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "Lky;"
+ )
+ field3960(15, 49, false, false, true);
- @ObfuscatedName("e")
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = -455840439
- )
- static int field3985;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = -1489316805
+ intValue = -1157893365
)
@Export("id")
final int id;
- @ObfuscatedName("y")
+ @ObfuscatedName("x")
@ObfuscatedGetter(
- intValue = -468786571
+ intValue = -982051127
)
@Export("modIcon")
public final int modIcon;
- @ObfuscatedName("c")
+ @ObfuscatedName("l")
@Export("isPrivileged")
public final boolean isPrivileged;
- @ObfuscatedName("w")
+ @ObfuscatedName("a")
@Export("isUser")
public final boolean isUser;
PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
- this.id = var3; // L: 26
- this.modIcon = var4; // L: 27
- this.isPrivileged = var6; // L: 28
- this.isUser = var7; // L: 29
- } // L: 30
+ this.id = var3; // L: 33
+ this.modIcon = var4; // L: 34
+ this.isPrivileged = var6; // L: 35
+ this.isUser = var7; // L: 36
+ } // L: 37
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.id; // L: 34
+ return this.id; // L: 41
}
}
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index fbaaac70eb..d4d5a4c35e 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -4,71 +4,71 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cl")
+@ObfuscatedName("ca")
@Implements("Players")
public class Players {
- @ObfuscatedName("sh")
- @ObfuscatedGetter(
- intValue = -419051257
- )
- static int field1317;
- @ObfuscatedName("l")
- static byte[] field1301;
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
+ static byte[] field1311;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "[Lgd;"
+ descriptor = "[Lgn;"
)
- static class193[] field1302;
- @ObfuscatedName("a")
+ static class192[] field1304;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "[Lpx;"
+ descriptor = "[Lqt;"
)
static Buffer[] field1307;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -193801041
+ intValue = 698385475
)
@Export("Players_count")
static int Players_count;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("Players_indices")
static int[] Players_indices;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1455321023
+ intValue = 581177589
)
@Export("Players_emptyIdxCount")
static int Players_emptyIdxCount;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("Players_emptyIndices")
static int[] Players_emptyIndices;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("Players_regions")
static int[] Players_regions;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("Players_orientations")
static int[] Players_orientations;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("Players_targetIndices")
static int[] Players_targetIndices;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = -1176869757
+ intValue = 1123966373
)
@Export("Players_pendingUpdateCount")
static int Players_pendingUpdateCount;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("Players_pendingUpdateIndices")
static int[] Players_pendingUpdateIndices;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "Lqt;"
)
- static Buffer field1306;
+ static Buffer field1317;
+ @ObfuscatedName("bp")
+ @ObfuscatedSignature(
+ descriptor = "Lka;"
+ )
+ static GameBuild field1305;
static {
- field1301 = new byte[2048]; // L: 18
- field1302 = new class193[2048]; // L: 19
+ field1311 = new byte[2048]; // L: 18
+ field1304 = new class192[2048]; // L: 19
field1307 = new Buffer[2048]; // L: 20
Players_count = 0; // L: 21
Players_indices = new int[2048]; // L: 22
@@ -79,225 +79,87 @@ public class Players {
Players_targetIndices = new int[2048]; // L: 27
Players_pendingUpdateCount = 0; // L: 28
Players_pendingUpdateIndices = new int[2048]; // L: 29
- field1306 = new Buffer(new byte[5000]); // L: 30
+ field1317 = new Buffer(new byte[5000]); // L: 30
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-145581238"
+ descriptor = "(Lqt;IIIIIII)V",
+ garbageValue = "1254271887"
)
- public static boolean method2427() {
- try {
- if (class273.musicPlayerStatus == 2) { // L: 74
- if (class273.musicTrack == null) { // L: 75
- class273.musicTrack = MusicTrack.readTrack(ClanChannelMember.musicTrackArchive, StructComposition.musicTrackGroupId, FriendsList.musicTrackFileId); // L: 76
- if (class273.musicTrack == null) { // L: 77
- return false;
- }
- }
+ @Export("loadTerrain")
+ static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ int var7;
+ if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 145
+ Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 146
- if (class152.soundCache == null) { // L: 79
- class152.soundCache = new SoundCache(class273.soundEffectsArchive, class462.musicSamplesArchive);
- }
-
- if (class273.midiPcmStream.loadMusicTrack(class273.musicTrack, class273.musicPatchesArchive, class152.soundCache, 22050)) { // L: 80
- class273.midiPcmStream.clearAll(); // L: 81
- class273.midiPcmStream.setPcmStreamVolume(Clock.musicTrackVolume); // L: 82
- class273.midiPcmStream.setMusicTrack(class273.musicTrack, VertexNormal.musicTrackBoolean); // L: 83
- class273.musicPlayerStatus = 0; // L: 84
- class273.musicTrack = null; // L: 85
- class152.soundCache = null; // L: 86
- ClanChannelMember.musicTrackArchive = null; // L: 87
- return true; // L: 88
- }
- }
- } catch (Exception var1) { // L: 92
- var1.printStackTrace(); // L: 93
- class273.midiPcmStream.clear(); // L: 94
- class273.musicPlayerStatus = 0; // L: 95
- class273.musicTrack = null; // L: 96
- class152.soundCache = null; // L: 97
- ClanChannelMember.musicTrackArchive = null; // L: 98
- }
-
- return false; // L: 100
- }
-
- @ObfuscatedName("jk")
- @ObfuscatedSignature(
- descriptor = "(Lki;II)I",
- garbageValue = "-1939093407"
- )
- static final int method2413(Widget var0, int var1) {
- if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10905
- try {
- int[] var2 = var0.cs1Instructions[var1]; // L: 10907
- int var3 = 0; // L: 10908
- int var4 = 0; // L: 10909
- byte var5 = 0; // L: 10910
-
- while (true) {
- int var6 = var2[var4++]; // L: 10912
- int var7 = 0; // L: 10913
- byte var8 = 0; // L: 10914
- if (var6 == 0) { // L: 10915
- return var3;
- }
-
- if (var6 == 1) { // L: 10916
- var7 = Client.currentLevels[var2[var4++]];
- }
-
- if (var6 == 2) { // L: 10917
- var7 = Client.levels[var2[var4++]];
- }
-
- if (var6 == 3) { // L: 10918
- var7 = Client.experience[var2[var4++]];
- }
-
- int var9;
- Widget var10;
- int var11;
- int var12;
- if (var6 == 4) { // L: 10919
- var9 = var2[var4++] << 16; // L: 10920
- var9 += var2[var4++]; // L: 10921
- var10 = class92.getWidget(var9); // L: 10922
- var11 = var2[var4++]; // L: 10923
- if (var11 != -1 && (!FileSystem.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10924
- for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10925
- if (var11 + 1 == var10.itemIds[var12]) { // L: 10926
- var7 += var10.itemQuantities[var12];
- }
- }
- }
- }
-
- if (var6 == 5) { // L: 10930
- var7 = Varps.Varps_main[var2[var4++]];
- }
-
- if (var6 == 6) { // L: 10931
- var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
- }
-
- if (var6 == 7) { // L: 10932
- var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
- }
-
- if (var6 == 8) { // L: 10933
- var7 = ModelData0.localPlayer.combatLevel;
- }
-
- if (var6 == 9) { // L: 10934
- for (var9 = 0; var9 < 25; ++var9) { // L: 10935
- if (Skills.Skills_enabled[var9]) { // L: 10936
- var7 += Client.levels[var9];
- }
- }
- }
-
- if (var6 == 10) { // L: 10939
- var9 = var2[var4++] << 16; // L: 10940
- var9 += var2[var4++]; // L: 10941
- var10 = class92.getWidget(var9); // L: 10942
- var11 = var2[var4++]; // L: 10943
- if (var11 != -1 && (!FileSystem.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10944
- for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10945
- if (var11 + 1 == var10.itemIds[var12]) { // L: 10946
- var7 = 999999999; // L: 10947
- break; // L: 10948
- }
- }
- }
- }
-
- if (var6 == 11) { // L: 10953
- var7 = Client.runEnergy;
- }
-
- if (var6 == 12) { // L: 10954
- var7 = Client.weight;
- }
-
- if (var6 == 13) { // L: 10955
- var9 = Varps.Varps_main[var2[var4++]]; // L: 10956
- int var13 = var2[var4++]; // L: 10957
- var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10958
- }
-
- if (var6 == 14) { // L: 10960
- var9 = var2[var4++]; // L: 10961
- var7 = class18.getVarbit(var9); // L: 10962
- }
-
- if (var6 == 15) { // L: 10964
- var8 = 1;
- }
-
- if (var6 == 16) { // L: 10965
- var8 = 2;
- }
-
- if (var6 == 17) { // L: 10966
- var8 = 3;
- }
-
- if (var6 == 18) { // L: 10967
- var7 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX;
- }
-
- if (var6 == 19) { // L: 10968
- var7 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY;
- }
-
- if (var6 == 20) { // L: 10969
- var7 = var2[var4++];
- }
-
- if (var8 == 0) { // L: 10970
- if (var5 == 0) { // L: 10971
- var3 += var7;
- }
-
- if (var5 == 1) { // L: 10972
- var3 -= var7;
- }
-
- if (var5 == 2 && var7 != 0) { // L: 10973
- var3 /= var7;
- }
-
- if (var5 == 3) { // L: 10974
- var3 *= var7;
- }
-
- var5 = 0; // L: 10975
+ while (true) {
+ var7 = var0.readUnsignedByte(); // L: 148
+ if (var7 == 0) { // L: 149
+ if (var1 == 0) {
+ Tiles.Tiles_heights[0][var2][var3] = -class14.method156(var2 + 932731 + var4, 556238 + var3 + var5) * 8; // L: 150
} else {
- var5 = var8; // L: 10977
+ Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 151
}
+ break;
+ }
+
+ if (var7 == 1) { // L: 154
+ int var8 = var0.readUnsignedByte(); // L: 155
+ if (var8 == 1) { // L: 156
+ var8 = 0;
+ }
+
+ if (var1 == 0) { // L: 157
+ Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
+ } else {
+ Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 158
+ }
+ break;
+ }
+
+ if (var7 <= 49) { // L: 161
+ Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 162
+ Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 163
+ Tiles.field996[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 164
+ } else if (var7 <= 81) { // L: 167
+ Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 168
+ } else {
+ Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 171
}
- } catch (Exception var14) { // L: 10980
- return -1; // L: 10981
}
} else {
- return -2;
- }
- }
+ while (true) {
+ var7 = var0.readUnsignedByte(); // L: 176
+ if (var7 == 0) { // L: 177
+ break;
+ }
- @ObfuscatedName("jl")
+ if (var7 == 1) { // L: 178
+ var0.readUnsignedByte(); // L: 179
+ break;
+ }
+
+ if (var7 <= 49) { // L: 182
+ var0.readUnsignedByte();
+ }
+ }
+ }
+
+ } // L: 185
+
+ @ObfuscatedName("le")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "4"
+ descriptor = "(Ljava/lang/String;B)V",
+ garbageValue = "94"
)
- static void method2426(int var0) {
- class116.tempMenuAction = new MenuAction(); // L: 11910
- class116.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11911
- class116.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11912
- class116.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11913
- class116.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11914
- class116.tempMenuAction.action = Client.menuActions[var0]; // L: 11915
- } // L: 11916
+ @Export("Clan_joinChat")
+ static final void Clan_joinChat(String var0) {
+ if (!var0.equals("")) { // L: 12233
+ PacketBufferNode var1 = EnumComposition.getPacketBufferNode(ClientPacket.field2942, Client.packetWriter.isaacCipher); // L: 12235
+ var1.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var0)); // L: 12236
+ var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12237
+ Client.packetWriter.addNode(var1); // L: 12238
+ }
+ } // L: 12239
}
diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java
index 894c873f00..57318b9513 100644
--- a/runescape-client/src/main/java/PrivateChatMode.java
+++ b/runescape-client/src/main/java/PrivateChatMode.java
@@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qb")
+@ObfuscatedName("qg")
@Implements("PrivateChatMode")
public class PrivateChatMode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lqb;"
+ descriptor = "Lqg;"
)
- static final PrivateChatMode field4795;
+ static final PrivateChatMode field4818;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lqg;"
+ )
+ public static final PrivateChatMode field4817;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lqb;"
+ descriptor = "Lqg;"
)
- public static final PrivateChatMode field4794;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lqb;"
- )
- static final PrivateChatMode field4793;
- @ObfuscatedName("k")
+ static final PrivateChatMode field4819;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1775266883
+ intValue = -2146881289
)
- public final int field4796;
+ public final int field4820;
static {
- field4795 = new PrivateChatMode(0); // L: 5
- field4794 = new PrivateChatMode(1); // L: 6
- field4793 = new PrivateChatMode(2);
+ field4818 = new PrivateChatMode(0); // L: 5
+ field4817 = new PrivateChatMode(1); // L: 6
+ field4819 = new PrivateChatMode(2);
} // L: 7
PrivateChatMode(int var1) {
- this.field4796 = var1; // L: 11
+ this.field4820 = var1; // L: 11
} // L: 12
}
diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java
index 2434b8aba6..c11ef262c7 100644
--- a/runescape-client/src/main/java/Projectile.java
+++ b/runescape-client/src/main/java/Projectile.java
@@ -4,135 +4,132 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bq")
+@ObfuscatedName("bu")
@Implements("Projectile")
public final class Projectile extends Renderable {
- @ObfuscatedName("is")
- @ObfuscatedSignature(
- descriptor = "[Lqr;"
- )
- @Export("crossSprites")
- static SpritePixels[] crossSprites;
- @ObfuscatedName("o")
+ @ObfuscatedName("rp")
+ @Export("ClanChat_inClanChat")
+ static boolean ClanChat_inClanChat;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1270230427
+ intValue = -630035333
)
@Export("id")
int id;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -2041826239
+ intValue = -753482197
)
@Export("plane")
int plane;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1745093525
+ intValue = -1909485103
)
@Export("sourceX")
int sourceX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1313084137
+ intValue = -867044193
)
@Export("sourceY")
int sourceY;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -771723281
+ intValue = 1371453553
)
@Export("sourceZ")
int sourceZ;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1417687011
+ intValue = 1478366795
)
@Export("endHeight")
int endHeight;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1939828539
+ intValue = 1542338147
)
@Export("cycleStart")
int cycleStart;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -269487725
+ intValue = 981154783
)
@Export("cycleEnd")
int cycleEnd;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -1305552491
+ intValue = -1247849497
)
@Export("slope")
int slope;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -717216545
+ intValue = -1919042303
)
@Export("startHeight")
int startHeight;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -2047363817
+ intValue = -1467854933
)
@Export("targetIndex")
int targetIndex;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("isMoving")
boolean isMoving;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("x")
double x;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("y")
double y;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("z")
double z;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("speedX")
double speedX;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("speedY")
double speedY;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("speed")
double speed;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("speedZ")
double speedZ;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("accelerationZ")
double accelerationZ;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = 1944098901
+ intValue = 262224371
)
@Export("yaw")
int yaw;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 932506569
+ intValue = -703855763
)
@Export("pitch")
int pitch;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "Lgq;"
+ descriptor = "Lgc;"
)
@Export("sequenceDefinition")
SequenceDefinition sequenceDefinition;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = 804241453
+ intValue = -100465905
)
@Export("frame")
int frame;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = 1940243561
+ intValue = 784173733
)
@Export("frameCycle")
int frameCycle;
@@ -153,19 +150,19 @@ public final class Projectile extends Renderable {
this.targetIndex = var10; // L: 45
this.endHeight = var11; // L: 46
this.isMoving = false; // L: 47
- int var12 = class136.SpotAnimationDefinition_get(this.id).sequence; // L: 48
+ int var12 = ObjectSound.SpotAnimationDefinition_get(this.id).sequence; // L: 48
if (var12 != -1) { // L: 49
- this.sequenceDefinition = class114.SequenceDefinition_get(var12);
+ this.sequenceDefinition = ScriptFrame.SequenceDefinition_get(var12);
} else {
this.sequenceDefinition = null; // L: 50
}
} // L: 51
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(IIIII)V",
- garbageValue = "253345363"
+ garbageValue = "-1811806599"
)
@Export("setDestination")
final void setDestination(int var1, int var2, int var3, int var4) {
@@ -175,29 +172,29 @@ public final class Projectile extends Renderable {
double var7 = (double)(var2 - this.sourceY); // L: 56
double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57
this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58
- this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59
+ this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; // L: 59
this.z = (double)this.sourceZ; // L: 60
}
var5 = (double)(this.cycleEnd + 1 - var4); // L: 62
this.speedX = ((double)var1 - this.x) / var5; // L: 63
this.speedY = ((double)var2 - this.y) / var5; // L: 64
- this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65
+ this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); // L: 65
if (!this.isMoving) { // L: 66
- this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope);
+ this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D);
}
- this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67
+ this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); // L: 67
} // L: 68
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected final Model getModel() {
- SpotAnimationDefinition var1 = class136.SpotAnimationDefinition_get(this.id); // L: 101
+ SpotAnimationDefinition var1 = ObjectSound.SpotAnimationDefinition_get(this.id); // L: 101
Model var2 = var1.getModel(this.frame); // L: 102
if (var2 == null) { // L: 103
return null;
@@ -207,15 +204,15 @@ public final class Projectile extends Renderable {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1804737749"
+ descriptor = "(IB)V",
+ garbageValue = "-99"
)
@Export("advance")
final void advance(int var1) {
this.isMoving = true; // L: 71
- this.x += (double)var1 * this.speedX; // L: 72
+ this.x += this.speedX * (double)var1; // L: 72
this.y += (double)var1 * this.speedY; // L: 73
this.z += (double)var1 * this.speedZ + (double)var1 * this.accelerationZ * 0.5D * (double)var1; // L: 74
this.speedZ += this.accelerationZ * (double)var1; // L: 75
@@ -243,7 +240,7 @@ public final class Projectile extends Renderable {
}
} else {
this.frame += var1; // L: 91
- int var2 = this.sequenceDefinition.method3729(); // L: 92
+ int var2 = this.sequenceDefinition.method3835(); // L: 92
if (this.frame >= var2) { // L: 93
this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94
}
@@ -252,13 +249,81 @@ public final class Projectile extends Renderable {
}
- @ObfuscatedName("ia")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
- garbageValue = "1000139939"
+ descriptor = "(Ljava/lang/CharSequence;I)I",
+ garbageValue = "-1805196162"
)
- @Export("insertMenuItemNoShift")
- public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
- class175.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9907
- } // L: 9908
+ public static int method1950(CharSequence var0) {
+ int var1 = var0.length(); // L: 148
+ int var2 = 0; // L: 149
+
+ for (int var3 = 0; var3 < var1; ++var3) { // L: 150
+ var2 = (var2 << 5) - var2 + var0.charAt(var3);
+ }
+
+ return var2; // L: 151
+ }
+
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "72"
+ )
+ public static void method1959() {
+ ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 569
+ } // L: 570
+
+ @ObfuscatedName("fa")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1050216582"
+ )
+ static final void method1961() {
+ FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2950
+ NPC.method2379(); // L: 2952
+ Widget.method5711(); // L: 2953
+ class141.method3047(); // L: 2954
+ PacketBufferNode.method5194(); // L: 2955
+ ObjectSound.method1702(); // L: 2956
+ SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2958
+ SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2959
+ SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2960
+ FileSystem.method3282(); // L: 2962
+ VarbitComposition.VarbitDefinition_cached.clear(); // L: 2964
+ VarpDefinition.VarpDefinition_cached.clear(); // L: 2967
+ AbstractWorldMapData.HitSplatDefinition_cachedSprites.method7525(); // L: 2969
+ ModeWhere.HitSplatDefinition_cached.method7525(); // L: 2970
+ HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 2972
+ HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 2973
+ HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 2974
+ class92.method2389(); // L: 2976
+ Interpreter.method1868(); // L: 2977
+ class67.method1886(); // L: 2978
+ SoundCache.method763(); // L: 2979
+ MilliClock.method3301(); // L: 2980
+ class67.method1887(); // L: 2981
+ Client.Widget_cachedModels.clear(); // L: 2982
+ Client.Widget_cachedFonts.clear(); // L: 2983
+ class14.method148(); // L: 2984
+ Widget.field3360.clear(); // L: 2986
+ Widget.field3361.clear(); // L: 2987
+ Widget.archive0.clear(); // L: 2988
+ Widget.archive1.clear(); // L: 2989
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2991
+ Script.Script_cached.clear(); // L: 2992
+ Varcs.archive5.clearFiles(); // L: 2993
+ WorldMapEvent.field2882.clearFiles(); // L: 2994
+ class341.archive7.clearFiles(); // L: 2995
+ Client.archive4.clearFiles(); // L: 2996
+ WorldMapSectionType.archive9.clearFiles(); // L: 2997
+ class121.archive6.clearFiles(); // L: 2998
+ class10.archive11.clearFiles(); // L: 2999
+ class304.archive8.clearFiles(); // L: 3000
+ Language.field4098.clearFiles(); // L: 3001
+ ApproximateRouteStrategy.archive10.clearFiles(); // L: 3002
+ UserComparator7.field1383.clearFiles(); // L: 3003
+ class267.archive12.clearFiles(); // L: 3004
+ class132.field1588.clearFiles(); // L: 3005
+ } // L: 3006
}
diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java
index c7bfc17782..94b4aa9824 100644
--- a/runescape-client/src/main/java/RasterProvider.java
+++ b/runescape-client/src/main/java/RasterProvider.java
@@ -17,10 +17,10 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ab")
@Implements("RasterProvider")
public final class RasterProvider extends AbstractRasterProvider {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("component")
Component component;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("image")
Image image;
@@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider {
this.apply(); // L: 31
} // L: 32
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(Ljava/awt/Component;B)V",
- garbageValue = "-88"
+ garbageValue = "2"
)
@Export("setComponent")
final void setComponent(Component var1) {
this.component = var1; // L: 35
} // L: 36
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "1511692839"
+ descriptor = "(IIB)V",
+ garbageValue = "37"
)
@Export("drawFull")
public final void drawFull(int var1, int var2) {
this.drawFull0(this.component.getGraphics(), var1, var2); // L: 40
} // L: 41
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IIIII)V",
- garbageValue = "-1899949578"
+ garbageValue = "2018315911"
)
@Export("draw")
public final void draw(int var1, int var2, int var3, int var4) {
this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 45
} // L: 46
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Ljava/awt/Graphics;IIB)V",
- garbageValue = "-56"
+ descriptor = "(Ljava/awt/Graphics;III)V",
+ garbageValue = "487330417"
)
@Export("drawFull0")
final void drawFull0(Graphics var1, int var2, int var3) {
@@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider {
} // L: 55
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Ljava/awt/Graphics;IIIII)V",
- garbageValue = "-1218744296"
+ descriptor = "(Ljava/awt/Graphics;IIIIB)V",
+ garbageValue = "-106"
)
@Export("draw0")
final void draw0(Graphics var1, int var2, int var3, int var4, int var5) {
diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java
index 12d3843343..a67e61e7eb 100644
--- a/runescape-client/src/main/java/Rasterizer2D.java
+++ b/runescape-client/src/main/java/Rasterizer2D.java
@@ -3,28 +3,28 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qc")
+@ObfuscatedName("qh")
@Implements("Rasterizer2D")
public class Rasterizer2D extends DualNode {
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@Export("Rasterizer2D_pixels")
public static int[] Rasterizer2D_pixels;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("Rasterizer2D_width")
public static int Rasterizer2D_width;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("Rasterizer2D_height")
public static int Rasterizer2D_height;
@ObfuscatedName("ab")
@Export("Rasterizer2D_yClipStart")
public static int Rasterizer2D_yClipStart;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@Export("Rasterizer2D_yClipEnd")
public static int Rasterizer2D_yClipEnd;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("Rasterizer2D_xClipStart")
public static int Rasterizer2D_xClipStart;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("Rasterizer2D_xClipEnd")
public static int Rasterizer2D_xClipEnd;
@@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode {
protected Rasterizer2D() {
} // L: 16
- @ObfuscatedName("de")
+ @ObfuscatedName("cd")
@Export("Rasterizer2D_replace")
public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
Rasterizer2D_pixels = var0; // L: 19
@@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode {
Rasterizer2D_setClip(0, 0, var1, var2); // L: 22
} // L: 23
- @ObfuscatedName("db")
+ @ObfuscatedName("cl")
@Export("Rasterizer2D_resetClip")
public static void Rasterizer2D_resetClip() {
Rasterizer2D_xClipStart = 0; // L: 26
@@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode {
Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29
} // L: 30
- @ObfuscatedName("dn")
+ @ObfuscatedName("ct")
@Export("Rasterizer2D_setClip")
public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) {
if (var0 < 0) { // L: 33
@@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode {
Rasterizer2D_yClipEnd = var3; // L: 40
} // L: 41
- @ObfuscatedName("dz")
+ @ObfuscatedName("ch")
@Export("Rasterizer2D_expandClip")
public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) {
if (Rasterizer2D_xClipStart < var0) { // L: 44
@@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode {
} // L: 48
- @ObfuscatedName("dl")
+ @ObfuscatedName("dm")
@Export("Rasterizer2D_getClipArray")
public static void Rasterizer2D_getClipArray(int[] var0) {
var0[0] = Rasterizer2D_xClipStart; // L: 51
@@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode {
var0[3] = Rasterizer2D_yClipEnd; // L: 54
} // L: 55
- @ObfuscatedName("da")
+ @ObfuscatedName("dd")
@Export("Rasterizer2D_setClipArray")
public static void Rasterizer2D_setClipArray(int[] var0) {
Rasterizer2D_xClipStart = var0[0]; // L: 58
@@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode {
Rasterizer2D_yClipEnd = var0[3]; // L: 61
} // L: 62
- @ObfuscatedName("dv")
+ @ObfuscatedName("dz")
@Export("Rasterizer2D_clear")
public static void Rasterizer2D_clear() {
int var0 = 0; // L: 65
@@ -225,8 +225,8 @@ public class Rasterizer2D extends DualNode {
var14 = var12 + var6 * Rasterizer2D_width; // L: 127
- for (var15 = var12; var15 <= var13; ++var15) {
- Rasterizer2D_pixels[var14++] = var3; // L: 128
+ for (var15 = var12; var15 <= var13; ++var15) { // L: 128
+ Rasterizer2D_pixels[var14++] = var3;
}
++var6; // L: 129
@@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 84 133
- @ObfuscatedName("ds")
+ @ObfuscatedName("dv")
@Export("Rasterizer2D_drawCircleAlpha")
public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) {
if (var4 != 0) { // L: 136
@@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 139 207
- @ObfuscatedName("dt")
+ @ObfuscatedName("dy")
@Export("Rasterizer2D_fillRectangleAlpha")
public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
if (var0 < Rasterizer2D_xClipStart) { // L: 210
@@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode {
} // L: 232
- @ObfuscatedName("df")
+ @ObfuscatedName("ds")
@Export("Rasterizer2D_fillRectangle")
public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) {
if (var0 < Rasterizer2D_xClipStart) { // L: 235
@@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode {
} // L: 253
- @ObfuscatedName("dm")
+ @ObfuscatedName("dg")
@Export("Rasterizer2D_fillRectangleGradient")
public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) {
if (var2 > 0 && var3 > 0) { // L: 256
@@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 282
- @ObfuscatedName("dq")
+ @ObfuscatedName("dp")
@Export("Rasterizer2D_fillRectangleGradientAlpha")
public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
if (var2 > 0 && var3 > 0) { // L: 285
@@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 326
- @ObfuscatedName("dw")
+ @ObfuscatedName("dx")
@ObfuscatedSignature(
descriptor = "(IIIIII[BIZ)V",
garbageValue = "1"
@@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 380
- @ObfuscatedName("dk")
+ @ObfuscatedName("dl")
@Export("Rasterizer2D_drawRectangle")
public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383
@@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode {
Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386
} // L: 387
- @ObfuscatedName("du")
+ @ObfuscatedName("dq")
@Export("Rasterizer2D_drawRectangleAlpha")
public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390
@@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode {
} // L: 396
- @ObfuscatedName("em")
+ @ObfuscatedName("dt")
@Export("Rasterizer2D_drawHorizontalLine")
public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399
@@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 407
- @ObfuscatedName("eh")
+ @ObfuscatedName("dw")
@Export("Rasterizer2D_drawHorizontalLineAlpha")
static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410
@@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 431
- @ObfuscatedName("ej")
+ @ObfuscatedName("di")
@Export("Rasterizer2D_drawVerticalLine")
public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434
@@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 442
- @ObfuscatedName("en")
+ @ObfuscatedName("da")
@Export("Rasterizer2D_drawVerticalLineAlpha")
static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445
@@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 467
- @ObfuscatedName("eb")
+ @ObfuscatedName("df")
@Export("Rasterizer2D_drawLine")
public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) {
var2 -= var0; // L: 470
@@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 475 480 524
- @ObfuscatedName("ea")
+ @ObfuscatedName("dj")
@Export("Rasterizer2D_setPixel")
static void Rasterizer2D_setPixel(int var0, int var1, int var2) {
if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527
@@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode {
}
} // L: 529
- @ObfuscatedName("er")
+ @ObfuscatedName("dk")
@Export("Rasterizer2D_fillMaskedRectangle")
public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) {
int var5 = var0 + Rasterizer2D_width * var1; // L: 532
diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java
index 7cbfc81d5c..56e3c120b1 100644
--- a/runescape-client/src/main/java/Rasterizer3D.java
+++ b/runescape-client/src/main/java/Rasterizer3D.java
@@ -3,92 +3,92 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gr")
+@ObfuscatedName("ga")
@Implements("Rasterizer3D")
public class Rasterizer3D extends Rasterizer2D {
- @ObfuscatedName("o")
- static boolean field2395;
+ @ObfuscatedName("c")
+ static boolean field2345;
+ @ObfuscatedName("v")
+ static boolean field2338;
@ObfuscatedName("q")
- static boolean field2400;
- @ObfuscatedName("l")
@Export("Rasterizer3D_isLowDetailTexture")
static boolean Rasterizer3D_isLowDetailTexture;
- @ObfuscatedName("k")
- public static boolean field2379;
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
+ public static boolean field2340;
+ @ObfuscatedName("j")
@Export("Rasterizer3D_alpha")
static int Rasterizer3D_alpha;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("Rasterizer3D_zoom")
public static int Rasterizer3D_zoom;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("Rasterizer3D_clipMidX")
static int Rasterizer3D_clipMidX;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("Rasterizer3D_clipMidY")
static int Rasterizer3D_clipMidY;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("Rasterizer3D_clipWidth")
static int Rasterizer3D_clipWidth;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("Rasterizer3D_clipHeight")
static int Rasterizer3D_clipHeight;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("Rasterizer3D_clipNegativeMidX")
static int Rasterizer3D_clipNegativeMidX;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("Rasterizer3D_clipMidX2")
static int Rasterizer3D_clipMidX2;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("Rasterizer3D_clipNegativeMidY")
static int Rasterizer3D_clipNegativeMidY;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("Rasterizer3D_clipMidY2")
static int Rasterizer3D_clipMidY2;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("Rasterizer3D_rowOffsets")
static int[] Rasterizer3D_rowOffsets;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("Rasterizer3D_colorPalette")
public static int[] Rasterizer3D_colorPalette;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "Lhk;"
+ descriptor = "Lhl;"
)
@Export("Rasterizer3D_textureLoader")
public static TextureLoader Rasterizer3D_textureLoader;
- @ObfuscatedName("z")
- static int[] field2402;
- @ObfuscatedName("i")
- static int[] field2385;
- @ObfuscatedName("u")
+ @ObfuscatedName("o")
+ static int[] field2360;
+ @ObfuscatedName("m")
+ static int[] field2347;
+ @ObfuscatedName("d")
@Export("Rasterizer3D_sine")
public static int[] Rasterizer3D_sine;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("Rasterizer3D_cosine")
public static int[] Rasterizer3D_cosine;
static {
- field2395 = false; // L: 8
- field2400 = false; // L: 9
+ field2345 = false; // L: 8
+ field2338 = false; // L: 9
Rasterizer3D_isLowDetailTexture = false; // L: 10
- field2379 = true; // L: 11
+ field2340 = true; // L: 11
Rasterizer3D_alpha = 0; // L: 12
Rasterizer3D_zoom = 512; // L: 19
Rasterizer3D_rowOffsets = new int[1024]; // L: 28
Rasterizer3D_colorPalette = new int[65536]; // L: 29
- field2402 = new int[512]; // L: 31
- field2385 = new int[2048]; // L: 32
+ field2360 = new int[512]; // L: 31
+ field2347 = new int[2048]; // L: 32
Rasterizer3D_sine = new int[2048]; // L: 33
Rasterizer3D_cosine = new int[2048]; // L: 34
int var0;
for (var0 = 1; var0 < 512; ++var0) { // L: 37
- field2402[var0] = 32768 / var0; // L: 38
+ field2360[var0] = 32768 / var0; // L: 38
}
for (var0 = 1; var0 < 2048; ++var0) { // L: 40
- field2385[var0] = 65536 / var0; // L: 41
+ field2347[var0] = 65536 / var0; // L: 41
}
for (var0 = 0; var0 < 2048; ++var0) { // L: 43
@@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D {
} // L: 47
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("Rasterizer3D_setClipFromRasterizer2D")
public static final void Rasterizer3D_setClipFromRasterizer2D() {
Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54
} // L: 55
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("Rasterizer3D_setClip")
static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) {
Rasterizer3D_clipWidth = var2 - var0; // L: 58
Rasterizer3D_clipHeight = var3 - var1; // L: 59
Rasterizer3D_method3(); // L: 60
if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61
- Rasterizer3D_rowOffsets = new int[FontName.method7228(Rasterizer3D_clipHeight)];
+ Rasterizer3D_rowOffsets = new int[class135.method2910(Rasterizer3D_clipHeight)];
}
int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62
@@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D {
} // L: 67
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("Rasterizer3D_method3")
public static final void Rasterizer3D_method3() {
Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70
@@ -134,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D {
Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75
} // L: 76
- @ObfuscatedName("k")
- public static final void method3939(int var0, int var1) {
+ @ObfuscatedName("f")
+ public static final void method4021(int var0, int var1) {
int var2 = Rasterizer3D_rowOffsets[0]; // L: 79
int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80
int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81
@@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D {
Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87
} // L: 88
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lhk;)V"
+ descriptor = "(Lhl;)V"
)
@Export("Rasterizer3D_setTextureLoader")
public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) {
Rasterizer3D_textureLoader = var0; // L: 91
} // L: 92
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("Rasterizer3D_setBrightness")
public static final void Rasterizer3D_setBrightness(double var0) {
Rasterizer3D_buildPalette(var0, 0, 512); // L: 95
} // L: 96
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("Rasterizer3D_buildPalette")
static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) {
int var4 = var2 * 128; // L: 99
@@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D {
} // L: 140
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("Rasterizer3D_brighten")
static int Rasterizer3D_brighten(int var0, double var1) {
double var3 = (double)(var0 >> 16) / 256.0D; // L: 143
@@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D {
return var11 + (var10 << 8) + (var9 << 16); // L: 152
}
- @ObfuscatedName("r")
- public static void method3976(int var0, int var1, int var2) {
- field2395 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156
+ @ObfuscatedName("y")
+ public static void method4030(int var0, int var1, int var2) {
+ field2345 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156
} // L: 157
- @ObfuscatedName("v")
- static final void method3915(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+ @ObfuscatedName("i")
+ static final void method4096(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
int var9 = var4 - var3; // L: 160
int var10 = var1 - var0; // L: 161
int var11 = var5 - var3; // L: 162
@@ -767,16 +767,16 @@ public class Rasterizer3D extends Rasterizer2D {
}
}
- @ObfuscatedName("y")
- static final void method3916(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) {
- var6 = method3923(var6, var9, var10, var11, var12); // L: 544
- var7 = method3923(var7, var9, var10, var11, var12); // L: 545
- var8 = method3923(var8, var9, var10, var11, var12); // L: 546
- method3915(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547
+ @ObfuscatedName("s")
+ static final void method4032(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, byte var9, byte var10, byte var11, byte var12) {
+ var6 = method4028(var6, var9, var10, var11, var12); // L: 544
+ var7 = method4028(var7, var9, var10, var11, var12); // L: 545
+ var8 = method4028(var8, var9, var10, var11, var12); // L: 546
+ method4096(var0, var1, var2, var3, var4, var5, var6, var7, var8); // L: 547
} // L: 548
- @ObfuscatedName("c")
- static int method3923(int var0, byte var1, byte var2, byte var3, byte var4) {
+ @ObfuscatedName("t")
+ static int method4028(int var0, byte var1, byte var2, byte var3, byte var4) {
int var5 = var0 >> 10 & 63; // L: 551
int var6 = var0 >> 7 & 7; // L: 552
int var7 = var0 & 127; // L: 553
@@ -796,10 +796,10 @@ public class Rasterizer3D extends Rasterizer2D {
return (var5 << 10 | var6 << 7 | var7) & 65535; // L: 564
}
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("Rasterizer3D_vertAlpha")
static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
- if (field2395) { // L: 568
+ if (field2345) { // L: 568
if (var5 > Rasterizer3D_clipWidth) { // L: 569
var5 = Rasterizer3D_clipWidth;
}
@@ -816,7 +816,7 @@ public class Rasterizer3D extends Rasterizer2D {
int var9;
int var10;
int var11;
- if (field2379) { // L: 575
+ if (field2340) { // L: 575
var3 = var5 - var4 >> 2; // L: 576
var7 <<= 2; // L: 577
if (Rasterizer3D_alpha == 0) { // L: 578
@@ -906,8 +906,8 @@ public class Rasterizer3D extends Rasterizer2D {
}
} // L: 629 652
- @ObfuscatedName("b")
- public static final void method3919(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ @ObfuscatedName("r")
+ public static final void method4116(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
int var7 = 0; // L: 657
if (var0 != var1) { // L: 658
var7 = (var4 - var3 << 14) / (var1 - var0); // L: 659
@@ -1362,17 +1362,17 @@ public class Rasterizer3D extends Rasterizer2D {
}
}
- @ObfuscatedName("t")
- static final void method3993(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) {
- int var11 = method3923(var6, var7, var8, var9, var10); // L: 981
+ @ObfuscatedName("u")
+ static final void method4035(int var0, int var1, int var2, int var3, int var4, int var5, int var6, byte var7, byte var8, byte var9, byte var10) {
+ int var11 = method4028(var6, var7, var8, var9, var10); // L: 981
var6 = Rasterizer3D_colorPalette[var11]; // L: 982
- method3919(var0, var1, var2, var3, var4, var5, var6); // L: 983
+ method4116(var0, var1, var2, var3, var4, var5, var6); // L: 983
} // L: 984
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("Rasterizer3D_horizAlpha")
static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) {
- if (field2395) { // L: 987
+ if (field2345) { // L: 987
if (var5 > Rasterizer3D_clipWidth) { // L: 988
var5 = Rasterizer3D_clipWidth;
}
@@ -1464,16 +1464,16 @@ public class Rasterizer3D extends Rasterizer2D {
}
}
- @ObfuscatedName("x")
- static final void method3922(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
+ @ObfuscatedName("h")
+ static final void method4070(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1041
int var20;
if (var19 == null) { // L: 1042
var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1043
- method3915(var0, var1, var2, var3, var4, var5, method3965(var20, var6), method3965(var20, var7), method3965(var20, var8)); // L: 1044
+ method4096(var0, var1, var2, var3, var4, var5, method4041(var20, var6), method4041(var20, var7), method4041(var20, var8)); // L: 1044
} else {
Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1047
- field2400 = Rasterizer3D_textureLoader.vmethod4381(var18); // L: 1048
+ field2338 = Rasterizer3D_textureLoader.vmethod4538(var18); // L: 1048
var20 = var4 - var3; // L: 1049
int var21 = var1 - var0; // L: 1050
int var22 = var5 - var3; // L: 1051
@@ -1545,41 +1545,7 @@ public class Rasterizer3D extends Rasterizer2D {
var32 += var34 * var41; // L: 1099
var35 += var37 * var41; // L: 1100
var38 += var40 * var41; // L: 1101
- if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1102
- var2 -= var1; // L: 1103
- var1 -= var0; // L: 1104
- var0 = Rasterizer3D_rowOffsets[var0]; // L: 1105
-
- while (true) {
- --var1; // L: 1106
- if (var1 < 0) {
- while (true) {
- --var2; // L: 1116
- if (var2 < 0) {
- return; // L: 1126
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1117
- var5 += var28; // L: 1118
- var4 += var27; // L: 1119
- var6 += var31; // L: 1120
- var0 += Rasterizer2D.Rasterizer2D_width; // L: 1121
- var32 += var34; // L: 1122
- var35 += var37; // L: 1123
- var38 += var40; // L: 1124
- }
- }
-
- Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1107
- var5 += var28; // L: 1108
- var3 += var26; // L: 1109
- var6 += var31; // L: 1110
- var0 += Rasterizer2D.Rasterizer2D_width; // L: 1111
- var32 += var34; // L: 1112
- var35 += var37; // L: 1113
- var38 += var40; // L: 1114
- }
- } else {
+ if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1102
var2 -= var1; // L: 1129
var1 -= var0; // L: 1130
var0 = Rasterizer3D_rowOffsets[var0]; // L: 1131
@@ -1613,6 +1579,40 @@ public class Rasterizer3D extends Rasterizer2D {
var35 += var37; // L: 1139
var38 += var40; // L: 1140
}
+ } else {
+ var2 -= var1; // L: 1103
+ var1 -= var0; // L: 1104
+ var0 = Rasterizer3D_rowOffsets[var0]; // L: 1105
+
+ while (true) {
+ --var1; // L: 1106
+ if (var1 < 0) {
+ while (true) {
+ --var2; // L: 1116
+ if (var2 < 0) {
+ return; // L: 1126
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1117
+ var5 += var28; // L: 1118
+ var4 += var27; // L: 1119
+ var6 += var31; // L: 1120
+ var0 += Rasterizer2D.Rasterizer2D_width; // L: 1121
+ var32 += var34; // L: 1122
+ var35 += var37; // L: 1123
+ var38 += var40; // L: 1124
+ }
+ }
+
+ Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1107
+ var5 += var28; // L: 1108
+ var3 += var26; // L: 1109
+ var6 += var31; // L: 1110
+ var0 += Rasterizer2D.Rasterizer2D_width; // L: 1111
+ var32 += var34; // L: 1112
+ var35 += var37; // L: 1113
+ var38 += var40; // L: 1114
+ }
}
} else {
var4 = var3 <<= 14; // L: 1156
@@ -2085,10 +2085,10 @@ public class Rasterizer3D extends Rasterizer2D {
}
} // L: 1045
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("Rasterizer3D_iDontKnow")
static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) {
- if (field2395) { // L: 1523
+ if (field2345) { // L: 1523
if (var6 > Rasterizer3D_clipWidth) { // L: 1524
var6 = Rasterizer3D_clipWidth;
}
@@ -2152,7 +2152,7 @@ public class Rasterizer3D extends Rasterizer2D {
var17 >>= 3; // L: 1568
var8 <<= 3; // L: 1569
var15 = var7 >> 8; // L: 1570
- if (field2400) { // L: 1571
+ if (field2338) { // L: 1571
if (var17 > 0) { // L: 1572
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1574
@@ -2347,7 +2347,7 @@ public class Rasterizer3D extends Rasterizer2D {
var17 >>= 3; // L: 1743
var8 <<= 3; // L: 1744
var15 = var7 >> 8; // L: 1745
- if (field2400) { // L: 1746
+ if (field2338) { // L: 1746
if (var17 > 0) { // L: 1747
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1749
@@ -2506,17 +2506,17 @@ public class Rasterizer3D extends Rasterizer2D {
}
} // L: 1881
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("drawTexturedTile")
static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1884
int var20;
if (var19 == null) { // L: 1885
var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1886
- method3915(var0, var1, var2, var3, var4, var5, method3965(var20, var6), method3965(var20, var7), method3965(var20, var8)); // L: 1887
+ method4096(var0, var1, var2, var3, var4, var5, method4041(var20, var6), method4041(var20, var7), method4041(var20, var8)); // L: 1887
} else {
Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1890
- field2400 = Rasterizer3D_textureLoader.vmethod4381(var18); // L: 1891
+ field2338 = Rasterizer3D_textureLoader.vmethod4538(var18); // L: 1891
var20 = var4 - var3; // L: 1892
int var21 = var1 - var0; // L: 1893
int var22 = var5 - var3; // L: 1894
@@ -3128,10 +3128,10 @@ public class Rasterizer3D extends Rasterizer2D {
}
} // L: 1888
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("Rasterizer3D_textureAlpha")
static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) {
- if (field2395) { // L: 2366
+ if (field2345) { // L: 2366
if (var6 > Rasterizer3D_clipWidth) { // L: 2367
var6 = Rasterizer3D_clipWidth;
}
@@ -3184,7 +3184,7 @@ public class Rasterizer3D extends Rasterizer2D {
var17 >>= 3; // L: 2408
var8 <<= 3; // L: 2409
var15 = var7 >> 8; // L: 2410
- if (field2400) { // L: 2412
+ if (field2338) { // L: 2412
if (var17 > 0) { // L: 2413
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2415
@@ -3327,7 +3327,7 @@ public class Rasterizer3D extends Rasterizer2D {
var17 >>= 3; // L: 2545
var8 <<= 3; // L: 2546
var15 = var7 >> 8; // L: 2547
- if (field2400) { // L: 2549
+ if (field2338) { // L: 2549
if (var17 > 0) { // L: 2550
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2552
@@ -3444,8 +3444,8 @@ public class Rasterizer3D extends Rasterizer2D {
}
} // L: 2648
- @ObfuscatedName("f")
- static final int method3965(int var0, int var1) {
+ @ObfuscatedName("p")
+ static final int method4041(int var0, int var1) {
var1 = (var0 & 127) * var1 >> 7; // L: 2651
if (var1 < 2) { // L: 2652
var1 = 2;
@@ -3456,33 +3456,33 @@ public class Rasterizer3D extends Rasterizer2D {
return (var0 & 65408) + var1; // L: 2654
}
- @ObfuscatedName("d")
- static final int method3927(int var0, int var1, int var2, int var3) {
+ @ObfuscatedName("b")
+ static final int method4052(int var0, int var1, int var2, int var3) {
return var0 * var2 + var3 * var1 >> 16; // L: 2658
}
- @ObfuscatedName("j")
- static final int method3951(int var0, int var1, int var2, int var3) {
+ @ObfuscatedName("n")
+ static final int method4072(int var0, int var1, int var2, int var3) {
return var2 * var1 - var3 * var0 >> 16; // L: 2662
}
- @ObfuscatedName("z")
- static final int method3929(int var0, int var1, int var2, int var3) {
+ @ObfuscatedName("o")
+ static final int method4025(int var0, int var1, int var2, int var3) {
return var0 * var2 - var3 * var1 >> 16; // L: 2666
}
- @ObfuscatedName("i")
- static final int method3980(int var0, int var1, int var2, int var3) {
+ @ObfuscatedName("m")
+ static final int method4044(int var0, int var1, int var2, int var3) {
return var3 * var0 + var2 * var1 >> 16; // L: 2670
}
- @ObfuscatedName("u")
- static final int method3930(int var0, int var1, int var2, int var3) {
+ @ObfuscatedName("d")
+ static final int method4045(int var0, int var1, int var2, int var3) {
return var0 * var2 + var3 * var1 >> 16; // L: 2674
}
- @ObfuscatedName("ag")
- static final int method3931(int var0, int var1, int var2, int var3) {
+ @ObfuscatedName("ad")
+ static final int method4046(int var0, int var1, int var2, int var3) {
return var2 * var1 - var3 * var0 >> 16; // L: 2678
}
}
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index e1fd2af1a8..d7303184c6 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -3,107 +3,107 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ah")
+@ObfuscatedName("ai")
@Implements("RawPcmStream")
public class RawPcmStream extends PcmStream {
- @ObfuscatedName("o")
- int field336;
+ @ObfuscatedName("c")
+ int field331;
+ @ObfuscatedName("v")
+ int field332;
@ObfuscatedName("q")
- int field333;
- @ObfuscatedName("l")
- int field339;
- @ObfuscatedName("k")
+ int field343;
+ @ObfuscatedName("f")
int field334;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
int field335;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
+ int field336;
+ @ObfuscatedName("g")
int field337;
- @ObfuscatedName("p")
- int field338;
- @ObfuscatedName("s")
+ @ObfuscatedName("y")
@Export("numLoops")
int numLoops;
- @ObfuscatedName("r")
+ @ObfuscatedName("i")
@Export("start")
int start;
- @ObfuscatedName("v")
+ @ObfuscatedName("s")
@Export("end")
int end;
- @ObfuscatedName("y")
- boolean field342;
- @ObfuscatedName("c")
- int field343;
- @ObfuscatedName("b")
- int field332;
@ObfuscatedName("t")
+ boolean field333;
+ @ObfuscatedName("z")
+ int field342;
+ @ObfuscatedName("r")
+ int field344;
+ @ObfuscatedName("u")
int field345;
- @ObfuscatedName("g")
- int field346;
+ @ObfuscatedName("k")
+ int field341;
@ObfuscatedSignature(
- descriptor = "(Lak;III)V"
+ descriptor = "(Laf;III)V"
)
RawPcmStream(RawSound var1, int var2, int var3, int var4) {
super.sound = var1; // L: 51
this.start = var1.start; // L: 52
this.end = var1.end; // L: 53
- this.field342 = var1.field266; // L: 54
- this.field333 = var2; // L: 55
- this.field339 = var3; // L: 56
+ this.field333 = var1.field261; // L: 54
+ this.field332 = var2; // L: 55
+ this.field343 = var3; // L: 56
this.field334 = var4; // L: 57
- this.field336 = 0; // L: 58
- this.method800(); // L: 59
+ this.field331 = 0; // L: 58
+ this.method776(); // L: 59
} // L: 60
@ObfuscatedSignature(
- descriptor = "(Lak;II)V"
+ descriptor = "(Laf;II)V"
)
RawPcmStream(RawSound var1, int var2, int var3) {
super.sound = var1; // L: 39
this.start = var1.start; // L: 40
this.end = var1.end; // L: 41
- this.field342 = var1.field266; // L: 42
- this.field333 = var2; // L: 43
- this.field339 = var3; // L: 44
+ this.field333 = var1.field261; // L: 42
+ this.field332 = var2; // L: 43
+ this.field343 = var3; // L: 44
this.field334 = 8192; // L: 45
- this.field336 = 0; // L: 46
- this.method800(); // L: 47
+ this.field331 = 0; // L: 46
+ this.method776(); // L: 47
} // L: 48
- @ObfuscatedName("a")
- void method800() {
- this.field335 = this.field339; // L: 73
- this.field337 = method827(this.field339, this.field334); // L: 74
- this.field338 = method925(this.field339, this.field334); // L: 75
+ @ObfuscatedName("j")
+ void method776() {
+ this.field335 = this.field343; // L: 73
+ this.field336 = method841(this.field343, this.field334); // L: 74
+ this.field337 = method771(this.field343, this.field334); // L: 75
} // L: 76
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("firstSubStream")
protected PcmStream firstSubStream() {
return null; // L: 200
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "()Lao;"
+ descriptor = "()Laz;"
)
@Export("nextSubStream")
protected PcmStream nextSubStream() {
return null; // L: 204
}
- @ObfuscatedName("s")
- protected int vmethod5295() {
- return this.field339 == 0 && this.field343 == 0 ? 0 : 1; // L: 208 209
+ @ObfuscatedName("w")
+ protected int vmethod5437() {
+ return this.field343 == 0 && this.field342 == 0 ? 0 : 1; // L: 208 209
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("fill")
public synchronized void fill(int[] var1, int var2, int var3) {
- if (this.field339 == 0 && this.field343 == 0) { // L: 213
+ if (this.field343 == 0 && this.field342 == 0) { // L: 213
this.skip(var3); // L: 214
} else {
RawSound var4 = (RawSound)super.sound; // L: 217
@@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream {
int var9 = var2; // L: 223
var3 += var2; // L: 224
- if (this.field336 < 0) { // L: 225
- if (this.field333 <= 0) { // L: 226
- this.method809(); // L: 228
+ if (this.field331 < 0) { // L: 225
+ if (this.field332 <= 0) { // L: 226
+ this.method785(); // L: 228
this.remove(); // L: 229
return; // L: 230
}
- this.field336 = 0;
+ this.field331 = 0;
}
- if (this.field336 >= var7) { // L: 233
- if (this.field333 >= 0) { // L: 234
- this.method809(); // L: 236
+ if (this.field331 >= var7) { // L: 233
+ if (this.field332 >= 0) { // L: 234
+ this.method785(); // L: 236
this.remove(); // L: 237
return; // L: 238
}
- this.field336 = var7 - 1;
+ this.field331 = var7 - 1;
}
if (this.numLoops < 0) { // L: 241
- if (this.field342) { // L: 242
- if (this.field333 < 0) { // L: 243
- var9 = this.method934(var1, var2, var5, var3, var4.samples[this.start]); // L: 244
- if (this.field336 >= var5) { // L: 245
+ if (this.field333) { // L: 242
+ if (this.field332 < 0) { // L: 243
+ var9 = this.method799(var1, var2, var5, var3, var4.samples[this.start]); // L: 244
+ if (this.field331 >= var5) { // L: 245
return;
}
- this.field336 = var5 + var5 - 1 - this.field336; // L: 246
- this.field333 = -this.field333; // L: 247
+ this.field331 = var5 + var5 - 1 - this.field331; // L: 246
+ this.field332 = -this.field332; // L: 247
}
while (true) {
- var9 = this.method822(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250
- if (this.field336 < var6) { // L: 251
+ var9 = this.method888(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250
+ if (this.field331 < var6) { // L: 251
return;
}
- this.field336 = var6 + var6 - 1 - this.field336; // L: 252
- this.field333 = -this.field333; // L: 253
- var9 = this.method934(var1, var9, var5, var3, var4.samples[this.start]); // L: 254
- if (this.field336 >= var5) { // L: 255
+ this.field331 = var6 + var6 - 1 - this.field331; // L: 252
+ this.field332 = -this.field332; // L: 253
+ var9 = this.method799(var1, var9, var5, var3, var4.samples[this.start]); // L: 254
+ if (this.field331 >= var5) { // L: 255
return;
}
- this.field336 = var5 + var5 - 1 - this.field336; // L: 256
- this.field333 = -this.field333; // L: 257
+ this.field331 = var5 + var5 - 1 - this.field331; // L: 256
+ this.field332 = -this.field332; // L: 257
}
- } else if (this.field333 < 0) { // L: 260
+ } else if (this.field332 < 0) { // L: 260
while (true) {
- var9 = this.method934(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262
- if (this.field336 >= var5) { // L: 263
+ var9 = this.method799(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262
+ if (this.field331 >= var5) { // L: 263
return;
}
- this.field336 = var6 - 1 - (var6 - 1 - this.field336) % var8; // L: 264
+ this.field331 = var6 - 1 - (var6 - 1 - this.field331) % var8; // L: 264
}
} else {
while (true) {
- var9 = this.method822(var1, var9, var6, var3, var4.samples[this.start]); // L: 269
- if (this.field336 < var6) { // L: 270
+ var9 = this.method888(var1, var9, var6, var3, var4.samples[this.start]); // L: 269
+ if (this.field331 < var6) { // L: 270
return;
}
- this.field336 = var5 + (this.field336 - var5) % var8; // L: 271
+ this.field331 = var5 + (this.field331 - var5) % var8; // L: 271
}
}
} else {
if (this.numLoops > 0) { // L: 275
- if (this.field342) { // L: 276
+ if (this.field333) { // L: 276
label127: {
- if (this.field333 < 0) { // L: 277
- var9 = this.method934(var1, var2, var5, var3, var4.samples[this.start]); // L: 278
- if (this.field336 >= var5) { // L: 279
+ if (this.field332 < 0) { // L: 277
+ var9 = this.method799(var1, var2, var5, var3, var4.samples[this.start]); // L: 278
+ if (this.field331 >= var5) { // L: 279
return;
}
- this.field336 = var5 + var5 - 1 - this.field336; // L: 280
- this.field333 = -this.field333; // L: 281
+ this.field331 = var5 + var5 - 1 - this.field331; // L: 280
+ this.field332 = -this.field332; // L: 281
if (--this.numLoops == 0) { // L: 282
break label127;
}
}
do {
- var9 = this.method822(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285
- if (this.field336 < var6) { // L: 286
+ var9 = this.method888(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285
+ if (this.field331 < var6) { // L: 286
return;
}
- this.field336 = var6 + var6 - 1 - this.field336; // L: 287
- this.field333 = -this.field333; // L: 288
+ this.field331 = var6 + var6 - 1 - this.field331; // L: 287
+ this.field332 = -this.field332; // L: 288
if (--this.numLoops == 0) { // L: 289
break;
}
- var9 = this.method934(var1, var9, var5, var3, var4.samples[this.start]); // L: 290
- if (this.field336 >= var5) { // L: 291
+ var9 = this.method799(var1, var9, var5, var3, var4.samples[this.start]); // L: 290
+ if (this.field331 >= var5) { // L: 291
return;
}
- this.field336 = var5 + var5 - 1 - this.field336; // L: 292
- this.field333 = -this.field333; // L: 293
+ this.field331 = var5 + var5 - 1 - this.field331; // L: 292
+ this.field332 = -this.field332; // L: 293
} while(--this.numLoops != 0); // L: 294
}
} else {
int var10;
- if (this.field333 < 0) { // L: 297
+ if (this.field332 < 0) { // L: 297
while (true) {
- var9 = this.method934(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299
- if (this.field336 >= var5) { // L: 300
+ var9 = this.method799(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299
+ if (this.field331 >= var5) { // L: 300
return;
}
- var10 = (var6 - 1 - this.field336) / var8; // L: 301
+ var10 = (var6 - 1 - this.field331) / var8; // L: 301
if (var10 >= this.numLoops) { // L: 302
- this.field336 += var8 * this.numLoops; // L: 303
+ this.field331 += var8 * this.numLoops; // L: 303
this.numLoops = 0; // L: 304
break; // L: 305
}
- this.field336 += var8 * var10; // L: 307
+ this.field331 += var8 * var10; // L: 307
this.numLoops -= var10; // L: 308
}
} else {
while (true) {
- var9 = this.method822(var1, var9, var6, var3, var4.samples[this.start]); // L: 313
- if (this.field336 < var6) { // L: 314
+ var9 = this.method888(var1, var9, var6, var3, var4.samples[this.start]); // L: 313
+ if (this.field331 < var6) { // L: 314
return;
}
- var10 = (this.field336 - var5) / var8; // L: 315
+ var10 = (this.field331 - var5) / var8; // L: 315
if (var10 >= this.numLoops) { // L: 316
- this.field336 -= var8 * this.numLoops; // L: 317
+ this.field331 -= var8 * this.numLoops; // L: 317
this.numLoops = 0; // L: 318
break; // L: 319
}
- this.field336 -= var8 * var10; // L: 321
+ this.field331 -= var8 * var10; // L: 321
this.numLoops -= var10; // L: 322
}
}
}
}
- if (this.field333 < 0) { // L: 326
- this.method934(var1, var9, 0, var3, 0); // L: 327
- if (this.field336 < 0) { // L: 328
- this.field336 = -1; // L: 329
- this.method809(); // L: 330
+ if (this.field332 < 0) { // L: 326
+ this.method799(var1, var9, 0, var3, 0); // L: 327
+ if (this.field331 < 0) { // L: 328
+ this.field331 = -1; // L: 329
+ this.method785(); // L: 330
this.remove(); // L: 331
}
} else {
- this.method822(var1, var9, var7, var3, 0); // L: 335
- if (this.field336 >= var7) { // L: 336
- this.field336 = var7; // L: 337
- this.method809(); // L: 338
+ this.method888(var1, var9, var7, var3, 0); // L: 335
+ if (this.field331 >= var7) { // L: 336
+ this.field331 = var7; // L: 337
+ this.method785(); // L: 338
this.remove(); // L: 339
}
}
@@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream {
}
} // L: 215 342
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("setNumLoops")
public synchronized void setNumLoops(int var1) {
this.numLoops = var1; // L: 79
} // L: 80
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("skip")
public synchronized void skip(int var1) {
- if (this.field343 > 0) { // L: 345
- if (var1 >= this.field343) { // L: 346
- if (this.field339 == Integer.MIN_VALUE) { // L: 347
- this.field339 = 0; // L: 348
- this.field338 = 0; // L: 349
- this.field337 = 0; // L: 350
+ if (this.field342 > 0) { // L: 345
+ if (var1 >= this.field342) { // L: 346
+ if (this.field343 == Integer.MIN_VALUE) { // L: 347
+ this.field343 = 0; // L: 348
+ this.field337 = 0; // L: 349
+ this.field336 = 0; // L: 350
this.field335 = 0; // L: 351
this.remove(); // L: 352
- var1 = this.field343; // L: 353
+ var1 = this.field342; // L: 353
}
- this.field343 = 0; // L: 355
- this.method800(); // L: 356
+ this.field342 = 0; // L: 355
+ this.method776(); // L: 356
} else {
- this.field335 += this.field332 * var1; // L: 359
- this.field337 += this.field345 * var1; // L: 360
- this.field338 += this.field346 * var1; // L: 361
- this.field343 -= var1; // L: 362
+ this.field335 += this.field344 * var1; // L: 359
+ this.field336 += this.field345 * var1; // L: 360
+ this.field337 += this.field341 * var1; // L: 361
+ this.field342 -= var1; // L: 362
}
}
@@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream {
this.numLoops = 0;
}
- if (this.field336 < 0) { // L: 371
- if (this.field333 <= 0) { // L: 372
- this.method809(); // L: 374
+ if (this.field331 < 0) { // L: 371
+ if (this.field332 <= 0) { // L: 372
+ this.method785(); // L: 374
this.remove(); // L: 375
return; // L: 376
}
- this.field336 = 0;
+ this.field331 = 0;
}
- if (this.field336 >= var5) { // L: 379
- if (this.field333 >= 0) { // L: 380
- this.method809(); // L: 382
+ if (this.field331 >= var5) { // L: 379
+ if (this.field332 >= 0) { // L: 380
+ this.method785(); // L: 382
this.remove(); // L: 383
return; // L: 384
}
- this.field336 = var5 - 1;
+ this.field331 = var5 - 1;
}
- this.field336 += this.field333 * var1; // L: 387
+ this.field331 += this.field332 * var1; // L: 387
if (this.numLoops < 0) { // L: 388
- if (!this.field342) { // L: 389
- if (this.field333 < 0) { // L: 404
- if (this.field336 >= var3) { // L: 405
+ if (!this.field333) { // L: 389
+ if (this.field332 < 0) { // L: 404
+ if (this.field331 >= var3) { // L: 405
return;
}
- this.field336 = var4 - 1 - (var4 - 1 - this.field336) % var6; // L: 406
+ this.field331 = var4 - 1 - (var4 - 1 - this.field331) % var6; // L: 406
} else {
- if (this.field336 < var4) { // L: 409
+ if (this.field331 < var4) { // L: 409
return;
}
- this.field336 = var3 + (this.field336 - var3) % var6; // L: 410
+ this.field331 = var3 + (this.field331 - var3) % var6; // L: 410
}
} else {
- if (this.field333 < 0) { // L: 390
- if (this.field336 >= var3) { // L: 391
+ if (this.field332 < 0) { // L: 390
+ if (this.field331 >= var3) { // L: 391
return;
}
- this.field336 = var3 + var3 - 1 - this.field336; // L: 392
- this.field333 = -this.field333; // L: 393
+ this.field331 = var3 + var3 - 1 - this.field331; // L: 392
+ this.field332 = -this.field332; // L: 393
}
- while (this.field336 >= var4) { // L: 396
- this.field336 = var4 + var4 - 1 - this.field336; // L: 397
- this.field333 = -this.field333; // L: 398
- if (this.field336 >= var3) { // L: 399
+ while (this.field331 >= var4) { // L: 396
+ this.field331 = var4 + var4 - 1 - this.field331; // L: 397
+ this.field332 = -this.field332; // L: 398
+ if (this.field331 >= var3) { // L: 399
return;
}
- this.field336 = var3 + var3 - 1 - this.field336; // L: 400
- this.field333 = -this.field333; // L: 401
+ this.field331 = var3 + var3 - 1 - this.field331; // L: 400
+ this.field332 = -this.field332; // L: 401
}
}
} else {
if (this.numLoops > 0) { // L: 414
- if (this.field342) { // L: 415
+ if (this.field333) { // L: 415
label129: {
- if (this.field333 < 0) { // L: 416
- if (this.field336 >= var3) { // L: 417
+ if (this.field332 < 0) { // L: 416
+ if (this.field331 >= var3) { // L: 417
return;
}
- this.field336 = var3 + var3 - 1 - this.field336; // L: 418
- this.field333 = -this.field333; // L: 419
+ this.field331 = var3 + var3 - 1 - this.field331; // L: 418
+ this.field332 = -this.field332; // L: 419
if (--this.numLoops == 0) { // L: 420
break label129;
}
}
do {
- if (this.field336 < var4) { // L: 423
+ if (this.field331 < var4) { // L: 423
return;
}
- this.field336 = var4 + var4 - 1 - this.field336; // L: 424
- this.field333 = -this.field333; // L: 425
+ this.field331 = var4 + var4 - 1 - this.field331; // L: 424
+ this.field332 = -this.field332; // L: 425
if (--this.numLoops == 0) { // L: 426
break;
}
- if (this.field336 >= var3) { // L: 427
+ if (this.field331 >= var3) { // L: 427
return;
}
- this.field336 = var3 + var3 - 1 - this.field336; // L: 428
- this.field333 = -this.field333; // L: 429
+ this.field331 = var3 + var3 - 1 - this.field331; // L: 428
+ this.field332 = -this.field332; // L: 429
} while(--this.numLoops != 0); // L: 430
}
} else {
label161: {
int var7;
- if (this.field333 < 0) { // L: 433
- if (this.field336 >= var3) { // L: 434
+ if (this.field332 < 0) { // L: 433
+ if (this.field331 >= var3) { // L: 434
return;
}
- var7 = (var4 - 1 - this.field336) / var6; // L: 435
+ var7 = (var4 - 1 - this.field331) / var6; // L: 435
if (var7 >= this.numLoops) { // L: 436
- this.field336 += var6 * this.numLoops; // L: 437
+ this.field331 += var6 * this.numLoops; // L: 437
this.numLoops = 0; // L: 438
break label161; // L: 439
}
- this.field336 += var6 * var7; // L: 441
+ this.field331 += var6 * var7; // L: 441
this.numLoops -= var7; // L: 442
} else {
- if (this.field336 < var4) { // L: 445
+ if (this.field331 < var4) { // L: 445
return;
}
- var7 = (this.field336 - var3) / var6; // L: 446
+ var7 = (this.field331 - var3) / var6; // L: 446
if (var7 >= this.numLoops) { // L: 447
- this.field336 -= var6 * this.numLoops; // L: 448
+ this.field331 -= var6 * this.numLoops; // L: 448
this.numLoops = 0; // L: 449
break label161; // L: 450
}
- this.field336 -= var6 * var7; // L: 452
+ this.field331 -= var6 * var7; // L: 452
this.numLoops -= var7; // L: 453
}
@@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream {
}
}
- if (this.field333 < 0) { // L: 457
- if (this.field336 < 0) { // L: 458
- this.field336 = -1; // L: 459
- this.method809(); // L: 460
+ if (this.field332 < 0) { // L: 457
+ if (this.field331 < 0) { // L: 458
+ this.field331 = -1; // L: 459
+ this.method785(); // L: 460
this.remove(); // L: 461
}
- } else if (this.field336 >= var5) { // L: 465
- this.field336 = var5; // L: 466
- this.method809(); // L: 467
+ } else if (this.field331 >= var5) { // L: 465
+ this.field331 = var5; // L: 466
+ this.method785(); // L: 467
this.remove(); // L: 468
}
}
} // L: 412 471
- @ObfuscatedName("c")
- public synchronized void method802(int var1) {
- this.method804(var1 << 6, this.method806()); // L: 83
+ @ObfuscatedName("t")
+ public synchronized void method790(int var1) {
+ this.method791(var1 << 6, this.method782()); // L: 83
} // L: 84
- @ObfuscatedName("w")
- synchronized void method803(int var1) {
- this.method804(var1, this.method806()); // L: 87
+ @ObfuscatedName("z")
+ synchronized void method779(int var1) {
+ this.method791(var1, this.method782()); // L: 87
} // L: 88
- @ObfuscatedName("b")
- synchronized void method804(int var1, int var2) {
- this.field339 = var1; // L: 91
+ @ObfuscatedName("r")
+ synchronized void method791(int var1, int var2) {
+ this.field343 = var1; // L: 91
this.field334 = var2; // L: 92
- this.field343 = 0; // L: 93
- this.method800(); // L: 94
+ this.field342 = 0; // L: 93
+ this.method776(); // L: 94
} // L: 95
- @ObfuscatedName("t")
- public synchronized int method805() {
- return this.field339 == Integer.MIN_VALUE ? 0 : this.field339; // L: 98
+ @ObfuscatedName("u")
+ public synchronized int method918() {
+ return this.field343 == Integer.MIN_VALUE ? 0 : this.field343; // L: 98
}
- @ObfuscatedName("g")
- public synchronized int method806() {
+ @ObfuscatedName("k")
+ public synchronized int method782() {
return this.field334 < 0 ? -1 : this.field334; // L: 102
}
- @ObfuscatedName("x")
- public synchronized void method807(int var1) {
+ @ObfuscatedName("h")
+ public synchronized void method786(int var1) {
int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106
if (var1 < -1) { // L: 107
var1 = -1;
@@ -507,90 +507,90 @@ public class RawPcmStream extends PcmStream {
var1 = var2;
}
- this.field336 = var1; // L: 109
+ this.field331 = var1; // L: 109
} // L: 110
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
descriptor = "(Z)V",
garbageValue = "1"
)
- public synchronized void method811() {
- this.field333 = (this.field333 ^ this.field333 >> 31) + (this.field333 >>> 31); // L: 113
- this.field333 = -this.field333; // L: 114
+ public synchronized void method784() {
+ this.field332 = (this.field332 ^ this.field332 >> 31) + (this.field332 >>> 31); // L: 113
+ this.field332 = -this.field332; // L: 114
} // L: 115
- @ObfuscatedName("e")
- void method809() {
- if (this.field343 != 0) { // L: 118
- if (this.field339 == Integer.MIN_VALUE) {
- this.field339 = 0; // L: 119
+ @ObfuscatedName("l")
+ void method785() {
+ if (this.field342 != 0) { // L: 118
+ if (this.field343 == Integer.MIN_VALUE) {
+ this.field343 = 0; // L: 119
}
- this.field343 = 0; // L: 120
- this.method800(); // L: 121
+ this.field342 = 0; // L: 120
+ this.method776(); // L: 121
}
} // L: 123
- @ObfuscatedName("h")
- public synchronized void method810(int var1, int var2) {
- this.method799(var1, var2, this.method806()); // L: 126
+ @ObfuscatedName("a")
+ public synchronized void method890(int var1, int var2) {
+ this.method787(var1, var2, this.method782()); // L: 126
} // L: 127
- @ObfuscatedName("f")
- public synchronized void method799(int var1, int var2, int var3) {
+ @ObfuscatedName("p")
+ public synchronized void method787(int var1, int var2, int var3) {
if (var1 == 0) { // L: 130
- this.method804(var2, var3); // L: 131
+ this.method791(var2, var3); // L: 131
} else {
- int var4 = method827(var2, var3); // L: 134
- int var5 = method925(var2, var3); // L: 135
- if (var4 == this.field337 && var5 == this.field338) { // L: 136
- this.field343 = 0; // L: 137
+ int var4 = method841(var2, var3); // L: 134
+ int var5 = method771(var2, var3); // L: 135
+ if (var4 == this.field336 && var5 == this.field337) { // L: 136
+ this.field342 = 0; // L: 137
} else {
int var6 = var2 - this.field335; // L: 140
if (this.field335 - var2 > var6) { // L: 141
var6 = this.field335 - var2;
}
- if (var4 - this.field337 > var6) { // L: 142
- var6 = var4 - this.field337;
+ if (var4 - this.field336 > var6) { // L: 142
+ var6 = var4 - this.field336;
}
- if (this.field337 - var4 > var6) { // L: 143
- var6 = this.field337 - var4;
+ if (this.field336 - var4 > var6) { // L: 143
+ var6 = this.field336 - var4;
}
- if (var5 - this.field338 > var6) {
- var6 = var5 - this.field338; // L: 144
+ if (var5 - this.field337 > var6) {
+ var6 = var5 - this.field337; // L: 144
}
- if (this.field338 - var5 > var6) { // L: 145
- var6 = this.field338 - var5;
+ if (this.field337 - var5 > var6) { // L: 145
+ var6 = this.field337 - var5;
}
if (var1 > var6) { // L: 146
var1 = var6;
}
- this.field343 = var1; // L: 147
- this.field339 = var2; // L: 148
+ this.field342 = var1; // L: 147
+ this.field343 = var2; // L: 148
this.field334 = var3; // L: 149
- this.field332 = (var2 - this.field335) / var1; // L: 150
- this.field345 = (var4 - this.field337) / var1; // L: 151
- this.field346 = (var5 - this.field338) / var1; // L: 152
+ this.field344 = (var2 - this.field335) / var1; // L: 150
+ this.field345 = (var4 - this.field336) / var1; // L: 151
+ this.field341 = (var5 - this.field337) / var1; // L: 152
}
}
} // L: 132 138 153
- @ObfuscatedName("d")
- public synchronized void method812(int var1) {
+ @ObfuscatedName("b")
+ public synchronized void method802(int var1) {
if (var1 == 0) { // L: 156
- this.method803(0); // L: 157
+ this.method779(0); // L: 157
this.remove(); // L: 158
- } else if (this.field337 == 0 && this.field338 == 0) { // L: 161
- this.field343 = 0; // L: 162
- this.field339 = 0; // L: 163
+ } else if (this.field336 == 0 && this.field337 == 0) { // L: 161
+ this.field342 = 0; // L: 162
+ this.field343 = 0; // L: 163
this.field335 = 0; // L: 164
this.remove(); // L: 165
} else {
@@ -599,165 +599,115 @@ public class RawPcmStream extends PcmStream {
var2 = this.field335;
}
- if (-this.field337 > var2) { // L: 170
+ if (-this.field336 > var2) { // L: 170
+ var2 = -this.field336;
+ }
+
+ if (this.field336 > var2) { // L: 171
+ var2 = this.field336;
+ }
+
+ if (-this.field337 > var2) { // L: 172
var2 = -this.field337;
}
- if (this.field337 > var2) { // L: 171
+ if (this.field337 > var2) { // L: 173
var2 = this.field337;
}
- if (-this.field338 > var2) { // L: 172
- var2 = -this.field338;
- }
-
- if (this.field338 > var2) { // L: 173
- var2 = this.field338;
- }
-
if (var1 > var2) { // L: 174
var1 = var2;
}
- this.field343 = var1; // L: 175
- this.field339 = Integer.MIN_VALUE; // L: 176
- this.field332 = -this.field335 / var1; // L: 177
- this.field345 = -this.field337 / var1; // L: 178
- this.field346 = -this.field338 / var1; // L: 179
+ this.field342 = var1; // L: 175
+ this.field343 = Integer.MIN_VALUE; // L: 176
+ this.field344 = -this.field335 / var1; // L: 177
+ this.field345 = -this.field336 / var1; // L: 178
+ this.field341 = -this.field337 / var1; // L: 179
}
} // L: 159 166 180
- @ObfuscatedName("j")
- public synchronized void method813(int var1) {
- if (this.field333 < 0) { // L: 183
- this.field333 = -var1;
+ @ObfuscatedName("n")
+ public synchronized void method789(int var1) {
+ if (this.field332 < 0) { // L: 183
+ this.field332 = -var1;
} else {
- this.field333 = var1; // L: 184
+ this.field332 = var1; // L: 184
}
} // L: 185
- @ObfuscatedName("z")
- public synchronized int method884() {
- return this.field333 < 0 ? -this.field333 : this.field333; // L: 188
- }
-
- @ObfuscatedName("ab")
- public boolean method815() {
- return this.field336 < 0 || this.field336 >= ((RawSound)super.sound).samples.length << 8; // L: 192
+ @ObfuscatedName("ae")
+ public synchronized int method819() {
+ return this.field332 < 0 ? -this.field332 : this.field332; // L: 188
}
@ObfuscatedName("aj")
- public boolean method935() {
- return this.field343 != 0; // L: 196
+ public boolean method860() {
+ return this.field331 < 0 || this.field331 >= ((RawSound)super.sound).samples.length << 8; // L: 192
}
- @ObfuscatedName("as")
- int method822(int[] var1, int var2, int var3, int var4, int var5) {
+ @ObfuscatedName("ax")
+ public boolean method792() {
+ return this.field342 != 0; // L: 196
+ }
+
+ @ObfuscatedName("ar")
+ int method888(int[] var1, int var2, int var3, int var4, int var5) {
while (true) {
- if (this.field343 > 0) { // L: 474
- int var6 = var2 + this.field343; // L: 475
+ if (this.field342 > 0) { // L: 474
+ int var6 = var2 + this.field342; // L: 475
if (var6 > var4) { // L: 476
var6 = var4;
}
- this.field343 += var2; // L: 477
- if (this.field333 == 256 && (this.field336 & 255) == 0) { // L: 478
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 479
- var2 = method888(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this);
+ this.field342 += var2; // L: 477
+ if (this.field332 == 256 && (this.field331 & 255) == 0) { // L: 478
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 479
+ var2 = method810(0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, this.field345, this.field341, 0, var6, var3, this);
} else {
- var2 = method833(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this); // L: 480
+ var2 = method839(((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, this.field344, 0, var6, var3, this); // L: 480
}
- } else if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 483
- var2 = method838(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this, this.field333, var5);
+ } else if (BuddyRankComparator.PcmPlayer_stereo) { // L: 483
+ var2 = method814(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, this.field345, this.field341, 0, var6, var3, this, this.field332, var5);
} else {
- var2 = method837(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this, this.field333, var5); // L: 484
+ var2 = method813(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, this.field344, 0, var6, var3, this, this.field332, var5); // L: 484
}
- this.field343 -= var2; // L: 486
- if (this.field343 != 0) { // L: 487
+ this.field342 -= var2; // L: 486
+ if (this.field342 != 0) { // L: 487
return var2;
}
- if (!this.method824()) { // L: 488
+ if (!this.method798()) { // L: 488
continue;
}
return var4;
}
- if (this.field333 == 256 && (this.field336 & 255) == 0) { // L: 490
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 491
- return method826(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this);
+ if (this.field332 == 256 && (this.field331 & 255) == 0) { // L: 490
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 491
+ return method824(0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, 0, var4, var3, this);
}
- return method853(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this); // L: 492
+ return method801(((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, 0, var4, var3, this); // L: 492
}
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 495
- return method928(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this, this.field333, var5);
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 495
+ return method806(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, 0, var4, var3, this, this.field332, var5);
}
- return method936(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this, this.field333, var5); // L: 496
+ return method805(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, 0, var4, var3, this, this.field332, var5); // L: 496
}
}
- @ObfuscatedName("au")
- int method934(int[] var1, int var2, int var3, int var4, int var5) {
- while (true) {
- if (this.field343 > 0) { // L: 501
- int var6 = var2 + this.field343; // L: 502
- if (var6 > var4) { // L: 503
- var6 = var4;
- }
-
- this.field343 += var2; // L: 504
- if (this.field333 == -256 && (this.field336 & 255) == 0) { // L: 505
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 506
- var2 = method863(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this);
- } else {
- var2 = method916(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this); // L: 507
- }
- } else if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 510
- var2 = method840(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, this.field345, this.field346, 0, var6, var3, this, this.field333, var5);
- } else {
- var2 = method839(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, this.field332, 0, var6, var3, this, this.field333, var5); // L: 511
- }
-
- this.field343 -= var2; // L: 513
- if (this.field343 != 0) { // L: 514
- return var2;
- }
-
- if (!this.method824()) { // L: 515
- continue;
- }
-
- return var4;
- }
-
- if (this.field333 == -256 && (this.field336 & 255) == 0) { // L: 517
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 518
- return method828(0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this);
- }
-
- return method865(((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this); // L: 519
- }
-
- if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 522
- return method832(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field337, this.field338, 0, var4, var3, this, this.field333, var5);
- }
-
- return method831(0, 0, ((RawSound)super.sound).samples, var1, this.field336, var2, this.field335, 0, var4, var3, this, this.field333, var5); // L: 523
- }
- }
-
- @ObfuscatedName("al")
- int vmethod951() {
+ @ObfuscatedName("at")
+ int vmethod948() {
int var1 = this.field335 * 3 >> 6; // L: 31
var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32
if (this.numLoops == 0) { // L: 33
- var1 -= var1 * this.field336 / (((RawSound)super.sound).samples.length << 8);
+ var1 -= var1 * this.field331 / (((RawSound)super.sound).samples.length << 8);
} else if (this.numLoops >= 0) {
var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34
}
@@ -765,9 +715,59 @@ public class RawPcmStream extends PcmStream {
return var1 > 255 ? 255 : var1; // L: 35
}
+ @ObfuscatedName("ag")
+ int method799(int[] var1, int var2, int var3, int var4, int var5) {
+ while (true) {
+ if (this.field342 > 0) { // L: 501
+ int var6 = var2 + this.field342; // L: 502
+ if (var6 > var4) { // L: 503
+ var6 = var4;
+ }
+
+ this.field342 += var2; // L: 504
+ if (this.field332 == -256 && (this.field331 & 255) == 0) { // L: 505
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 506
+ var2 = method831(0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, this.field345, this.field341, 0, var6, var3, this);
+ } else {
+ var2 = method811(((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, this.field344, 0, var6, var3, this); // L: 507
+ }
+ } else if (BuddyRankComparator.PcmPlayer_stereo) { // L: 510
+ var2 = method816(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, this.field345, this.field341, 0, var6, var3, this, this.field332, var5);
+ } else {
+ var2 = method820(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, this.field344, 0, var6, var3, this, this.field332, var5); // L: 511
+ }
+
+ this.field342 -= var2; // L: 513
+ if (this.field342 != 0) { // L: 514
+ return var2;
+ }
+
+ if (!this.method798()) { // L: 515
+ continue;
+ }
+
+ return var4;
+ }
+
+ if (this.field332 == -256 && (this.field331 & 255) == 0) { // L: 517
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 518
+ return method905(0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, 0, var4, var3, this);
+ }
+
+ return method921(((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, 0, var4, var3, this); // L: 519
+ }
+
+ if (BuddyRankComparator.PcmPlayer_stereo) { // L: 522
+ return method808(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field336, this.field337, 0, var4, var3, this, this.field332, var5);
+ }
+
+ return method807(0, 0, ((RawSound)super.sound).samples, var1, this.field331, var2, this.field335, 0, var4, var3, this, this.field332, var5); // L: 523
+ }
+ }
+
@ObfuscatedName("aq")
- boolean method824() {
- int var1 = this.field339; // L: 528
+ boolean method798() {
+ int var1 = this.field343; // L: 528
int var2;
int var3;
if (var1 == Integer.MIN_VALUE) { // L: 531
@@ -775,97 +775,97 @@ public class RawPcmStream extends PcmStream {
var2 = 0; // L: 533
var1 = 0; // L: 534
} else {
- var2 = method827(var1, this.field334); // L: 537
- var3 = method925(var1, this.field334); // L: 538
+ var2 = method841(var1, this.field334); // L: 537
+ var3 = method771(var1, this.field334); // L: 538
}
- if (var1 == this.field335 && var2 == this.field337 && var3 == this.field338) { // L: 540
- if (this.field339 == Integer.MIN_VALUE) { // L: 570
- this.field339 = 0; // L: 571
- this.field338 = 0; // L: 572
- this.field337 = 0; // L: 573
+ if (var1 == this.field335 && var2 == this.field336 && var3 == this.field337) { // L: 540
+ if (this.field343 == Integer.MIN_VALUE) { // L: 570
+ this.field343 = 0; // L: 571
+ this.field337 = 0; // L: 572
+ this.field336 = 0; // L: 573
this.field335 = 0; // L: 574
this.remove(); // L: 575
return true; // L: 576
} else {
- this.method800(); // L: 578
+ this.method776(); // L: 578
return false; // L: 579
}
} else {
if (this.field335 < var1) { // L: 541
- this.field332 = 1; // L: 542
- this.field343 = var1 - this.field335; // L: 543
+ this.field344 = 1; // L: 542
+ this.field342 = var1 - this.field335; // L: 543
} else if (this.field335 > var1) { // L: 545
- this.field332 = -1; // L: 546
- this.field343 = this.field335 - var1; // L: 547
+ this.field344 = -1; // L: 546
+ this.field342 = this.field335 - var1; // L: 547
} else {
- this.field332 = 0; // L: 549
+ this.field344 = 0; // L: 549
}
- if (this.field337 < var2) { // L: 550
+ if (this.field336 < var2) { // L: 550
this.field345 = 1; // L: 551
- if (this.field343 == 0 || this.field343 > var2 - this.field337) { // L: 552
- this.field343 = var2 - this.field337;
+ if (this.field342 == 0 || this.field342 > var2 - this.field336) { // L: 552
+ this.field342 = var2 - this.field336;
}
- } else if (this.field337 > var2) { // L: 554
+ } else if (this.field336 > var2) { // L: 554
this.field345 = -1; // L: 555
- if (this.field343 == 0 || this.field343 > this.field337 - var2) { // L: 556
- this.field343 = this.field337 - var2;
+ if (this.field342 == 0 || this.field342 > this.field336 - var2) { // L: 556
+ this.field342 = this.field336 - var2;
}
} else {
this.field345 = 0; // L: 558
}
- if (this.field338 < var3) { // L: 559
- this.field346 = 1; // L: 560
- if (this.field343 == 0 || this.field343 > var3 - this.field338) { // L: 561
- this.field343 = var3 - this.field338;
+ if (this.field337 < var3) { // L: 559
+ this.field341 = 1; // L: 560
+ if (this.field342 == 0 || this.field342 > var3 - this.field337) { // L: 561
+ this.field342 = var3 - this.field337;
}
- } else if (this.field338 > var3) { // L: 563
- this.field346 = -1; // L: 564
- if (this.field343 == 0 || this.field343 > this.field338 - var3) { // L: 565
- this.field343 = this.field338 - var3;
+ } else if (this.field337 > var3) { // L: 563
+ this.field341 = -1; // L: 564
+ if (this.field342 == 0 || this.field342 > this.field337 - var3) { // L: 565
+ this.field342 = this.field337 - var3;
}
} else {
- this.field346 = 0; // L: 567
+ this.field341 = 0; // L: 567
}
return false; // L: 568
}
}
- @ObfuscatedName("o")
- static int method827(int var0, int var1) {
+ @ObfuscatedName("c")
+ static int method841(int var0, int var1) {
return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23
}
- @ObfuscatedName("q")
- static int method925(int var0, int var1) {
+ @ObfuscatedName("v")
+ static int method771(int var0, int var1) {
return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lak;II)Lah;"
+ descriptor = "(Laf;II)Lai;"
)
@Export("createRawPcmStream")
public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) {
- return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field300 * 100)), var2 << 6) : null; // L: 63 64
+ return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field287 * 100)), var2 << 6) : null; // L: 63 64
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lak;III)Lah;"
+ descriptor = "(Laf;III)Lai;"
)
- public static RawPcmStream method829(RawSound var0, int var1, int var2, int var3) {
+ public static RawPcmStream method775(RawSound var0, int var1, int var2, int var3) {
return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69
}
- @ObfuscatedName("ad")
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
- descriptor = "([B[IIIIIIILah;)I"
+ descriptor = "([B[IIIIIIILai;)I"
)
- static int method853(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
+ static int method801(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
var2 >>= 8; // L: 583
var7 >>= 8; // L: 584
var4 <<= 2; // L: 585
@@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream {
var10001 = var3++; // L: 596
}
- var8.field336 = var2 << 8; // L: 598
+ var8.field331 = var2 << 8; // L: 598
return var3; // L: 599
}
- @ObfuscatedName("an")
+ @ObfuscatedName("ai")
@ObfuscatedSignature(
- descriptor = "(I[B[IIIIIIIILah;)I"
+ descriptor = "(I[B[IIIIIIIILai;)I"
)
- static int method826(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
+ static int method824(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
var3 >>= 8; // L: 603
var9 >>= 8; // L: 604
var5 <<= 2; // L: 605
@@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream {
var10001 = var4++;
}
- var10.field336 = var3 << 8; // L: 631
+ var10.field331 = var3 << 8; // L: 631
return var4 >> 1; // L: 632
}
- @ObfuscatedName("aw")
+ @ObfuscatedName("az")
@ObfuscatedSignature(
- descriptor = "([B[IIIIIIILah;)I"
+ descriptor = "([B[IIIIIIILai;)I"
)
- static int method865(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
+ static int method921(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
var2 >>= 8; // L: 636
var7 >>= 8; // L: 637
var4 <<= 2; // L: 638
@@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream {
var10001 = var3++; // L: 649
}
- var8.field336 = var2 << 8; // L: 651
+ var8.field331 = var2 << 8; // L: 651
return var3; // L: 652
}
- @ObfuscatedName("ah")
+ @ObfuscatedName("av")
@ObfuscatedSignature(
- descriptor = "(I[B[IIIIIIIILah;)I"
+ descriptor = "(I[B[IIIIIIIILai;)I"
)
- static int method828(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
+ static int method905(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
var3 >>= 8; // L: 656
var9 >>= 8; // L: 657
var5 <<= 2; // L: 658
@@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream {
var10001 = var4++;
}
- var10.field336 = var3 << 8; // L: 684
+ var10.field331 = var3 << 8; // L: 684
return var4 >> 1; // L: 685
}
- @ObfuscatedName("ao")
+ @ObfuscatedName("aw")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIILai;II)I"
)
- static int method936(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
+ static int method805(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689
var7 = var8;
}
@@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream {
var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700
}
- var10.field336 = var4; // L: 703
+ var10.field331 = var4; // L: 703
return var5; // L: 704
}
- @ObfuscatedName("av")
+ @ObfuscatedName("au")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIIILai;II)I"
)
- static int method928(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+ static int method806(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708
var8 = var9;
}
@@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream {
var3[var10001] += var0 * var7 >> 6;
}
- var11.field336 = var4; // L: 729
+ var11.field331 = var4; // L: 729
return var5 >> 1; // L: 730
}
- @ObfuscatedName("ai")
+ @ObfuscatedName("ay")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIILai;II)I"
)
- static int method831(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
+ static int method807(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734
var7 = var8;
}
@@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream {
var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745
}
- var10.field336 = var4; // L: 748
+ var10.field331 = var4; // L: 748
return var5; // L: 749
}
- @ObfuscatedName("ay")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIIILai;II)I"
)
- static int method832(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+ static int method808(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753
var8 = var9;
}
@@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream {
var3[var10001] += var0 * var7 >> 6;
}
- var11.field336 = var4; // L: 773
+ var11.field331 = var4; // L: 773
return var5 >> 1; // L: 774
}
- @ObfuscatedName("aa")
+ @ObfuscatedName("be")
@ObfuscatedSignature(
- descriptor = "([B[IIIIIIIILah;)I"
+ descriptor = "([B[IIIIIIIILai;)I"
)
- static int method833(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
+ static int method839(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
var2 >>= 8; // L: 778
var8 >>= 8; // L: 779
var4 <<= 2; // L: 780
@@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream {
var6 = var7;
}
- var9.field337 += var9.field345 * (var6 - var3); // L: 783
- var9.field338 += var9.field346 * (var6 - var3); // L: 784
+ var9.field336 += var9.field345 * (var6 - var3); // L: 783
+ var9.field337 += var9.field341 * (var6 - var3); // L: 784
int var10001;
for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794
@@ -1210,15 +1210,15 @@ public class RawPcmStream extends PcmStream {
}
var9.field335 = var4 >> 2; // L: 801
- var9.field336 = var2 << 8; // L: 802
+ var9.field331 = var2 << 8; // L: 802
return var3; // L: 803
}
- @ObfuscatedName("ax")
+ @ObfuscatedName("bz")
@ObfuscatedSignature(
- descriptor = "(I[B[IIIIIIIIIILah;)I"
+ descriptor = "(I[B[IIIIIIIIIILai;)I"
)
- static int method888(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
+ static int method810(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
var3 >>= 8; // L: 807
var11 >>= 8; // L: 808
var5 <<= 2; // L: 809
@@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream {
var9 = var10;
}
- var12.field335 += var12.field332 * (var9 - var4); // L: 814
+ var12.field335 += var12.field344 * (var9 - var4); // L: 814
var4 <<= 1; // L: 815
var9 <<= 1; // L: 816
@@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream {
var2[var10001] += var13 * var6;
}
- var12.field337 = var5 >> 2; // L: 848
- var12.field338 = var6 >> 2; // L: 849
- var12.field336 = var3 << 8; // L: 850
+ var12.field336 = var5 >> 2; // L: 848
+ var12.field337 = var6 >> 2; // L: 849
+ var12.field331 = var3 << 8; // L: 850
return var4 >> 1; // L: 851
}
- @ObfuscatedName("at")
+ @ObfuscatedName("bp")
@ObfuscatedSignature(
- descriptor = "([B[IIIIIIIILah;)I"
+ descriptor = "([B[IIIIIIIILai;)I"
)
- static int method916(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
+ static int method811(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
var2 >>= 8; // L: 855
var8 >>= 8; // L: 856
var4 <<= 2; // L: 857
@@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream {
var6 = var7;
}
- var9.field337 += var9.field345 * (var6 - var3); // L: 860
- var9.field338 += var9.field346 * (var6 - var3); // L: 861
+ var9.field336 += var9.field345 * (var6 - var3); // L: 860
+ var9.field337 += var9.field341 * (var6 - var3); // L: 861
int var10001;
for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871
@@ -1317,15 +1317,15 @@ public class RawPcmStream extends PcmStream {
}
var9.field335 = var4 >> 2; // L: 878
- var9.field336 = var2 << 8; // L: 879
+ var9.field331 = var2 << 8; // L: 879
return var3; // L: 880
}
- @ObfuscatedName("br")
+ @ObfuscatedName("bf")
@ObfuscatedSignature(
- descriptor = "(I[B[IIIIIIIIIILah;)I"
+ descriptor = "(I[B[IIIIIIIIIILai;)I"
)
- static int method863(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
+ static int method831(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
var3 >>= 8; // L: 884
var11 >>= 8; // L: 885
var5 <<= 2; // L: 886
@@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream {
var9 = var10;
}
- var12.field335 += var12.field332 * (var9 - var4); // L: 891
+ var12.field335 += var12.field344 * (var9 - var4); // L: 891
var4 <<= 1; // L: 892
var9 <<= 1; // L: 893
@@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream {
var2[var10001] += var13 * var6;
}
- var12.field337 = var5 >> 2; // L: 925
- var12.field338 = var6 >> 2; // L: 926
- var12.field336 = var3 << 8; // L: 927
+ var12.field336 = var5 >> 2; // L: 925
+ var12.field337 = var6 >> 2; // L: 926
+ var12.field331 = var3 << 8; // L: 927
return var4 >> 1; // L: 928
}
- @ObfuscatedName("bc")
+ @ObfuscatedName("bg")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIIILai;II)I"
)
- static int method837(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
- var11.field337 -= var11.field345 * var5; // L: 932
- var11.field338 -= var11.field346 * var5; // L: 933
+ static int method813(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+ var11.field336 -= var11.field345 * var5; // L: 932
+ var11.field337 -= var11.field341 * var5; // L: 933
if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934
var8 = var9;
}
@@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream {
var6 += var7; // L: 947
}
- var11.field337 += var11.field345 * var5; // L: 950
- var11.field338 += var11.field346 * var5; // L: 951
+ var11.field336 += var11.field345 * var5; // L: 950
+ var11.field337 += var11.field341 * var5; // L: 951
var11.field335 = var6; // L: 952
- var11.field336 = var4; // L: 953
+ var11.field331 = var4; // L: 953
return var5; // L: 954
}
- @ObfuscatedName("bo")
+ @ObfuscatedName("br")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIIIIILai;II)I"
)
- static int method838(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
- var13.field335 -= var5 * var13.field332; // L: 958
+ static int method814(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
+ var13.field335 -= var5 * var13.field344; // L: 958
if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959
var10 = var11;
}
@@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream {
}
var5 >>= 1; // L: 984
- var13.field335 += var13.field332 * var5; // L: 985
- var13.field337 = var6; // L: 986
- var13.field338 = var7; // L: 987
- var13.field336 = var4; // L: 988
+ var13.field335 += var13.field344 * var5; // L: 985
+ var13.field336 = var6; // L: 986
+ var13.field337 = var7; // L: 987
+ var13.field331 = var4; // L: 988
return var5; // L: 989
}
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIIILai;II)I"
)
- static int method839(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
- var11.field337 -= var11.field345 * var5; // L: 993
- var11.field338 -= var11.field346 * var5; // L: 994
+ static int method820(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+ var11.field336 -= var11.field345 * var5; // L: 993
+ var11.field337 -= var11.field341 * var5; // L: 994
if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995
var8 = var9;
}
@@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream {
var6 += var7; // L: 1008
}
- var11.field337 += var11.field345 * var5; // L: 1011
- var11.field338 += var11.field346 * var5; // L: 1012
+ var11.field336 += var11.field345 * var5; // L: 1011
+ var11.field337 += var11.field341 * var5; // L: 1012
var11.field335 = var6; // L: 1013
- var11.field336 = var4; // L: 1014
+ var11.field331 = var4; // L: 1014
return var5; // L: 1015
}
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@ObfuscatedSignature(
- descriptor = "(II[B[IIIIIIIIIILah;II)I"
+ descriptor = "(II[B[IIIIIIIIIILai;II)I"
)
- static int method840(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
- var13.field335 -= var5 * var13.field332; // L: 1019
+ static int method816(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
+ var13.field335 -= var5 * var13.field344; // L: 1019
if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020
var10 = var11;
}
@@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream {
}
var5 >>= 1; // L: 1044
- var13.field335 += var13.field332 * var5; // L: 1045
- var13.field337 = var6; // L: 1046
- var13.field338 = var7; // L: 1047
- var13.field336 = var4; // L: 1048
+ var13.field335 += var13.field344 * var5; // L: 1045
+ var13.field336 = var6; // L: 1046
+ var13.field337 = var7; // L: 1047
+ var13.field331 = var4; // L: 1048
return var5; // L: 1049
}
}
diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java
index 9357bfac3c..057e78e5bb 100644
--- a/runescape-client/src/main/java/RawSound.java
+++ b/runescape-client/src/main/java/RawSound.java
@@ -3,23 +3,23 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ak")
+@ObfuscatedName("af")
@Implements("RawSound")
public class RawSound extends AbstractSound {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("sampleRate")
public int sampleRate;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("samples")
public byte[] samples;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("start")
public int start;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("end")
int end;
- @ObfuscatedName("a")
- public boolean field266;
+ @ObfuscatedName("j")
+ public boolean field261;
RawSound(int var1, byte[] var2, int var3, int var4) {
this.sampleRate = var1; // L: 13
@@ -33,12 +33,12 @@ public class RawSound extends AbstractSound {
this.samples = var2; // L: 21
this.start = var3; // L: 22
this.end = var4; // L: 23
- this.field266 = var5; // L: 24
+ this.field261 = var5; // L: 24
} // L: 25
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lbr;)Lak;"
+ descriptor = "(Lbe;)Laf;"
)
@Export("resample")
public RawSound resample(Decimator var1) {
diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java
index 1da2cd5839..7cabf7dd65 100644
--- a/runescape-client/src/main/java/ReflectionCheck.java
+++ b/runescape-client/src/main/java/ReflectionCheck.java
@@ -5,220 +5,175 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("ap")
+@ObfuscatedName("aj")
@Implements("ReflectionCheck")
public class ReflectionCheck extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("ba")
@ObfuscatedGetter(
- intValue = 741550747
+ intValue = 1448497001
+ )
+ static int field247;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1169863591
)
@Export("id")
int id;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 757684467
+ intValue = 181292073
)
@Export("size")
int size;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("operations")
int[] operations;
- @ObfuscatedName("k")
- @Export("creationErrors")
- int[] creationErrors;
- @ObfuscatedName("a")
- @Export("fields")
- Field[] fields;
- @ObfuscatedName("m")
- @Export("arguments")
- byte[][][] arguments;
- @ObfuscatedName("p")
+ @ObfuscatedName("f")
@Export("intReplaceValues")
int[] intReplaceValues;
- @ObfuscatedName("s")
+ @ObfuscatedName("j")
+ @Export("creationErrors")
+ int[] creationErrors;
+ @ObfuscatedName("e")
+ @Export("fields")
+ Field[] fields;
+ @ObfuscatedName("g")
@Export("methods")
Method[] methods;
+ @ObfuscatedName("w")
+ @Export("arguments")
+ byte[][][] arguments;
ReflectionCheck() {
} // L: 17
- @ObfuscatedName("l")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Loo;FFFB)F",
- garbageValue = "3"
+ descriptor = "(III)V",
+ garbageValue = "1131201261"
)
- static float method601(class390 var0, float var1, float var2, float var3) {
- float var4 = Ignored.method6616(var0.field4416, var0.field4417, var1); // L: 116
- if (Math.abs(var4) < class114.field1435) { // L: 117
- return var1;
- } else {
- float var5 = Ignored.method6616(var0.field4416, var0.field4417, var2); // L: 118
- if (Math.abs(var5) < class114.field1435) { // L: 119
- return var2;
- } else {
- float var6 = 0.0F; // L: 120
- float var7 = 0.0F; // L: 121
- float var8 = 0.0F; // L: 122
- float var13 = 0.0F; // L: 127
- boolean var14 = true; // L: 128
- boolean var15 = false; // L: 129
+ @Export("changeWorldSelectSorting")
+ static void changeWorldSelectSorting(int var0, int var1) {
+ int[] var2 = new int[4]; // L: 63
+ int[] var3 = new int[4]; // L: 64
+ var2[0] = var0; // L: 65
+ var3[0] = var1; // L: 66
+ int var4 = 1; // L: 67
- do {
- var15 = false; // L: 131
- if (var14) { // L: 132
- var6 = var1; // L: 133
- var13 = var4; // L: 134
- var7 = var2 - var1; // L: 135
- var8 = var7; // L: 136
- var14 = false; // L: 137
- }
-
- if (Math.abs(var13) < Math.abs(var5)) { // L: 139
- var1 = var2; // L: 140
- var2 = var6; // L: 141
- var6 = var1; // L: 142
- var4 = var5; // L: 143
- var5 = var13; // L: 144
- var13 = var4; // L: 145
- }
-
- float var16 = class114.field1436 * Math.abs(var2) + var3 * 0.5F; // L: 147
- float var17 = 0.5F * (var6 - var2); // L: 148
- boolean var18 = Math.abs(var17) > var16 && var5 != 0.0F; // L: 149
- if (var18) { // L: 150
- if (Math.abs(var8) >= var16 && Math.abs(var4) > Math.abs(var5)) { // L: 151
- float var12 = var5 / var4; // L: 156
- float var9;
- float var10;
- if (var1 == var6) { // L: 157
- var9 = var12 * 2.0F * var17; // L: 158
- var10 = 1.0F - var12; // L: 159
- } else {
- var10 = var4 / var13; // L: 162
- float var11 = var5 / var13; // L: 163
- var9 = var12 * ((var10 - var11) * var10 * var17 * 2.0F - (var11 - 1.0F) * (var2 - var1)); // L: 164
- var10 = (var11 - 1.0F) * (var10 - 1.0F) * (var12 - 1.0F); // L: 165
- }
-
- if ((double)var9 > 0.0D) { // L: 167
- var10 = -var10;
- } else {
- var9 = -var9; // L: 168
- }
-
- var12 = var8; // L: 169
- var8 = var7; // L: 170
- if (2.0F * var9 < var17 * 3.0F * var10 - Math.abs(var16 * var10) && var9 < Math.abs(var10 * var12 * 0.5F)) { // L: 171
- var7 = var9 / var10; // L: 172
- } else {
- var7 = var17; // L: 175
- var8 = var17; // L: 176
- }
- } else {
- var7 = var17; // L: 152
- var8 = var17; // L: 153
- }
-
- var1 = var2; // L: 179
- var4 = var5; // L: 180
- if (Math.abs(var7) > var16) { // L: 181
- var2 += var7;
- } else if ((double)var17 > 0.0D) { // L: 182
- var2 += var16;
- } else {
- var2 -= var16; // L: 183
- }
-
- var5 = Ignored.method6616(var0.field4416, var0.field4417, var2); // L: 184
- if ((double)(var5 * (var13 / Math.abs(var13))) > 0.0D) { // L: 185
- var14 = true; // L: 186
- var15 = true; // L: 187
- } else {
- var15 = true; // L: 190
- }
- }
- } while(var15);
-
- return var2; // L: 194
+ for (int var5 = 0; var5 < 4; ++var5) { // L: 68
+ if (World.World_sortOption1[var5] != var0) { // L: 69
+ var2[var4] = World.World_sortOption1[var5]; // L: 70
+ var3[var4] = World.World_sortOption2[var5]; // L: 71
+ ++var4; // L: 72
}
}
- }
- @ObfuscatedName("av")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-926243112"
- )
- static int method598(int var0, Script var1, boolean var2) {
- if (var0 == 6900) { // L: 4535
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4536
- return 1; // L: 4537
- } else if (var0 == 6950) { // L: 4539
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4540
- return 1; // L: 4541
- } else {
- return 2; // L: 4543
- }
- }
+ World.World_sortOption1 = var2; // L: 75
+ World.World_sortOption2 = var3; // L: 76
+ MouseRecorder.sortWorlds(class362.World_worlds, 0, class362.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77
+ } // L: 78
- @ObfuscatedName("hm")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "92197601"
+ garbageValue = "-1378535469"
)
- static final void method600() {
- for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7841 7842 7848
- if (var0.hitpoints == -1) { // L: 7843
- var0.delay = 0; // L: 7844
- UrlRequester.method2536(var0); // L: 7845
- } else {
- var0.remove(); // L: 7847
- }
+ public static void method579() {
+ class272.midiPcmStream.clear();
+ class272.musicPlayerStatus = 1;
+ class272.musicTrackArchive = null; // L: 43
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIS)V",
+ garbageValue = "-8124"
+ )
+ @Export("itemContainerSetItem")
+ static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
+ ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39
+ if (var4 == null) { // L: 40
+ var4 = new ItemContainer(); // L: 41
+ ItemContainer.itemContainers.put(var4, (long)var0); // L: 42
}
- } // L: 7850
+ if (var4.ids.length <= var1) { // L: 44
+ int[] var5 = new int[var1 + 1]; // L: 45
+ int[] var6 = new int[var1 + 1]; // L: 46
- @ObfuscatedName("kr")
+ int var7;
+ for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
+ var5[var7] = var4.ids[var7]; // L: 48
+ var6[var7] = var4.quantities[var7]; // L: 49
+ }
+
+ for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
+ var5[var7] = -1; // L: 52
+ var6[var7] = 0; // L: 53
+ }
+
+ var4.ids = var5; // L: 55
+ var4.quantities = var6; // L: 56
+ }
+
+ var4.ids[var1] = var2; // L: 58
+ var4.quantities[var1] = var3; // L: 59
+ } // L: 60
+
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "(Lki;I)Z",
- garbageValue = "1785924836"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-232696808"
)
- static final boolean method599(Widget var0) {
- int var1 = var0.contentType; // L: 12260
- if (var1 == 205) { // L: 12261
- Client.logoutTimer = 250; // L: 12262
- return true; // L: 12263
- } else {
- int var2;
- int var3;
- if (var1 >= 300 && var1 <= 313) { // L: 12265
- var2 = (var1 - 300) / 2; // L: 12266
- var3 = var1 & 1; // L: 12267
- Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12268
- }
-
- if (var1 >= 314 && var1 <= 323) { // L: 12270
- var2 = (var1 - 314) / 2; // L: 12271
- var3 = var1 & 1; // L: 12272
- Client.playerAppearance.method5394(var2, var3 == 1); // L: 12273
- }
-
- if (var1 == 324) { // L: 12275
- Client.playerAppearance.changeSex(false);
- }
-
- if (var1 == 325) { // L: 12276
- Client.playerAppearance.changeSex(true);
- }
-
- if (var1 == 326) { // L: 12277
- PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field3012, Client.packetWriter.isaacCipher); // L: 12279
- Client.playerAppearance.write(var4.packetBuffer); // L: 12280
- Client.packetWriter.addNode(var4); // L: 12281
- return true; // L: 12282
+ static int method576(int var0, Script var1, boolean var2) {
+ Widget var7;
+ if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1279
+ int var4;
+ if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1296
+ var7 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1297
+ var4 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1298
+ if (var4 >= 1 && var4 <= 10) { // L: 1299
+ class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1302
+ Interpreter.field843.add(var8); // L: 1303
+ return 1; // L: 1304
+ } else {
+ throw new RuntimeException(); // L: 1300
+ }
+ } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1306
+ class446.Interpreter_intStackSize -= 3; // L: 1307
+ int var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 1308
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 1309
+ int var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 1310
+ if (var5 >= 1 && var5 <= 10) { // L: 1311
+ class93 var6 = new class93(var5, var3, var4, class140.getWidget(var3).itemId); // L: 1314
+ Interpreter.field843.add(var6); // L: 1315
+ return 1; // L: 1316
+ } else {
+ throw new RuntimeException(); // L: 1312
+ }
} else {
- return false; // L: 12284
+ return 2; // L: 1318
+ }
+ } else if (Interpreter.field850 >= 10) { // L: 1280
+ throw new RuntimeException(); // L: 1281
+ } else {
+ if (var0 >= 2000) { // L: 1284
+ var7 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1285
+ } else {
+ var7 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1287
+ }
+
+ if (var7.onResize == null) { // L: 1288
+ return 0;
+ } else {
+ ScriptEvent var9 = new ScriptEvent(); // L: 1289
+ var9.widget = var7; // L: 1290
+ var9.args = var7.onResize; // L: 1291
+ var9.field1056 = Interpreter.field850 + 1; // L: 1292
+ Client.scriptEvents.addFirst(var9); // L: 1293
+ return 1; // L: 1294
}
}
}
diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java
index a7ad70053d..2cdd52edec 100644
--- a/runescape-client/src/main/java/Renderable.java
+++ b/runescape-client/src/main/java/Renderable.java
@@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gx")
+@ObfuscatedName("gj")
@Implements("Renderable")
public abstract class Renderable extends DualNode {
- @ObfuscatedName("dy")
+ @ObfuscatedName("dr")
@ObfuscatedGetter(
- intValue = 1243608959
+ intValue = 1004163911
)
@Export("height")
public int height;
@@ -18,17 +18,17 @@ public abstract class Renderable extends DualNode {
this.height = 1000; // L: 6
} // L: 8
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected Model getModel() {
return null; // L: 19
}
- @ObfuscatedName("cd")
+ @ObfuscatedName("cv")
@Export("draw")
void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
Model var11 = this.getModel(); // L: 11
@@ -37,31 +37,79 @@ public abstract class Renderable extends DualNode {
var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); // L: 14
}
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;I)V",
+ garbageValue = "730571688"
+ )
+ public static void method4342(AbstractArchive var0) {
} // L: 16
- @ObfuscatedName("ie")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "110"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1526978313"
)
- static final void method4211(int var0) {
- if (var0 >= 0) { // L: 8911
- int var1 = Client.menuArguments1[var0]; // L: 8912
- int var2 = Client.menuArguments2[var0]; // L: 8913
- int var3 = Client.menuOpcodes[var0]; // L: 8914
- int var4 = Client.menuIdentifiers[var0]; // L: 8915
- String var5 = Client.menuActions[var0]; // L: 8916
- String var6 = Client.menuTargets[var0]; // L: 8917
- ModeWhere.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8918
+ static int method4339(int var0, Script var1, boolean var2) {
+ if (var0 == 7400) { // L: 4680
+ --class446.Interpreter_intStackSize; // L: 4681
+ --Interpreter.Interpreter_stringStackSize; // L: 4682
+ return 1; // L: 4683
+ } else if (var0 == 7401) { // L: 4685
+ --class446.Interpreter_intStackSize; // L: 4686
+ --Interpreter.Interpreter_stringStackSize; // L: 4687
+ return 1; // L: 4688
+ } else if (var0 == 7402) { // L: 4690
+ class446.Interpreter_intStackSize -= 2; // L: 4691
+ --Interpreter.Interpreter_stringStackSize; // L: 4692
+ return 1; // L: 4693
+ } else if (var0 == 7403) { // L: 4695
+ class446.Interpreter_intStackSize -= 2; // L: 4696
+ --Interpreter.Interpreter_stringStackSize; // L: 4697
+ return 1; // L: 4698
+ } else if (var0 == 7404) { // L: 4700
+ --class446.Interpreter_intStackSize; // L: 4701
+ --Interpreter.Interpreter_stringStackSize; // L: 4702
+ return 1; // L: 4703
+ } else if (var0 == 7405) { // L: 4705
+ class446.Interpreter_intStackSize -= 2; // L: 4706
+ return 1; // L: 4707
+ } else if (var0 == 7406) { // L: 4709
+ --class446.Interpreter_intStackSize; // L: 4710
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4711
+ return 1; // L: 4712
+ } else if (var0 == 7407) { // L: 4714
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4715
+ return 1; // L: 4716
+ } else if (var0 == 7408) { // L: 4718
+ class446.Interpreter_intStackSize -= 2; // L: 4719
+ --Interpreter.Interpreter_stringStackSize; // L: 4720
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4721
+ return 1; // L: 4722
+ } else if (var0 == 7409) { // L: 4724
+ --class446.Interpreter_intStackSize; // L: 4725
+ return 1; // L: 4726
+ } else {
+ return 2; // L: 4728
}
- } // L: 8919
+ }
- @ObfuscatedName("ko")
+ @ObfuscatedName("fu")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2137628055"
+ descriptor = "(B)V",
+ garbageValue = "51"
)
- static final void method4210() {
- Client.field689 = Client.cycleCntr; // L: 12425
- } // L: 12426
+ @Export("playPcmPlayers")
+ static final void playPcmPlayers() {
+ if (class238.pcmPlayer1 != null) { // L: 3628
+ class238.pcmPlayer1.run();
+ }
+
+ if (AttackOption.pcmPlayer0 != null) { // L: 3629
+ AttackOption.pcmPlayer0.run();
+ }
+
+ } // L: 3630
}
diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java
index 01f4f8df1a..a9a1c30934 100644
--- a/runescape-client/src/main/java/RouteStrategy.java
+++ b/runescape-client/src/main/java/RouteStrategy.java
@@ -4,35 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gw")
+@ObfuscatedName("gu")
@Implements("RouteStrategy")
public abstract class RouteStrategy {
- @ObfuscatedName("v")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -28865855
- )
- static int field2242;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -716123983
+ intValue = -1648462545
)
@Export("approxDestinationX")
public int approxDestinationX;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1217895239
+ intValue = -235998971
)
@Export("approxDestinationY")
public int approxDestinationY;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1357888893
+ intValue = -2103328385
)
@Export("approxDestinationSizeX")
public int approxDestinationSizeX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -546663349
+ intValue = 738835935
)
@Export("approxDestinationSizeY")
public int approxDestinationSizeY;
@@ -40,102 +35,11 @@ public abstract class RouteStrategy {
protected RouteStrategy() {
} // L: 9
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIILgh;I)Z",
- garbageValue = "-425355466"
+ descriptor = "(IIILgv;I)Z",
+ garbageValue = "1278947831"
)
@Export("hasArrived")
public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4);
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(CI)C",
- garbageValue = "-1536877918"
- )
- static char method3795(char var0) {
- if (var0 == 198) { // L: 95
- return 'E';
- } else if (var0 == 230) { // L: 96
- return 'e';
- } else if (var0 == 223) {
- return 's'; // L: 97
- } else if (var0 == 338) { // L: 98
- return 'E';
- } else {
- return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100
- }
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "([BB)V",
- garbageValue = "0"
- )
- @Export("SpriteBuffer_decode")
- static void SpriteBuffer_decode(byte[] var0) {
- Buffer var1 = new Buffer(var0); // L: 179
- var1.offset = var0.length - 2; // L: 180
- class453.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 181
- class453.SpriteBuffer_xOffsets = new int[class453.SpriteBuffer_spriteCount]; // L: 182
- class453.SpriteBuffer_yOffsets = new int[class453.SpriteBuffer_spriteCount]; // L: 183
- ScriptFrame.SpriteBuffer_spriteWidths = new int[class453.SpriteBuffer_spriteCount]; // L: 184
- class453.SpriteBuffer_spriteHeights = new int[class453.SpriteBuffer_spriteCount]; // L: 185
- class127.SpriteBuffer_pixels = new byte[class453.SpriteBuffer_spriteCount][]; // L: 186
- var1.offset = var0.length - 7 - class453.SpriteBuffer_spriteCount * 8; // L: 187
- class453.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 188
- class453.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 189
- int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 190
-
- int var3;
- for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 191
- class453.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
- }
-
- for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 192
- class453.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
- }
-
- for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 193
- ScriptFrame.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
- }
-
- for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 194
- class453.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
- }
-
- var1.offset = var0.length - 7 - class453.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 195
- Decimator.SpriteBuffer_spritePalette = new int[var2]; // L: 196
-
- for (var3 = 1; var3 < var2; ++var3) { // L: 197
- Decimator.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 198
- if (Decimator.SpriteBuffer_spritePalette[var3] == 0) { // L: 199
- Decimator.SpriteBuffer_spritePalette[var3] = 1;
- }
- }
-
- var1.offset = 0; // L: 201
-
- for (var3 = 0; var3 < class453.SpriteBuffer_spriteCount; ++var3) { // L: 202
- int var4 = ScriptFrame.SpriteBuffer_spriteWidths[var3]; // L: 203
- int var5 = class453.SpriteBuffer_spriteHeights[var3]; // L: 204
- int var6 = var4 * var5; // L: 205
- byte[] var7 = new byte[var6]; // L: 206
- class127.SpriteBuffer_pixels[var3] = var7; // L: 207
- int var8 = var1.readUnsignedByte(); // L: 208
- int var9;
- if (var8 == 0) { // L: 209
- for (var9 = 0; var9 < var6; ++var9) { // L: 210
- var7[var9] = var1.readByte();
- }
- } else if (var8 == 1) { // L: 212
- for (var9 = 0; var9 < var4; ++var9) { // L: 213
- for (int var10 = 0; var10 < var5; ++var10) { // L: 214
- var7[var9 + var10 * var4] = var1.readByte(); // L: 215
- }
- }
- }
- }
-
- } // L: 220
}
diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java
index 98b6248547..923aa2e2ce 100644
--- a/runescape-client/src/main/java/RunException.java
+++ b/runescape-client/src/main/java/RunException.java
@@ -1,28 +1,37 @@
import java.applet.Applet;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("qy")
+@ObfuscatedName("qc")
@Implements("RunException")
public class RunException extends RuntimeException {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("RunException_applet")
public static Applet RunException_applet;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("localPlayerName")
public static String localPlayerName;
- @ObfuscatedName("p")
- static byte[][][] field4812;
- @ObfuscatedName("a")
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -906997917
+ )
+ public static int field4838;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = 47816443
+ )
+ public static int field4839;
+ @ObfuscatedName("e")
@Export("message")
String message;
- @ObfuscatedName("m")
+ @ObfuscatedName("g")
@Export("throwable")
Throwable throwable;
RunException(Throwable var1, String var2) {
- this.message = var2; // L: 27
- this.throwable = var1; // L: 28
- } // L: 29
+ this.message = var2; // L: 28
+ this.throwable = var1; // L: 29
+ } // L: 30
}
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index ce70ad2d4a..baa4aedc08 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -3,188 +3,188 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gm")
+@ObfuscatedName("gg")
@Implements("Scene")
public class Scene {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("Scene_isLowDetail")
public static boolean Scene_isLowDetail;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("tileUpdateCount")
static int tileUpdateCount;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("Scene_plane")
static int Scene_plane;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("Scene_drawnCount")
static int Scene_drawnCount;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("Scene_cameraXTileMin")
static int Scene_cameraXTileMin;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("Scene_cameraXTileMax")
static int Scene_cameraXTileMax;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("Scene_cameraYTileMin")
static int Scene_cameraYTileMin;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("Scene_cameraYTileMax")
static int Scene_cameraYTileMax;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("Scene_cameraXTile")
static int Scene_cameraXTile;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@Export("Scene_cameraYTile")
static int Scene_cameraYTile;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@Export("Scene_cameraX")
static int Scene_cameraX;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@Export("Scene_cameraY")
static int Scene_cameraY;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@Export("Scene_cameraZ")
static int Scene_cameraZ;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("Scene_cameraPitchSine")
static int Scene_cameraPitchSine;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@Export("Scene_cameraPitchCosine")
static int Scene_cameraPitchCosine;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("Scene_cameraYawSine")
static int Scene_cameraYawSine;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("Scene_cameraYawCosine")
static int Scene_cameraYawCosine;
@ObfuscatedName("ab")
@ObfuscatedSignature(
- descriptor = "[Lhx;"
+ descriptor = "[Lhb;"
)
@Export("gameObjects")
static GameObject[] gameObjects;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@Export("checkClick")
static boolean checkClick;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@Export("Scene_selectedPlane")
static int Scene_selectedPlane;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("Scene_selectedScreenX")
static int Scene_selectedScreenX;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@Export("Scene_selectedScreenY")
static int Scene_selectedScreenY;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@Export("Scene_selectedX")
public static int Scene_selectedX;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@Export("Scene_selectedY")
public static int Scene_selectedY;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@Export("viewportWalking")
static boolean viewportWalking;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@Export("Scene_planesCount")
static int Scene_planesCount;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@Export("Scene_planeOccluderCounts")
static int[] Scene_planeOccluderCounts;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@ObfuscatedSignature(
- descriptor = "[[Lhy;"
+ descriptor = "[[Lgb;"
)
@Export("Scene_planeOccluders")
static Occluder[][] Scene_planeOccluders;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@Export("Scene_currentOccludersCount")
static int Scene_currentOccludersCount;
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@ObfuscatedSignature(
- descriptor = "[Lhy;"
+ descriptor = "[Lgb;"
)
@Export("Scene_currentOccluders")
static Occluder[] Scene_currentOccluders;
- @ObfuscatedName("ao")
+ @ObfuscatedName("az")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("Scene_tilesDeque")
static NodeDeque Scene_tilesDeque;
@ObfuscatedName("av")
- static final int[] field2464;
- @ObfuscatedName("ai")
- static final int[] field2475;
- @ObfuscatedName("ay")
- static final int[] field2466;
+ static final int[] field2425;
+ @ObfuscatedName("aw")
+ static final int[] field2426;
+ @ObfuscatedName("au")
+ static final int[] field2427;
@ObfuscatedName("aa")
- static final int[] field2467;
- @ObfuscatedName("ax")
- static final int[] field2468;
- @ObfuscatedName("at")
- static final int[] field2478;
- @ObfuscatedName("br")
- static final int[] field2470;
- @ObfuscatedName("bs")
+ static final int[] field2416;
+ @ObfuscatedName("ay")
+ static final int[] field2429;
+ @ObfuscatedName("as")
+ static final int[] field2430;
+ @ObfuscatedName("be")
+ static final int[] field2431;
+ @ObfuscatedName("bq")
@Export("visibilityMap")
static boolean[][][][] visibilityMap;
- @ObfuscatedName("bx")
+ @ObfuscatedName("bc")
@Export("visibleTiles")
static boolean[][] visibleTiles;
- @ObfuscatedName("bd")
+ @ObfuscatedName("bl")
@Export("Scene_viewportXCenter")
static int Scene_viewportXCenter;
- @ObfuscatedName("bj")
+ @ObfuscatedName("bv")
@Export("Scene_viewportYCenter")
static int Scene_viewportYCenter;
- @ObfuscatedName("be")
+ @ObfuscatedName("bt")
@Export("Scene_viewportXMin")
static int Scene_viewportXMin;
- @ObfuscatedName("bf")
+ @ObfuscatedName("bh")
@Export("Scene_viewportYMin")
static int Scene_viewportYMin;
- @ObfuscatedName("bz")
+ @ObfuscatedName("bs")
@Export("Scene_viewportXMax")
static int Scene_viewportXMax;
- @ObfuscatedName("bv")
+ @ObfuscatedName("bk")
@Export("Scene_viewportYMax")
static int Scene_viewportYMax;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("planes")
int planes;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("xSize")
int xSize;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("ySize")
int ySize;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("tileHeights")
int[][][] tileHeights;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "[[[Lgn;"
+ descriptor = "[[[Lgy;"
)
@Export("tiles")
Tile[][][] tiles;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("minPlane")
int minPlane;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("tempGameObjectsCount")
int tempGameObjectsCount;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "[Lhx;"
+ descriptor = "[Lhb;"
)
@Export("tempGameObjects")
GameObject[] tempGameObjects;
- @ObfuscatedName("v")
- int[][][] field2454;
- @ObfuscatedName("bo")
+ @ObfuscatedName("i")
+ int[][][] field2388;
+ @ObfuscatedName("br")
@Export("tileShape2D")
int[][] tileShape2D;
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@Export("tileRotation2D")
int[][] tileRotation2D;
@@ -206,13 +206,13 @@ public class Scene {
Scene_currentOccludersCount = 0; // L: 51
Scene_currentOccluders = new Occluder[500]; // L: 52
Scene_tilesDeque = new NodeDeque(); // L: 53
- field2464 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54
- field2475 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55
- field2466 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56
- field2467 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57
- field2468 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58
- field2478 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59
- field2470 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60
+ field2425 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54
+ field2426 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55
+ field2427 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56
+ field2416 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57
+ field2429 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58
+ field2430 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59
+ field2431 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60
visibilityMap = new boolean[8][32][51][51]; // L: 86
}
@@ -226,12 +226,12 @@ public class Scene {
this.xSize = var2; // L: 97
this.ySize = var3; // L: 98
this.tiles = new Tile[var1][var2][var3]; // L: 99
- this.field2454 = new int[var1][var2 + 1][var3 + 1]; // L: 100
+ this.field2388 = new int[var1][var2 + 1][var3 + 1]; // L: 100
this.tileHeights = var4; // L: 101
this.clear(); // L: 102
} // L: 103
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("clear")
public void clear() {
int var1;
@@ -264,7 +264,7 @@ public class Scene {
} // L: 120
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("init")
public void init(int var1) {
this.minPlane = var1; // L: 123
@@ -279,7 +279,7 @@ public class Scene {
} // L: 129
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("setLinkBelow")
public void setLinkBelow(int var1, int var2) {
Tile var3 = this.tiles[0][var1][var2]; // L: 132
@@ -291,7 +291,7 @@ public class Scene {
for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137
GameObject var7 = var5.gameObjects[var6]; // L: 138
- if (VarcInt.method3323(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139
+ if (ClanChannelMember.method2865(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139
--var7.plane;
}
}
@@ -306,7 +306,7 @@ public class Scene {
this.tiles[3][var1][var2] = null; // L: 145
} // L: 146
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("setTileMinPlane")
public void setTileMinPlane(int var1, int var2, int var3, int var4) {
Tile var5 = this.tiles[var1][var2][var3]; // L: 165
@@ -315,7 +315,7 @@ public class Scene {
}
} // L: 168
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("addTile")
public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) {
SceneTilePaint var21;
@@ -353,9 +353,9 @@ public class Scene {
}
} // L: 175 181 186
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(IIIILgx;JI)V"
+ descriptor = "(IIIILgj;JI)V"
)
@Export("newFloorDecoration")
public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) {
@@ -375,9 +375,9 @@ public class Scene {
}
} // L: 199
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(IIIILgx;JLgx;Lgx;)V"
+ descriptor = "(IIIILgj;JLgj;Lgj;)V"
)
@Export("newGroundItemPile")
public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) {
@@ -411,9 +411,9 @@ public class Scene {
this.tiles[var1][var2][var3].itemLayer = var10; // L: 223
} // L: 224
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(IIIILgx;Lgx;IIJI)V"
+ descriptor = "(IIIILgj;Lgj;IIJI)V"
)
@Export("newBoundaryObject")
public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) {
@@ -439,9 +439,9 @@ public class Scene {
}
} // L: 240
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(IIIILgx;Lgx;IIIIJI)V"
+ descriptor = "(IIIILgj;Lgj;IIIIJI)V"
)
@Export("newWallDecoration")
public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) {
@@ -469,11 +469,11 @@ public class Scene {
}
} // L: 258
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(IIIIIILgx;IJI)Z"
+ descriptor = "(IIIIIILgj;IJI)Z"
)
- public boolean method4176(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
+ public boolean method4188(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
if (var7 == null) { // L: 261
return true;
} else {
@@ -483,9 +483,9 @@ public class Scene {
}
}
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(IIIIILgx;IJZ)Z"
+ descriptor = "(IIIIILgj;IJZ)Z"
)
@Export("drawEntity")
public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) {
@@ -522,18 +522,18 @@ public class Scene {
}
}
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(IIIIILgx;IJIIII)Z"
+ descriptor = "(IIIIILgj;IJIIII)Z"
)
@Export("addNullableObject")
public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) {
return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288
}
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(IIIIIIIILgx;IZJI)Z"
+ descriptor = "(IIIIIIIILgj;IZJI)Z"
)
@Export("newGameObject")
boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) {
@@ -605,7 +605,7 @@ public class Scene {
return true; // L: 329
}
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("clearTempGameObjects")
public void clearTempGameObjects() {
for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333
@@ -617,9 +617,9 @@ public class Scene {
this.tempGameObjectsCount = 0; // L: 338
} // L: 339
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(Lhx;)V"
+ descriptor = "(Lhb;)V"
)
@Export("removeGameObject")
void removeGameObject(GameObject var1) {
@@ -653,8 +653,8 @@ public class Scene {
} // L: 365
- @ObfuscatedName("x")
- public void method4180(int var1, int var2, int var3, int var4) {
+ @ObfuscatedName("h")
+ public void method4171(int var1, int var2, int var3, int var4) {
Tile var5 = this.tiles[var1][var2][var3]; // L: 368
if (var5 != null) { // L: 369
WallDecoration var6 = var5.wallDecoration; // L: 370
@@ -665,7 +665,7 @@ public class Scene {
}
} // L: 374
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("removeBoundaryObject")
public void removeBoundaryObject(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 377
@@ -674,7 +674,7 @@ public class Scene {
}
} // L: 378 380
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("removeWallDecoration")
public void removeWallDecoration(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 383
@@ -683,14 +683,14 @@ public class Scene {
}
} // L: 384 386
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("removeGameObject")
public void removeGameObject(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 389
if (var4 != null) { // L: 390
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391
GameObject var6 = var4.gameObjects[var5]; // L: 392
- if (VarcInt.method3323(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393
+ if (ClanChannelMember.method2865(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393
this.removeGameObject(var6); // L: 394
return; // L: 395
}
@@ -699,7 +699,7 @@ public class Scene {
}
} // L: 398
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("removeFloorDecoration")
public void removeFloorDecoration(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 401
@@ -708,7 +708,7 @@ public class Scene {
}
} // L: 402 404
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("removeGroundItemPile")
public void removeGroundItemPile(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 407
@@ -717,27 +717,27 @@ public class Scene {
}
} // L: 408 410
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "(III)Lhc;"
+ descriptor = "(III)Lhi;"
)
- public BoundaryObject method4147(int var1, int var2, int var3) {
+ public BoundaryObject method4333(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 413
return var4 == null ? null : var4.boundaryObject; // L: 414 415
}
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "(III)Lhf;"
+ descriptor = "(III)Lhr;"
)
- public WallDecoration method4049(int var1, int var2, int var3) {
+ public WallDecoration method4178(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 419
return var4 == null ? null : var4.wallDecoration; // L: 420 421
}
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "(III)Lhx;"
+ descriptor = "(III)Lhb;"
)
@Export("getGameObject")
public GameObject getGameObject(int var1, int var2, int var3) {
@@ -747,7 +747,7 @@ public class Scene {
} else {
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427
GameObject var6 = var4.gameObjects[var5]; // L: 428
- if (VarcInt.method3323(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429
+ if (ClanChannelMember.method2865(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429
return var6;
}
}
@@ -756,9 +756,9 @@ public class Scene {
}
}
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "(III)Lga;"
+ descriptor = "(III)Lge;"
)
@Export("getFloorDecoration")
public FloorDecoration getFloorDecoration(int var1, int var2, int var3) {
@@ -766,21 +766,21 @@ public class Scene {
return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437
}
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("getBoundaryObjectTag")
public long getBoundaryObjectTag(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 441
return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443
}
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@Export("getWallDecorationTag")
public long getWallDecorationTag(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 447
return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449
}
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@Export("getGameObjectTag")
public long getGameObjectTag(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 453
@@ -789,7 +789,7 @@ public class Scene {
} else {
for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455
GameObject var6 = var4.gameObjects[var5]; // L: 456
- if (VarcInt.method3323(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457
+ if (ClanChannelMember.method2865(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457
return var6.tag;
}
}
@@ -798,7 +798,7 @@ public class Scene {
}
}
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("getFloorDecorationTag")
public long getFloorDecorationTag(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 463
@@ -828,8 +828,8 @@ public class Scene {
}
}
- @ObfuscatedName("aj")
- public void method4057(int var1, int var2, int var3) {
+ @ObfuscatedName("ap")
+ public void method4186(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481
for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482
for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483
@@ -839,11 +839,11 @@ public class Scene {
ModelData var10;
if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487
ModelData var9 = (ModelData)var8.renderable1; // L: 488
- this.method4059(var9, var4, var5, var6, 1, 1); // L: 489
+ this.method4313(var9, var4, var5, var6, 1, 1); // L: 489
if (var8.renderable2 instanceof ModelData) { // L: 490
var10 = (ModelData)var8.renderable2; // L: 491
- this.method4059(var10, var4, var5, var6, 1, 1); // L: 492
- ModelData.method3862(var9, var10, 0, 0, 0, false); // L: 493
+ this.method4313(var10, var4, var5, var6, 1, 1); // L: 492
+ ModelData.method3944(var9, var10, 0, 0, 0, false); // L: 493
var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494
}
@@ -854,7 +854,7 @@ public class Scene {
GameObject var14 = var7.gameObjects[var12]; // L: 499
if (var14 != null && var14.renderable instanceof ModelData) { // L: 500
ModelData var11 = (ModelData)var14.renderable; // L: 501
- this.method4059(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502
+ this.method4313(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502
var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503
}
}
@@ -862,7 +862,7 @@ public class Scene {
FloorDecoration var13 = var7.floorDecoration; // L: 506
if (var13 != null && var13.renderable instanceof ModelData) { // L: 507
var10 = (ModelData)var13.renderable; // L: 508
- this.method4058(var10, var4, var5, var6); // L: 509
+ this.method4187(var10, var4, var5, var6); // L: 509
var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510
}
}
@@ -872,18 +872,18 @@ public class Scene {
} // L: 516
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@ObfuscatedSignature(
- descriptor = "(Lgs;III)V"
+ descriptor = "(Lgw;III)V"
)
- void method4058(ModelData var1, int var2, int var3, int var4) {
+ void method4187(ModelData var1, int var2, int var3, int var4) {
Tile var5;
ModelData var6;
if (var3 < this.xSize) { // L: 519
var5 = this.tiles[var2][var3 + 1][var4]; // L: 520
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521
var6 = (ModelData)var5.floorDecoration.renderable; // L: 522
- ModelData.method3862(var1, var6, 128, 0, 0, true); // L: 523
+ ModelData.method3944(var1, var6, 128, 0, 0, true); // L: 523
}
}
@@ -891,7 +891,7 @@ public class Scene {
var5 = this.tiles[var2][var3][var4 + 1]; // L: 527
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528
var6 = (ModelData)var5.floorDecoration.renderable; // L: 529
- ModelData.method3862(var1, var6, 0, 0, 128, true); // L: 530
+ ModelData.method3944(var1, var6, 0, 0, 128, true); // L: 530
}
}
@@ -899,7 +899,7 @@ public class Scene {
var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535
var6 = (ModelData)var5.floorDecoration.renderable; // L: 536
- ModelData.method3862(var1, var6, 128, 0, 128, true); // L: 537
+ ModelData.method3944(var1, var6, 128, 0, 128, true); // L: 537
}
}
@@ -907,17 +907,17 @@ public class Scene {
var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542
var6 = (ModelData)var5.floorDecoration.renderable; // L: 543
- ModelData.method3862(var1, var6, 128, 0, -128, true); // L: 544
+ ModelData.method3944(var1, var6, 128, 0, -128, true); // L: 544
}
}
} // L: 547
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "(Lgs;IIIII)V"
+ descriptor = "(Lgw;IIIII)V"
)
- void method4059(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
+ void method4313(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
boolean var7 = true; // L: 550
int var8 = var3; // L: 551
int var9 = var3 + var5; // L: 552
@@ -938,12 +938,12 @@ public class Scene {
ModelData var18;
if (var17.renderable1 instanceof ModelData) { // L: 567
var18 = (ModelData)var17.renderable1; // L: 568
- ModelData.method3862(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569
+ ModelData.method3944(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569
}
if (var17.renderable2 instanceof ModelData) { // L: 571
var18 = (ModelData)var17.renderable2; // L: 572
- ModelData.method3862(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573
+ ModelData.method3944(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573
}
}
@@ -953,7 +953,7 @@ public class Scene {
ModelData var20 = (ModelData)var19.renderable; // L: 579
int var21 = var19.endX - var19.startX + 1; // L: 580
int var22 = var19.endY - var19.startY + 1; // L: 581
- ModelData.method3862(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582
+ ModelData.method3944(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582
}
}
}
@@ -969,7 +969,7 @@ public class Scene {
} // L: 590
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@Export("drawTileMinimap")
public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
Tile var7 = this.tiles[var4][var5][var6]; // L: 593
@@ -1034,7 +1034,7 @@ public class Scene {
}
} // L: 606 635
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@Export("menuOpen")
public void menuOpen(int var1, int var2, int var3, boolean var4) {
if (!shouldSendWalk() || var4) { // L: 714
@@ -1048,13 +1048,13 @@ public class Scene {
}
} // L: 722
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@Export("setViewportWalking")
public void setViewportWalking() {
viewportWalking = true; // L: 725
} // L: 726
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@Export("draw")
public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
if (var1 < 0) { // L: 738
@@ -1124,8 +1124,8 @@ public class Scene {
if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772
var16.drawPrimary = true; // L: 778
var16.drawSecondary = true; // L: 779
- if (var16.gameObjectsCount > 0) { // L: 780
- var16.drawGameObjects = true;
+ if (var16.gameObjectsCount > 0) {
+ var16.drawGameObjects = true; // L: 780
} else {
var16.drawGameObjects = false; // L: 781
}
@@ -1251,9 +1251,9 @@ public class Scene {
checkClick = false; // L: 862
} // L: 863
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@ObfuscatedSignature(
- descriptor = "(Lgn;Z)V"
+ descriptor = "(Lgy;Z)V"
)
@Export("drawTile")
void drawTile(Tile var1, boolean var2) {
@@ -1347,10 +1347,10 @@ public class Scene {
if (var3.linkedBelowTile != null) { // L: 901
var9 = var3.linkedBelowTile; // L: 902
if (var9.paint != null) { // L: 903
- if (!this.method4074(0, var4, var5)) { // L: 904
+ if (!this.method4203(0, var4, var5)) { // L: 904
this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
}
- } else if (var9.model != null && !this.method4074(0, var4, var5)) { // L: 906 907
+ } else if (var9.model != null && !this.method4203(0, var4, var5)) { // L: 906 907
this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
}
@@ -1369,13 +1369,13 @@ public class Scene {
var20 = false; // L: 916
if (var3.paint != null) { // L: 917
- if (!this.method4074(var7, var4, var5)) { // L: 918
+ if (!this.method4203(var7, var4, var5)) { // L: 918
var20 = true; // L: 919
if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920
this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
}
}
- } else if (var3.model != null && !this.method4074(var7, var4, var5)) { // L: 923 924
+ } else if (var3.model != null && !this.method4203(var7, var4, var5)) { // L: 923 924
var20 = true; // L: 925
this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926
}
@@ -1397,43 +1397,43 @@ public class Scene {
var21 += 6;
}
- var11 = field2464[var21]; // L: 938
- var3.field2374 = field2466[var21]; // L: 939
+ var11 = field2425[var21]; // L: 938
+ var3.field2326 = field2427[var21]; // L: 939
}
if (var31 != null) { // L: 941
- if ((var31.orientationA & field2475[var21]) != 0) { // L: 942
+ if ((var31.orientationA & field2426[var21]) != 0) { // L: 942
if (var31.orientationA == 16) { // L: 943
var3.drawGameObjectEdges = 3; // L: 944
- var3.field2372 = field2467[var21]; // L: 945
- var3.field2373 = 3 - var3.field2372; // L: 946
+ var3.field2333 = field2416[var21]; // L: 945
+ var3.field2334 = 3 - var3.field2333; // L: 946
} else if (var31.orientationA == 32) { // L: 948
var3.drawGameObjectEdges = 6; // L: 949
- var3.field2372 = field2468[var21]; // L: 950
- var3.field2373 = 6 - var3.field2372; // L: 951
+ var3.field2333 = field2429[var21]; // L: 950
+ var3.field2334 = 6 - var3.field2333; // L: 951
} else if (var31.orientationA == 64) { // L: 953
var3.drawGameObjectEdges = 12; // L: 954
- var3.field2372 = field2478[var21]; // L: 955
- var3.field2373 = 12 - var3.field2372; // L: 956
+ var3.field2333 = field2430[var21]; // L: 955
+ var3.field2334 = 12 - var3.field2333; // L: 956
} else {
var3.drawGameObjectEdges = 9; // L: 959
- var3.field2372 = field2470[var21]; // L: 960
- var3.field2373 = 9 - var3.field2372; // L: 961
+ var3.field2333 = field2431[var21]; // L: 960
+ var3.field2334 = 9 - var3.field2333; // L: 961
}
} else {
var3.drawGameObjectEdges = 0; // L: 964
}
- if ((var31.orientationA & var11) != 0 && !this.method4191(var7, var4, var5, var31.orientationA)) { // L: 965
+ if ((var31.orientationA & var11) != 0 && !this.method4169(var7, var4, var5, var31.orientationA)) { // L: 965
var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
- if ((var31.orientationB & var11) != 0 && !this.method4191(var7, var4, var5, var31.orientationB)) { // L: 966
+ if ((var31.orientationB & var11) != 0 && !this.method4169(var7, var4, var5, var31.orientationB)) { // L: 966
var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.z - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
}
- if (var13 != null && !this.method4089(var7, var4, var5, var13.renderable1.height)) { // L: 968
+ if (var13 != null && !this.method4205(var7, var4, var5, var13.renderable1.height)) { // L: 968
if ((var13.orientation & var11) != 0) { // L: 969
var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.z - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970
} else if (var13.orientation == 256) { // L: 972
@@ -1521,7 +1521,7 @@ public class Scene {
var20 = true; // L: 1022
for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023
- if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2372) { // L: 1024
+ if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2333) { // L: 1024
var20 = false; // L: 1025
break; // L: 1026
}
@@ -1529,7 +1529,7 @@ public class Scene {
if (var20) { // L: 1029
var10 = var3.boundaryObject; // L: 1030
- if (!this.method4191(var7, var4, var5, var10.orientationA)) { // L: 1031
+ if (!this.method4169(var7, var4, var5, var10.orientationA)) { // L: 1031
var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.z - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
}
@@ -1576,7 +1576,7 @@ public class Scene {
var16 += 2;
}
- if ((var16 & var36.drawGameObjectEdges) == var3.field2373) { // L: 1056
+ if ((var16 & var36.drawGameObjectEdges) == var3.field2334) { // L: 1056
var3.drawGameObjects = true; // L: 1057
continue label563; // L: 1058
}
@@ -1594,9 +1594,9 @@ public class Scene {
var15 = Scene_cameraYTile - var12.startY; // L: 1067
var16 = var12.endY - Scene_cameraYTile; // L: 1068
if (var16 > var15) { // L: 1069
- var12.field2697 = var24 + var16;
+ var12.field2655 = var24 + var16;
} else {
- var12.field2697 = var24 + var15; // L: 1070
+ var12.field2655 = var24 + var15; // L: 1070
}
}
}
@@ -1608,10 +1608,10 @@ public class Scene {
for (var24 = 0; var24 < var21; ++var24) { // L: 1076
GameObject var35 = gameObjects[var24]; // L: 1077
if (var35.lastDrawn != Scene_drawnCount) { // L: 1078
- if (var35.field2697 > var11) { // L: 1079
- var11 = var35.field2697; // L: 1080
+ if (var35.field2655 > var11) { // L: 1079
+ var11 = var35.field2655; // L: 1080
var25 = var24; // L: 1081
- } else if (var11 == var35.field2697) { // L: 1083
+ } else if (var11 == var35.field2655) { // L: 1083
var15 = var35.centerX - Scene_cameraX; // L: 1084
var16 = var35.centerY - Scene_cameraZ; // L: 1085
var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086
@@ -1629,7 +1629,7 @@ public class Scene {
GameObject var33 = gameObjects[var25]; // L: 1093
var33.lastDrawn = Scene_drawnCount; // L: 1094
- if (!this.method4132(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095
+ if (!this.method4206(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095
var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096
}
@@ -1701,10 +1701,10 @@ public class Scene {
}
}
- if (var3.field2374 != 0) { // L: 1138
+ if (var3.field2326 != 0) { // L: 1138
WallDecoration var29 = var3.wallDecoration; // L: 1139
- if (var29 != null && !this.method4089(var7, var4, var5, var29.renderable1.height)) { // L: 1140
- if ((var29.orientation & var3.field2374) != 0) { // L: 1141
+ if (var29 != null && !this.method4205(var7, var4, var5, var29.renderable1.height)) { // L: 1140
+ if ((var29.orientation & var3.field2326) != 0) { // L: 1141
var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.z - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142
} else if (var29.orientation == 256) { // L: 1144
var11 = var29.x - Scene_cameraX; // L: 1145
@@ -1733,11 +1733,11 @@ public class Scene {
BoundaryObject var27 = var3.boundaryObject; // L: 1163
if (var27 != null) { // L: 1164
- if ((var27.orientationB & var3.field2374) != 0 && !this.method4191(var7, var4, var5, var27.orientationB)) { // L: 1165
+ if ((var27.orientationB & var3.field2326) != 0 && !this.method4169(var7, var4, var5, var27.orientationB)) { // L: 1165
var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
}
- if ((var27.orientationA & var3.field2374) != 0 && !this.method4191(var7, var4, var5, var27.orientationA)) { // L: 1166
+ if ((var27.orientationA & var3.field2326) != 0 && !this.method4169(var7, var4, var5, var27.orientationA)) { // L: 1166
var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.z - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
}
}
@@ -1781,9 +1781,9 @@ public class Scene {
}
}
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
- descriptor = "(Lhr;IIIIIII)V"
+ descriptor = "(Lhu;IIIIIII)V"
)
@Export("drawTileUnderlay")
void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
@@ -1837,9 +1837,9 @@ public class Scene {
Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242
int var30;
if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243
- Rasterizer3D.field2395 = false; // L: 1244
+ Rasterizer3D.field2345 = false; // L: 1244
if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245
- Rasterizer3D.field2395 = true;
+ Rasterizer3D.field2345 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246
@@ -1849,7 +1849,7 @@ public class Scene {
if (var1.texture == -1) { // L: 1250
if (var1.neColor != 12345678) { // L: 1251
- Rasterizer3D.method3915(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
+ Rasterizer3D.method4096(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
}
} else if (!Scene_isLowDetail) { // L: 1253
if (var1.isFlat) { // L: 1254
@@ -1859,14 +1859,14 @@ public class Scene {
}
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258
- Rasterizer3D.method3915(var27, var29, var25, var26, var28, var24, method4071(var30, var1.neColor), method4071(var30, var1.nwColor), method4071(var30, var1.seColor)); // L: 1259
+ Rasterizer3D.method4096(var27, var29, var25, var26, var28, var24, method4243(var30, var1.neColor), method4243(var30, var1.nwColor), method4243(var30, var1.seColor)); // L: 1259
}
}
if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262
- Rasterizer3D.field2395 = false; // L: 1263
+ Rasterizer3D.field2345 = false; // L: 1263
if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264
- Rasterizer3D.field2395 = true;
+ Rasterizer3D.field2345 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265
@@ -1876,13 +1876,13 @@ public class Scene {
if (var1.texture == -1) { // L: 1269
if (var1.swColor != 12345678) { // L: 1270
- Rasterizer3D.method3915(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
+ Rasterizer3D.method4096(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
}
} else if (!Scene_isLowDetail) { // L: 1272
Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276
- Rasterizer3D.method3915(var23, var25, var29, var22, var24, var28, method4071(var30, var1.swColor), method4071(var30, var1.seColor), method4071(var30, var1.nwColor)); // L: 1277
+ Rasterizer3D.method4096(var23, var25, var29, var22, var24, var28, method4243(var30, var1.swColor), method4243(var30, var1.seColor), method4243(var30, var1.nwColor)); // L: 1277
}
}
@@ -1892,9 +1892,9 @@ public class Scene {
}
} // L: 1280
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@ObfuscatedSignature(
- descriptor = "(Lhu;IIIIII)V"
+ descriptor = "(Lhs;IIIIII)V"
)
@Export("drawTileOverlay")
void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) {
@@ -1919,13 +1919,13 @@ public class Scene {
}
if (var1.triangleTextureId != null) { // L: 1295
- SceneTileModel.field2535[var9] = var10; // L: 1296
- SceneTileModel.field2545[var9] = var13; // L: 1297
- SceneTileModel.field2534[var9] = var12; // L: 1298
+ SceneTileModel.field2488[var9] = var10; // L: 1296
+ SceneTileModel.field2501[var9] = var13; // L: 1297
+ SceneTileModel.field2502[var9] = var12; // L: 1298
}
- SceneTileModel.field2539[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300
- SceneTileModel.field2540[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301
+ SceneTileModel.field2498[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300
+ SceneTileModel.field2499[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301
}
Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303
@@ -1935,16 +1935,16 @@ public class Scene {
var10 = var1.faceX[var9]; // L: 1306
var11 = var1.faceY[var9]; // L: 1307
var12 = var1.faceZ[var9]; // L: 1308
- var13 = SceneTileModel.field2539[var10]; // L: 1309
- int var14 = SceneTileModel.field2539[var11]; // L: 1310
- int var15 = SceneTileModel.field2539[var12]; // L: 1311
- int var16 = SceneTileModel.field2540[var10]; // L: 1312
- int var17 = SceneTileModel.field2540[var11]; // L: 1313
- int var18 = SceneTileModel.field2540[var12]; // L: 1314
+ var13 = SceneTileModel.field2498[var10]; // L: 1309
+ int var14 = SceneTileModel.field2498[var11]; // L: 1310
+ int var15 = SceneTileModel.field2498[var12]; // L: 1311
+ int var16 = SceneTileModel.field2499[var10]; // L: 1312
+ int var17 = SceneTileModel.field2499[var11]; // L: 1313
+ int var18 = SceneTileModel.field2499[var12]; // L: 1314
if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315
- Rasterizer3D.field2395 = false; // L: 1316
+ Rasterizer3D.field2345 = false; // L: 1316
if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317
- Rasterizer3D.field2395 = true;
+ Rasterizer3D.field2345 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318
@@ -1955,23 +1955,23 @@ public class Scene {
if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322
if (!Scene_isLowDetail) { // L: 1326
if (var1.isFlat) { // L: 1327
- Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2535[0], SceneTileModel.field2535[1], SceneTileModel.field2535[3], SceneTileModel.field2545[0], SceneTileModel.field2545[1], SceneTileModel.field2545[3], SceneTileModel.field2534[0], SceneTileModel.field2534[1], SceneTileModel.field2534[3], var1.triangleTextureId[var9]);
+ Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2488[0], SceneTileModel.field2488[1], SceneTileModel.field2488[3], SceneTileModel.field2501[0], SceneTileModel.field2501[1], SceneTileModel.field2501[3], SceneTileModel.field2502[0], SceneTileModel.field2502[1], SceneTileModel.field2502[3], var1.triangleTextureId[var9]);
} else {
- Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2535[var10], SceneTileModel.field2535[var11], SceneTileModel.field2535[var12], SceneTileModel.field2545[var10], SceneTileModel.field2545[var11], SceneTileModel.field2545[var12], SceneTileModel.field2534[var10], SceneTileModel.field2534[var11], SceneTileModel.field2534[var12], var1.triangleTextureId[var9]); // L: 1328
+ Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2488[var10], SceneTileModel.field2488[var11], SceneTileModel.field2488[var12], SceneTileModel.field2501[var10], SceneTileModel.field2501[var11], SceneTileModel.field2501[var12], SceneTileModel.field2502[var10], SceneTileModel.field2502[var11], SceneTileModel.field2502[var12], var1.triangleTextureId[var9]); // L: 1328
}
} else {
int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331
- Rasterizer3D.method3915(var16, var17, var18, var13, var14, var15, method4071(var19, var1.triangleColorA[var9]), method4071(var19, var1.triangleColorB[var9]), method4071(var19, var1.triangleColorC[var9])); // L: 1332
+ Rasterizer3D.method4096(var16, var17, var18, var13, var14, var15, method4243(var19, var1.triangleColorA[var9]), method4243(var19, var1.triangleColorB[var9]), method4243(var19, var1.triangleColorC[var9])); // L: 1332
}
} else if (var1.triangleColorA[var9] != 12345678) { // L: 1323
- Rasterizer3D.method3915(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
+ Rasterizer3D.method4096(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
}
}
}
} // L: 1337
- @ObfuscatedName("ai")
+ @ObfuscatedName("aw")
@Export("occlude")
void occlude() {
int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364
@@ -2010,20 +2010,20 @@ public class Scene {
if (var13) { // L: 1383
var9 = Scene_cameraX - var4.minX; // L: 1384
if (var9 > 32) { // L: 1385
- var4.field2510 = 1;
+ var4.field2470 = 1;
} else {
if (var9 >= -32) { // L: 1386
continue;
}
- var4.field2510 = 2; // L: 1387
+ var4.field2470 = 2; // L: 1387
var9 = -var9; // L: 1388
}
- var4.field2509 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391
- var4.field2495 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392
- var4.field2506 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393
- var4.field2511 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394
+ var4.field2467 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391
+ var4.field2468 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392
+ var4.field2462 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393
+ var4.field2473 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394
Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395
}
}
@@ -2052,20 +2052,20 @@ public class Scene {
if (var13) { // L: 1412
var9 = Scene_cameraZ - var4.minZ; // L: 1413
if (var9 > 32) { // L: 1414
- var4.field2510 = 3;
+ var4.field2470 = 3;
} else {
if (var9 >= -32) { // L: 1415
continue;
}
- var4.field2510 = 4; // L: 1416
+ var4.field2470 = 4; // L: 1416
var9 = -var9; // L: 1417
}
- var4.field2507 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420
- var4.field2508 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421
- var4.field2506 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422
- var4.field2511 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423
+ var4.field2472 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420
+ var4.field2466 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421
+ var4.field2462 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422
+ var4.field2473 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423
Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424
}
}
@@ -2106,11 +2106,11 @@ public class Scene {
}
if (var10) { // L: 1448
- var4.field2510 = 5; // L: 1449
- var4.field2507 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450
- var4.field2508 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451
- var4.field2509 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452
- var4.field2495 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453
+ var4.field2470 = 5; // L: 1449
+ var4.field2472 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450
+ var4.field2466 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451
+ var4.field2467 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452
+ var4.field2468 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453
Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454
}
}
@@ -2120,9 +2120,9 @@ public class Scene {
} // L: 1458
- @ObfuscatedName("ay")
- boolean method4074(int var1, int var2, int var3) {
- int var4 = this.field2454[var1][var2][var3]; // L: 1461
+ @ObfuscatedName("au")
+ boolean method4203(int var1, int var2, int var3) {
+ int var4 = this.field2388[var1][var2][var3]; // L: 1461
if (var4 == -Scene_drawnCount) { // L: 1462
return false;
} else if (var4 == Scene_drawnCount) { // L: 1463
@@ -2130,19 +2130,19 @@ public class Scene {
} else {
int var5 = var2 << 7; // L: 1464
int var6 = var3 << 7; // L: 1465
- if (this.method4109(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4109(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466
- this.field2454[var1][var2][var3] = Scene_drawnCount; // L: 1467
+ if (this.method4207(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4207(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466
+ this.field2388[var1][var2][var3] = Scene_drawnCount; // L: 1467
return true; // L: 1468
} else {
- this.field2454[var1][var2][var3] = -Scene_drawnCount; // L: 1471
+ this.field2388[var1][var2][var3] = -Scene_drawnCount; // L: 1471
return false; // L: 1472
}
}
}
- @ObfuscatedName("aa")
- boolean method4191(int var1, int var2, int var3, int var4) {
- if (!this.method4074(var1, var2, var3)) { // L: 1477
+ @ObfuscatedName("ay")
+ boolean method4169(int var1, int var2, int var3, int var4) {
+ if (!this.method4203(var1, var2, var3)) { // L: 1477
return false;
} else {
int var5 = var2 << 7; // L: 1478
@@ -2154,30 +2154,30 @@ public class Scene {
if (var4 < 16) { // L: 1484
if (var4 == 1) { // L: 1485
if (var5 > Scene_cameraX) { // L: 1486
- if (!this.method4109(var5, var7, var6)) { // L: 1487
+ if (!this.method4207(var5, var7, var6)) { // L: 1487
return false;
}
- if (!this.method4109(var5, var7, var6 + 128)) { // L: 1488
+ if (!this.method4207(var5, var7, var6 + 128)) { // L: 1488
return false;
}
}
if (var1 > 0) { // L: 1490
- if (!this.method4109(var5, var8, var6)) { // L: 1491
+ if (!this.method4207(var5, var8, var6)) { // L: 1491
return false;
}
- if (!this.method4109(var5, var8, var6 + 128)) { // L: 1492
+ if (!this.method4207(var5, var8, var6 + 128)) { // L: 1492
return false;
}
}
- if (!this.method4109(var5, var9, var6)) { // L: 1494
+ if (!this.method4207(var5, var9, var6)) { // L: 1494
return false;
}
- if (!this.method4109(var5, var9, var6 + 128)) { // L: 1495
+ if (!this.method4207(var5, var9, var6 + 128)) { // L: 1495
return false;
}
@@ -2186,30 +2186,30 @@ public class Scene {
if (var4 == 2) { // L: 1498
if (var6 < Scene_cameraZ) { // L: 1499
- if (!this.method4109(var5, var7, var6 + 128)) { // L: 1500
+ if (!this.method4207(var5, var7, var6 + 128)) { // L: 1500
return false;
}
- if (!this.method4109(var5 + 128, var7, var6 + 128)) { // L: 1501
+ if (!this.method4207(var5 + 128, var7, var6 + 128)) { // L: 1501
return false;
}
}
if (var1 > 0) { // L: 1503
- if (!this.method4109(var5, var8, var6 + 128)) { // L: 1504
+ if (!this.method4207(var5, var8, var6 + 128)) { // L: 1504
return false;
}
- if (!this.method4109(var5 + 128, var8, var6 + 128)) { // L: 1505
+ if (!this.method4207(var5 + 128, var8, var6 + 128)) { // L: 1505
return false;
}
}
- if (!this.method4109(var5, var9, var6 + 128)) { // L: 1507
+ if (!this.method4207(var5, var9, var6 + 128)) { // L: 1507
return false;
}
- if (!this.method4109(var5 + 128, var9, var6 + 128)) { // L: 1508
+ if (!this.method4207(var5 + 128, var9, var6 + 128)) { // L: 1508
return false;
}
@@ -2218,30 +2218,30 @@ public class Scene {
if (var4 == 4) { // L: 1511
if (var5 < Scene_cameraX) { // L: 1512
- if (!this.method4109(var5 + 128, var7, var6)) { // L: 1513
+ if (!this.method4207(var5 + 128, var7, var6)) { // L: 1513
return false;
}
- if (!this.method4109(var5 + 128, var7, var6 + 128)) { // L: 1514
+ if (!this.method4207(var5 + 128, var7, var6 + 128)) { // L: 1514
return false;
}
}
if (var1 > 0) { // L: 1516
- if (!this.method4109(var5 + 128, var8, var6)) { // L: 1517
+ if (!this.method4207(var5 + 128, var8, var6)) { // L: 1517
return false;
}
- if (!this.method4109(var5 + 128, var8, var6 + 128)) { // L: 1518
+ if (!this.method4207(var5 + 128, var8, var6 + 128)) { // L: 1518
return false;
}
}
- if (!this.method4109(var5 + 128, var9, var6)) { // L: 1520
+ if (!this.method4207(var5 + 128, var9, var6)) { // L: 1520
return false;
}
- if (!this.method4109(var5 + 128, var9, var6 + 128)) { // L: 1521
+ if (!this.method4207(var5 + 128, var9, var6 + 128)) { // L: 1521
return false;
}
@@ -2250,30 +2250,30 @@ public class Scene {
if (var4 == 8) { // L: 1524
if (var6 > Scene_cameraZ) { // L: 1525
- if (!this.method4109(var5, var7, var6)) { // L: 1526
+ if (!this.method4207(var5, var7, var6)) { // L: 1526
return false;
}
- if (!this.method4109(var5 + 128, var7, var6)) { // L: 1527
+ if (!this.method4207(var5 + 128, var7, var6)) { // L: 1527
return false;
}
}
if (var1 > 0) { // L: 1529
- if (!this.method4109(var5, var8, var6)) { // L: 1530
+ if (!this.method4207(var5, var8, var6)) { // L: 1530
return false;
}
- if (!this.method4109(var5 + 128, var8, var6)) { // L: 1531
+ if (!this.method4207(var5 + 128, var8, var6)) { // L: 1531
return false;
}
}
- if (!this.method4109(var5, var9, var6)) { // L: 1533
+ if (!this.method4207(var5, var9, var6)) { // L: 1533
return false;
}
- if (!this.method4109(var5 + 128, var9, var6)) { // L: 1534
+ if (!this.method4207(var5 + 128, var9, var6)) { // L: 1534
return false;
}
@@ -2281,49 +2281,49 @@ public class Scene {
}
}
- if (!this.method4109(var5 + 64, var10, var6 + 64)) { // L: 1538
+ if (!this.method4207(var5 + 64, var10, var6 + 64)) { // L: 1538
return false;
} else if (var4 == 16) { // L: 1539
- return this.method4109(var5, var9, var6 + 128); // L: 1540
+ return this.method4207(var5, var9, var6 + 128); // L: 1540
} else if (var4 == 32) { // L: 1543
- return this.method4109(var5 + 128, var9, var6 + 128); // L: 1544
+ return this.method4207(var5 + 128, var9, var6 + 128); // L: 1544
} else if (var4 == 64) { // L: 1547
- return this.method4109(var5 + 128, var9, var6); // L: 1548
+ return this.method4207(var5 + 128, var9, var6); // L: 1548
} else if (var4 == 128) { // L: 1551
- return this.method4109(var5, var9, var6); // L: 1552
+ return this.method4207(var5, var9, var6); // L: 1552
} else {
return true; // L: 1555
}
}
}
- @ObfuscatedName("ax")
- boolean method4089(int var1, int var2, int var3, int var4) {
- if (!this.method4074(var1, var2, var3)) { // L: 1559
+ @ObfuscatedName("as")
+ boolean method4205(int var1, int var2, int var3, int var4) {
+ if (!this.method4203(var1, var2, var3)) { // L: 1559
return false;
} else {
int var5 = var2 << 7; // L: 1560
int var6 = var3 << 7; // L: 1561
- return this.method4109(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4109(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4109(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562
+ return this.method4207(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4207(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562
}
}
- @ObfuscatedName("at")
- boolean method4132(int var1, int var2, int var3, int var4, int var5, int var6) {
+ @ObfuscatedName("be")
+ boolean method4206(int var1, int var2, int var3, int var4, int var5, int var6) {
int var7;
int var8;
if (var3 == var2 && var5 == var4) { // L: 1567
- if (!this.method4074(var1, var2, var4)) { // L: 1568
+ if (!this.method4203(var1, var2, var4)) { // L: 1568
return false;
} else {
var7 = var2 << 7; // L: 1569
var8 = var4 << 7; // L: 1570
- return this.method4109(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4109(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4109(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4109(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571
+ return this.method4207(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4207(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4207(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4207(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571
}
} else {
for (var7 = var2; var7 <= var3; ++var7) { // L: 1574
for (var8 = var4; var8 <= var5; ++var8) { // L: 1575
- if (this.field2454[var1][var7][var8] == -Scene_drawnCount) { // L: 1576
+ if (this.field2388[var1][var7][var8] == -Scene_drawnCount) { // L: 1576
return false;
}
}
@@ -2332,17 +2332,17 @@ public class Scene {
var7 = (var2 << 7) + 1; // L: 1579
var8 = (var4 << 7) + 2; // L: 1580
int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581
- if (!this.method4109(var7, var9, var8)) { // L: 1582
+ if (!this.method4207(var7, var9, var8)) { // L: 1582
return false;
} else {
int var10 = (var3 << 7) - 1; // L: 1583
- if (!this.method4109(var10, var9, var8)) { // L: 1584
+ if (!this.method4207(var10, var9, var8)) { // L: 1584
return false;
} else {
int var11 = (var5 << 7) - 1; // L: 1585
- if (!this.method4109(var7, var9, var11)) { // L: 1586
+ if (!this.method4207(var7, var9, var11)) { // L: 1586
return false;
- } else if (!this.method4109(var10, var9, var11)) { // L: 1587
+ } else if (!this.method4207(var10, var9, var11)) { // L: 1587
return false;
} else {
return true; // L: 1588
@@ -2352,8 +2352,8 @@ public class Scene {
}
}
- @ObfuscatedName("br")
- boolean method4109(int var1, int var2, int var3) {
+ @ObfuscatedName("bz")
+ boolean method4207(int var1, int var2, int var3) {
for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592
Occluder var5 = Scene_currentOccluders[var4]; // L: 1593
int var6;
@@ -2361,57 +2361,57 @@ public class Scene {
int var8;
int var9;
int var10;
- if (var5.field2510 == 1) { // L: 1594
+ if (var5.field2470 == 1) { // L: 1594
var6 = var5.minX - var1; // L: 1595
if (var6 > 0) { // L: 1596
- var7 = (var6 * var5.field2509 >> 8) + var5.minZ; // L: 1597
- var8 = (var6 * var5.field2495 >> 8) + var5.maxZ; // L: 1598
- var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1599
- var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1600
+ var7 = (var6 * var5.field2467 >> 8) + var5.minZ; // L: 1597
+ var8 = (var6 * var5.field2468 >> 8) + var5.maxZ; // L: 1598
+ var9 = (var6 * var5.field2462 >> 8) + var5.minY; // L: 1599
+ var10 = (var6 * var5.field2473 >> 8) + var5.maxY; // L: 1600
if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601
return true;
}
}
- } else if (var5.field2510 == 2) { // L: 1605
+ } else if (var5.field2470 == 2) { // L: 1605
var6 = var1 - var5.minX; // L: 1606
if (var6 > 0) { // L: 1607
- var7 = (var6 * var5.field2509 >> 8) + var5.minZ; // L: 1608
- var8 = (var6 * var5.field2495 >> 8) + var5.maxZ; // L: 1609
- var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1610
- var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1611
+ var7 = (var6 * var5.field2467 >> 8) + var5.minZ; // L: 1608
+ var8 = (var6 * var5.field2468 >> 8) + var5.maxZ; // L: 1609
+ var9 = (var6 * var5.field2462 >> 8) + var5.minY; // L: 1610
+ var10 = (var6 * var5.field2473 >> 8) + var5.maxY; // L: 1611
if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612
return true;
}
}
- } else if (var5.field2510 == 3) { // L: 1616
+ } else if (var5.field2470 == 3) { // L: 1616
var6 = var5.minZ - var3; // L: 1617
if (var6 > 0) { // L: 1618
- var7 = (var6 * var5.field2507 >> 8) + var5.minX; // L: 1619
- var8 = (var6 * var5.field2508 >> 8) + var5.maxX; // L: 1620
- var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1621
- var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1622
+ var7 = (var6 * var5.field2472 >> 8) + var5.minX; // L: 1619
+ var8 = (var6 * var5.field2466 >> 8) + var5.maxX; // L: 1620
+ var9 = (var6 * var5.field2462 >> 8) + var5.minY; // L: 1621
+ var10 = (var6 * var5.field2473 >> 8) + var5.maxY; // L: 1622
if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623
return true;
}
}
- } else if (var5.field2510 == 4) { // L: 1627
+ } else if (var5.field2470 == 4) { // L: 1627
var6 = var3 - var5.minZ; // L: 1628
if (var6 > 0) { // L: 1629
- var7 = (var6 * var5.field2507 >> 8) + var5.minX; // L: 1630
- var8 = (var6 * var5.field2508 >> 8) + var5.maxX; // L: 1631
- var9 = (var6 * var5.field2506 >> 8) + var5.minY; // L: 1632
- var10 = (var6 * var5.field2511 >> 8) + var5.maxY; // L: 1633
+ var7 = (var6 * var5.field2472 >> 8) + var5.minX; // L: 1630
+ var8 = (var6 * var5.field2466 >> 8) + var5.maxX; // L: 1631
+ var9 = (var6 * var5.field2462 >> 8) + var5.minY; // L: 1632
+ var10 = (var6 * var5.field2473 >> 8) + var5.maxY; // L: 1633
if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634
return true;
}
}
- } else if (var5.field2510 == 5) { // L: 1638
+ } else if (var5.field2470 == 5) { // L: 1638
var6 = var2 - var5.minY; // L: 1639
if (var6 > 0) { // L: 1640
- var7 = (var6 * var5.field2507 >> 8) + var5.minX; // L: 1641
- var8 = (var6 * var5.field2508 >> 8) + var5.maxX; // L: 1642
- var9 = (var6 * var5.field2509 >> 8) + var5.minZ; // L: 1643
- var10 = (var6 * var5.field2495 >> 8) + var5.maxZ; // L: 1644
+ var7 = (var6 * var5.field2472 >> 8) + var5.minX; // L: 1641
+ var8 = (var6 * var5.field2466 >> 8) + var5.maxX; // L: 1642
+ var9 = (var6 * var5.field2467 >> 8) + var5.minZ; // L: 1643
+ var10 = (var6 * var5.field2468 >> 8) + var5.maxZ; // L: 1644
if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645
return true;
}
@@ -2422,7 +2422,7 @@ public class Scene {
return false; // L: 1650
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("Scene_addOccluder")
public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
Occluder var8 = new Occluder(); // L: 149
@@ -2440,7 +2440,7 @@ public class Scene {
Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161
} // L: 162
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@Export("Scene_buildVisiblityMap")
public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) {
Scene_viewportXMin = 0; // L: 638
@@ -2473,7 +2473,7 @@ public class Scene {
boolean var14 = false; // L: 657
for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658
- if (method4062(var12, var0[var8] + var15, var13)) { // L: 659
+ if (method4191(var12, var0[var8] + var15, var13)) { // L: 659
var14 = true; // L: 660
break;
}
@@ -2491,27 +2491,27 @@ public class Scene {
for (var9 = -25; var9 < 25; ++var9) { // L: 672
boolean var16 = false; // L: 673
- label85:
+ label84:
for (var11 = -1; var11 <= 1; ++var11) { // L: 674
for (var12 = -1; var12 <= 1; ++var12) { // L: 675
if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676
var16 = true; // L: 677
- break label85;
+ break label84;
}
if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680
var16 = true; // L: 681
- break label85; // L: 682
+ break label84; // L: 682
}
if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684
var16 = true; // L: 685
- break label85; // L: 686
+ break label84; // L: 686
}
if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688
var16 = true; // L: 689
- break label85; // L: 690
+ break label84; // L: 690
}
}
}
@@ -2524,8 +2524,8 @@ public class Scene {
} // L: 699
- @ObfuscatedName("au")
- static boolean method4062(int var0, int var1, int var2) {
+ @ObfuscatedName("an")
+ static boolean method4191(int var0, int var1, int var2) {
int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702
int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703
int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704
@@ -2539,20 +2539,20 @@ public class Scene {
}
}
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@Export("shouldSendWalk")
public static boolean shouldSendWalk() {
return viewportWalking && Scene_selectedX != -1; // L: 729
}
- @ObfuscatedName("aq")
- public static void method4066() {
+ @ObfuscatedName("at")
+ public static void method4195() {
Scene_selectedX = -1; // L: 733
viewportWalking = false; // L: 734
} // L: 735
- @ObfuscatedName("ao")
- static final int method4071(int var0, int var1) {
+ @ObfuscatedName("az")
+ static final int method4243(int var0, int var1) {
var1 = (var0 & 127) * var1 >> 7; // L: 1340
if (var1 < 2) { // L: 1341
var1 = 2;
diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java
index 2f89bd55ab..a5c1ffc175 100644
--- a/runescape-client/src/main/java/SceneTileModel.java
+++ b/runescape-client/src/main/java/SceneTileModel.java
@@ -2,77 +2,77 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("hu")
+@ObfuscatedName("hs")
@Implements("SceneTileModel")
public final class SceneTileModel {
- @ObfuscatedName("g")
- static int[] field2539;
- @ObfuscatedName("x")
- static int[] field2540;
- @ObfuscatedName("n")
- static int[] field2535;
- @ObfuscatedName("e")
- static int[] field2545;
+ @ObfuscatedName("k")
+ static int[] field2498;
@ObfuscatedName("h")
- static int[] field2534;
- @ObfuscatedName("f")
- static final int[][] field2544;
- @ObfuscatedName("d")
- static final int[][] field2529;
- @ObfuscatedName("o")
+ static int[] field2499;
+ @ObfuscatedName("x")
+ static int[] field2488;
+ @ObfuscatedName("l")
+ static int[] field2501;
+ @ObfuscatedName("a")
+ static int[] field2502;
+ @ObfuscatedName("p")
+ static final int[][] field2503;
+ @ObfuscatedName("b")
+ static final int[][] field2483;
+ @ObfuscatedName("c")
@Export("vertexX")
int[] vertexX;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("vertexY")
int[] vertexY;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("vertexZ")
int[] vertexZ;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("triangleColorA")
int[] triangleColorA;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("triangleColorB")
int[] triangleColorB;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("triangleColorC")
int[] triangleColorC;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("faceX")
int[] faceX;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("faceY")
int[] faceY;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("faceZ")
int[] faceZ;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("triangleTextureId")
int[] triangleTextureId;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("isFlat")
boolean isFlat;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("shape")
int shape;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("rotation")
int rotation;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("underlayRgb")
int underlayRgb;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("overlayRgb")
int overlayRgb;
static {
- field2539 = new int[6]; // L: 21
- field2540 = new int[6]; // L: 22
- field2535 = new int[6]; // L: 23
- field2545 = new int[6]; // L: 24
- field2534 = new int[6]; // L: 25
- field2544 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26
- field2529 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
+ field2498 = new int[6]; // L: 21
+ field2499 = new int[6]; // L: 22
+ field2488 = new int[6]; // L: 23
+ field2501 = new int[6]; // L: 24
+ field2502 = new int[6]; // L: 25
+ field2503 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26
+ field2483 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
}
SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) {
@@ -89,7 +89,7 @@ public final class SceneTileModel {
int var21 = var20 / 2; // L: 64
int var22 = var20 / 4; // L: 65
int var23 = var20 * 3 / 4; // L: 66
- int[] var24 = field2544[var1]; // L: 67
+ int[] var24 = field2503[var1]; // L: 67
int var25 = var24.length; // L: 68
this.vertexX = new int[var25]; // L: 69
this.vertexY = new int[var25]; // L: 70
@@ -224,7 +224,7 @@ public final class SceneTileModel {
var27[var30] = var36; // L: 202
}
- int[] var38 = field2529[var1]; // L: 204
+ int[] var38 = field2483[var1]; // L: 204
var31 = var38.length / 4; // L: 205
this.faceX = new int[var31]; // L: 206
this.faceY = new int[var31]; // L: 207
diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java
index 2980900698..4ced7af18a 100644
--- a/runescape-client/src/main/java/SceneTilePaint.java
+++ b/runescape-client/src/main/java/SceneTilePaint.java
@@ -2,46 +2,53 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hr")
+@ObfuscatedName("hu")
@Implements("SceneTilePaint")
public final class SceneTilePaint {
- @ObfuscatedName("o")
+ @ObfuscatedName("cj")
+ @ObfuscatedSignature(
+ descriptor = "Lqu;"
+ )
+ @Export("worldSelectRightSprite")
+ static IndexedSprite worldSelectRightSprite;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1947995877
+ intValue = 1769216381
)
@Export("swColor")
int swColor;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1030656937
+ intValue = -78289351
)
@Export("seColor")
int seColor;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -126920151
+ intValue = -184307337
)
@Export("neColor")
int neColor;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1841043153
+ intValue = -1175452837
)
@Export("nwColor")
int nwColor;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1012887619
+ intValue = 516518743
)
@Export("texture")
int texture;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("isFlat")
boolean isFlat;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 402871861
+ intValue = 1480522927
)
@Export("rgb")
int rgb;
@@ -56,4 +63,78 @@ public final class SceneTilePaint {
this.rgb = var6; // L: 18
this.isFlat = var7; // L: 19
} // L: 20
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "([BIIB)Ljava/lang/String;",
+ garbageValue = "-117"
+ )
+ @Export("decodeStringCp1252")
+ public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
+ char[] var3 = new char[var2]; // L: 114
+ int var4 = 0; // L: 115
+
+ for (int var5 = 0; var5 < var2; ++var5) { // L: 116
+ int var6 = var0[var5 + var1] & 255; // L: 117
+ if (var6 != 0) { // L: 118
+ if (var6 >= 128 && var6 < 160) { // L: 119
+ char var7 = class340.cp1252AsciiExtension[var6 - 128]; // L: 120
+ if (var7 == 0) { // L: 121
+ var7 = '?';
+ }
+
+ var6 = var7; // L: 122
+ }
+
+ var3[var4++] = (char)var6; // L: 124
+ }
+ }
+
+ return new String(var3, 0, var4); // L: 126
+ }
+
+ @ObfuscatedName("hr")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)I",
+ garbageValue = "744577981"
+ )
+ @Export("getTileHeight")
+ static final int getTileHeight(int var0, int var1, int var2) {
+ int var3 = var0 >> 7; // L: 5462
+ int var4 = var1 >> 7; // L: 5463
+ if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5464
+ int var5 = var2; // L: 5465
+ if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5466
+ var5 = var2 + 1;
+ }
+
+ int var6 = var0 & 127; // L: 5467
+ int var7 = var1 & 127; // L: 5468
+ int var8 = Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 + (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] >> 7; // L: 5469
+ int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5470
+ return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5471
+ } else {
+ return 0;
+ }
+ }
+
+ @ObfuscatedName("lv")
+ @ObfuscatedSignature(
+ descriptor = "(IIZI)V",
+ garbageValue = "1779675406"
+ )
+ static final void method4530(int var0, int var1, boolean var2) {
+ if (Client.currentClanChannels[var0] != null) { // L: 12276
+ if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3113()) { // L: 12277
+ ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12278
+ PacketBufferNode var4 = EnumComposition.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 12279
+ var4.packetBuffer.writeByte(4 + ScriptEvent.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12280
+ var4.packetBuffer.writeByte(var0); // L: 12281
+ var4.packetBuffer.writeShort(var1); // L: 12282
+ var4.packetBuffer.writeBoolean(var2); // L: 12283
+ var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12284
+ Client.packetWriter.addNode(var4); // L: 12285
+ }
+ }
+ } // L: 12286
}
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index e514cc1592..aa7194afef 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -1,56 +1,63 @@
+import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bb")
+@ObfuscatedName("bi")
@Implements("Script")
public class Script extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("Script_cached")
static EvictingDualNodeHashTable Script_cached;
+ @ObfuscatedName("o")
+ @ObfuscatedGetter(
+ intValue = 1079051883
+ )
+ @Export("canvasWidth")
+ public static int canvasWidth;
+ @ObfuscatedName("v")
+ String field967;
@ObfuscatedName("q")
- String field949;
- @ObfuscatedName("l")
@Export("opcodes")
int[] opcodes;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("intOperands")
int[] intOperands;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("stringOperands")
String[] stringOperands;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -1638738709
+ intValue = 762574265
)
@Export("localIntCount")
int localIntCount;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 2011225427
+ intValue = -1282940193
)
@Export("localStringCount")
int localStringCount;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1425203371
+ intValue = -1341494055
)
@Export("intArgumentCount")
int intArgumentCount;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 2038288745
+ intValue = 2092128287
)
@Export("stringArgumentCount")
int stringArgumentCount;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "[Lpt;"
+ descriptor = "[Lpb;"
)
@Export("switches")
IterableNodeHashTable[] switches;
@@ -62,53 +69,119 @@ public class Script extends DualNode {
Script() {
} // L: 23
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(IB)[Lpt;",
- garbageValue = "0"
+ descriptor = "(II)[Lpb;",
+ garbageValue = "-1127899828"
)
@Export("newIterableNodeHashTable")
IterableNodeHashTable[] newIterableNodeHashTable(int var1) {
- return new IterableNodeHashTable[var1]; // L: 155
+ return new IterableNodeHashTable[var1]; // L: 127
}
- @ObfuscatedName("q")
+ @ObfuscatedName("go")
@ObfuscatedSignature(
- descriptor = "(II)Lfb;",
- garbageValue = "16711680"
+ descriptor = "(Lcj;B)V",
+ garbageValue = "3"
)
- @Export("KitDefinition_get")
- public static KitDefinition KitDefinition_get(int var0) {
- KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33
- if (var1 != null) { // L: 34
- return var1;
- } else {
- byte[] var2 = class18.KitDefinition_archive.takeFile(3, var0); // L: 35
- var1 = new KitDefinition(); // L: 36
- if (var2 != null) { // L: 37
- var1.decode(new Buffer(var2));
+ static final void method1977(Actor var0) {
+ if (var0.field1129 != 0) { // L: 4279
+ if (var0.targetIndex != -1) { // L: 4280
+ Object var1 = null; // L: 4281
+ if (var0.targetIndex < 32768) { // L: 4282
+ var1 = Client.npcs[var0.targetIndex];
+ } else if (var0.targetIndex >= 32768) { // L: 4283
+ var1 = Client.players[var0.targetIndex - 32768];
+ }
+
+ if (var1 != null) { // L: 4284
+ int var2 = var0.x - ((Actor)var1).x; // L: 4285
+ int var3 = var0.y - ((Actor)var1).y; // L: 4286
+ if (var2 != 0 || var3 != 0) { // L: 4287
+ var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
+ }
+ } else if (var0.false0) { // L: 4289
+ var0.targetIndex = -1; // L: 4290
+ var0.false0 = false; // L: 4291
+ }
}
- KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38
- return var1; // L: 39
- }
- }
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(Lki;IB)V",
- garbageValue = "11"
- )
- @Export("Widget_setKeyIgnoreHeld")
- static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
- if (var0.field3474 == null) { // L: 1020
- throw new RuntimeException(); // L: 1021
- } else {
- if (var0.field3527 == null) { // L: 1023
- var0.field3527 = new int[var0.field3474.length]; // L: 1024
+ if (var0.field1165 != -1 && (var0.pathLength == 0 || var0.field1202 > 0)) { // L: 4294
+ var0.orientation = var0.field1165; // L: 4295
+ var0.field1165 = -1; // L: 4296
+ }
+
+ int var4 = var0.orientation - var0.rotation & 2047; // L: 4298
+ if (var4 == 0 && var0.false0) { // L: 4299
+ var0.targetIndex = -1; // L: 4300
+ var0.false0 = false; // L: 4301
+ }
+
+ if (var4 != 0) { // L: 4303
+ ++var0.field1196; // L: 4304
+ boolean var6;
+ if (var4 > 1024) { // L: 4305
+ var0.rotation -= var0.field1161 ? var4 : var0.field1129 * 124924459 * 881523843; // L: 4306
+ var6 = true; // L: 4307
+ if (var4 < var0.field1129 || var4 > 2048 - var0.field1129) { // L: 4308
+ var0.rotation = var0.orientation; // L: 4309
+ var6 = false; // L: 4310
+ }
+
+ if (!var0.field1161 && var0.idleSequence == var0.movementSequence && (var0.field1196 > 25 || var6)) { // L: 4312
+ if (var0.turnLeftSequence != -1) { // L: 4313
+ var0.movementSequence = var0.turnLeftSequence;
+ } else {
+ var0.movementSequence = var0.walkSequence; // L: 4314
+ }
+ }
+ } else {
+ var0.rotation += var0.field1161 ? var4 : 124924459 * var0.field1129 * 881523843; // L: 4318
+ var6 = true; // L: 4319
+ if (var4 < var0.field1129 || var4 > 2048 - var0.field1129) { // L: 4320
+ var0.rotation = var0.orientation; // L: 4321
+ var6 = false; // L: 4322
+ }
+
+ if (!var0.field1161 && var0.movementSequence == var0.idleSequence && (var0.field1196 > 25 || var6)) { // L: 4324
+ if (var0.turnRightSequence != -1) { // L: 4325
+ var0.movementSequence = var0.turnRightSequence;
+ } else {
+ var0.movementSequence = var0.walkSequence; // L: 4326
+ }
+ }
+ }
+
+ var0.rotation &= 2047; // L: 4330
+ var0.field1161 = false; // L: 4331
+ } else {
+ var0.field1196 = 0; // L: 4333
}
- var0.field3527[var1] = Integer.MAX_VALUE; // L: 1026
}
- } // L: 1027
+ } // L: 4334
+
+ @ObfuscatedName("hq")
+ @ObfuscatedSignature(
+ descriptor = "(ZI)V",
+ garbageValue = "302270289"
+ )
+ static final void method1978(boolean var0) {
+ Renderable.playPcmPlayers(); // L: 5708
+ ++Client.packetWriter.pendingWrites; // L: 5709
+ if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5710
+ Client.packetWriter.pendingWrites = 0; // L: 5711
+ if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5712
+ PacketBufferNode var1 = EnumComposition.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 5714
+ Client.packetWriter.addNode(var1); // L: 5715
+
+ try {
+ Client.packetWriter.flush(); // L: 5717
+ } catch (IOException var3) { // L: 5719
+ Client.hadNetworkError = true; // L: 5720
+ }
+ }
+
+ }
+ } // L: 5723
}
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index 0701e5f15a..2cce4a3365 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -4,74 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cr")
+@ObfuscatedName("cw")
@Implements("ScriptEvent")
public class ScriptEvent extends Node {
- @ObfuscatedName("ic")
- @ObfuscatedSignature(
- descriptor = "[Lqd;"
- )
- @Export("modIconSprites")
- static IndexedSprite[] modIconSprites;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("args")
Object[] args;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("isMouseInputEvent")
boolean isMouseInputEvent;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("widget")
Widget widget;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1486957431
+ intValue = 708016645
)
@Export("mouseX")
int mouseX;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -2142202081
+ intValue = -768277781
)
@Export("mouseY")
int mouseY;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 19118051
+ intValue = -1223835253
)
@Export("opIndex")
int opIndex;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("dragTarget")
Widget dragTarget;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -337661445
+ intValue = 308775773
)
@Export("keyTyped")
int keyTyped;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -2123703635
+ intValue = -1014377791
)
@Export("keyPressed")
int keyPressed;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("targetName")
String targetName;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = 702616363
+ intValue = 643045145
)
- int field1054;
- @ObfuscatedName("c")
+ int field1056;
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -394904135
+ intValue = 1853302577
)
@Export("type")
int type;
@@ -80,67 +74,77 @@ public class ScriptEvent extends Node {
this.type = 76; // L: 19
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "([Ljava/lang/Object;B)V",
- garbageValue = "3"
+ descriptor = "([Ljava/lang/Object;I)V",
+ garbageValue = "1631698731"
)
@Export("setArgs")
public void setArgs(Object[] var1) {
this.args = var1; // L: 22
} // L: 23
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "1156737002"
+ garbageValue = "-59182126"
)
@Export("setType")
public void setType(int var1) {
- this.type = var1;
+ this.type = var1; // L: 26
+ } // L: 27
+
+ @ObfuscatedName("bf")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)I",
+ garbageValue = "-2093180066"
+ )
+ @Export("stringCp1252NullTerminatedByteSize")
+ public static int stringCp1252NullTerminatedByteSize(String var0) {
+ return var0.length() + 1; // L: 117
}
- @ObfuscatedName("o")
+ @ObfuscatedName("lf")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "520194545"
+ garbageValue = "-372949524"
)
- static void method2074() {
- class82.field1072 = new int[2000]; // L: 25
- int var0 = 0; // L: 26
- int var1 = 240;
+ static void method2101() {
+ if (Client.field533 && class101.localPlayer != null) { // L: 12429
+ int var0 = class101.localPlayer.pathX[0]; // L: 12430
+ int var1 = class101.localPlayer.pathY[0]; // L: 12431
+ if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 12432
+ return;
+ }
- int var3;
- for (byte var2 = 12; var0 < 16; var1 -= var2) {
- var3 = class127.method2805((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var0 * 0.425F / 16.0F)); // L: 30
- class82.field1072[var0] = var3; // L: 31
- ++var0; // L: 29
+ InterfaceParent.oculusOrbFocalPointX = class101.localPlayer.x; // L: 12433
+ int var2 = SceneTilePaint.getTileHeight(class101.localPlayer.x, class101.localPlayer.y, PacketWriter.Client_plane) - Client.camFollowHeight; // L: 12434
+ if (var2 < class181.field1992) { // L: 12435
+ class181.field1992 = var2;
+ }
+
+ class141.oculusOrbFocalPointY = class101.localPlayer.y; // L: 12436
+ Client.field533 = false; // L: 12437
}
- var1 = 48; // L: 33
+ } // L: 12439
- for (int var5 = var1 / 6; var0 < class82.field1072.length; var1 -= var5) { // L: 34 35 41
- var3 = var0 * 2; // L: 36
+ @ObfuscatedName("lo")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-115976306"
+ )
+ static void method2106() {
+ if (UrlRequester.field1362 != null) { // L: 12460
+ Client.field770 = Client.cycle; // L: 12461
+ UrlRequester.field1362.method6035(); // L: 12462
- for (int var4 = class127.method2805((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class82.field1072.length; ++var0) { // L: 37 38
- class82.field1072[var0] = var4; // L: 39
+ for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12463
+ if (Client.players[var0] != null) { // L: 12464
+ UrlRequester.field1362.method6048((Client.players[var0].x >> 7) + class28.baseX, (Client.players[var0].y >> 7) + WorldMapLabelSize.baseY); // L: 12465
+ }
}
}
- } // L: 43
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;ZZI)V",
- garbageValue = "-1817866678"
- )
- @Export("openURL")
- public static void openURL(String var0, boolean var1, boolean var2) {
- World.method1663(var0, var1, "openjs", var2); // L: 27
- } // L: 28
-
- @ObfuscatedName("p")
- public static int method2085(long var0) {
- return (int)(var0 >>> 7 & 127L); // L: 68
- }
+ } // L: 12469
}
diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java
index 3a0ab0ae0c..5d1a0911c5 100644
--- a/runescape-client/src/main/java/ScriptFrame.java
+++ b/runescape-client/src/main/java/ScriptFrame.java
@@ -4,38 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bc")
+@ObfuscatedName("bg")
@Implements("ScriptFrame")
public class ScriptFrame {
- @ObfuscatedName("tq")
- @ObfuscatedGetter(
- intValue = -1251502185
- )
- static int field457;
- @ObfuscatedName("m")
- @Export("SpriteBuffer_spriteWidths")
- public static int[] SpriteBuffer_spriteWidths;
- @ObfuscatedName("g")
- @ObfuscatedGetter(
- intValue = -1911995335
- )
- static int field449;
- @ObfuscatedName("o")
+ @ObfuscatedName("cw")
@ObfuscatedSignature(
- descriptor = "Lbb;"
+ descriptor = "[Lqe;"
+ )
+ @Export("worldSelectBackSprites")
+ static SpritePixels[] worldSelectBackSprites;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lbi;"
)
@Export("script")
Script script;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1536799167
+ intValue = 1512825097
)
@Export("pc")
int pc;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("intLocals")
int[] intLocals;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("stringLocals")
String[] stringLocals;
@@ -43,15 +36,55 @@ public class ScriptFrame {
this.pc = -1; // L: 5
} // L: 9
- @ObfuscatedName("m")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "125"
+ descriptor = "(IB)Lgc;",
+ garbageValue = "12"
)
- static void method1066(int var0) {
- ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72
- if (var1 != null) {
- var1.remove(); // L: 74
+ @Export("SequenceDefinition_get")
+ public static SequenceDefinition SequenceDefinition_get(int var0) {
+ SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 52
+ if (var1 != null) { // L: 53
+ return var1;
+ } else {
+ byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 54
+ var1 = new SequenceDefinition(); // L: 55
+ if (var2 != null) { // L: 56
+ var1.decode(new Buffer(var2));
+ }
+
+ var1.postDecode(); // L: 57
+ SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 58
+ return var1; // L: 59
}
- } // L: 73 75
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(III)Lkb;",
+ garbageValue = "114682209"
+ )
+ @Export("getWidgetChild")
+ public static Widget getWidgetChild(int var0, int var1) {
+ Widget var2 = class140.getWidget(var0); // L: 230
+ if (var1 == -1) { // L: 231
+ return var2;
+ } else {
+ return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 232 233
+ }
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(II)Ldf;",
+ garbageValue = "-246877585"
+ )
+ static class123 method1052(int var0) {
+ class123 var1 = (class123)Actor.findEnumerated(Interpreter.method1866(), var0); // L: 126
+ if (var1 == null) {
+ var1 = class123.field1528; // L: 127
+ }
+
+ return var1; // L: 128
+ }
}
diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java
index 4183e54d9d..31b72b14c0 100644
--- a/runescape-client/src/main/java/SecureRandomCallable.java
+++ b/runescape-client/src/main/java/SecureRandomCallable.java
@@ -1,128 +1,24 @@
-import java.security.SecureRandom;
import java.util.concurrent.Callable;
-import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bg")
+@ObfuscatedName("by")
@Implements("SecureRandomCallable")
public class SecureRandomCallable implements Callable {
- @ObfuscatedName("ss")
- @ObfuscatedSignature(
- descriptor = "Lal;"
- )
- @Export("pcmPlayer0")
- static PcmPlayer pcmPlayer0;
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Lqr;"
- )
- @Export("rightTitleSprite")
- static SpritePixels rightTitleSprite;
- @ObfuscatedName("x")
- @Export("cacheParentPaths")
- static String[] cacheParentPaths;
- @ObfuscatedName("hx")
- @ObfuscatedGetter(
- intValue = -1451292815
- )
- @Export("baseX")
- static int baseX;
-
SecureRandomCallable() {
- } // L: 42
+ } // L: 36
public Object call() {
- SecureRandom var2 = new SecureRandom(); // L: 48
- var2.nextInt(); // L: 49
- return var2; // L: 52
+ return NetFileRequest.method5843(); // L: 46
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;I)[B",
- garbageValue = "1836628976"
+ descriptor = "(II)Ljava/lang/String;",
+ garbageValue = "1552029421"
)
- public static byte[] method2035(CharSequence var0) {
- int var1 = var0.length(); // L: 9
- byte[] var2 = new byte[var1]; // L: 10
-
- for (int var3 = 0; var3 < var1; ++var3) { // L: 11
- char var4 = var0.charAt(var3); // L: 12
- if (var4 > 127) { // L: 13
- var2[var3] = 63;
- } else {
- var2[var3] = (byte)var4; // L: 14
- }
- }
-
- return var2; // L: 16
+ static String method2066(int var0) {
+ return ""; // L: 18
}
-
- @ObfuscatedName("fx")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "342853228"
- )
- @Export("logOut")
- static final void logOut() {
- Client.packetWriter.close(); // L: 2950
- EnumComposition.method3400(); // L: 2952
- VarcInt.method3321(); // L: 2953
- PcmPlayer.method757(); // L: 2954
- ObjectComposition.ObjectDefinition_cached.clear(); // L: 2956
- ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2957
- ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2958
- ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2959
- NPCComposition.NpcDefinition_cached.clear(); // L: 2962
- NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2963
- class92.method2370(); // L: 2965
- SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2967
- SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2968
- SequenceDefinition.SequenceDefinition_cachedModel.clear(); // L: 2969
- SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2972
- SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2973
- VarbitComposition.VarbitDefinition_cached.clear(); // L: 2976
- VarpDefinition.VarpDefinition_cached.clear(); // L: 2979
- Login.HitSplatDefinition_cachedSprites.method7382(); // L: 2981
- class221.HitSplatDefinition_cached.method7382(); // L: 2982
- SoundSystem.method780(); // L: 2983
- class175.method3379(); // L: 2984
- class250.method4933(); // L: 2985
- ParamComposition.ParamDefinition_cached.clear(); // L: 2987
- WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2990
- PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2993
- Widget.Widget_cachedSprites.clear(); // L: 2996
- Widget.Widget_cachedModels.clear(); // L: 2997
- Widget.Widget_cachedFonts.clear(); // L: 2998
- Widget.Widget_cachedSpriteMasks.clear(); // L: 2999
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3001
- Script.Script_cached.clear(); // L: 3002
- NetSocket.archive0.clearFiles(); // L: 3003
- Clock.archive1.clearFiles(); // L: 3004
- class194.archive3.clearFiles(); // L: 3005
- MouseHandler.archive4.clearFiles(); // L: 3006
- Message.archive5.clearFiles(); // L: 3007
- AbstractUserComparator.archive6.clearFiles(); // L: 3008
- InterfaceParent.archive7.clearFiles(); // L: 3009
- class305.archive8.clearFiles(); // L: 3010
- TileItem.archive9.clearFiles(); // L: 3011
- ObjectSound.archive10.clearFiles(); // L: 3012
- UrlRequest.archive11.clearFiles(); // L: 3013
- class115.archive12.clearFiles(); // L: 3014
- class175.scene.clear(); // L: 3016
-
- for (int var0 = 0; var0 < 4; ++var0) { // L: 3017
- Client.collisionMaps[var0].clear();
- }
-
- System.gc(); // L: 3018
- UrlRequester.method2538(2); // L: 3019
- Client.currentTrackGroupId = -1; // L: 3020
- Client.playingJingle = false; // L: 3021
- Varcs.method2466(); // L: 3022
- PendingSpawn.updateGameState(10); // L: 3023
- } // L: 3024
}
diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java
index 0f3e12f341..e6591c4de1 100644
--- a/runescape-client/src/main/java/SecureRandomFuture.java
+++ b/runescape-client/src/main/java/SecureRandomFuture.java
@@ -4,16 +4,22 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bh")
+@ObfuscatedName("bw")
@Implements("SecureRandomFuture")
public class SecureRandomFuture {
- @ObfuscatedName("o")
+ @ObfuscatedName("pm")
+ @ObfuscatedGetter(
+ intValue = -1419708281
+ )
+ static int field960;
+ @ObfuscatedName("c")
@Export("executor")
ExecutorService executor;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("future")
Future future;
@@ -22,10 +28,10 @@ public class SecureRandomFuture {
this.future = this.executor.submit(new SecureRandomCallable()); // L: 14
} // L: 15
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-446839079"
+ descriptor = "(B)V",
+ garbageValue = "-33"
)
@Export("shutdown")
void shutdown() {
@@ -33,29 +39,114 @@ public class SecureRandomFuture {
this.executor = null; // L: 19
} // L: 20
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-627112505"
+ garbageValue = "1943813302"
)
@Export("isDone")
boolean isDone() {
- return this.future.isDone(); // L: 23
+ return this.future.isDone();
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/security/SecureRandom;",
- garbageValue = "-41"
+ descriptor = "(I)Ljava/security/SecureRandom;",
+ garbageValue = "448481251"
)
@Export("get")
SecureRandom get() {
try {
- return (SecureRandom)this.future.get(); // L: 28
- } catch (Exception var4) { // L: 30
- SecureRandom var3 = new SecureRandom(); // L: 33
- var3.nextInt(); // L: 34
- return var3; // L: 37
+ return (SecureRandom)this.future.get();
+ } catch (Exception var2) {
+ return NetFileRequest.method5843();
}
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lfi;",
+ garbageValue = "81"
+ )
+ @Export("KitDefinition_get")
+ public static KitDefinition KitDefinition_get(int var0) {
+ KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
+ if (var1 != null) {
+ return var1;
+ } else {
+ byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
+ var1 = new KitDefinition();
+ if (var2 != null) {
+ var1.decode(new Buffer(var2));
+ }
+
+ KitDefinition.KitDefinition_cached.put(var1, (long)var0);
+ return var1;
+ }
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;Llh;IZI)Lda;",
+ garbageValue = "1850622535"
+ )
+ public static class122 method1963(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
+ boolean var4 = true;
+ byte[] var5 = var0.getFile(var2 >> 16 & 65535, var2 & 65535);
+ if (var5 == null) {
+ var4 = false;
+ return null; // L: 27
+ } else {
+ int var6 = (var5[1] & 255) << 8 | var5[2] & 255;
+ byte[] var7;
+ if (var3) {
+ var7 = var1.getFile(0, var6);
+ } else {
+ var7 = var1.getFile(var6, 0);
+ }
+
+ if (var7 == null) { // L: 33
+ var4 = false;
+ }
+
+ if (!var4) { // L: 34
+ return null;
+ } else {
+ try {
+ return new class122(var0, var1, var2, var3); // L: 36
+ } catch (Exception var9) { // L: 38
+ return null; // L: 39
+ }
+ }
+ }
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+ garbageValue = "1953508485"
+ )
+ @Export("addChatMessage")
+ static void addChatMessage(int var0, String var1, String var2, String var3) {
+ ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23
+ if (var4 == null) { // L: 24
+ var4 = new ChatChannel(); // L: 25
+ Messages.Messages_channels.put(var0, var4); // L: 26
+ }
+
+ Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28
+ Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29
+ Messages.Messages_queue.add(var5); // L: 30
+ Client.chatCycle = Client.cycleCntr; // L: 31
+ } // L: 32
+
+ @ObfuscatedName("ey")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "7"
+ )
+ static final void method1967() {
+ Scene.Scene_isLowDetail = false; // L: 877
+ Client.isLowDetail = false; // L: 878
+ } // L: 879
}
diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java
index 53ddfe5edd..a1460640c0 100644
--- a/runescape-client/src/main/java/SequenceDefinition.java
+++ b/runescape-client/src/main/java/SequenceDefinition.java
@@ -1,6 +1,3 @@
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
import java.util.HashMap;
import java.util.Map;
import net.runelite.mapping.Export;
@@ -9,129 +6,129 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gq")
+@ObfuscatedName("gc")
@Implements("SequenceDefinition")
public class SequenceDefinition extends DualNode {
- @ObfuscatedName("o")
- static boolean field2221;
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
+ static boolean field2166;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("SequenceDefinition_archive")
- public static AbstractArchive SequenceDefinition_archive;
- @ObfuscatedName("l")
+ static AbstractArchive SequenceDefinition_archive;
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("SequenceDefinition_animationsArchive")
- public static AbstractArchive SequenceDefinition_animationsArchive;
- @ObfuscatedName("k")
+ static AbstractArchive SequenceDefinition_animationsArchive;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("SequenceDefinition_skeletonsArchive")
- public static AbstractArchive SequenceDefinition_skeletonsArchive;
- @ObfuscatedName("a")
+ static AbstractArchive SequenceDefinition_skeletonsArchive;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("SequenceDefinition_cached")
public static EvictingDualNodeHashTable SequenceDefinition_cached;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("SequenceDefinition_cachedFrames")
public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("SequenceDefinition_cachedModel")
public static EvictingDualNodeHashTable SequenceDefinition_cachedModel;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -451535761
+ intValue = -1654992317
)
@Export("SequenceDefinition_cachedModelId")
int SequenceDefinition_cachedModelId;
- @ObfuscatedName("r")
- public Map field2209;
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = -1088599689
- )
- int field2207;
@ObfuscatedName("y")
+ public Map field2172;
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 828887833
+ intValue = 197023681
)
- int field2202;
- @ObfuscatedName("c")
+ int field2173;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = 310114289
+ )
+ int field2164;
+ @ObfuscatedName("t")
@Export("frameIds")
public int[] frameIds;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("chatFrameIds")
int[] chatFrameIds;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("frameLengths")
public int[] frameLengths;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("soundEffects")
public int[] soundEffects;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = -242259733
+ intValue = 790194713
)
@Export("frameCount")
public int frameCount;
- @ObfuscatedName("x")
- int[] field2217;
- @ObfuscatedName("n")
- boolean[] field2218;
- @ObfuscatedName("e")
- public boolean field2201;
@ObfuscatedName("h")
+ int[] field2180;
+ @ObfuscatedName("x")
+ boolean[] field2181;
+ @ObfuscatedName("l")
+ public boolean field2182;
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 1404138407
+ intValue = -1662385101
)
- public int field2220;
- @ObfuscatedName("f")
+ public int field2183;
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = -681508511
+ intValue = 1893104295
)
@Export("shield")
public int shield;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = 1106803533
+ intValue = -216403099
)
@Export("weapon")
public int weapon;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedGetter(
- intValue = -256717621
+ intValue = -1939539881
)
- public int field2223;
- @ObfuscatedName("z")
+ public int field2186;
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = -1918601831
+ intValue = -174247791
)
- public int field2224;
- @ObfuscatedName("i")
+ public int field2187;
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = -1593140013
+ intValue = 1763697953
)
- public int field2206;
- @ObfuscatedName("u")
+ public int field2188;
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = 1948704665
+ intValue = 1018362487
)
- public int field2208;
+ public int field2174;
static {
- field2221 = false; // L: 16
+ field2166 = false; // L: 16
SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20
SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21
SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100); // L: 22
@@ -139,601 +136,560 @@ public class SequenceDefinition extends DualNode {
SequenceDefinition() {
this.SequenceDefinition_cachedModelId = -1; // L: 23
- this.field2207 = 0; // L: 25
- this.field2202 = 0; // L: 26
+ this.field2173 = 0; // L: 25
+ this.field2164 = 0; // L: 26
this.frameCount = -1; // L: 31
- this.field2201 = false; // L: 34
- this.field2220 = 5; // L: 35
+ this.field2182 = false; // L: 34
+ this.field2183 = 5; // L: 35
this.shield = -1; // L: 36
this.weapon = -1; // L: 37
- this.field2223 = 99; // L: 38
- this.field2224 = -1; // L: 39
- this.field2206 = -1; // L: 40
- this.field2208 = 2; // L: 41
+ this.field2186 = 99; // L: 38
+ this.field2187 = -1; // L: 39
+ this.field2188 = -1; // L: 40
+ this.field2174 = 2; // L: 41
} // L: 43
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "106"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-950901529"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 58
- if (var2 == 0) { // L: 59
- return; // L: 62
+ int var2 = var1.readUnsignedByte(); // L: 64
+ if (var2 == 0) { // L: 65
+ return; // L: 68
}
- this.decodeNext(var1, var2); // L: 60
+ this.decodeNext(var1, var2); // L: 66
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "696368219"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "325602175"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
int var3;
int var4;
- if (var2 == 1) { // L: 65
- var3 = var1.readUnsignedShort(); // L: 66
- this.frameLengths = new int[var3]; // L: 67
+ if (var2 == 1) { // L: 71
+ var3 = var1.readUnsignedShort(); // L: 72
+ this.frameLengths = new int[var3]; // L: 73
- for (var4 = 0; var4 < var3; ++var4) { // L: 68
+ for (var4 = 0; var4 < var3; ++var4) { // L: 74
this.frameLengths[var4] = var1.readUnsignedShort();
}
- this.frameIds = new int[var3]; // L: 69
+ this.frameIds = new int[var3]; // L: 75
- for (var4 = 0; var4 < var3; ++var4) { // L: 70
+ for (var4 = 0; var4 < var3; ++var4) { // L: 76
this.frameIds[var4] = var1.readUnsignedShort();
}
- for (var4 = 0; var4 < var3; ++var4) { // L: 71
+ for (var4 = 0; var4 < var3; ++var4) { // L: 77
this.frameIds[var4] += var1.readUnsignedShort() << 16;
}
- } else if (var2 == 2) { // L: 73
+ } else if (var2 == 2) { // L: 79
this.frameCount = var1.readUnsignedShort();
- } else if (var2 == 3) { // L: 74
- var3 = var1.readUnsignedByte(); // L: 75
- this.field2217 = new int[var3 + 1]; // L: 76
+ } else if (var2 == 3) { // L: 80
+ var3 = var1.readUnsignedByte(); // L: 81
+ this.field2180 = new int[var3 + 1]; // L: 82
- for (var4 = 0; var4 < var3; ++var4) { // L: 77
- this.field2217[var4] = var1.readUnsignedByte();
+ for (var4 = 0; var4 < var3; ++var4) { // L: 83
+ this.field2180[var4] = var1.readUnsignedByte();
}
- this.field2217[var3] = 9999999; // L: 78
- } else if (var2 == 4) { // L: 80
- this.field2201 = true;
- } else if (var2 == 5) { // L: 81
- this.field2220 = var1.readUnsignedByte();
- } else if (var2 == 6) { // L: 82
+ this.field2180[var3] = 9999999; // L: 84
+ } else if (var2 == 4) { // L: 86
+ this.field2182 = true;
+ } else if (var2 == 5) { // L: 87
+ this.field2183 = var1.readUnsignedByte();
+ } else if (var2 == 6) { // L: 88
this.shield = var1.readUnsignedShort();
- } else if (var2 == 7) { // L: 83
+ } else if (var2 == 7) { // L: 89
this.weapon = var1.readUnsignedShort();
- } else if (var2 == 8) { // L: 84
- this.field2223 = var1.readUnsignedByte();
- } else if (var2 == 9) { // L: 85
- this.field2224 = var1.readUnsignedByte();
- } else if (var2 == 10) { // L: 86
- this.field2206 = var1.readUnsignedByte();
- } else if (var2 == 11) { // L: 87
- this.field2208 = var1.readUnsignedByte();
- } else if (var2 == 12) { // L: 88
- var3 = var1.readUnsignedByte(); // L: 89
- this.chatFrameIds = new int[var3]; // L: 90
+ } else if (var2 == 8) { // L: 90
+ this.field2186 = var1.readUnsignedByte();
+ } else if (var2 == 9) { // L: 91
+ this.field2187 = var1.readUnsignedByte();
+ } else if (var2 == 10) { // L: 92
+ this.field2188 = var1.readUnsignedByte();
+ } else if (var2 == 11) { // L: 93
+ this.field2174 = var1.readUnsignedByte();
+ } else if (var2 == 12) { // L: 94
+ var3 = var1.readUnsignedByte(); // L: 95
+ this.chatFrameIds = new int[var3]; // L: 96
- for (var4 = 0; var4 < var3; ++var4) { // L: 91
+ for (var4 = 0; var4 < var3; ++var4) { // L: 97
this.chatFrameIds[var4] = var1.readUnsignedShort();
}
- for (var4 = 0; var4 < var3; ++var4) { // L: 92
+ for (var4 = 0; var4 < var3; ++var4) { // L: 98
this.chatFrameIds[var4] += var1.readUnsignedShort() << 16;
}
- } else if (var2 == 13) { // L: 94
- var3 = var1.readUnsignedByte(); // L: 95
- this.soundEffects = new int[var3]; // L: 96
+ } else if (var2 == 13) { // L: 100
+ var3 = var1.readUnsignedByte(); // L: 101
+ this.soundEffects = new int[var3]; // L: 102
- for (var4 = 0; var4 < var3; ++var4) { // L: 97
+ for (var4 = 0; var4 < var3; ++var4) { // L: 103
this.soundEffects[var4] = var1.readMedium();
}
- } else if (var2 == 14) { // L: 99
- this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 100
- } else if (var2 == 15) { // L: 102
- var3 = var1.readUnsignedShort(); // L: 103
- this.field2209 = new HashMap(); // L: 104
+ } else if (var2 == 14) { // L: 105
+ this.SequenceDefinition_cachedModelId = var1.readInt(); // L: 106
+ } else if (var2 == 15) { // L: 108
+ var3 = var1.readUnsignedShort(); // L: 109
+ this.field2172 = new HashMap(); // L: 110
- for (var4 = 0; var4 < var3; ++var4) { // L: 105
- int var5 = var1.readUnsignedShort(); // L: 106
- int var6 = var1.readMedium(); // L: 107
- this.field2209.put(var5, var6); // L: 108
+ for (var4 = 0; var4 < var3; ++var4) { // L: 111
+ int var5 = var1.readUnsignedShort(); // L: 112
+ int var6 = var1.readMedium(); // L: 113
+ this.field2172.put(var5, var6); // L: 114
}
- } else if (var2 == 16) { // L: 111
- this.field2207 = var1.readUnsignedShort(); // L: 112
- this.field2202 = var1.readUnsignedShort(); // L: 113
- } else if (var2 == 17) { // L: 115
- this.field2218 = new boolean[256]; // L: 116
+ } else if (var2 == 16) { // L: 117
+ this.field2173 = var1.readUnsignedShort(); // L: 118
+ this.field2164 = var1.readUnsignedShort(); // L: 119
+ } else if (var2 == 17) { // L: 121
+ this.field2181 = new boolean[256]; // L: 122
- for (var3 = 0; var3 < this.field2218.length; ++var3) { // L: 117
- this.field2218[var3] = false; // L: 118
+ for (var3 = 0; var3 < this.field2181.length; ++var3) { // L: 123
+ this.field2181[var3] = false; // L: 124
}
- var3 = var1.readUnsignedByte(); // L: 120
+ var3 = var1.readUnsignedByte(); // L: 126
- for (var4 = 0; var4 < var3; ++var4) { // L: 121
- this.field2218[var1.readUnsignedByte()] = true; // L: 122
+ for (var4 = 0; var4 < var3; ++var4) { // L: 127
+ this.field2181[var1.readUnsignedByte()] = true; // L: 128
}
}
- } // L: 126
+ } // L: 132
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1790392441"
+ garbageValue = "283328116"
)
@Export("postDecode")
void postDecode() {
- if (this.field2224 == -1) { // L: 129
- if (this.field2217 == null && this.field2218 == null) { // L: 130
- this.field2224 = 0; // L: 131
+ if (this.field2187 == -1) { // L: 135
+ if (this.field2180 == null && this.field2181 == null) { // L: 136
+ this.field2187 = 0; // L: 137
} else {
- this.field2224 = -1918601831 * 7506;
+ this.field2187 = 2;
}
}
- if (this.field2206 == -1) { // L: 133
- if (this.field2217 == null && this.field2218 == null) { // L: 134
- this.field2206 = 0; // L: 135
+ if (this.field2188 == -1) { // L: 139
+ if (this.field2180 == null && this.field2181 == null) { // L: 140
+ this.field2188 = 0; // L: 141
} else {
- this.field2206 = 2;
+ this.field2188 = 2;
}
}
- } // L: 137
+ } // L: 143
- @ObfuscatedName("a")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lhv;II)Lhv;",
- garbageValue = "-1686484197"
+ descriptor = "(Lhy;II)Lhy;",
+ garbageValue = "-427559290"
)
@Export("transformActorModel")
public Model transformActorModel(Model var1, int var2) {
- Model var4;
- if (!this.isCachedModelIdSet()) { // L: 140
- var2 = this.frameIds[var2]; // L: 141
- Frames var5 = class141.getFrames(var2 >> 16); // L: 142
- var2 &= 65535; // L: 143
- if (var5 == null) {
+ if (!this.isCachedModelIdSet()) { // L: 146
+ var2 = this.frameIds[var2]; // L: 147
+ Frames var8 = ParamComposition.getFrames(var2 >> 16); // L: 148
+ var2 &= 65535; // L: 149
+ if (var8 == null) { // L: 150
return var1.toSharedSequenceModel(true);
} else {
- var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2));
- var4.animate(var5, var2);
- return var4;
+ Model var7 = var1.toSharedSequenceModel(!var8.hasAlphaTransform(var2)); // L: 151
+ var7.animate(var8, var2); // L: 152
+ return var7; // L: 153
}
} else {
- class122 var3 = class146.method2997(this.SequenceDefinition_cachedModelId); // L: 150
- if (var3 == null) { // L: 151
+ int var4 = this.SequenceDefinition_cachedModelId; // L: 157
+ class122 var5 = (class122)SequenceDefinition_cachedModel.get((long)var4); // L: 159
+ class122 var3;
+ if (var5 != null) { // L: 160
+ var3 = var5; // L: 161
+ } else {
+ var5 = SecureRandomFuture.method1963(SequenceDefinition_animationsArchive, SequenceDefinition_skeletonsArchive, var4, false); // L: 164
+ if (var5 != null) { // L: 165
+ SequenceDefinition_cachedModel.put(var5, (long)var4);
+ }
+
+ var3 = var5; // L: 166
+ }
+
+ if (var3 == null) { // L: 169
return var1.toSharedSequenceModel(true);
} else {
- var4 = var1.toSharedSequenceModel(!var3.method2755());
- var4.method4259(var3, var2);
- return var4;
+ Model var6 = var1.toSharedSequenceModel(!var3.method2778()); // L: 170
+ var6.method4404(var3, var2); // L: 171
+ return var6; // L: 172
}
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Lhv;III)Lhv;",
- garbageValue = "-680992651"
+ descriptor = "(Lhy;III)Lhy;",
+ garbageValue = "-331559312"
)
@Export("transformObjectModel")
Model transformObjectModel(Model var1, int var2, int var3) {
- Model var5;
- if (!this.isCachedModelIdSet()) {
- var2 = this.frameIds[var2];
- Frames var6 = class141.getFrames(var2 >> 16);
- var2 &= 65535;
- if (var6 == null) {
- return var1.toSharedSequenceModel(true);
+ if (!this.isCachedModelIdSet()) { // L: 177
+ var2 = this.frameIds[var2]; // L: 178
+ Frames var9 = ParamComposition.getFrames(var2 >> 16); // L: 179
+ var2 &= 65535; // L: 180
+ if (var9 == null) {
+ return var1.toSharedSequenceModel(true); // L: 181
} else {
- var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2));
- var3 &= 3;
- if (var3 == 1) {
- var5.rotateY270Ccw();
- } else if (var3 == 2) { // L: 167
- var5.rotateY180();
- } else if (var3 == 3) {
- var5.rotateY90Ccw(); // L: 168
+ Model var8 = var1.toSharedSequenceModel(!var9.hasAlphaTransform(var2)); // L: 182
+ var3 &= 3; // L: 183
+ if (var3 == 1) { // L: 184
+ var8.rotateY270Ccw();
+ } else if (var3 == 2) { // L: 185
+ var8.rotateY180();
+ } else if (var3 == 3) { // L: 186
+ var8.rotateY90Ccw();
}
- var5.animate(var6, var2);
- if (var3 == 1) {
- var5.rotateY90Ccw();
- } else if (var3 == 2) { // L: 171
- var5.rotateY180();
- } else if (var3 == 3) {
- var5.rotateY270Ccw();
+ var8.animate(var9, var2); // L: 187
+ if (var3 == 1) { // L: 188
+ var8.rotateY90Ccw();
+ } else if (var3 == 2) { // L: 189
+ var8.rotateY180();
+ } else if (var3 == 3) { // L: 190
+ var8.rotateY270Ccw();
}
- return var5; // L: 173
+ return var8; // L: 191
}
} else {
- class122 var4 = class146.method2997(this.SequenceDefinition_cachedModelId); // L: 176
- if (var4 == null) {
+ int var5 = this.SequenceDefinition_cachedModelId; // L: 195
+ class122 var6 = (class122)SequenceDefinition_cachedModel.get((long)var5); // L: 197
+ class122 var4;
+ if (var6 != null) { // L: 198
+ var4 = var6; // L: 199
+ } else {
+ var6 = SecureRandomFuture.method1963(SequenceDefinition_animationsArchive, SequenceDefinition_skeletonsArchive, var5, false); // L: 202
+ if (var6 != null) { // L: 203
+ SequenceDefinition_cachedModel.put(var6, (long)var5);
+ }
+
+ var4 = var6; // L: 204
+ }
+
+ if (var4 == null) { // L: 207
return var1.toSharedSequenceModel(true);
} else {
- var5 = var1.toSharedSequenceModel(!var4.method2755());
- var3 &= 3;
- if (var3 == 1) {
- var5.rotateY270Ccw();
- } else if (var3 == 2) { // L: 181
- var5.rotateY180();
- } else if (var3 == 3) { // L: 182
- var5.rotateY90Ccw();
+ Model var7 = var1.toSharedSequenceModel(!var4.method2778()); // L: 208
+ var3 &= 3; // L: 209
+ if (var3 == 1) { // L: 210
+ var7.rotateY270Ccw();
+ } else if (var3 == 2) { // L: 211
+ var7.rotateY180();
+ } else if (var3 == 3) { // L: 212
+ var7.rotateY90Ccw();
}
- var5.method4259(var4, var2);
- if (var3 == 1) {
- var5.rotateY90Ccw();
- } else if (var3 == 2) { // L: 185
- var5.rotateY180();
- } else if (var3 == 3) { // L: 186
- var5.rotateY270Ccw();
+ var7.method4404(var4, var2); // L: 213
+ if (var3 == 1) { // L: 214
+ var7.rotateY90Ccw();
+ } else if (var3 == 2) { // L: 215
+ var7.rotateY180();
+ } else if (var3 == 3) { // L: 216
+ var7.rotateY270Ccw();
}
- return var5; // L: 187
+ return var7; // L: 217
}
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Lhv;II)Lhv;",
- garbageValue = "-1909373486"
+ descriptor = "(Lhy;II)Lhy;",
+ garbageValue = "-1841001380"
)
@Export("transformSpotAnimationModel")
Model transformSpotAnimationModel(Model var1, int var2) {
- Model var4;
- if (!this.isCachedModelIdSet()) {
- var2 = this.frameIds[var2];
- Frames var5 = class141.getFrames(var2 >> 16);
- var2 &= 65535;
- if (var5 == null) { // L: 196
+ if (!this.isCachedModelIdSet()) { // L: 222
+ var2 = this.frameIds[var2]; // L: 223
+ Frames var8 = ParamComposition.getFrames(var2 >> 16); // L: 224
+ var2 &= 65535; // L: 225
+ if (var8 == null) { // L: 226
return var1.toSharedSpotAnimationModel(true);
} else {
- var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2));
- var4.animate(var5, var2);
- return var4; // L: 199
+ Model var7 = var1.toSharedSpotAnimationModel(!var8.hasAlphaTransform(var2)); // L: 227
+ var7.animate(var8, var2); // L: 228
+ return var7; // L: 229
}
} else {
- class122 var3 = class146.method2997(this.SequenceDefinition_cachedModelId);
- if (var3 == null) { // L: 203
+ int var4 = this.SequenceDefinition_cachedModelId; // L: 233
+ class122 var5 = (class122)SequenceDefinition_cachedModel.get((long)var4); // L: 235
+ class122 var3;
+ if (var5 != null) { // L: 236
+ var3 = var5; // L: 237
+ } else {
+ var5 = SecureRandomFuture.method1963(SequenceDefinition_animationsArchive, SequenceDefinition_skeletonsArchive, var4, false); // L: 240
+ if (var5 != null) { // L: 241
+ SequenceDefinition_cachedModel.put(var5, (long)var4);
+ }
+
+ var3 = var5; // L: 242
+ }
+
+ if (var3 == null) { // L: 245
return var1.toSharedSpotAnimationModel(true);
} else {
- var4 = var1.toSharedSpotAnimationModel(!var3.method2755()); // L: 204
- var4.method4259(var3, var2); // L: 205
- return var4;
+ Model var6 = var1.toSharedSpotAnimationModel(!var3.method2778()); // L: 246
+ var6.method4404(var3, var2); // L: 247
+ return var6; // L: 248
+ }
+ }
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(Lhy;ILgc;II)Lhy;",
+ garbageValue = "-1919480423"
+ )
+ @Export("applyTransformations")
+ public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) {
+ if (field2166 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 253
+ return this.method3828(var1, var2, var3, var4); // L: 254
+ } else {
+ Model var5 = var1.toSharedSequenceModel(false); // L: 256
+ boolean var6 = false; // L: 257
+ Frames var7 = null; // L: 258
+ class122 var8;
+ if (this.isCachedModelIdSet()) { // L: 259
+ var8 = this.method3836(); // L: 260
+ if (var3.isCachedModelIdSet() && this.field2181 == null) { // L: 261
+ var5.method4404(var8, var2); // L: 262
+ return var5; // L: 263
+ }
+
+ var5.method4399(var8, var2, this.field2181, false); // L: 265
+ } else {
+ var2 = this.frameIds[var2]; // L: 268
+ var7 = ParamComposition.getFrames(var2 >> 16); // L: 269
+ var2 &= 65535; // L: 270
+ if (var7 == null) { // L: 271
+ return var3.transformActorModel(var1, var4);
+ }
+
+ if (!var3.isCachedModelIdSet() && (this.field2180 == null || var4 == -1)) { // L: 272
+ var5.animate(var7, var2); // L: 273
+ return var5; // L: 274
+ }
+
+ if (this.field2180 == null || var4 == -1) { // L: 276
+ var5.animate(var7, var2); // L: 277
+ return var5; // L: 278
+ }
+
+ var6 = var3.isCachedModelIdSet(); // L: 280
+ if (!var6) { // L: 281
+ var5.method4398(var7, var2, this.field2180, false); // L: 282
+ }
+ }
+
+ if (var3.isCachedModelIdSet()) { // L: 285
+ var8 = var3.method3836(); // L: 286
+ var5.method4399(var8, var4, this.field2181, true); // L: 287
+ } else {
+ var4 = var3.frameIds[var4]; // L: 290
+ Frames var9 = ParamComposition.getFrames(var4 >> 16); // L: 291
+ var4 &= 65535; // L: 292
+ if (var9 == null) { // L: 293
+ return this.transformActorModel(var1, var2);
+ }
+
+ var5.method4398(var9, var4, this.field2180, true); // L: 294
+ }
+
+ if (var6 && var7 != null) { // L: 296
+ var5.method4398(var7, var2, this.field2180, false); // L: 297
+ }
+
+ var5.resetBounds(); // L: 299
+ return var5; // L: 300
+ }
+ }
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(Lhy;ILgc;IB)Lhy;",
+ garbageValue = "63"
+ )
+ Model method3828(Model var1, int var2, SequenceDefinition var3, int var4) {
+ var2 = this.frameIds[var2]; // L: 304
+ Frames var5 = ParamComposition.getFrames(var2 >> 16); // L: 305
+ var2 &= 65535; // L: 306
+ if (var5 == null) { // L: 307
+ return var3.transformActorModel(var1, var4);
+ } else {
+ var4 = var3.frameIds[var4]; // L: 308
+ Frames var6 = ParamComposition.getFrames(var4 >> 16); // L: 309
+ var4 &= 65535; // L: 310
+ Model var7;
+ if (var6 == null) { // L: 311
+ var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 312
+ var7.animate(var5, var2); // L: 313
+ return var7; // L: 314
+ } else {
+ var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 316
+ var7.animate2(var5, var2, var6, var4, this.field2180); // L: 317
+ return var7; // L: 318
}
}
}
@ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(Lhv;ILgq;IB)Lhv;",
- garbageValue = "70"
- )
- @Export("applyTransformations")
- public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) {
- if (field2221 && !this.isCachedModelIdSet() && !var3.isCachedModelIdSet()) { // L: 211
- return this.method3710(var1, var2, var3, var4);
- } else {
- Model var5 = var1.toSharedSequenceModel(false); // L: 214
- boolean var6 = false;
- Frames var7 = null;
- class122 var8;
- if (this.isCachedModelIdSet()) {
- var8 = this.method3735();
- if (var3.isCachedModelIdSet() && this.field2218 == null) {
- var5.method4259(var8, var2);
- return var5;
- }
-
- var5.method4263(var8, var2, this.field2218, false); // L: 223
- } else {
- var2 = this.frameIds[var2]; // L: 226
- var7 = class141.getFrames(var2 >> 16); // L: 227
- var2 &= 65535;
- if (var7 == null) {
- return var3.transformActorModel(var1, var4);
- }
-
- if (!var3.isCachedModelIdSet() && (this.field2217 == null || var4 == -1)) {
- var5.animate(var7, var2);
- return var5; // L: 232
- }
-
- if (this.field2217 == null || var4 == -1) { // L: 234
- var5.animate(var7, var2); // L: 235
- return var5; // L: 236
- }
-
- var6 = var3.isCachedModelIdSet();
- if (!var6) {
- var5.method4264(var7, var2, this.field2217, false); // L: 240
- }
- }
-
- if (var3.isCachedModelIdSet()) {
- var8 = var3.method3735(); // L: 244
- var5.method4263(var8, var4, this.field2218, true);
- } else {
- var4 = var3.frameIds[var4];
- Frames var9 = class141.getFrames(var4 >> 16);
- var4 &= 65535; // L: 250
- if (var9 == null) {
- return this.transformActorModel(var1, var2);
- }
-
- var5.method4264(var9, var4, this.field2217, true);
- }
-
- if (var6 && var7 != null) { // L: 254
- var5.method4264(var7, var2, this.field2217, false); // L: 255
- }
-
- var5.resetBounds(); // L: 257
- return var5;
- }
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(Lhv;ILgq;IB)Lhv;",
- garbageValue = "-110"
- )
- Model method3710(Model var1, int var2, SequenceDefinition var3, int var4) {
- var2 = this.frameIds[var2]; // L: 262
- Frames var5 = class141.getFrames(var2 >> 16);
- var2 &= 65535;
- if (var5 == null) { // L: 265
- return var3.transformActorModel(var1, var4);
- } else {
- var4 = var3.frameIds[var4]; // L: 266
- Frames var6 = class141.getFrames(var4 >> 16); // L: 267
- var4 &= 65535; // L: 268
- Model var7;
- if (var6 == null) { // L: 269
- var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 270
- var7.animate(var5, var2); // L: 271
- return var7; // L: 272
- } else {
- var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 274
- var7.animate2(var5, var2, var6, var4, this.field2217); // L: 275
- return var7; // L: 276
- }
- }
- }
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(Lhv;II)Lhv;",
- garbageValue = "771999182"
+ descriptor = "(Lhy;II)Lhy;",
+ garbageValue = "-212353813"
)
@Export("transformWidgetModel")
public Model transformWidgetModel(Model var1, int var2) {
- if (!this.isCachedModelIdSet()) { // L: 280
- int var3 = this.frameIds[var2]; // L: 281
- Frames var4 = class141.getFrames(var3 >> 16); // L: 282
- var3 &= 65535; // L: 283
- if (var4 == null) { // L: 284
+ if (!this.isCachedModelIdSet()) { // L: 322
+ int var3 = this.frameIds[var2]; // L: 323
+ Frames var4 = ParamComposition.getFrames(var3 >> 16); // L: 324
+ var3 &= 65535; // L: 325
+ if (var4 == null) { // L: 326
return var1.toSharedSequenceModel(true);
} else {
- Frames var5 = null; // L: 285
- int var6 = 0; // L: 286
- if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 287
- var6 = this.chatFrameIds[var2]; // L: 288
- var5 = class141.getFrames(var6 >> 16); // L: 289
- var6 &= 65535; // L: 290
+ Frames var5 = null; // L: 327
+ int var6 = 0; // L: 328
+ if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 329
+ var6 = this.chatFrameIds[var2]; // L: 330
+ var5 = ParamComposition.getFrames(var6 >> 16); // L: 331
+ var6 &= 65535; // L: 332
}
Model var7;
- if (var5 != null && var6 != 65535) { // L: 292
- var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 297
- var7.animate(var4, var3); // L: 298
- var7.animate(var5, var6); // L: 299
- return var7; // L: 300
+ if (var5 != null && var6 != 65535) { // L: 334
+ var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 339
+ var7.animate(var4, var3); // L: 340
+ var7.animate(var5, var6); // L: 341
+ return var7; // L: 342
} else {
- var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 293
- var7.animate(var4, var3); // L: 294
- return var7; // L: 295
+ var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 335
+ var7.animate(var4, var3); // L: 336
+ return var7; // L: 337
}
}
} else {
- return this.transformActorModel(var1, var2); // L: 303
+ return this.transformActorModel(var1, var2); // L: 345
}
}
- @ObfuscatedName("y")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1132270109"
+ garbageValue = "-1630749054"
)
@Export("isCachedModelIdSet")
public boolean isCachedModelIdSet() {
- return this.SequenceDefinition_cachedModelId >= 0; // L: 308
+ return this.SequenceDefinition_cachedModelId >= 0; // L: 350
}
- @ObfuscatedName("c")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "0"
+ descriptor = "(I)I",
+ garbageValue = "2120991547"
)
- public int method3729() {
- return this.field2202 - this.field2207; // L: 312
+ public int method3835() {
+ return this.field2164 - this.field2173; // L: 354
}
- @ObfuscatedName("b")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(I)Lds;",
- garbageValue = "2065274183"
+ descriptor = "(I)Lda;",
+ garbageValue = "-1352870748"
)
- public class122 method3735() {
- return this.isCachedModelIdSet() ? class146.method2997(this.SequenceDefinition_cachedModelId) : null; // L: 353 354 357
+ public class122 method3836() {
+ if (this.isCachedModelIdSet()) { // L: 366
+ int var2 = this.SequenceDefinition_cachedModelId; // L: 368
+ class122 var3 = (class122)SequenceDefinition_cachedModel.get((long)var2); // L: 370
+ class122 var1;
+ if (var3 != null) { // L: 371
+ var1 = var3; // L: 372
+ } else {
+ var3 = SecureRandomFuture.method1963(SequenceDefinition_animationsArchive, SequenceDefinition_skeletonsArchive, var2, false); // L: 375
+ if (var3 != null) { // L: 376
+ SequenceDefinition_cachedModel.put(var3, (long)var2);
+ }
+
+ var1 = var3; // L: 377
+ }
+
+ return var1; // L: 379
+ } else {
+ return null; // L: 382
+ }
}
- @ObfuscatedName("q")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
- garbageValue = "-1646829162"
+ descriptor = "(IIIII)I",
+ garbageValue = "-1897967162"
)
- static File method3717(String var0, String var1, int var2) {
- String var3 = var2 == 0 ? "" : "" + var2; // L: 144
- JagexCache.JagexCache_locationFile = new File(BufferedSource.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 145
- String var4 = null; // L: 146
- String var5 = null; // L: 147
- boolean var6 = false; // L: 148
- int var11;
- File var26;
- if (JagexCache.JagexCache_locationFile.exists()) { // L: 149
- try {
- AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 152
-
- Buffer var8;
- int var9;
- for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 153 154 157
- var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 155
- if (var9 == -1) { // L: 156
- throw new IOException();
- }
- }
-
- var8.offset = 0; // L: 159
- var9 = var8.readUnsignedByte(); // L: 160
- if (var9 < 1 || var9 > 3) { // L: 161
- throw new IOException("" + var9);
- }
-
- int var10 = 0; // L: 162
- if (var9 > 1) { // L: 163
- var10 = var8.readUnsignedByte();
- }
-
- if (var9 <= 2) { // L: 164
- var4 = var8.readStringCp1252NullCircumfixed(); // L: 165
- if (var10 == 1) { // L: 166
- var5 = var8.readStringCp1252NullCircumfixed();
- }
- } else {
- var4 = var8.readCESU8(); // L: 169
- if (var10 == 1) { // L: 170
- var5 = var8.readCESU8();
- }
- }
-
- var7.close(); // L: 172
- } catch (IOException var24) { // L: 174
- var24.printStackTrace(); // L: 175
- }
-
- if (var4 != null) { // L: 177
- var26 = new File(var4); // L: 178
- if (!var26.exists()) { // L: 179
- var4 = null; // L: 180
- }
- }
-
- if (var4 != null) { // L: 183
- var26 = new File(var4, "test.dat"); // L: 184
-
- boolean var27;
- try {
- RandomAccessFile var15 = new RandomAccessFile(var26, "rw"); // L: 188
- var11 = var15.read(); // L: 189
- var15.seek(0L); // L: 190
- var15.write(var11); // L: 191
- var15.seek(0L); // L: 192
- var15.close(); // L: 193
- var26.delete(); // L: 194
- var27 = true; // L: 195
- } catch (Exception var22) { // L: 197
- var27 = false; // L: 198
- }
-
- if (!var27) { // L: 201
- var4 = null; // L: 202
- }
- }
- }
-
- if (var4 == null && var2 == 0) { // L: 206
- label137:
- for (int var16 = 0; var16 < class83.cacheSubPaths.length; ++var16) { // L: 207
- for (int var17 = 0; var17 < SecureRandomCallable.cacheParentPaths.length; ++var17) { // L: 208
- File var18 = new File(SecureRandomCallable.cacheParentPaths[var17] + class83.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar); // L: 209
- if (var18.exists()) { // L: 210
- File var19 = new File(var18, "test.dat"); // L: 212
-
- boolean var28;
- try {
- RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); // L: 215
- int var13 = var12.read(); // L: 216
- var12.seek(0L); // L: 217
- var12.write(var13); // L: 218
- var12.seek(0L); // L: 219
- var12.close(); // L: 220
- var19.delete(); // L: 221
- var28 = true; // L: 222
- } catch (Exception var21) { // L: 224
- var28 = false; // L: 225
- }
-
- if (var28) { // L: 228
- var4 = var18.toString(); // L: 229
- var6 = true; // L: 230
- break label137; // L: 231
- }
- }
- }
- }
- }
-
- if (var4 == null) { // L: 237
- var4 = BufferedSource.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 238
- var6 = true; // L: 239
- }
-
- if (var5 != null) { // L: 241
- File var25 = new File(var5); // L: 242
- var26 = new File(var4); // L: 243
-
- try {
- File[] var31 = var25.listFiles(); // L: 245
- File[] var30 = var31; // L: 247
-
- for (var11 = 0; var11 < var30.length; ++var11) { // L: 248
- File var29 = var30[var11]; // L: 249
- File var20 = new File(var26, var29.getName()); // L: 251
- boolean var14 = var29.renameTo(var20); // L: 252
- if (!var14) { // L: 253
- throw new IOException();
- }
- }
- } catch (Exception var23) { // L: 258
- var23.printStackTrace(); // L: 259
- }
-
- var6 = true; // L: 261
- }
-
- if (var6) { // L: 263
- class268.method5030(new File(var4), (File)null);
- }
-
- return new File(var4); // L: 264
+ static final int method3827(int var0, int var1, int var2, int var3) {
+ int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 900
+ return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 901
}
+
+ @ObfuscatedName("gq")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;ZS)V",
+ garbageValue = "26429"
+ )
+ @Export("drawLoadingMessage")
+ static final void drawLoadingMessage(String var0, boolean var1) {
+ if (Client.showLoadingMessages) { // L: 4466
+ byte var2 = 4; // L: 4467
+ int var3 = var2 + 6; // L: 4468
+ int var4 = var2 + 6; // L: 4469
+ int var5 = DevicePcmPlayerProvider.fontPlain12.lineWidth(var0, 250); // L: 4470
+ int var6 = DevicePcmPlayerProvider.fontPlain12.lineCount(var0, 250) * 13; // L: 4471
+ Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); // L: 4472
+ Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); // L: 4473
+ DevicePcmPlayerProvider.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4474
+ int var7 = var3 - var2; // L: 4475
+ int var8 = var4 - var2; // L: 4476
+ int var9 = var2 + var5 + var2; // L: 4477
+ int var10 = var2 + var2 + var6; // L: 4478
+
+ int var11;
+ for (var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4480
+ if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 4481
+ Client.field703[var11] = true;
+ }
+ }
+
+ if (var1) { // L: 4484
+ Message.rasterProvider.drawFull(0, 0); // L: 4485
+ } else {
+ var11 = var3; // L: 4488
+ int var12 = var4; // L: 4489
+ int var13 = var5; // L: 4490
+ int var14 = var6; // L: 4491
+
+ for (int var15 = 0; var15 < Client.rootWidgetCount; ++var15) { // L: 4493
+ if (Client.rootWidgetXs[var15] + Client.rootWidgetWidths[var15] > var11 && Client.rootWidgetXs[var15] < var13 + var11 && Client.rootWidgetYs[var15] + Client.rootWidgetHeights[var15] > var12 && Client.rootWidgetYs[var15] < var14 + var12) { // L: 4494
+ Client.field704[var15] = true;
+ }
+ }
+ }
+
+ }
+ } // L: 4498
}
diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java
index 93b89aa9d5..429b5540f5 100644
--- a/runescape-client/src/main/java/ServerPacket.java
+++ b/runescape-client/src/main/java/ServerPacket.java
@@ -4,672 +4,1031 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jg")
+@ObfuscatedName("jn")
@Implements("ServerPacket")
public class ServerPacket {
- @ObfuscatedName("um")
- @ObfuscatedSignature(
- descriptor = "Lop;"
- )
- @Export("worldMap")
- static WorldMap worldMap;
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3166;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3085;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3152;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3087;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3088;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3170;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3090;
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3179;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3149;
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3140;
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3093;
@ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3112;
- @ObfuscatedName("w")
+ public static final ServerPacket field3093;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3096;
- @ObfuscatedName("b")
+ public static final ServerPacket field3037;
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3092;
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3089;
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3099;
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3100;
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3101;
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3102;
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3103;
+ public static final ServerPacket field3038;
@ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3187;
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3105;
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3106;
- @ObfuscatedName("z")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3107;
- @ObfuscatedName("i")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3108;
- @ObfuscatedName("u")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3109;
- @ObfuscatedName("ag")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3139;
- @ObfuscatedName("ar")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3111;
- @ObfuscatedName("am")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3182;
- @ObfuscatedName("ac")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3084;
- @ObfuscatedName("ab")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3183;
- @ObfuscatedName("aj")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3115;
- @ObfuscatedName("ae")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3091;
- @ObfuscatedName("az")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3117;
- @ObfuscatedName("ap")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
public static final ServerPacket field3118;
- @ObfuscatedName("as")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3119;
- @ObfuscatedName("au")
+ public static final ServerPacket field3040;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3120;
- @ObfuscatedName("ak")
+ public static final ServerPacket field3041;
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3121;
- @ObfuscatedName("af")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3122;
- @ObfuscatedName("al")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3123;
- @ObfuscatedName("aq")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3161;
- @ObfuscatedName("ad")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3125;
- @ObfuscatedName("an")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3124;
- @ObfuscatedName("aw")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3127;
- @ObfuscatedName("ah")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3154;
- @ObfuscatedName("ao")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3129;
- @ObfuscatedName("av")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3130;
- @ObfuscatedName("ai")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3131;
- @ObfuscatedName("ay")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3188;
- @ObfuscatedName("aa")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3133;
- @ObfuscatedName("ax")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
public static final ServerPacket field3142;
- @ObfuscatedName("at")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3110;
- @ObfuscatedName("br")
+ public static final ServerPacket field3109;
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3114;
- @ObfuscatedName("ba")
+ public static final ServerPacket field3130;
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3137;
- @ObfuscatedName("bk")
+ public static final ServerPacket field3067;
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3094;
- @ObfuscatedName("bi")
+ public static final ServerPacket field3046;
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3190;
- @ObfuscatedName("bc")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3126;
- @ObfuscatedName("bo")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3141;
- @ObfuscatedName("bl")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3180;
- @ObfuscatedName("bs")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3143;
- @ObfuscatedName("bx")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3144;
- @ObfuscatedName("bd")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3153;
- @ObfuscatedName("bj")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3146;
- @ObfuscatedName("be")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3116;
- @ObfuscatedName("bf")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3148;
- @ObfuscatedName("bz")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3097;
- @ObfuscatedName("bv")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3150;
- @ObfuscatedName("bt")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3151;
- @ObfuscatedName("bu")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3134;
- @ObfuscatedName("bq")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3147;
- @ObfuscatedName("bh")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3162;
- @ObfuscatedName("bb")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3155;
- @ObfuscatedName("bm")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3156;
- @ObfuscatedName("by")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3157;
- @ObfuscatedName("bn")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3158;
- @ObfuscatedName("bg")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3159;
- @ObfuscatedName("bp")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3160;
- @ObfuscatedName("bw")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3098;
- @ObfuscatedName("co")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
public static final ServerPacket field3113;
- @ObfuscatedName("ck")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3163;
- @ObfuscatedName("cr")
+ public static final ServerPacket field3048;
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3164;
- @ObfuscatedName("cv")
+ public static final ServerPacket field3049;
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3165;
- @ObfuscatedName("cs")
+ public static final ServerPacket field3050;
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3104;
- @ObfuscatedName("cm")
+ public static final ServerPacket field3039;
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3167;
- @ObfuscatedName("ca")
+ public static final ServerPacket field3052;
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3168;
- @ObfuscatedName("ci")
+ public static final ServerPacket field3053;
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3169;
- @ObfuscatedName("cx")
+ public static final ServerPacket field3054;
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3135;
- @ObfuscatedName("cn")
+ public static final ServerPacket field3055;
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3171;
- @ObfuscatedName("cc")
+ public static final ServerPacket field3056;
+ @ObfuscatedName("b")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3172;
- @ObfuscatedName("cy")
+ public static final ServerPacket field3057;
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3173;
- @ObfuscatedName("ct")
+ public static final ServerPacket field3058;
+ @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3174;
- @ObfuscatedName("cd")
+ public static final ServerPacket field3097;
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3175;
- @ObfuscatedName("cw")
+ public static final ServerPacket field3079;
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3176;
- @ObfuscatedName("cf")
+ public static final ServerPacket field3061;
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3177;
- @ObfuscatedName("cq")
+ public static final ServerPacket field3051;
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3132;
- @ObfuscatedName("cg")
+ public static final ServerPacket field3063;
+ @ObfuscatedName("al")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3044;
+ @ObfuscatedName("ao")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3059;
+ @ObfuscatedName("ab")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3066;
+ @ObfuscatedName("ap")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3092;
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3068;
+ @ObfuscatedName("ae")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3119;
+ @ObfuscatedName("aj")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3070;
+ @ObfuscatedName("am")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3071;
+ @ObfuscatedName("an")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3129;
+ @ObfuscatedName("af")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3042;
+ @ObfuscatedName("ax")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3069;
+ @ObfuscatedName("ar")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3075;
+ @ObfuscatedName("at")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3076;
+ @ObfuscatedName("ag")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3110;
+ @ObfuscatedName("aq")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3078;
+ @ObfuscatedName("ah")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3127;
+ @ObfuscatedName("ai")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3080;
+ @ObfuscatedName("az")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3126;
+ @ObfuscatedName("av")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3082;
+ @ObfuscatedName("aw")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3083;
+ @ObfuscatedName("au")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3084;
+ @ObfuscatedName("aa")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3085;
+ @ObfuscatedName("ay")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
)
public static final ServerPacket field3086;
- @ObfuscatedName("cl")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3145;
- @ObfuscatedName("cu")
+ public static final ServerPacket field3087;
+ @ObfuscatedName("be")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3181;
- @ObfuscatedName("ch")
+ public static final ServerPacket field3088;
+ @ObfuscatedName("bz")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3060;
+ @ObfuscatedName("bp")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3090;
+ @ObfuscatedName("bf")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3091;
+ @ObfuscatedName("bg")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3096;
+ @ObfuscatedName("br")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3140;
+ @ObfuscatedName("bn")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3094;
+ @ObfuscatedName("bq")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
)
public static final ServerPacket field3095;
- @ObfuscatedName("cz")
+ @ObfuscatedName("bc")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3186;
- @ObfuscatedName("ce")
+ public static final ServerPacket field3045;
+ @ObfuscatedName("bl")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3184;
+ public static final ServerPacket field3043;
+ @ObfuscatedName("bv")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3062;
+ @ObfuscatedName("bt")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3138;
+ @ObfuscatedName("bh")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3100;
+ @ObfuscatedName("bs")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3101;
+ @ObfuscatedName("bk")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3064;
+ @ObfuscatedName("bb")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3099;
+ @ObfuscatedName("ba")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3104;
+ @ObfuscatedName("bu")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3105;
+ @ObfuscatedName("bw")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3047;
+ @ObfuscatedName("bi")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3107;
+ @ObfuscatedName("bo")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3081;
+ @ObfuscatedName("bx")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3106;
+ @ObfuscatedName("bm")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3074;
+ @ObfuscatedName("by")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3111;
+ @ObfuscatedName("bj")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3112;
+ @ObfuscatedName("bd")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3073;
+ @ObfuscatedName("cr")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3114;
+ @ObfuscatedName("cq")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3077;
+ @ObfuscatedName("cw")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3116;
+ @ObfuscatedName("cx")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3117;
+ @ObfuscatedName("cc")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3108;
+ @ObfuscatedName("cm")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3089;
+ @ObfuscatedName("ci")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3120;
+ @ObfuscatedName("cg")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3121;
@ObfuscatedName("cj")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
)
- public static final ServerPacket field3185;
- @ObfuscatedName("cb")
- @ObfuscatedSignature(
- descriptor = "Ljg;"
- )
- public static final ServerPacket field3178;
+ public static final ServerPacket field3122;
@ObfuscatedName("cp")
@ObfuscatedSignature(
- descriptor = "Ljg;"
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3123;
+ @ObfuscatedName("cf")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3124;
+ @ObfuscatedName("cv")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3125;
+ @ObfuscatedName("cn")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3072;
+ @ObfuscatedName("co")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3103;
+ @ObfuscatedName("cz")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3128;
+ @ObfuscatedName("cu")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3102;
+ @ObfuscatedName("ce")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3065;
+ @ObfuscatedName("cy")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3131;
+ @ObfuscatedName("ca")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3132;
+ @ObfuscatedName("ck")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3133;
+ @ObfuscatedName("cb")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3134;
+ @ObfuscatedName("cs")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3135;
+ @ObfuscatedName("cd")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
)
public static final ServerPacket field3136;
- @ObfuscatedName("dc")
+ @ObfuscatedName("cl")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3137;
+ @ObfuscatedName("ct")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3115;
+ @ObfuscatedName("ch")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3139;
+ @ObfuscatedName("dm")
+ @ObfuscatedSignature(
+ descriptor = "Ljn;"
+ )
+ public static final ServerPacket field3098;
+ @ObfuscatedName("dd")
@ObfuscatedGetter(
- intValue = -1591353555
+ intValue = 1936739439
)
@Export("id")
public final int id;
- @ObfuscatedName("dp")
+ @ObfuscatedName("dz")
@ObfuscatedGetter(
- intValue = 1497414687
+ intValue = 615071029
)
@Export("length")
public final int length;
static {
- field3166 = new ServerPacket(0, -2); // L: 5
- field3085 = new ServerPacket(1, 17); // L: 6
- field3152 = new ServerPacket(2, 0); // L: 7
- field3087 = new ServerPacket(3, 6); // L: 8
- field3088 = new ServerPacket(4, 20); // L: 9
- field3170 = new ServerPacket(5, 8); // L: 10
- field3090 = new ServerPacket(6, 2); // L: 11
- field3179 = new ServerPacket(7, -2); // L: 12
- field3149 = new ServerPacket(8, -2); // L: 13
- field3140 = new ServerPacket(9, 1); // L: 14
- field3093 = new ServerPacket(10, -1); // L: 15
- field3112 = new ServerPacket(11, 6); // L: 16
- field3096 = new ServerPacket(12, 5); // L: 17
- field3092 = new ServerPacket(13, 0); // L: 18
- field3089 = new ServerPacket(14, -2); // L: 19
- field3099 = new ServerPacket(15, 1); // L: 20
- field3100 = new ServerPacket(16, -2); // L: 21
- field3101 = new ServerPacket(17, -2); // L: 22
- field3102 = new ServerPacket(18, 0); // L: 23
- field3103 = new ServerPacket(19, -1); // L: 24
- field3187 = new ServerPacket(20, -2); // L: 25
- field3105 = new ServerPacket(21, 2); // L: 26
- field3106 = new ServerPacket(22, -2); // L: 27
- field3107 = new ServerPacket(23, -2); // L: 28
- field3108 = new ServerPacket(24, -1); // L: 29
- field3109 = new ServerPacket(25, 2); // L: 30
- field3139 = new ServerPacket(26, -1); // L: 31
- field3111 = new ServerPacket(27, 1); // L: 32
- field3182 = new ServerPacket(28, 4); // L: 33
- field3084 = new ServerPacket(29, -1); // L: 34
- field3183 = new ServerPacket(30, -2); // L: 35
- field3115 = new ServerPacket(31, -2); // L: 36
- field3091 = new ServerPacket(32, -2); // L: 37
- field3117 = new ServerPacket(33, 5); // L: 38
- field3118 = new ServerPacket(34, 6); // L: 39
- field3119 = new ServerPacket(35, 6); // L: 40
- field3120 = new ServerPacket(36, -1); // L: 41
- field3121 = new ServerPacket(37, 8); // L: 42
- field3122 = new ServerPacket(38, 0); // L: 43
- field3123 = new ServerPacket(39, 8); // L: 44
- field3161 = new ServerPacket(40, 2); // L: 45
- field3125 = new ServerPacket(41, -2); // L: 46
- field3124 = new ServerPacket(42, 6); // L: 47
- field3127 = new ServerPacket(43, 2); // L: 48
- field3154 = new ServerPacket(44, 14); // L: 49
- field3129 = new ServerPacket(45, 6); // L: 50
- field3130 = new ServerPacket(46, 5); // L: 51
- field3131 = new ServerPacket(47, 4); // L: 52
- field3188 = new ServerPacket(48, 7); // L: 53
- field3133 = new ServerPacket(49, 2); // L: 54
- field3142 = new ServerPacket(50, 6); // L: 55
- field3110 = new ServerPacket(51, 0); // L: 56
- field3114 = new ServerPacket(52, -2); // L: 57
- field3137 = new ServerPacket(53, 6); // L: 58
- field3094 = new ServerPacket(54, 1); // L: 59
- field3190 = new ServerPacket(55, 4); // L: 60
- field3126 = new ServerPacket(56, 28); // L: 61
- field3141 = new ServerPacket(57, 0); // L: 62
- field3180 = new ServerPacket(58, -2); // L: 63
- field3143 = new ServerPacket(59, 3); // L: 64
- field3144 = new ServerPacket(60, 2); // L: 65
- field3153 = new ServerPacket(61, 10); // L: 66
- field3146 = new ServerPacket(62, 1); // L: 67
- field3116 = new ServerPacket(63, -1); // L: 68
- field3148 = new ServerPacket(64, 6); // L: 69
- field3097 = new ServerPacket(65, 6); // L: 70
- field3150 = new ServerPacket(66, 6); // L: 71
- field3151 = new ServerPacket(67, -2); // L: 72
- field3134 = new ServerPacket(68, 5); // L: 73
- field3147 = new ServerPacket(69, 0); // L: 74
- field3162 = new ServerPacket(70, 7); // L: 75
- field3155 = new ServerPacket(71, 1); // L: 76
- field3156 = new ServerPacket(72, 4); // L: 77
- field3157 = new ServerPacket(73, 8); // L: 78
- field3158 = new ServerPacket(74, 8); // L: 79
- field3159 = new ServerPacket(75, 0); // L: 80
- field3160 = new ServerPacket(76, 6); // L: 81
- field3098 = new ServerPacket(77, 3); // L: 82
- field3113 = new ServerPacket(78, -1); // L: 83
- field3163 = new ServerPacket(79, -2); // L: 84
- field3164 = new ServerPacket(80, -2); // L: 85
- field3165 = new ServerPacket(81, 2); // L: 86
- field3104 = new ServerPacket(82, 2); // L: 87
- field3167 = new ServerPacket(83, 4); // L: 88
- field3168 = new ServerPacket(84, 4); // L: 89
- field3169 = new ServerPacket(85, 2); // L: 90
- field3135 = new ServerPacket(86, 5); // L: 91
- field3171 = new ServerPacket(87, 12); // L: 92
- field3172 = new ServerPacket(88, 8); // L: 93
- field3173 = new ServerPacket(89, -2); // L: 94
- field3174 = new ServerPacket(90, 10); // L: 95
- field3175 = new ServerPacket(91, 5); // L: 96
- field3176 = new ServerPacket(92, 0); // L: 97
- field3177 = new ServerPacket(93, 4); // L: 98
- field3132 = new ServerPacket(94, 4); // L: 99
- field3086 = new ServerPacket(95, -2); // L: 100
- field3145 = new ServerPacket(96, -2); // L: 101
- field3181 = new ServerPacket(97, -2); // L: 102
- field3095 = new ServerPacket(98, -2); // L: 103
- field3186 = new ServerPacket(99, 8); // L: 104
- field3184 = new ServerPacket(100, -2); // L: 105
- field3185 = new ServerPacket(101, -1); // L: 106
- field3178 = new ServerPacket(102, 15); // L: 107
- field3136 = new ServerPacket(103, -2); // L: 108
+ field3093 = new ServerPacket(0, -2); // L: 5
+ field3037 = new ServerPacket(1, 12); // L: 6
+ field3038 = new ServerPacket(2, 3); // L: 7
+ field3118 = new ServerPacket(3, 15); // L: 8
+ field3040 = new ServerPacket(4, 5); // L: 9
+ field3041 = new ServerPacket(5, 6); // L: 10
+ field3142 = new ServerPacket(6, 2); // L: 11
+ field3109 = new ServerPacket(7, -1); // L: 12
+ field3130 = new ServerPacket(8, 0); // L: 13
+ field3067 = new ServerPacket(9, 6); // L: 14
+ field3046 = new ServerPacket(10, -2); // L: 15
+ field3113 = new ServerPacket(11, -1); // L: 16
+ field3048 = new ServerPacket(12, -1); // L: 17
+ field3049 = new ServerPacket(13, 8); // L: 18
+ field3050 = new ServerPacket(14, 14); // L: 19
+ field3039 = new ServerPacket(15, 4); // L: 20
+ field3052 = new ServerPacket(16, 8); // L: 21
+ field3053 = new ServerPacket(17, 5); // L: 22
+ field3054 = new ServerPacket(18, 7); // L: 23
+ field3055 = new ServerPacket(19, 0); // L: 24
+ field3056 = new ServerPacket(20, -2); // L: 25
+ field3057 = new ServerPacket(21, 5); // L: 26
+ field3058 = new ServerPacket(22, -2); // L: 27
+ field3097 = new ServerPacket(23, -2); // L: 28
+ field3079 = new ServerPacket(24, 2); // L: 29
+ field3061 = new ServerPacket(25, 2); // L: 30
+ field3051 = new ServerPacket(26, 2); // L: 31
+ field3063 = new ServerPacket(27, 5); // L: 32
+ field3044 = new ServerPacket(28, 0); // L: 33
+ field3059 = new ServerPacket(29, 5); // L: 34
+ field3066 = new ServerPacket(30, -2); // L: 35
+ field3092 = new ServerPacket(31, 28); // L: 36
+ field3068 = new ServerPacket(32, 0); // L: 37
+ field3119 = new ServerPacket(33, 8); // L: 38
+ field3070 = new ServerPacket(34, 2); // L: 39
+ field3071 = new ServerPacket(35, 1); // L: 40
+ field3129 = new ServerPacket(36, 4); // L: 41
+ field3042 = new ServerPacket(37, -2); // L: 42
+ field3069 = new ServerPacket(38, -1); // L: 43
+ field3075 = new ServerPacket(39, 1); // L: 44
+ field3076 = new ServerPacket(40, 0); // L: 45
+ field3110 = new ServerPacket(41, 1); // L: 46
+ field3078 = new ServerPacket(42, 4); // L: 47
+ field3127 = new ServerPacket(43, 0); // L: 48
+ field3080 = new ServerPacket(44, 4); // L: 49
+ field3126 = new ServerPacket(45, 6); // L: 50
+ field3082 = new ServerPacket(46, -2); // L: 51
+ field3083 = new ServerPacket(47, -2); // L: 52
+ field3084 = new ServerPacket(48, 2); // L: 53
+ field3085 = new ServerPacket(49, 7); // L: 54
+ field3086 = new ServerPacket(50, -1); // L: 55
+ field3087 = new ServerPacket(51, 8); // L: 56
+ field3088 = new ServerPacket(52, -2); // L: 57
+ field3060 = new ServerPacket(53, 10); // L: 58
+ field3090 = new ServerPacket(54, -2); // L: 59
+ field3091 = new ServerPacket(55, 6); // L: 60
+ field3096 = new ServerPacket(56, 1); // L: 61
+ field3140 = new ServerPacket(57, 4); // L: 62
+ field3094 = new ServerPacket(58, 20); // L: 63
+ field3095 = new ServerPacket(59, 5); // L: 64
+ field3045 = new ServerPacket(60, -1); // L: 65
+ field3043 = new ServerPacket(61, 6); // L: 66
+ field3062 = new ServerPacket(62, -2); // L: 67
+ field3138 = new ServerPacket(63, 6); // L: 68
+ field3100 = new ServerPacket(64, 6); // L: 69
+ field3101 = new ServerPacket(65, 2); // L: 70
+ field3064 = new ServerPacket(66, -2); // L: 71
+ field3099 = new ServerPacket(67, -2); // L: 72
+ field3104 = new ServerPacket(68, 6); // L: 73
+ field3105 = new ServerPacket(69, -2); // L: 74
+ field3047 = new ServerPacket(70, 6); // L: 75
+ field3107 = new ServerPacket(71, 0); // L: 76
+ field3081 = new ServerPacket(72, 6); // L: 77
+ field3106 = new ServerPacket(73, -2); // L: 78
+ field3074 = new ServerPacket(74, 10); // L: 79
+ field3111 = new ServerPacket(75, 1); // L: 80
+ field3112 = new ServerPacket(76, -2); // L: 81
+ field3073 = new ServerPacket(77, 1); // L: 82
+ field3114 = new ServerPacket(78, -1); // L: 83
+ field3077 = new ServerPacket(79, 4); // L: 84
+ field3116 = new ServerPacket(80, 17); // L: 85
+ field3117 = new ServerPacket(81, 8); // L: 86
+ field3108 = new ServerPacket(82, 2); // L: 87
+ field3089 = new ServerPacket(83, -2); // L: 88
+ field3120 = new ServerPacket(84, -2); // L: 89
+ field3121 = new ServerPacket(85, 6); // L: 90
+ field3122 = new ServerPacket(86, 0); // L: 91
+ field3123 = new ServerPacket(87, 8); // L: 92
+ field3124 = new ServerPacket(88, -1); // L: 93
+ field3125 = new ServerPacket(89, 4); // L: 94
+ field3072 = new ServerPacket(90, 0); // L: 95
+ field3103 = new ServerPacket(91, 6); // L: 96
+ field3128 = new ServerPacket(92, -1); // L: 97
+ field3102 = new ServerPacket(93, 8); // L: 98
+ field3065 = new ServerPacket(94, -2);
+ field3131 = new ServerPacket(95, -2);
+ field3132 = new ServerPacket(96, 3); // L: 101
+ field3133 = new ServerPacket(97, 4); // L: 102
+ field3134 = new ServerPacket(98, -2);
+ field3135 = new ServerPacket(99, 2);
+ field3136 = new ServerPacket(100, -2); // L: 105
+ field3137 = new ServerPacket(101, -2); // L: 106
+ field3115 = new ServerPacket(102, -2); // L: 107
+ field3139 = new ServerPacket(103, 2);
+ field3098 = new ServerPacket(104, -2); // L: 109
}
ServerPacket(int var1, int var2) {
- this.id = var1; // L: 117
- this.length = var2; // L: 118
- } // L: 119
+ this.id = var1;
+ this.length = var2;
+ }
- @ObfuscatedName("s")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)[I",
- garbageValue = "238481455"
+ descriptor = "(Llh;Llh;Ljava/lang/String;Ljava/lang/String;B)Lmt;",
+ garbageValue = "30"
)
- public static int[] method5020() {
- int[] var0 = new int[KeyHandler.field134]; // L: 250
+ public static Font method5211(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
+ int var4 = var0.getGroupId(var2); // L: 99
+ int var5 = var0.getFileId(var4, var3); // L: 100
+ Font var6;
+ if (!Ignored.method6774(var0, var4, var5)) { // L: 103
+ var6 = null; // L: 104
+ } else {
+ byte[] var8 = var1.takeFile(var4, var5); // L: 108
+ Font var7;
+ if (var8 == null) { // L: 110
+ var7 = null; // L: 111
+ } else {
+ Font var9 = new Font(var8, class426.SpriteBuffer_xOffsets, class142.SpriteBuffer_yOffsets, class359.SpriteBuffer_spriteWidths, class456.SpriteBuffer_spriteHeights, class13.SpriteBuffer_spritePalette, class421.SpriteBuffer_pixels); // L: 114
+ class426.SpriteBuffer_xOffsets = null; // L: 116
+ class142.SpriteBuffer_yOffsets = null; // L: 117
+ class359.SpriteBuffer_spriteWidths = null; // L: 118
+ class456.SpriteBuffer_spriteHeights = null; // L: 119
+ class13.SpriteBuffer_spritePalette = null; // L: 120
+ class421.SpriteBuffer_pixels = null; // L: 121
+ var7 = var9; // L: 123
+ }
- for (int var1 = 0; var1 < KeyHandler.field134; ++var1) { // L: 251
- var0[var1] = KeyHandler.field140[var1]; // L: 252
+ var6 = var7; // L: 125
}
- return var0; // L: 254
+ return var6; // L: 127
}
+
+ @ObfuscatedName("bf")
+ @ObfuscatedSignature(
+ descriptor = "(ILkd;ZI)V",
+ garbageValue = "-26625372"
+ )
+ static void method5210(int var0, Coord var1, boolean var2) {
+ WorldMapArea var3 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var0); // L: 4987
+ int var4 = class101.localPlayer.plane; // L: 4988
+ int var5 = (class101.localPlayer.x >> 7) + class28.baseX; // L: 4989
+ int var6 = (class101.localPlayer.y >> 7) + WorldMapLabelSize.baseY; // L: 4990
+ Coord var7 = new Coord(var4, var5, var6); // L: 4991
+ GrandExchangeOfferAgeComparator.getWorldMap().method7292(var3, var7, var1, var2); // L: 4992
+ } // L: 4993
+
+ @ObfuscatedName("gm")
+ @ObfuscatedSignature(
+ descriptor = "(IIIII)V",
+ garbageValue = "-1821871039"
+ )
+ @Export("drawEntities")
+ static final void drawEntities(int var0, int var1, int var2, int var3) {
+ ++Client.viewportDrawCount; // L: 4501
+ if (class101.localPlayer.x >> 7 == Client.destinationX && class101.localPlayer.y >> 7 == Client.destinationY) { // L: 4503
+ Client.destinationX = 0; // L: 4504
+ }
+
+ HealthBarUpdate.method2204(); // L: 4507
+ if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4509
+ ByteArrayPool.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4510
+ }
+
+ AbstractArchive.addNpcsToScene(true); // L: 4513
+ class135.method2917(); // L: 4514
+ AbstractArchive.addNpcsToScene(false); // L: 4515
+ World.method1627(); // L: 4516
+ CollisionMap.method3907(); // L: 4517
+ class201.setViewportShape(var0, var1, var2, var3, true); // L: 4518
+ var0 = Client.viewportOffsetX; // L: 4519
+ var1 = Client.viewportOffsetY; // L: 4520
+ var2 = Client.viewportWidth; // L: 4521
+ var3 = Client.viewportHeight; // L: 4522
+ Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4523
+ Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4524
+ int var4 = Client.camAngleX; // L: 4525
+ if (Client.field681 / 256 > var4) { // L: 4526
+ var4 = Client.field681 / 256;
+ }
+
+ if (Client.field743[4] && Client.field745[4] + 128 > var4) { // L: 4527
+ var4 = Client.field745[4] + 128;
+ }
+
+ int var5 = Client.camAngleY & 2047; // L: 4528
+ KeyHandler.method301(InterfaceParent.oculusOrbFocalPointX, class181.field1992, class141.oculusOrbFocalPointY, var4, var5, GZipDecompressor.method8314(var4), var3); // L: 4529
+ int var6;
+ int var7;
+ int var8;
+ if (!Client.isCameraLocked) { // L: 4531
+ var6 = class427.method7523();
+ } else {
+ if (class19.clientPreferences.method2245()) { // L: 4535
+ var7 = PacketWriter.Client_plane; // L: 4536
+ } else {
+ var8 = SceneTilePaint.getTileHeight(class18.cameraX, class228.cameraZ, PacketWriter.Client_plane); // L: 4539
+ if (var8 - class16.cameraY < 800 && (Tiles.Tiles_renderFlags[PacketWriter.Client_plane][class18.cameraX >> 7][class228.cameraZ >> 7] & 4) != 0) { // L: 4540
+ var7 = PacketWriter.Client_plane; // L: 4541
+ } else {
+ var7 = 3; // L: 4544
+ }
+ }
+
+ var6 = var7; // L: 4546
+ }
+
+ var7 = class18.cameraX; // L: 4548
+ var8 = class16.cameraY; // L: 4549
+ int var9 = class228.cameraZ; // L: 4550
+ int var10 = ViewportMouse.cameraPitch; // L: 4551
+ int var11 = SoundCache.cameraYaw; // L: 4552
+
+ int var12;
+ int var13;
+ for (var12 = 0; var12 < 5; ++var12) { // L: 4553
+ if (Client.field743[var12]) { // L: 4554
+ var13 = (int)(Math.random() * (double)(Client.field762[var12] * 2 + 1) - (double)Client.field762[var12] + Math.sin((double)Client.field537[var12] / 100.0D * (double)Client.field747[var12]) * (double)Client.field745[var12]); // L: 4555
+ if (var12 == 0) { // L: 4556
+ class18.cameraX += var13;
+ }
+
+ if (var12 == 1) { // L: 4557
+ class16.cameraY += var13;
+ }
+
+ if (var12 == 2) { // L: 4558
+ class228.cameraZ += var13;
+ }
+
+ if (var12 == 3) { // L: 4559
+ SoundCache.cameraYaw = var13 + SoundCache.cameraYaw & 2047;
+ }
+
+ if (var12 == 4) { // L: 4560
+ ViewportMouse.cameraPitch += var13; // L: 4561
+ if (ViewportMouse.cameraPitch < 128) { // L: 4562
+ ViewportMouse.cameraPitch = 128;
+ }
+
+ if (ViewportMouse.cameraPitch > 383) { // L: 4563
+ ViewportMouse.cameraPitch = 383;
+ }
+ }
+ }
+ }
+
+ var12 = MouseHandler.MouseHandler_x; // L: 4567
+ var13 = MouseHandler.MouseHandler_y; // L: 4568
+ if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4569
+ var12 = MouseHandler.MouseHandler_lastPressedX; // L: 4570
+ var13 = MouseHandler.MouseHandler_lastPressedY; // L: 4571
+ }
+
+ int var14;
+ if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 4573
+ var14 = var12 - var0; // L: 4574
+ int var15 = var13 - var1; // L: 4575
+ ViewportMouse.ViewportMouse_x = var14; // L: 4577
+ ViewportMouse.ViewportMouse_y = var15; // L: 4578
+ ViewportMouse.ViewportMouse_isInViewport = true; // L: 4579
+ ViewportMouse.ViewportMouse_entityCount = 0; // L: 4580
+ ViewportMouse.ViewportMouse_false0 = false; // L: 4581
+ } else {
+ ViewportMouse.ViewportMouse_isInViewport = false; // L: 4586
+ ViewportMouse.ViewportMouse_entityCount = 0; // L: 4587
+ }
+
+ Renderable.playPcmPlayers(); // L: 4590
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4591
+ Renderable.playPcmPlayers(); // L: 4592
+ var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 4593
+ Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4594
+ class356.scene.draw(class18.cameraX, class16.cameraY, class228.cameraZ, ViewportMouse.cameraPitch, SoundCache.cameraYaw, var6); // L: 4595
+ Rasterizer3D.Rasterizer3D_zoom = var14; // L: 4596
+ Renderable.playPcmPlayers(); // L: 4597
+ class356.scene.clearTempGameObjects(); // L: 4598
+ Client.overheadTextCount = 0; // L: 4600
+ boolean var32 = false; // L: 4601
+ int var16 = -1; // L: 4602
+ int var17 = -1; // L: 4603
+ int var18 = Players.Players_count; // L: 4604
+ int[] var19 = Players.Players_indices; // L: 4605
+
+ int var20;
+ for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { // L: 4606
+ Object var31;
+ if (var20 < var18) { // L: 4608
+ var31 = Client.players[var19[var20]]; // L: 4609
+ if (var19[var20] == Client.combatTargetPlayerIndex) { // L: 4610
+ var32 = true; // L: 4611
+ var16 = var20; // L: 4612
+ continue;
+ }
+
+ if (var31 == class101.localPlayer) { // L: 4615
+ var17 = var20; // L: 4616
+ continue; // L: 4617
+ }
+ } else {
+ var31 = Client.npcs[Client.npcIndices[var20 - var18]]; // L: 4620
+ }
+
+ class154.drawActor2d((Actor)var31, var20, var0, var1, var2, var3); // L: 4621
+ }
+
+ if (Client.renderSelf && var17 != -1) { // L: 4623
+ class154.drawActor2d(class101.localPlayer, var17, var0, var1, var2, var3); // L: 4624
+ }
+
+ if (var32) { // L: 4626
+ class154.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); // L: 4627
+ }
+
+ for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { // L: 4629
+ int var21 = Client.overheadTextXs[var20]; // L: 4630
+ int var22 = Client.overheadTextYs[var20]; // L: 4631
+ int var23 = Client.overheadTextXOffsets[var20]; // L: 4632
+ int var24 = Client.overheadTextAscents[var20]; // L: 4633
+ boolean var25 = true; // L: 4634
+
+ while (var25) {
+ var25 = false; // L: 4636
+
+ for (int var30 = 0; var30 < var20; ++var30) { // L: 4637
+ if (var22 + 2 > Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] && var22 - var24 < Client.overheadTextYs[var30] + 2 && var21 - var23 < Client.overheadTextXs[var30] + Client.overheadTextXOffsets[var30] && var23 + var21 > Client.overheadTextXs[var30] - Client.overheadTextXOffsets[var30] && Client.overheadTextYs[var30] - Client.overheadTextAscents[var30] < var22) { // L: 4638 4639
+ var22 = Client.overheadTextYs[var30] - Client.overheadTextAscents[var30]; // L: 4640
+ var25 = true; // L: 4641
+ }
+ }
+ }
+
+ Client.viewportTempX = Client.overheadTextXs[var20]; // L: 4646
+ Client.viewportTempY = Client.overheadTextYs[var20] = var22; // L: 4647
+ String var26 = Client.overheadText[var20]; // L: 4648
+ if (Client.chatEffects == 0) { // L: 4649
+ int var27 = 16776960; // L: 4650
+ if (Client.overheadTextColors[var20] < 6) { // L: 4651
+ var27 = Client.field773[Client.overheadTextColors[var20]];
+ }
+
+ if (Client.overheadTextColors[var20] == 6) { // L: 4652
+ var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
+ }
+
+ if (Client.overheadTextColors[var20] == 7) { // L: 4653
+ var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
+ }
+
+ if (Client.overheadTextColors[var20] == 8) { // L: 4654
+ var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
+ }
+
+ int var28;
+ if (Client.overheadTextColors[var20] == 9) { // L: 4655
+ var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4656
+ if (var28 < 50) { // L: 4657
+ var27 = var28 * 1280 + 16711680;
+ } else if (var28 < 100) { // L: 4658
+ var27 = 16776960 - (var28 - 50) * 327680;
+ } else if (var28 < 150) { // L: 4659
+ var27 = (var28 - 100) * 5 + 65280;
+ }
+ }
+
+ if (Client.overheadTextColors[var20] == 10) { // L: 4661
+ var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4662
+ if (var28 < 50) { // L: 4663
+ var27 = var28 * 5 + 16711680;
+ } else if (var28 < 100) { // L: 4664
+ var27 = 16711935 - (var28 - 50) * 327680;
+ } else if (var28 < 150) { // L: 4665
+ var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5;
+ }
+ }
+
+ if (Client.overheadTextColors[var20] == 11) { // L: 4667
+ var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4668
+ if (var28 < 50) { // L: 4669
+ var27 = 16777215 - var28 * 327685;
+ } else if (var28 < 100) { // L: 4670
+ var27 = (var28 - 50) * 327685 + 65280;
+ } else if (var28 < 150) { // L: 4671
+ var27 = 16777215 - (var28 - 100) * 327680;
+ }
+ }
+
+ if (Client.overheadTextEffects[var20] == 0) { // L: 4673
+ TileItem.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0);
+ }
+
+ if (Client.overheadTextEffects[var20] == 1) { // L: 4674
+ TileItem.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
+ }
+
+ if (Client.overheadTextEffects[var20] == 2) { // L: 4675
+ TileItem.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
+ }
+
+ if (Client.overheadTextEffects[var20] == 3) { // L: 4676
+ TileItem.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]);
+ }
+
+ if (Client.overheadTextEffects[var20] == 4) { // L: 4677
+ var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (TileItem.fontBold12.stringWidth(var26) + 100) / 150; // L: 4678
+ Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4679
+ TileItem.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); // L: 4680
+ Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4681
+ }
+
+ if (Client.overheadTextEffects[var20] == 5) { // L: 4683
+ var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4684
+ int var29 = 0; // L: 4685
+ if (var28 < 25) { // L: 4686
+ var29 = var28 - 25;
+ } else if (var28 > 125) { // L: 4687
+ var29 = var28 - 125;
+ }
+
+ Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - TileItem.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4688
+ TileItem.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); // L: 4689
+ Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4690
+ }
+ } else {
+ TileItem.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4694
+ }
+ }
+
+ if (Client.hintArrowType == 2) { // L: 4699
+ class220.worldToScreen((Client.hintArrowX - class28.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - WorldMapLabelSize.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4700
+ if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4701
+ UserComparator4.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
+ }
+ }
+
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field555); // L: 4703
+ HealthBar.method2349(var0, var1, var2, var3); // L: 4704
+ class18.cameraX = var7; // L: 4705
+ class16.cameraY = var8; // L: 4706
+ class228.cameraZ = var9; // L: 4707
+ ViewportMouse.cameraPitch = var10; // L: 4708
+ SoundCache.cameraYaw = var11; // L: 4709
+ if (Client.isLoading && UrlRequest.method2557(true, false) == 0) { // L: 4710
+ Client.isLoading = false;
+ }
+
+ if (Client.isLoading) { // L: 4711
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4712
+ SequenceDefinition.drawLoadingMessage("Loading - please wait.", false); // L: 4713
+ }
+
+ } // L: 4715
+
+ @ObfuscatedName("ls")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "503977504"
+ )
+ static final void method5209(int var0, int var1) {
+ if (Client.currentClanChannels[var0] != null) { // L: 12263
+ if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3113()) { // L: 12264
+ ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12265
+ if (var2.rank == -1) {
+ PacketBufferNode var3 = EnumComposition.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 12267
+ var3.packetBuffer.writeByte(3 + ScriptEvent.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12268
+ var3.packetBuffer.writeByte(var0); // L: 12269
+ var3.packetBuffer.writeShort(var1); // L: 12270
+ var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12271
+ Client.packetWriter.addNode(var3); // L: 12272
+ }
+ }
+ }
+ } // L: 12266 12273
}
diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java
index ca554add2b..6b60dc49d9 100644
--- a/runescape-client/src/main/java/Skeleton.java
+++ b/runescape-client/src/main/java/Skeleton.java
@@ -1,36 +1,35 @@
-import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gf")
+@ObfuscatedName("gm")
@Implements("Skeleton")
public class Skeleton extends Node {
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1034195309
+ intValue = 1780002005
)
@Export("id")
int id;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -27257925
+ intValue = -64074659
)
@Export("count")
int count;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("transformTypes")
int[] transformTypes;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("labels")
int[][] labels;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Lgb;"
+ descriptor = "Lgq;"
)
- class202 field2409;
+ class201 field2376;
public Skeleton(int var1, byte[] var2) {
this.id = var1; // L: 19
@@ -54,142 +53,30 @@ public class Skeleton extends Node {
}
}
- if (var3.offset < var3.array.length) {
- var4 = var3.readUnsignedShort();
- if (var4 > 0) {
- this.field2409 = new class202(var3, var4);
+ if (var3.offset < var3.array.length) { // L: 29
+ var4 = var3.readUnsignedShort(); // L: 30
+ if (var4 > 0) { // L: 31
+ this.field2376 = new class201(var3, var4); // L: 32
}
}
- }
+ } // L: 35
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-2063510736"
+ garbageValue = "-58631089"
)
- public int method4018() {
+ public int method4148() {
return this.count; // L: 38
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lgb;",
- garbageValue = "2098752701"
+ descriptor = "(I)Lgq;",
+ garbageValue = "1269137329"
)
- public class202 method4023() {
- return this.field2409; // L: 42
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(ILnc;Lle;I)V",
- garbageValue = "-2024769656"
- )
- static void method4022(int var0, ArchiveDisk var1, Archive var2) {
- byte[] var3 = null;
- synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
- for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
- if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) {
- var3 = var5.data; // L: 34
- break;
- }
- }
- }
-
- if (var3 != null) { // L: 39
- var2.load(var1, var0, var3, true); // L: 40
- } else {
- byte[] var4 = var1.read(var0); // L: 43
- var2.load(var1, var0, var4, true); // L: 44
- }
- } // L: 41 45
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lnf;ZI)V",
- garbageValue = "-824720850"
- )
- public static void method4024(AbstractSocket var0, boolean var1) {
- if (NetCache.NetCache_socket != null) { // L: 60
- try {
- NetCache.NetCache_socket.close(); // L: 62
- } catch (Exception var6) { // L: 64
- }
-
- NetCache.NetCache_socket = null; // L: 65
- }
-
- NetCache.NetCache_socket = var0; // L: 67
- MouseRecorder.method2088(var1); // L: 68
- NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 69
- WorldMapIcon_0.NetCache_currentResponse = null; // L: 70
- class357.NetCache_responseArchiveBuffer = null; // L: 71
- NetCache.field4052 = 0; // L: 72
-
- while (true) {
- NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 74
- if (var2 == null) { // L: 75
- while (true) {
- var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 81
- if (var2 == null) { // L: 82
- if (NetCache.field4043 != 0) { // L: 88
- try {
- Buffer var7 = new Buffer(4); // L: 90
- var7.writeByte(4); // L: 91
- var7.writeByte(NetCache.field4043); // L: 92
- var7.writeShort(0); // L: 93
- NetCache.NetCache_socket.write(var7.array, 0, 4); // L: 94
- } catch (IOException var5) {
- try {
- NetCache.NetCache_socket.close(); // L: 98
- } catch (Exception var4) { // L: 100
- }
-
- ++NetCache.NetCache_ioExceptions; // L: 101
- NetCache.NetCache_socket = null; // L: 102
- }
- }
-
- NetCache.NetCache_loadTime = 0; // L: 105
- NetCache.field4041 = class113.method2624(); // L: 106
- return; // L: 107
- }
-
- NetCache.NetCache_pendingWritesQueue.addLast(var2); // L: 83
- NetCache.NetCache_pendingWrites.put(var2, var2.key); // L: 84
- ++NetCache.NetCache_pendingWritesCount; // L: 85
- --NetCache.NetCache_pendingResponsesCount; // L: 86
- }
- }
-
- NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); // L: 76
- ++NetCache.NetCache_pendingPriorityWritesCount; // L: 77
- --NetCache.NetCache_pendingPriorityResponsesCount; // L: 78
- }
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1940091052"
- )
- static int method4019(int var0, int var1) {
- ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28
- if (var2 == null) { // L: 29
- return 0;
- } else if (var1 == -1) { // L: 30
- return 0;
- } else {
- int var3 = 0; // L: 31
-
- for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32
- if (var2.ids[var4] == var1) {
- var3 += var2.quantities[var4]; // L: 33
- }
- }
-
- return var3; // L: 35
- }
+ public class201 method4150() {
+ return this.field2376; // L: 42
}
}
diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java
index 9daf504357..9dfe582855 100644
--- a/runescape-client/src/main/java/Skills.java
+++ b/runescape-client/src/main/java/Skills.java
@@ -1,18 +1,14 @@
-import java.applet.Applet;
-import java.net.URL;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import netscape.javascript.JSObject;
-@ObfuscatedName("kj")
+@ObfuscatedName("kn")
@Implements("Skills")
public class Skills {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("Skills_enabled")
public static final boolean[] Skills_enabled;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("Skills_experienceTable")
public static int[] Skills_experienceTable;
@@ -29,125 +25,4 @@ public class Skills {
}
} // L: 16
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z",
- garbageValue = "-363880091"
- )
- static boolean method5578(String var0, int var1, String var2) {
- if (var1 == 0) { // L: 63
- try {
- if (!class29.field168.startsWith("win")) { // L: 65
- throw new Exception();
- } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 66
- throw new Exception();
- } else {
- String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 67
-
- for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 68
- if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 69
- throw new Exception();
- }
- }
-
- Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 71
- return true; // L: 72
- }
- } catch (Throwable var8) { // L: 74
- return false; // L: 75
- }
- } else if (var1 == 1) { // L: 78
- try {
- Applet var7 = class29.field170; // L: 81
- Object[] var5 = new Object[]{(new URL(class29.field170.getCodeBase(), var0)).toString()}; // L: 82
- Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 85
- return var3 != null; // L: 88
- } catch (Throwable var9) { // L: 90
- return false; // L: 91
- }
- } else if (var1 == 2) { // L: 94
- try {
- class29.field170.getAppletContext().showDocument(new URL(class29.field170.getCodeBase(), var0), "_blank"); // L: 96
- return true; // L: 97
- } catch (Exception var10) { // L: 99
- return false; // L: 100
- }
- } else if (var1 == 3) { // L: 103
- try {
- class27.method370(class29.field170, "loggedout"); // L: 105
- } catch (Throwable var12) { // L: 107
- }
-
- try {
- class29.field170.getAppletContext().showDocument(new URL(class29.field170.getCodeBase(), var0), "_top"); // L: 109
- return true; // L: 110
- } catch (Exception var11) { // L: 112
- return false; // L: 113
- }
- } else {
- throw new IllegalArgumentException(); // L: 116
- }
- }
-
- @ObfuscatedName("bz")
- @ObfuscatedSignature(
- descriptor = "([BB)[B",
- garbageValue = "-45"
- )
- @Export("decompressBytes")
- static final byte[] decompressBytes(byte[] var0) {
- Buffer var1 = new Buffer(var0); // L: 370
- int var2 = var1.readUnsignedByte(); // L: 371
- int var3 = var1.readInt(); // L: 372
- if (var3 < 0 || AbstractArchive.field4026 != 0 && var3 > AbstractArchive.field4026) { // L: 373
- throw new RuntimeException(); // L: 374
- } else if (var2 == 0) { // L: 376
- byte[] var6 = new byte[var3]; // L: 377
- var1.readBytes(var6, 0, var3); // L: 378
- return var6; // L: 379
- } else {
- int var4 = var1.readInt(); // L: 382
- if (var4 >= 0 && (AbstractArchive.field4026 == 0 || var4 <= AbstractArchive.field4026)) { // L: 383
- byte[] var5 = new byte[var4]; // L: 386
- if (var2 == 1) { // L: 387
- BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
- } else {
- AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 388
- }
-
- return var5; // L: 389
- } else {
- throw new RuntimeException(); // L: 384
- }
- }
- }
-
- @ObfuscatedName("iv")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "1857636420"
- )
- @Export("resumePauseWidget")
- static void resumePauseWidget(int var0, int var1) {
- PacketBufferNode var2 = WallDecoration.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 9801
- var2.packetBuffer.writeIntME(var0); // L: 9802
- var2.packetBuffer.method7551(var1); // L: 9803
- Client.packetWriter.addNode(var2); // L: 9804
- } // L: 9805
-
- @ObfuscatedName("ky")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-224237635"
- )
- @Export("Clan_joinChat")
- static final void Clan_joinChat(String var0) {
- if (!var0.equals("")) { // L: 12447
- PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 12449
- var1.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var0)); // L: 12450
- var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12451
- Client.packetWriter.addNode(var1); // L: 12452
- }
- } // L: 12453
}
diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java
index 4a2c2d49ec..a8169eef10 100644
--- a/runescape-client/src/main/java/SoftWrapper.java
+++ b/runescape-client/src/main/java/SoftWrapper.java
@@ -3,10 +3,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("ij")
+@ObfuscatedName("ia")
@Implements("SoftWrapper")
public class SoftWrapper extends Wrapper {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("ref")
SoftReference ref;
@@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper {
this.ref = new SoftReference(var1); // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("get")
Object get() {
return this.ref.get(); // L: 15
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("isSoft")
boolean isSoft() {
return true; // L: 19
diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java
index 3fb65d9b50..72e48bd50c 100644
--- a/runescape-client/src/main/java/SoundCache.java
+++ b/runescape-client/src/main/java/SoundCache.java
@@ -1,38 +1,51 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("an")
+@ObfuscatedName("aq")
@Implements("SoundCache")
public class SoundCache {
- @ObfuscatedName("o")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "[[Lkb;"
+ )
+ @Export("Widget_interfaceComponents")
+ public static Widget[][] Widget_interfaceComponents;
+ @ObfuscatedName("jl")
+ @ObfuscatedGetter(
+ intValue = -2119317865
+ )
+ @Export("cameraYaw")
+ static int cameraYaw;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
)
@Export("soundEffectIndex")
AbstractArchive soundEffectIndex;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("musicSampleIndex")
AbstractArchive musicSampleIndex;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("musicSamples")
NodeHashTable musicSamples;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lpv;"
+ descriptor = "Lpm;"
)
@Export("rawSounds")
NodeHashTable rawSounds;
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;)V"
+ descriptor = "(Llh;Llh;)V"
)
public SoundCache(AbstractArchive var1, AbstractArchive var2) {
this.musicSamples = new NodeHashTable(256); // L: 9
@@ -41,10 +54,10 @@ public class SoundCache {
this.musicSampleIndex = var2; // L: 14
} // L: 15
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II[II)Lak;",
- garbageValue = "-317198731"
+ descriptor = "(II[IB)Laf;",
+ garbageValue = "-125"
)
@Export("getSoundEffect0")
RawSound getSoundEffect0(int var1, int var2, int[] var3) {
@@ -63,8 +76,8 @@ public class SoundCache {
} else {
var7 = var8.toRawSound(); // L: 26
this.rawSounds.put(var7, var5); // L: 27
- if (var3 != null) {
- var3[0] -= var7.samples.length; // L: 28
+ if (var3 != null) { // L: 28
+ var3[0] -= var7.samples.length;
}
return var7; // L: 29
@@ -72,10 +85,10 @@ public class SoundCache {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II[II)Lak;",
- garbageValue = "830371012"
+ descriptor = "(II[II)Laf;",
+ garbageValue = "-713616404"
)
@Export("getMusicSample0")
RawSound getMusicSample0(int var1, int var2, int[] var3) {
@@ -99,20 +112,20 @@ public class SoundCache {
}
var7 = var8.toRawSound(var3); // L: 45
- if (var7 == null) { // L: 46
+ if (var7 == null) {
return null;
} else {
- var8.remove(); // L: 47
- this.rawSounds.put(var7, var5); // L: 48
- return var7; // L: 49
+ var8.remove();
+ this.rawSounds.put(var7, var5);
+ return var7;
}
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I[II)Lak;",
- garbageValue = "-1527876593"
+ descriptor = "(I[II)Laf;",
+ garbageValue = "-1912096844"
)
@Export("getSoundEffect")
public RawSound getSoundEffect(int var1, int[] var2) {
@@ -125,10 +138,10 @@ public class SoundCache {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I[II)Lak;",
- garbageValue = "243303881"
+ descriptor = "(I[IB)Laf;",
+ garbageValue = "0"
)
@Export("getMusicSample")
public RawSound getMusicSample(int var1, int[] var2) {
@@ -143,473 +156,236 @@ public class SoundCache {
@ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lmx;Lmx;Lmx;I)V",
- garbageValue = "-417556486"
+ descriptor = "(Llh;Llh;Llh;I)V",
+ garbageValue = "1628403772"
)
- @Export("drawTitle")
- static void drawTitle(Font var0, Font var1, Font var2) {
- Login.xPadding = (GraphicsObject.canvasWidth - 765) / 2; // L: 1171
- Login.loginBoxX = Login.xPadding + 202; // L: 1172
- Decimator.loginBoxCenter = Login.loginBoxX + 180; // L: 1173
- if (Login.worldSelectOpen) { // L: 1174
- Language.method5885(var0, var1); // L: 1175
- } else {
- UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1178
- SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1179
- Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 1180
- int var4;
- if (Client.gameState == 0 || Client.gameState == 5) { // L: 1181
- byte var3 = 20; // L: 1182
- var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1183
- var4 = 253 - var3; // L: 1184
- Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1185
- Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1186
- Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1187
- Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1188
- var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1189
+ public static void method762(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+ SequenceDefinition.SequenceDefinition_archive = var0; // L: 46
+ SequenceDefinition.SequenceDefinition_animationsArchive = var1; // L: 47
+ SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; // L: 48
+ } // L: 49
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(II)Z",
+ garbageValue = "297920354"
+ )
+ public static boolean method764(int var0) {
+ return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 247 248
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(IS)Z",
+ garbageValue = "275"
+ )
+ public static boolean method753(int var0) {
+ return var0 >= 0 && var0 < 112 ? KeyHandler.field141[var0] : false; // L: 252 253
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1943432471"
+ )
+ public static void method763() {
+ WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 173
+ } // L: 174
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1304277979"
+ )
+ static void method766() {
+ class426.SpriteBuffer_xOffsets = null; // L: 234
+ class142.SpriteBuffer_yOffsets = null; // L: 235
+ class359.SpriteBuffer_spriteWidths = null; // L: 236
+ class456.SpriteBuffer_spriteHeights = null; // L: 237
+ class13.SpriteBuffer_spritePalette = null; // L: 238
+ class421.SpriteBuffer_pixels = null; // L: 239
+ } // L: 240
+
+ @ObfuscatedName("ix")
+ @ObfuscatedSignature(
+ descriptor = "(Lpq;B)V",
+ garbageValue = "41"
+ )
+ static final void method765(PacketBuffer var0) {
+ for (int var1 = 0; var1 < Client.field538; ++var1) { // L: 8067
+ int var2 = Client.field539[var1]; // L: 8068
+ NPC var3 = Client.npcs[var2]; // L: 8069
+ int var4 = var0.readUnsignedByte(); // L: 8070
+ int var5;
+ if (class101.field1366 && (var4 & 64) != 0) { // L: 8071
+ var5 = var0.readUnsignedByte(); // L: 8072
+ var4 += var5 << 8; // L: 8073
}
- String var5;
- String var7;
- String var8;
- int var9;
- char[] var10;
- int var11;
- short var25;
- int var26;
- short var27;
- if (Client.gameState == 20) { // L: 1191
- Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1192
- var25 = 201; // L: 1193
- var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1194
- var26 = var25 + 15; // L: 1195
- var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1196
- var26 += 15; // L: 1197
- var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1198
- var26 += 15; // L: 1199
- var26 += 7; // L: 1200
- if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1201
- var0.draw("Login: ", Login.loginBoxX + 180 - 110, var26, 16777215, 0); // L: 1202
- var27 = 200; // L: 1203
+ if ((var4 & 1024) != 0) { // L: 8075
+ var3.field1189 = Client.cycle + var0.method7775(); // L: 8076
+ var3.field1135 = Client.cycle + var0.method7774(); // L: 8077
+ var3.field1191 = var0.readByte(); // L: 8078
+ var3.field1192 = var0.method7769(); // L: 8079
+ var3.field1193 = var0.method7952(); // L: 8080
+ var3.field1133 = (byte)var0.method7767(); // L: 8081
+ }
- for (var5 = class168.method3253(); var0.stringWidth(var5) > var27; var5 = var5.substring(0, var5.length() - 1)) { // L: 1204 1205 1206
+ int var6;
+ int var7;
+ if ((var4 & 16) != 0) { // L: 8083
+ var5 = var0.method7774(); // L: 8084
+ if (var5 == 65535) { // L: 8085
+ var5 = -1; // L: 8086
+ }
+
+ var6 = var0.method7766(); // L: 8088
+ if (var5 == var3.sequence && var5 != -1) { // L: 8089
+ var7 = ScriptFrame.SequenceDefinition_get(var5).field2174; // L: 8090
+ if (var7 == 1) { // L: 8091
+ var3.sequenceFrame = 0; // L: 8092
+ var3.sequenceFrameCycle = 0; // L: 8093
+ var3.sequenceDelay = var6; // L: 8094
+ var3.field1190 = 0; // L: 8095
}
- var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var26, 16777215, 0); // L: 1208
- var26 += 15; // L: 1209
- var7 = Login.Login_password; // L: 1211
- var9 = var7.length(); // L: 1214
- var10 = new char[var9]; // L: 1216
-
- for (var11 = 0; var11 < var9; ++var11) { // L: 1217
- var10[var11] = '*';
+ if (var7 == 2) { // L: 8097
+ var3.field1190 = 0; // L: 8098
}
-
- var8 = new String(var10); // L: 1218
-
- for (var8 = var8; var0.stringWidth(var8) > var27; var8 = var8.substring(1)) { // L: 1222 1223 1224
- }
-
- var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var26, 16777215, 0); // L: 1226
- var26 += 15; // L: 1227
+ } else if (var5 == -1 || var3.sequence == -1 || ScriptFrame.SequenceDefinition_get(var5).field2183 >= ScriptFrame.SequenceDefinition_get(var3.sequence).field2183) { // L: 8101
+ var3.sequence = var5; // L: 8102
+ var3.sequenceFrame = 0; // L: 8103
+ var3.sequenceFrameCycle = 0; // L: 8104
+ var3.sequenceDelay = var6; // L: 8105
+ var3.field1190 = 0; // L: 8106
+ var3.field1203 = var3.pathLength; // L: 8107
}
}
- if (Client.gameState == 10 || Client.gameState == 11 || Client.gameState == 50) { // L: 1230
- Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1231
- short var19;
- if (Login.loginIndex == 0) { // L: 1232
- var25 = 251; // L: 1233
- var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1234
- var26 = var25 + 30; // L: 1235
- var4 = Login.loginBoxX + 180 - 80; // L: 1236
- var19 = 291; // L: 1237
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1238
- var0.drawLines("New User", var4 - 73, var19 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1239
- var4 = Login.loginBoxX + 180 + 80; // L: 1240
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1241
- var0.drawLines("Existing User", var4 - 73, var19 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1242
- } else if (Login.loginIndex == 1) { // L: 1244
- var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1245
- var25 = 236; // L: 1246
- var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16777215, 0); // L: 1247
- var26 = var25 + 15; // L: 1248
- var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1249
- var26 += 15; // L: 1250
- var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1251
- var26 += 15; // L: 1252
- var4 = Login.loginBoxX + 180 - 80; // L: 1253
- var19 = 321; // L: 1254
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1255
- var0.drawCentered("Continue", var4, var19 + 5, 16777215, 0); // L: 1256
- var4 = Login.loginBoxX + 180 + 80; // L: 1257
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1258
- var0.drawCentered("Cancel", var4, var19 + 5, 16777215, 0); // L: 1259
- } else {
- IndexedSprite var28;
- if (Login.loginIndex == 2) { // L: 1261
- var25 = 201; // L: 1262
- var0.drawCentered(Login.Login_response1, Decimator.loginBoxCenter, var25, 16776960, 0); // L: 1263
- var26 = var25 + 15; // L: 1264
- var0.drawCentered(Login.Login_response2, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1265
- var26 += 15; // L: 1266
- var0.drawCentered(Login.Login_response3, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1267
- var26 += 15; // L: 1268
- var26 += 7; // L: 1269
- var0.draw("Login: ", Decimator.loginBoxCenter - 110, var26, 16777215, 0); // L: 1270
- var27 = 200; // L: 1271
+ if ((var4 & 2) != 0) { // L: 8111
+ var3.spotAnimation = var0.method7775(); // L: 8112
+ var5 = var0.method7785(); // L: 8113
+ var3.spotAnimationHeight = var5 >> 16; // L: 8114
+ var3.field1178 = (var5 & 65535) + Client.cycle; // L: 8115
+ var3.spotAnimationFrame = 0; // L: 8116
+ var3.spotAnimationFrameCycle = 0; // L: 8117
+ if (var3.field1178 > Client.cycle) { // L: 8118
+ var3.spotAnimationFrame = -1;
+ }
- for (var5 = class168.method3253(); var0.stringWidth(var5) > var27; var5 = var5.substring(1)) { // L: 1272 1273 1274
- }
+ if (var3.spotAnimation == 65535) { // L: 8119
+ var3.spotAnimation = -1;
+ }
+ }
- var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Decimator.loginBoxCenter - 70, var26, 16777215, 0); // L: 1276
- var26 += 15; // L: 1277
- var7 = Login.Login_password; // L: 1279
- var9 = var7.length(); // L: 1282
- var10 = new char[var9]; // L: 1284
-
- for (var11 = 0; var11 < var9; ++var11) { // L: 1285
- var10[var11] = '*';
- }
-
- var8 = new String(var10); // L: 1286
-
- for (var8 = var8; var0.stringWidth(var8) > var27; var8 = var8.substring(1)) { // L: 1290 1291 1292
- }
-
- var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Decimator.loginBoxCenter - 108, var26, 16777215, 0); // L: 1294
- var26 += 15; // L: 1295
- var25 = 277; // L: 1296
- var9 = Decimator.loginBoxCenter + -117; // L: 1297
- boolean var29 = Client.Login_isUsernameRemembered; // L: 1299
- boolean var12 = Login.field879; // L: 1300
- var28 = var29 ? (var12 ? UrlRequester.field1354 : class101.options_buttons_2Sprite) : (var12 ? Login.field888 : class67.options_buttons_0Sprite); // L: 1302
- var28.drawAt(var9, var25); // L: 1305
- var9 = var9 + var28.subWidth + 5; // L: 1306
- var1.draw("Remember username", var9, var25 + 13, 16776960, 0); // L: 1307
- var9 = Decimator.loginBoxCenter + 24; // L: 1308
- boolean var15 = class12.clientPreferences.method2257(); // L: 1310
- boolean var16 = Login.field881; // L: 1311
- IndexedSprite var14 = var15 ? (var16 ? UrlRequester.field1354 : class101.options_buttons_2Sprite) : (var16 ? Login.field888 : class67.options_buttons_0Sprite); // L: 1313
- var14.drawAt(var9, var25); // L: 1316
- var9 = var9 + var14.subWidth + 5; // L: 1317
- var1.draw("Hide username", var9, var25 + 13, 16776960, 0); // L: 1318
- var26 = var25 + 15; // L: 1319
- int var17 = Decimator.loginBoxCenter - 80; // L: 1320
- short var18 = 321; // L: 1321
- Login.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); // L: 1322
- var0.drawCentered("Login", var17, var18 + 5, 16777215, 0); // L: 1323
- var17 = Decimator.loginBoxCenter + 80; // L: 1324
- Login.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); // L: 1325
- var0.drawCentered("Cancel", var17, var18 + 5, 16777215, 0); // L: 1326
- var25 = 357; // L: 1327
- switch(Login.field907) { // L: 1328
- case 2:
- class17.field89 = "Having trouble logging in?"; // L: 1333
- break;
- default:
- class17.field89 = "Can't login? Click here."; // L: 1330
- }
-
- ChatChannel.field976 = new Bounds(Decimator.loginBoxCenter, var25, var1.stringWidth(class17.field89), 11); // L: 1336
- ChatChannel.field977 = new Bounds(Decimator.loginBoxCenter, var25, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1337
- var1.drawCentered(class17.field89, Decimator.loginBoxCenter, var25, 16777215, 0); // L: 1338
- } else if (Login.loginIndex == 3) { // L: 1340
- var25 = 201; // L: 1341
- var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1342
- var26 = var25 + 20; // L: 1343
- var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1344
- var26 += 15; // L: 1345
- var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1346
- var26 += 15; // L: 1347
- var4 = Login.loginBoxX + 180; // L: 1348
- var19 = 276; // L: 1349
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1350
- var2.drawCentered("Try again", var4, var19 + 5, 16777215, 0); // L: 1351
- var4 = Login.loginBoxX + 180; // L: 1352
- var19 = 326; // L: 1353
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1354
- var2.drawCentered("Forgotten password?", var4, var19 + 5, 16777215, 0); // L: 1355
- } else if (Login.loginIndex == 4) { // L: 1357
- var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1358
- var25 = 236; // L: 1359
- var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16777215, 0); // L: 1360
- var26 = var25 + 15; // L: 1361
- var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1362
- var26 += 15; // L: 1363
- var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1364
- var26 += 15; // L: 1365
- var5 = "PIN: "; // L: 1367
- var7 = class92.otp; // L: 1369
- var9 = var7.length(); // L: 1372
- var10 = new char[var9]; // L: 1374
-
- for (var11 = 0; var11 < var9; ++var11) { // L: 1375
- var10[var11] = '*';
- }
-
- var8 = new String(var10); // L: 1376
- var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var26, 16777215, 0); // L: 1380
- var26 -= 8; // L: 1381
- var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var26, 16776960, 0); // L: 1382
- var26 += 15; // L: 1383
- var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var26, 16776960, 0); // L: 1384
- int var22 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1385
- var9 = var26 - var0.ascent; // L: 1386
- if (Login.field900) { // L: 1388
- var28 = class101.options_buttons_2Sprite; // L: 1389
+ int var8;
+ if ((var4 & 32) != 0) { // L: 8121
+ var5 = var0.readUnsignedByte(); // L: 8122
+ int var9;
+ int var10;
+ int var11;
+ if (var5 > 0) { // L: 8123
+ for (var6 = 0; var6 < var5; ++var6) { // L: 8124
+ var8 = -1; // L: 8126
+ var9 = -1; // L: 8127
+ var10 = -1; // L: 8128
+ var7 = var0.readUShortSmart(); // L: 8129
+ if (var7 == 32767) { // L: 8130
+ var7 = var0.readUShortSmart(); // L: 8131
+ var9 = var0.readUShortSmart(); // L: 8132
+ var8 = var0.readUShortSmart(); // L: 8133
+ var10 = var0.readUShortSmart(); // L: 8134
+ } else if (var7 != 32766) { // L: 8136
+ var9 = var0.readUShortSmart(); // L: 8137
} else {
- var28 = class67.options_buttons_0Sprite; // L: 1392
+ var7 = -1; // L: 8139
}
- var28.drawAt(var22, var9); // L: 1394
- var26 += 15; // L: 1395
- var11 = Login.loginBoxX + 180 - 80; // L: 1396
- short var30 = 321; // L: 1397
- Login.titlebuttonSprite.drawAt(var11 - 73, var30 - 20); // L: 1398
- var0.drawCentered("Continue", var11, var30 + 5, 16777215, 0); // L: 1399
- var11 = Login.loginBoxX + 180 + 80; // L: 1400
- Login.titlebuttonSprite.drawAt(var11 - 73, var30 - 20); // L: 1401
- var0.drawCentered("Cancel", var11, var30 + 5, 16777215, 0); // L: 1402
- var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var30 + 36, 255, 0); // L: 1403
- } else if (Login.loginIndex == 5) { // L: 1405
- var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1406
- var25 = 221; // L: 1407
- var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1408
- var26 = var25 + 15; // L: 1409
- var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1410
- var26 += 15; // L: 1411
- var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1412
- var26 += 15; // L: 1413
- var26 += 14; // L: 1414
- var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var26, 16777215, 0); // L: 1415
- var27 = 174; // L: 1416
+ var11 = var0.readUShortSmart(); // L: 8140
+ var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 8141
+ }
+ }
- for (var5 = class168.method3253(); var0.stringWidth(var5) > var27; var5 = var5.substring(1)) { // L: 1417 1418 1419
- }
-
- var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class166.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var26, 16777215, 0); // L: 1421
- var26 += 15; // L: 1422
- int var23 = Login.loginBoxX + 180 - 80; // L: 1423
- short var21 = 321; // L: 1424
- Login.titlebuttonSprite.drawAt(var23 - 73, var21 - 20); // L: 1425
- var0.drawCentered("Recover", var23, var21 + 5, 16777215, 0); // L: 1426
- var23 = Login.loginBoxX + 180 + 80; // L: 1427
- Login.titlebuttonSprite.drawAt(var23 - 73, var21 - 20); // L: 1428
- var0.drawCentered("Back", var23, var21 + 5, 16777215, 0); // L: 1429
- var21 = 356; // L: 1430
- var1.drawCentered("Still having trouble logging in?", Decimator.loginBoxCenter, var21, 268435455, 0); // L: 1431
- } else if (Login.loginIndex == 6) { // L: 1433
- var25 = 201; // L: 1434
- var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1435
- var26 = var25 + 15; // L: 1436
- var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1437
- var26 += 15; // L: 1438
- var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1439
- var26 += 15; // L: 1440
- var4 = Login.loginBoxX + 180; // L: 1441
- var19 = 321; // L: 1442
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1443
- var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1444
- } else if (Login.loginIndex == 7) { // L: 1446
- if (class92.field1273 && !Client.onMobile) { // L: 1447
- var25 = 201; // L: 1448
- var0.drawCentered(Login.Login_response1, Decimator.loginBoxCenter, var25, 16776960, 0); // L: 1449
- var26 = var25 + 15; // L: 1450
- var0.drawCentered(Login.Login_response2, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1451
- var26 += 15; // L: 1452
- var0.drawCentered(Login.Login_response3, Decimator.loginBoxCenter, var26, 16776960, 0); // L: 1453
- var4 = Decimator.loginBoxCenter - 150; // L: 1454
- var26 += 10; // L: 1455
-
- int var31;
- for (var31 = 0; var31 < 8; ++var31) { // L: 1456
- Login.titlebuttonSprite.method7927(var4, var26, 30, 40); // L: 1457
- boolean var35 = var31 == Login.field896 & Client.cycle % 40 < 20; // L: 1458
- var0.draw((Login.field876[var31] == null ? "" : Login.field876[var31]) + (var35 ? class166.colorStartTag(16776960) + "|" : ""), var4 + 10, var26 + 27, 16777215, 0); // L: 1459
- if (var31 != 1 && var31 != 3) { // L: 1460
- var4 += 35; // L: 1465
- } else {
- var4 += 50; // L: 1461
- var0.draw(AbstractFont.escapeBrackets("/"), var4 - 13, var26 + 27, 16777215, 0); // L: 1462
- }
- }
-
- var31 = Decimator.loginBoxCenter - 80; // L: 1468
- short var36 = 321; // L: 1469
- Login.titlebuttonSprite.drawAt(var31 - 73, var36 - 20); // L: 1470
- var0.drawCentered("Submit", var31, var36 + 5, 16777215, 0); // L: 1471
- var31 = Decimator.loginBoxCenter + 80; // L: 1472
- Login.titlebuttonSprite.drawAt(var31 - 73, var36 - 20); // L: 1473
- var0.drawCentered("Cancel", var31, var36 + 5, 16777215, 0); // L: 1474
+ var6 = var0.readUnsignedByte(); // L: 8144
+ if (var6 > 0) { // L: 8145
+ for (var7 = 0; var7 < var6; ++var7) { // L: 8146
+ var8 = var0.readUShortSmart(); // L: 8147
+ var9 = var0.readUShortSmart(); // L: 8148
+ if (var9 != 32767) { // L: 8149
+ var10 = var0.readUShortSmart(); // L: 8150
+ var11 = var0.method7767(); // L: 8151
+ int var12 = var9 > 0 ? var0.method7767() : var11; // L: 8152
+ var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 8153
} else {
- var25 = 216; // L: 1477
- var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1478
- var26 = var25 + 15; // L: 1479
- var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1480
- var26 += 15; // L: 1481
- var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1482
- var26 += 15; // L: 1483
- var4 = Login.loginBoxX + 180 - 80; // L: 1484
- var19 = 321; // L: 1485
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1486
- var0.drawCentered("Set Date of Birth", var4, var19 + 5, 16777215, 0); // L: 1487
- var4 = Login.loginBoxX + 180 + 80; // L: 1488
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1489
- var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1490
+ var3.removeHealthBar(var8); // L: 8155
}
- } else if (Login.loginIndex == 8) { // L: 1493
- var25 = 216; // L: 1494
- var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1495
- var26 = var25 + 15; // L: 1496
- var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1497
- var26 += 15; // L: 1498
- var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1499
- var26 += 15; // L: 1500
- var4 = Login.loginBoxX + 180 - 80; // L: 1501
- var19 = 321; // L: 1502
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1503
- var0.drawCentered("Privacy Policy", var4, var19 + 5, 16777215, 0); // L: 1504
- var4 = Login.loginBoxX + 180 + 80; // L: 1505
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1506
- var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1507
- } else if (Login.loginIndex == 9) { // L: 1509
- var25 = 221; // L: 1510
- var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1511
- var26 = var25 + 25; // L: 1512
- var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1513
- var26 += 25; // L: 1514
- var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1515
- var4 = Login.loginBoxX + 180; // L: 1516
- var19 = 311; // L: 1517
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1518
- var0.drawCentered("Try again", var4, var19 + 5, 16777215, 0); // L: 1519
- } else if (Login.loginIndex == 10) { // L: 1521
- var26 = Login.loginBoxX + 180; // L: 1522
- var27 = 209; // L: 1523
- var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var27, 16776960, 0); // L: 1524
- var4 = var27 + 20; // L: 1525
- Clock.field1839.drawAt(var26 - 109, var4); // L: 1526
- Login.field882.drawAt(var26 - 48, var4 + 18); // L: 1527
- } else if (Login.loginIndex == 12) { // L: 1529
- var26 = Decimator.loginBoxCenter; // L: 1530
- var27 = 216; // L: 1531
- var2.drawCentered("Before using this app, please read and accept our", var26, var27, 16777215, 0); // L: 1532
- var4 = var27 + 17; // L: 1533
- var2.drawCentered("terms of use, privacy policy, and end user licence", var26, var4, 16777215, 0); // L: 1534
- var4 += 17; // L: 1535
- var2.drawCentered("agreement (EULA).", var26, var4, 16777215, 0); // L: 1536
- var4 += 17; // L: 1537
- var2.drawCentered("By accepting, you agree to these documents.", var26, var4, 16777215, 0); // L: 1538
- var26 = Decimator.loginBoxCenter - 80; // L: 1539
- var27 = 311; // L: 1540
- Login.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); // L: 1541
- var0.drawCentered("Accept", var26, var27 + 5, 16777215, 0); // L: 1542
- var26 = Decimator.loginBoxCenter + 80; // L: 1543
- Login.titlebuttonSprite.drawAt(var26 - 73, var27 - 20); // L: 1544
- var0.drawCentered("Decline", var26, var27 + 5, 16777215, 0); // L: 1545
- } else if (Login.loginIndex == 13) { // L: 1547
- var25 = 231; // L: 1548
- var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var25, 16777215, 0); // L: 1549
- var26 = var25 + 20; // L: 1550
- var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var26, 16777215, 0); // L: 1551
- var4 = Login.loginBoxX + 180; // L: 1552
- var25 = 311; // L: 1553
- Login.titlebuttonSprite.drawAt(var4 - 73, var25 - 20); // L: 1554
- var0.drawCentered("Back", var4, var25 + 5, 16777215, 0); // L: 1555
- } else if (Login.loginIndex == 14) { // L: 1557
- var25 = 201; // L: 1558
- String var20 = ""; // L: 1559
- var5 = ""; // L: 1560
- String var6 = ""; // L: 1561
- switch(Login.field887) { // L: 1562
- case 0:
- var20 = "Your account has been disabled."; // L: 1577
- var5 = Strings.field3689; // L: 1578
- var6 = ""; // L: 1579
- break;
- case 1:
- var20 = "Account locked as we suspect it has been stolen."; // L: 1565
- var5 = Strings.field3743; // L: 1566
- var6 = ""; // L: 1567
- break;
- default:
- PcmPlayer.Login_promptCredentials(false); // L: 1572
- }
-
- var0.drawCentered(var20, Login.loginBoxX + 180, var25, 16776960, 0); // L: 1583
- var26 = var25 + 15; // L: 1584
- var2.drawCentered(var5, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1585
- var26 += 15; // L: 1586
- var2.drawCentered(var6, Login.loginBoxX + 180, var26, 16776960, 0); // L: 1587
- var26 += 15; // L: 1588
- int var32 = Login.loginBoxX + 180; // L: 1589
- short var33 = 276; // L: 1590
- Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); // L: 1591
- var0.drawCentered("Support Page", var32, var33 + 5, 16777215, 0); // L: 1592
- var32 = Login.loginBoxX + 180; // L: 1593
- var33 = 326; // L: 1594
- Login.titlebuttonSprite.drawAt(var32 - 73, var33 - 20); // L: 1595
- var0.drawCentered("Back", var32, var33 + 5, 16777215, 0); // L: 1596
- } else if (Login.loginIndex == 24) { // L: 1598
- var25 = 221; // L: 1599
- var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var25, 16777215, 0); // L: 1600
- var26 = var25 + 15; // L: 1601
- var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1602
- var26 += 15; // L: 1603
- var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var26, 16777215, 0); // L: 1604
- var26 += 15; // L: 1605
- var4 = Login.loginBoxX + 180; // L: 1606
- var19 = 301; // L: 1607
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1608
- var0.drawCentered("Ok", var4, var19 + 5, 16777215, 0); // L: 1609
- } else if (Login.loginIndex == 26) { // L: 1611
- var25 = 216; // L: 1612
- var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1613
- var26 = var25 + 15; // L: 1614
- var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1615
- var26 += 15; // L: 1616
- var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var26, 16776960, 0); // L: 1617
- var26 += 15; // L: 1618
- var4 = Login.loginBoxX + 180 - 80; // L: 1619
- var19 = 321; // L: 1620
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1621
- var0.drawCentered("Set Date of Birth", var4, var19 + 5, 16777215, 0); // L: 1622
- var4 = Login.loginBoxX + 180 + 80; // L: 1623
- Login.titlebuttonSprite.drawAt(var4 - 73, var19 - 20); // L: 1624
- var0.drawCentered("Back", var4, var19 + 5, 16777215, 0); // L: 1625
}
}
}
- if (Client.gameState >= 10) { // L: 1628
- int[] var24 = new int[4]; // L: 1629
- Rasterizer2D.Rasterizer2D_getClipArray(var24); // L: 1630
- Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class433.canvasHeight); // L: 1631
- class193.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1632
- class193.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1633
- Rasterizer2D.Rasterizer2D_setClipArray(var24); // L: 1634
+ if ((var4 & 512) != 0) { // L: 8159
+ var3.method2373(var0.readStringCp1252NullTerminated()); // L: 8160
}
- class358.title_muteSprite[class12.clientPreferences.method2226() ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1636
- if (Client.gameState > 5 && class263.clientLanguage == Language.Language_EN) { // L: 1637
- if (ArchiveDiskAction.field3997 != null) { // L: 1638
- var26 = Login.xPadding + 5; // L: 1639
- var27 = 463; // L: 1640
- byte var34 = 100; // L: 1641
- byte var37 = 35; // L: 1642
- ArchiveDiskAction.field3997.drawAt(var26, var27); // L: 1643
- var0.drawCentered("World" + " " + Client.worldId, var34 / 2 + var26, var37 / 2 + var27 - 2, 16777215, 0); // L: 1644
- if (NPC.World_request != null) { // L: 1645
- var1.drawCentered("Loading...", var34 / 2 + var26, var37 / 2 + var27 + 12, 16777215, 0);
- } else {
- var1.drawCentered("Click to switch", var34 / 2 + var26, var37 / 2 + var27 + 12, 16777215, 0); // L: 1646
- }
- } else {
- ArchiveDiskAction.field3997 = JagexCache.SpriteBuffer_getIndexedSpriteByName(class305.archive8, "sl_button", ""); // L: 1649
+ if ((var4 & 2048) != 0) { // L: 8162
+ var3.field1204 = var0.method7787(); // L: 8163
+ }
+
+ if ((var4 & 8) != 0) { // L: 8165
+ var3.definition = BuddyRankComparator.getNpcDefinition(var0.method7776()); // L: 8166
+ var3.field1205 = var3.definition.size; // L: 8167
+ var3.field1129 = var3.definition.rotation; // L: 8168
+ var3.walkSequence = var3.definition.walkSequence; // L: 8169
+ var3.walkBackSequence = var3.definition.walkBackSequence; // L: 8170
+ var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 8171
+ var3.walkRightSequence = var3.definition.walkRightSequence; // L: 8172
+ var3.idleSequence = var3.definition.idleSequence; // L: 8173
+ var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 8174
+ var3.turnRightSequence = var3.definition.turnRightSequence; // L: 8175
+ }
+
+ if ((var4 & 128) != 0) { // L: 8177
+ var3.targetIndex = var0.method7776(); // L: 8178
+ if (var3.targetIndex == 65535) { // L: 8179
+ var3.targetIndex = -1;
}
}
+ if (class101.field1366 && (var4 & 256) != 0 || !class101.field1366 && (var4 & 64) != 0) { // L: 8181
+ var3.field1140 = var0.method7952(); // L: 8182
+ var3.field1182 = var0.method7769(); // L: 8183
+ var3.field1181 = var0.method7768(); // L: 8184
+ var3.field1183 = var0.method7768(); // L: 8185
+ var3.field1184 = var0.method7776() + Client.cycle; // L: 8186
+ var3.field1194 = var0.method7775() + Client.cycle; // L: 8187
+ var3.field1186 = var0.method7776(); // L: 8188
+ var3.pathLength = 1; // L: 8189
+ var3.field1203 = 0; // L: 8190
+ var3.field1140 += var3.pathX[0]; // L: 8191
+ var3.field1182 += var3.pathY[0]; // L: 8192
+ var3.field1181 += var3.pathX[0]; // L: 8193
+ var3.field1183 += var3.pathY[0]; // L: 8194
+ }
+
+ if ((var4 & 1) != 0) { // L: 8196
+ var5 = var0.method7776(); // L: 8197
+ var6 = var0.method7775(); // L: 8198
+ if (class101.field1366) { // L: 8199
+ var3.field1161 = var0.method7766() == 1; // L: 8200
+ }
+
+ var7 = var3.x - (var5 - class28.baseX - class28.baseX) * 64; // L: 8202
+ var8 = var3.y - (var6 - WorldMapLabelSize.baseY - WorldMapLabelSize.baseY) * 64; // L: 8203
+ if (var7 != 0 || var8 != 0) { // L: 8204
+ var3.field1165 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
+ }
+ }
+
+ if ((var4 & 4) != 0) { // L: 8206
+ var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 8207
+ var3.overheadTextCyclesRemaining = 100; // L: 8208
+ }
}
- } // L: 1176 1652
+
+ } // L: 8211
}
diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java
index 2e8103a7af..0e7d5ff76c 100644
--- a/runescape-client/src/main/java/SoundEffect.java
+++ b/runescape-client/src/main/java/SoundEffect.java
@@ -3,24 +3,24 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("au")
+@ObfuscatedName("an")
@Implements("SoundEffect")
public class SoundEffect {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "[Lbk;"
+ descriptor = "[Lbp;"
)
@Export("instruments")
Instrument[] instruments;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("start")
int start;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("end")
int end;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
SoundEffect(Buffer var1) {
this.instruments = new Instrument[10]; // L: 10
@@ -38,9 +38,9 @@ public class SoundEffect {
this.end = var1.readUnsignedShort(); // L: 29
} // L: 30
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "()Lak;"
+ descriptor = "()Laf;"
)
@Export("toRawSound")
public RawSound toRawSound() {
@@ -48,7 +48,7 @@ public class SoundEffect {
return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("calculateDelay")
public final int calculateDelay() {
int var1 = 9999999; // L: 38
@@ -83,7 +83,7 @@ public class SoundEffect {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("mix")
final byte[] mix() {
int var1 = 0; // L: 57
@@ -122,9 +122,9 @@ public class SoundEffect {
}
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;II)Lau;"
+ descriptor = "(Llh;II)Lan;"
)
@Export("readSoundEffect")
public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) {
diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java
index 2d34e9f8b3..6d0755e612 100644
--- a/runescape-client/src/main/java/SoundEnvelope.java
+++ b/runescape-client/src/main/java/SoundEnvelope.java
@@ -3,42 +3,42 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("aq")
+@ObfuscatedName("at")
@Implements("SoundEnvelope")
public class SoundEnvelope {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("segments")
int segments;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("durations")
int[] durations;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("phases")
int[] phases;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("start")
int start;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("end")
int end;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("form")
int form;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("ticks")
int ticks;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("phaseIndex")
int phaseIndex;
- @ObfuscatedName("r")
- @Export("step")
- int step;
- @ObfuscatedName("v")
- @Export("amplitude")
- int amplitude;
@ObfuscatedName("y")
@Export("max")
int max;
+ @ObfuscatedName("i")
+ @Export("step")
+ int step;
+ @ObfuscatedName("s")
+ @Export("amplitude")
+ int amplitude;
SoundEnvelope() {
this.segments = 2; // L: 21
@@ -50,9 +50,9 @@ public class SoundEnvelope {
this.phases[1] = 65535; // L: 27
} // L: 28
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
@Export("decode")
final void decode(Buffer var1) {
@@ -62,9 +62,9 @@ public class SoundEnvelope {
this.decodeSegments(var1); // L: 34
} // L: 35
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
@Export("decodeSegments")
final void decodeSegments(Buffer var1) {
@@ -79,7 +79,7 @@ public class SoundEnvelope {
} // L: 45
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("reset")
final void reset() {
this.ticks = 0; // L: 48
@@ -89,7 +89,7 @@ public class SoundEnvelope {
this.max = 0; // L: 52
} // L: 53
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("doStep")
final int doStep(int var1) {
if (this.max >= this.ticks) { // L: 56
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index 61a8a4519d..5d858343e4 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -1,28 +1,22 @@
+import java.util.Iterator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("ad")
+@ObfuscatedName("ag")
@Implements("SoundSystem")
public class SoundSystem implements Runnable {
- @ObfuscatedName("iw")
+ @ObfuscatedName("ui")
+ static Iterator field312;
+ @ObfuscatedName("nt")
@ObfuscatedSignature(
- descriptor = "Lqr;"
+ descriptor = "Lkb;"
)
- @Export("compass")
- static SpritePixels compass;
- @ObfuscatedName("po")
- @ObfuscatedGetter(
- intValue = -2095633831
- )
- @Export("widgetDragDuration")
- static int widgetDragDuration;
- @ObfuscatedName("o")
+ static Widget field313;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "[Lal;"
+ descriptor = "[Lar;"
)
@Export("players")
volatile PcmPlayer[] players;
@@ -40,153 +34,158 @@ public class SoundSystem implements Runnable {
}
}
} catch (Exception var4) { // L: 17
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var4); // L: 18
+ class249.RunException_sendStackTrace((String)null, var4); // L: 18
}
} // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IIIB)Lqr;",
- garbageValue = "19"
+ descriptor = "(I)[Lky;",
+ garbageValue = "-236959023"
)
- static SpritePixels method774(int var0, int var1, int var2) {
- DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38
- long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41
- return (SpritePixels)var3.get(var4); // L: 43
+ @Export("PlayerType_values")
+ public static PlayerType[] PlayerType_values() {
+ return new PlayerType[]{PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman, PlayerType.field3959, PlayerType.PlayerType_jagexModerator, PlayerType.field3949, PlayerType.PlayerType_ultimateIronman, PlayerType.field3952, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3958, PlayerType.field3951, PlayerType.field3954, PlayerType.field3957, PlayerType.field3956, PlayerType.PlayerType_normal, PlayerType.field3960, PlayerType.field3945}; // L: 29
}
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1284020216"
+ descriptor = "(Llh;II)V",
+ garbageValue = "1978245093"
)
- static int method777(int var0, Script var1, boolean var2) {
- int var4;
- int var9;
- if (var0 == ScriptOpcodes.CC_CREATE) { // L: 478
- class12.Interpreter_intStackSize -= 3; // L: 479
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 480
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 481
- int var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 482
- if (var4 == 0) { // L: 483
- throw new RuntimeException(); // L: 484
- } else {
- Widget var6 = class92.getWidget(var9); // L: 486
- if (var6.children == null) { // L: 487
- var6.children = new Widget[var11 + 1];
- }
-
- if (var6.children.length <= var11) { // L: 488
- Widget[] var7 = new Widget[var11 + 1]; // L: 489
-
- for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 490
- var7[var8] = var6.children[var8];
- }
-
- var6.children = var7; // L: 491
- }
-
- if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 493
- throw new RuntimeException("" + (var11 - 1));
- } else {
- Widget var12 = new Widget(); // L: 494
- var12.type = var4; // L: 495
- var12.parentId = var12.id = var6.id; // L: 496
- var12.childIndex = var11; // L: 497
- var12.isIf3 = true; // L: 498
- var6.children[var11] = var12; // L: 499
- if (var2) { // L: 500
- Interpreter.scriptDotWidget = var12;
- } else {
- KeyHandler.scriptActiveWidget = var12; // L: 501
- }
-
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var6); // L: 502
- return 1; // L: 503
- }
- }
+ static void method739(AbstractArchive var0, int var1) {
+ if ((var1 & 536870912) != 0) { // L: 286
+ Login.logoSprite = class421.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 287
+ } else if ((var1 & 1073741824) != 0) { // L: 289
+ Login.logoSprite = class421.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 290
} else {
- Widget var3;
- if (var0 == ScriptOpcodes.CC_DELETE) { // L: 505
- var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 506
- Widget var10 = class92.getWidget(var3.id); // L: 507
- var10.children[var3.childIndex] = null; // L: 508
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 509
- return 1; // L: 510
- } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 512
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 513
- var3.children = null; // L: 514
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 515
- return 1; // L: 516
- } else if (var0 == 103) { // L: 518
- class12.Interpreter_intStackSize -= 3; // L: 519
- return 1; // L: 520
- } else if (var0 == 104) { // L: 522
- --class12.Interpreter_intStackSize; // L: 523
- return 1; // L: 524
- } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 526
- if (var0 == ScriptOpcodes.IF_FIND) { // L: 539
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 540
- if (var3 != null) { // L: 541
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 542
- if (var2) { // L: 543
- Interpreter.scriptDotWidget = var3;
- } else {
- KeyHandler.scriptActiveWidget = var3; // L: 544
- }
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 546
- }
+ Login.logoSprite = class421.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 293
+ }
- return 1; // L: 547
- } else if (var0 == 202) { // L: 549
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] = 0; // L: 550
- return 1; // L: 551
- } else if (var0 == 203) { // L: 553
- Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize + 1] = 0; // L: 554
- return 1; // L: 555
+ } // L: 295
+
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(III)I",
+ garbageValue = "939387682"
+ )
+ static final int method740(int var0, int var1) {
+ int var2 = WorldMapIcon_1.method4594(var0 - 1, var1 - 1) + WorldMapIcon_1.method4594(1 + var0, var1 - 1) + WorldMapIcon_1.method4594(var0 - 1, var1 + 1) + WorldMapIcon_1.method4594(var0 + 1, 1 + var1); // L: 905
+ int var3 = WorldMapIcon_1.method4594(var0 - 1, var1) + WorldMapIcon_1.method4594(1 + var0, var1) + WorldMapIcon_1.method4594(var0, var1 - 1) + WorldMapIcon_1.method4594(var0, 1 + var1); // L: 906
+ int var4 = WorldMapIcon_1.method4594(var0, var1); // L: 907
+ return var2 / 16 + var3 / 8 + var4 / 4; // L: 908
+ }
+
+ @ObfuscatedName("bx")
+ @ObfuscatedSignature(
+ descriptor = "([BB)[B",
+ garbageValue = "-44"
+ )
+ @Export("decompressBytes")
+ static final byte[] decompressBytes(byte[] var0) {
+ Buffer var1 = new Buffer(var0); // L: 382
+ int var2 = var1.readUnsignedByte(); // L: 383
+ int var3 = var1.readInt(); // L: 384
+ if (var3 < 0 || AbstractArchive.field4012 != 0 && var3 > AbstractArchive.field4012) { // L: 385
+ throw new RuntimeException(); // L: 386
+ } else if (var2 == 0) { // L: 388
+ byte[] var6 = new byte[var3]; // L: 389
+ var1.readBytes(var6, 0, var3); // L: 390
+ return var6; // L: 391
+ } else {
+ int var4 = var1.readInt(); // L: 394
+ if (var4 >= 0 && (AbstractArchive.field4012 == 0 || var4 <= AbstractArchive.field4012)) { // L: 395
+ byte[] var5 = new byte[var4]; // L: 398
+ if (var2 == 1) { // L: 399
+ BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
} else {
- return 2; // L: 557
+ AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 400
}
+
+ return var5; // L: 401
} else {
- class12.Interpreter_intStackSize -= 2; // L: 527
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 528
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 529
- Widget var5 = ApproximateRouteStrategy.getWidgetChild(var9, var4); // L: 530
- if (var5 != null && var4 != -1) { // L: 531
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 532
- if (var2) { // L: 533
- Interpreter.scriptDotWidget = var5;
- } else {
- KeyHandler.scriptActiveWidget = var5; // L: 534
- }
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 536
- }
-
- return 1; // L: 537
+ throw new RuntimeException(); // L: 396
}
}
}
- @ObfuscatedName("c")
+ @ObfuscatedName("fo")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-583915205"
+ garbageValue = "-2037281423"
)
- public static void method780() {
- HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 177
- HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 178
- HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 179
- } // L: 180
+ static void method736() {
+ Client.packetWriter.clearBuffer(); // L: 2758
+ Client.packetWriter.packetBuffer.offset = 0; // L: 2759
+ Client.packetWriter.serverPacket = null; // L: 2760
+ Client.packetWriter.field1350 = null; // L: 2761
+ Client.packetWriter.field1347 = null; // L: 2762
+ Client.packetWriter.field1352 = null; // L: 2763
+ Client.packetWriter.serverPacketLength = 0; // L: 2764
+ Client.packetWriter.field1342 = 0; // L: 2765
+ Client.rebootTimer = 0; // L: 2766
+ class125.method2824(); // L: 2767
+ Client.minimapState = 0; // L: 2768
+ Client.destinationX = 0; // L: 2769
- @ObfuscatedName("gg")
+ int var0;
+ for (var0 = 0; var0 < 2048; ++var0) { // L: 2770
+ Client.players[var0] = null;
+ }
+
+ class101.localPlayer = null; // L: 2771
+
+ for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2772
+ NPC var1 = Client.npcs[var0]; // L: 2773
+ if (var1 != null) { // L: 2774
+ var1.targetIndex = -1; // L: 2775
+ var1.false0 = false; // L: 2776
+ }
+ }
+
+ class125.method2830(); // L: 2779
+ HealthBarUpdate.updateGameState(30); // L: 2780
+
+ for (var0 = 0; var0 < 100; ++var0) { // L: 2781
+ Client.field703[var0] = true;
+ }
+
+ SpriteMask.method5522(); // L: 2782
+ } // L: 2783
+
+ @ObfuscatedName("ft")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "1"
+ descriptor = "(IIIB)V",
+ garbageValue = "-73"
)
- static boolean method779() {
- return (Client.drawPlayerNames & 1) != 0; // L: 5008
- }
+ @Export("queueSoundEffect")
+ static void queueSoundEffect(int var0, int var1, int var2) {
+ if (class19.clientPreferences.method2241() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3747
+ Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3748
+ Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3749
+ Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3750
+ Client.soundEffects[Client.soundEffectCount] = null; // L: 3751
+ Client.soundLocations[Client.soundEffectCount] = 0; // L: 3752
+ ++Client.soundEffectCount; // L: 3753
+ }
+
+ } // L: 3755
+
+ @ObfuscatedName("fq")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-735322936"
+ )
+ static final void method743() {
+ if (Projectile.ClanChat_inClanChat) { // L: 3785
+ if (Huffman.friendsChat != null) { // L: 3786
+ Huffman.friendsChat.sort(); // L: 3787
+ }
+
+ class161.method3287(); // L: 3789
+ Projectile.ClanChat_inClanChat = false; // L: 3790
+ }
+
+ } // L: 3792
}
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index 3b830373a7..44df9f7e45 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -4,84 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fw")
+@ObfuscatedName("fx")
@Implements("SpotAnimationDefinition")
public class SpotAnimationDefinition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("SpotAnimationDefinition_archive")
public static AbstractArchive SpotAnimationDefinition_archive;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("SpotAnimationDefinition_cached")
- public static EvictingDualNodeHashTable SpotAnimationDefinition_cached;
- @ObfuscatedName("k")
+ static EvictingDualNodeHashTable SpotAnimationDefinition_cached;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("SpotAnimationDefinition_cachedModels")
- public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels;
- @ObfuscatedName("a")
+ static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1265887753
+ intValue = -1382549895
)
@Export("id")
int id;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1347640095
+ intValue = -1229920569
)
@Export("archive")
int archive;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 2010808801
+ intValue = -1555956767
)
@Export("sequence")
public int sequence;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("recolorFrom")
short[] recolorFrom;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("recolorTo")
short[] recolorTo;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("retextureFrom")
short[] retextureFrom;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("retextureTo")
short[] retextureTo;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 816040179
+ intValue = -1642412551
)
@Export("widthScale")
int widthScale;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 1605734173
+ intValue = 770109721
)
@Export("heightScale")
int heightScale;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 166860727
+ intValue = -35378605
)
@Export("orientation")
int orientation;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = -373307205
+ intValue = -754453843
)
@Export("ambient")
int ambient;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 1923246683
+ intValue = -661323209
)
@Export("contrast")
int contrast;
@@ -100,10 +100,10 @@ public class SpotAnimationDefinition extends DualNode {
this.contrast = 0; // L: 27
} // L: 29
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "39"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-1"
)
@Export("decode")
void decode(Buffer var1) {
@@ -117,10 +117,10 @@ public class SpotAnimationDefinition extends DualNode {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "2139192007"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-2073276189"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
@@ -136,8 +136,8 @@ public class SpotAnimationDefinition extends DualNode {
this.orientation = var1.readUnsignedShort();
} else if (var2 == 7) { // L: 56
this.ambient = var1.readUnsignedByte();
- } else if (var2 == 8) { // L: 57
- this.contrast = var1.readUnsignedByte();
+ } else if (var2 == 8) {
+ this.contrast = var1.readUnsignedByte(); // L: 57
} else {
int var3;
int var4;
@@ -164,16 +164,16 @@ public class SpotAnimationDefinition extends DualNode {
} // L: 77
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)Lhv;",
- garbageValue = "835849725"
+ descriptor = "(II)Lhy;",
+ garbageValue = "843172679"
)
@Export("getModel")
public final Model getModel(int var1) {
Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80
if (var2 == null) { // L: 81
- ModelData var3 = ModelData.ModelData_get(class175.SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82
+ ModelData var3 = ModelData.ModelData_get(class147.SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82
if (var3 == null) { // L: 83
return null;
}
@@ -197,7 +197,7 @@ public class SpotAnimationDefinition extends DualNode {
Model var5;
if (this.sequence != -1 && var1 != -1) { // L: 98
- var5 = class114.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
+ var5 = ScriptFrame.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
} else {
var5 = var2.toSharedSpotAnimationModel(true); // L: 99
}
diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java
index 34addfe0af..357559e66f 100644
--- a/runescape-client/src/main/java/SpriteMask.java
+++ b/runescape-client/src/main/java/SpriteMask.java
@@ -4,49 +4,133 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ka")
+@ObfuscatedName("kp")
@Implements("SpriteMask")
public class SpriteMask extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -124127001
+ intValue = -1630376351
)
@Export("width")
public final int width;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1115318745
+ intValue = 890911275
)
@Export("height")
public final int height;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("xWidths")
public final int[] xWidths;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("xStarts")
public final int[] xStarts;
SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) {
- this.width = var1; // L: 953
- this.height = var2; // L: 954
- this.xWidths = var3; // L: 955
- this.xStarts = var4; // L: 956
- } // L: 957
+ this.width = var1; // L: 973
+ this.height = var2; // L: 974
+ this.xWidths = var3; // L: 975
+ this.xStarts = var4; // L: 976
+ } // L: 977
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(III)Z",
- garbageValue = "-1641750028"
+ garbageValue = "1395546386"
)
@Export("contains")
public boolean contains(int var1, int var2) {
- if (var2 >= 0 && var2 < this.xStarts.length) { // L: 960
- int var3 = this.xStarts[var2]; // L: 961
- if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 962
+ if (var2 >= 0 && var2 < this.xStarts.length) { // L: 980
+ int var3 = this.xStarts[var2]; // L: 981
+ if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 982
return true;
}
}
- return false; // L: 964
+ return false; // L: 984
}
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(B)[I",
+ garbageValue = "117"
+ )
+ public static int[] method5523() {
+ int[] var0 = new int[KeyHandler.field144]; // L: 257
+
+ for (int var1 = 0; var1 < KeyHandler.field144; ++var1) { // L: 258
+ var0[var1] = KeyHandler.field134[var1]; // L: 259
+ }
+
+ return var0; // L: 261
+ }
+
+ @ObfuscatedName("aw")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-1051989669"
+ )
+ static int method5524(int var0, Script var1, boolean var2) {
+ if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4557
+ if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4561
+ if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4565
+ if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4569
+ if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4573
+ if (var0 != 7031 && var0 != 7032) { // L: 4577
+ if (var0 == 7033) { // L: 4582
+ --Interpreter.Interpreter_stringStackSize; // L: 4583
+ return 1; // L: 4584
+ } else if (var0 != 7036 && var0 != 7037) { // L: 4586
+ if (var0 == 7038) { // L: 4590
+ --class446.Interpreter_intStackSize; // L: 4591
+ return 1; // L: 4592
+ } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4594
+ return 2; // L: 4598
+ } else {
+ --class446.Interpreter_intStackSize; // L: 4595
+ return 1; // L: 4596
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 4587
+ return 1; // L: 4588
+ }
+ } else {
+ --Interpreter.Interpreter_stringStackSize; // L: 4578
+ --class446.Interpreter_intStackSize; // L: 4579
+ return 1; // L: 4580
+ }
+ } else {
+ --class446.Interpreter_intStackSize; // L: 4574
+ return 1; // L: 4575
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 4570
+ return 1; // L: 4571
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 4566
+ return 1; // L: 4567
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 3; // L: 4562
+ return 1; // L: 4563
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 5; // L: 4558
+ return 1; // L: 4559
+ }
+ }
+
+ @ObfuscatedName("gl")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1187838679"
+ )
+ static void method5522() {
+ PacketBufferNode var0 = EnumComposition.getPacketBufferNode(ClientPacket.field3008, Client.packetWriter.isaacCipher); // L: 4385
+ var0.packetBuffer.writeByte(class9.getWindowedMode()); // L: 4386
+ var0.packetBuffer.writeShort(Script.canvasWidth); // L: 4387
+ var0.packetBuffer.writeShort(class78.canvasHeight); // L: 4388
+ Client.packetWriter.addNode(var0); // L: 4389
+ } // L: 4390
}
diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java
index 671a2b299d..7974ef55c5 100644
--- a/runescape-client/src/main/java/SpritePixels.java
+++ b/runescape-client/src/main/java/SpritePixels.java
@@ -3,28 +3,28 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qr")
+@ObfuscatedName("qe")
@Implements("SpritePixels")
public final class SpritePixels extends Rasterizer2D {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("pixels")
public int[] pixels;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("subWidth")
public int subWidth;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("subHeight")
public int subHeight;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("xOffset")
public int xOffset;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("yOffset")
- public int yOffset;
- @ObfuscatedName("m")
+ int yOffset;
+ @ObfuscatedName("e")
@Export("width")
public int width;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("height")
public int height;
@@ -40,12 +40,12 @@ public final class SpritePixels extends Rasterizer2D {
this(new int[var2 * var1], var1, var2); // L: 22
} // L: 23
- public SpritePixels() {
+ SpritePixels() {
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "()Lqr;"
+ descriptor = "()Lqe;"
)
@Export("mirrorHorizontally")
public SpritePixels mirrorHorizontally() {
@@ -64,11 +64,11 @@ public final class SpritePixels extends Rasterizer2D {
return var1; // L: 44
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "()Lqr;"
+ descriptor = "()Lqe;"
)
- public SpritePixels method8001() {
+ public SpritePixels method8151() {
SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 48
var1.width = this.width; // L: 49
var1.height = this.height; // L: 50
@@ -83,9 +83,9 @@ public final class SpritePixels extends Rasterizer2D {
return var1; // L: 55
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "()Lqr;"
+ descriptor = "()Lqe;"
)
@Export("copyNormalized")
public SpritePixels copyNormalized() {
@@ -100,13 +100,13 @@ public final class SpritePixels extends Rasterizer2D {
return var1; // L: 65
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("setRaster")
public void setRaster() {
Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 69
} // L: 70
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("normalize")
public void normalize() {
if (this.subWidth != this.width || this.subHeight != this.height) { // L: 73
@@ -126,7 +126,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 85
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("pad")
public void pad(int var1) {
if (this.subWidth != this.width || this.subHeight != this.height) { // L: 88
@@ -168,7 +168,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 110
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("flipHorizontally")
public void flipHorizontally() {
int[] var1 = new int[this.subWidth * this.subHeight]; // L: 113
@@ -184,7 +184,7 @@ public final class SpritePixels extends Rasterizer2D {
this.xOffset = this.width - this.subWidth - this.xOffset; // L: 119
} // L: 120
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("flipVertically")
public void flipVertically() {
int[] var1 = new int[this.subWidth * this.subHeight]; // L: 123
@@ -200,7 +200,7 @@ public final class SpritePixels extends Rasterizer2D {
this.yOffset = this.height - this.subHeight - this.yOffset; // L: 129
} // L: 130
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("outline")
public void outline(int var1) {
int[] var2 = new int[this.subWidth * this.subHeight]; // L: 133
@@ -214,8 +214,8 @@ public final class SpritePixels extends Rasterizer2D {
var6 = var1;
} else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 140
var6 = var1;
- } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
- var6 = var1; // L: 141
+ } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { // L: 141
+ var6 = var1;
} else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 142
var6 = var1;
}
@@ -228,22 +228,22 @@ public final class SpritePixels extends Rasterizer2D {
this.pixels = var2; // L: 147
} // L: 148
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("shadow")
public void shadow(int var1) {
for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 151
int var3 = var2 * this.subWidth; // L: 152
for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 153
- if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { // L: 154
- this.pixels[var4 + var3] = var1;
+ if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
+ this.pixels[var4 + var3] = var1; // L: 154
}
}
}
} // L: 157
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("drawAt")
public void drawAt(int var1, int var2) {
var1 += this.xOffset; // L: 160
@@ -289,7 +289,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 193
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("drawTransBgAt")
public void drawTransBgAt(int var1, int var2) {
var1 += this.xOffset; // L: 214
@@ -335,7 +335,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 247
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("drawScaledAt")
public void drawScaledAt(int var1, int var2, int var3, int var4) {
if (var3 > 0 && var4 > 0) { // L: 278
@@ -400,7 +400,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 321
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("drawTransOverlayAt")
public void drawTransOverlayAt(int var1, int var2, int var3, int var4) {
if (var3 == 256) { // L: 340
@@ -450,7 +450,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 342 377
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@Export("drawTransAt")
public void drawTransAt(int var1, int var2, int var3) {
var1 += this.xOffset; // L: 400
@@ -496,7 +496,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 433
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@Export("drawTransScaledAt")
public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) {
if (var3 > 0 && var4 > 0) { // L: 452
@@ -561,8 +561,8 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 495
- @ObfuscatedName("j")
- public void method7970(int var1, int var2, int var3) {
+ @ObfuscatedName("n")
+ public void method8171(int var1, int var2, int var3) {
var1 += this.xOffset; // L: 518
var2 += this.yOffset; // L: 519
int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 520
@@ -603,16 +603,16 @@ public final class SpritePixels extends Rasterizer2D {
if (var7 > 0 && var6 > 0) { // L: 549
if (var3 == 256) {
- method7950(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550
+ method8176(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 550
} else {
- method7972(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551
+ method8173(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 551
}
}
} // L: 552
- @ObfuscatedName("u")
- public void method8030(int var1, int var2, int var3, int var4, int var5) {
+ @ObfuscatedName("d")
+ public void method8155(int var1, int var2, int var3, int var4, int var5) {
if (var3 > 0 && var4 > 0) { // L: 593
int var6 = this.subWidth; // L: 594
int var7 = this.subHeight; // L: 595
@@ -672,16 +672,16 @@ public final class SpritePixels extends Rasterizer2D {
}
if (var5 == 256) { // L: 635
- method7973(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
+ method8175(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
} else {
- method7952(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636
+ method8269(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 636
}
}
} // L: 637
- @ObfuscatedName("am")
- public void method7947(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
+ @ObfuscatedName("al")
+ public void method8270(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
int var9 = var2 < 0 ? -var2 : 0; // L: 686
int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 687
int var11 = var1 < 0 ? -var1 : 0; // L: 688
@@ -728,7 +728,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 711
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@Export("drawRotatedMaskedCenteredAround")
public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
try {
@@ -764,7 +764,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 740
@ObfuscatedName("ab")
- public void method7992(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
+ public void method8179(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
try {
int var10 = -var3 / 2; // L: 744
int var11 = -var4 / 2; // L: 745
@@ -802,13 +802,13 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 770
- @ObfuscatedName("aj")
- public void method7951(int var1, int var2, int var3, int var4) {
- this.method7978(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773
+ @ObfuscatedName("ap")
+ public void method8180(int var1, int var2, int var3, int var4) {
+ this.method8260(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 773
} // L: 774
- @ObfuscatedName("ae")
- void method7978(int var1, int var2, int var3, int var4, int var5, int var6) {
+ @ObfuscatedName("ac")
+ void method8260(int var1, int var2, int var3, int var4, int var5, int var6) {
if (var6 != 0) { // L: 777
var1 -= this.xOffset << 4; // L: 778
var2 -= this.yOffset << 4; // L: 779
@@ -1276,7 +1276,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 1087
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("drawScaledWorldmap")
public void drawScaledWorldmap(int var1, int var2, int var3, int var4) {
if (var3 <= this.width && var4 <= this.height) { // L: 1090
@@ -1399,7 +1399,7 @@ public final class SpritePixels extends Rasterizer2D {
}
} // L: 1105 1162
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("Sprite_draw")
static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
for (int var8 = -var5; var8 < 0; ++var8) { // L: 196
@@ -1419,7 +1419,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 211
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("Sprite_drawTransBg")
static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
int var9 = -(var5 >> 2); // L: 250
@@ -1472,7 +1472,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 275
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("Sprite_drawScaled")
static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
int var12 = var3; // L: 324
@@ -1498,7 +1498,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 337
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("Sprite_drawTransOverlay")
static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
int var11 = 256 - var9; // L: 380
@@ -1524,7 +1524,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 397
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@Export("Sprite_drawTransparent")
static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
int var10 = 256 - var9; // L: 436
@@ -1546,7 +1546,7 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 449
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@Export("Sprite_drawTransScaled")
static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
int var13 = 256 - var12; // L: 498
@@ -1574,8 +1574,8 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 515
- @ObfuscatedName("z")
- static void method7950(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
+ @ObfuscatedName("o")
+ static void method8176(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
for (var8 = -var10; var8 < 0; ++var8) { // L: 555
for (var6 = -var9; var6 < 0; ++var6) { // L: 556
var0 = var4[var5++]; // L: 557
@@ -1596,8 +1596,8 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 570
- @ObfuscatedName("i")
- static void method7972(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) {
+ @ObfuscatedName("m")
+ static void method8173(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) {
for (var8 = -var10; var8 < 0; ++var8) { // L: 573
for (var6 = -var9; var6 < 0; ++var6) { // L: 574
var0 = var4[var5++]; // L: 575
@@ -1620,8 +1620,8 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 590
- @ObfuscatedName("ag")
- static void method7973(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) {
+ @ObfuscatedName("ad")
+ static void method8175(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) {
for (int var16 = var3; var8 < 0; ++var8) { // L: 640 641
var7 = var15 * (var9 >> 16); // L: 642
@@ -1647,8 +1647,8 @@ public final class SpritePixels extends Rasterizer2D {
} // L: 659
- @ObfuscatedName("ar")
- static void method7952(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) {
+ @ObfuscatedName("ak")
+ static void method8269(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) {
for (int var17 = var3; var8 < 0; ++var8) { // L: 662 663
var7 = var15 * (var9 >> 16); // L: 664
diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java
index 1bc88d1ab9..ea2c2753b5 100644
--- a/runescape-client/src/main/java/Strings.java
+++ b/runescape-client/src/main/java/Strings.java
@@ -1,25 +1,25 @@
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("kq")
+@ObfuscatedName("kl")
@Implements("Strings")
public class Strings {
- @ObfuscatedName("bi")
- public static String field3689;
- @ObfuscatedName("cq")
- public static String field3743;
- @ObfuscatedName("ki")
- public static String field3712;
- @ObfuscatedName("kv")
- public static String field3929;
- @ObfuscatedName("ks")
- public static String field3706;
+ @ObfuscatedName("bf")
+ public static String field3670;
+ @ObfuscatedName("ce")
+ public static String field3709;
+ @ObfuscatedName("ke")
+ public static String field3894;
+ @ObfuscatedName("kh")
+ public static String field3926;
+ @ObfuscatedName("ku")
+ public static String field3896;
static {
- field3689 = "Please visit the support page for assistance."; // L: 60
- field3743 = "Please visit the support page for assistance."; // L: 99
- field3712 = ""; // L: 299
- field3929 = "Page has opened in a new window."; // L: 300
- field3706 = "(Please check your popup blocker.)"; // L: 301
+ field3670 = "Please visit the support page for assistance."; // L: 60
+ field3709 = "Please visit the support page for assistance."; // L: 99
+ field3894 = ""; // L: 299
+ field3926 = "Page has opened in a new window."; // L: 300
+ field3896 = "(Please check your popup blocker.)"; // L: 301
} // L: 342
}
diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java
index dc0a2b8480..afe3b19085 100644
--- a/runescape-client/src/main/java/StructComposition.java
+++ b/runescape-client/src/main/java/StructComposition.java
@@ -1,149 +1,236 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("gp")
+@ObfuscatedName("gi")
@Implements("StructComposition")
public class StructComposition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("StructDefinition_archive")
static AbstractArchive StructDefinition_archive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("StructDefinition_cached")
static EvictingDualNodeHashTable StructDefinition_cached;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = -232799299
- )
- @Export("musicTrackGroupId")
- public static int musicTrackGroupId;
- @ObfuscatedName("l")
+ @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "Lpt;"
+ descriptor = "Llh;"
+ )
+ @Export("Widget_spritesArchive")
+ public static AbstractArchive Widget_spritesArchive;
+ @ObfuscatedName("fl")
+ @Export("worldHost")
+ static String worldHost;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lpb;"
)
@Export("params")
IterableNodeHashTable params;
static {
- StructDefinition_cached = new EvictingDualNodeHashTable(64);
+ StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13
}
StructComposition() {
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-2016417159"
+ garbageValue = "749475992"
)
@Export("postDecode")
void postDecode() {
- } // L: 33
+ }
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-1920119994"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "56"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 37
- if (var2 == 0) { // L: 38
+ int var2 = var1.readUnsignedByte();
+ if (var2 == 0) {
return; // L: 41
}
- this.decodeNext(var1, var2); // L: 39
+ this.decodeNext(var1, var2);
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1132236208"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "1584006933"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
if (var2 == 249) {
- this.params = JagexCache.readStringIntParameters(var1, this.params); // L: 44
+ this.params = LoginScreenAnimation.readStringIntParameters(var1, this.params); // L: 44
}
} // L: 46
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "668273905"
+ descriptor = "(IIB)I",
+ garbageValue = "80"
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
- return class154.method3061(this.params, var1, var2); // L: 49
+ return class124.method2818(this.params, var1, var2); // L: 49
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
- garbageValue = "-1640856664"
+ garbageValue = "-581400473"
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
- return AttackOption.method2393(this.params, var1, var2); // L: 53
+ IterableNodeHashTable var4 = this.params; // L: 54
+ String var3;
+ if (var4 == null) { // L: 56
+ var3 = var2; // L: 57
+ } else {
+ ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 60
+ if (var5 == null) { // L: 61
+ var3 = var2; // L: 62
+ } else {
+ var3 = (String)var5.obj; // L: 65
+ }
+ }
+
+ return var3; // L: 67
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
+ public static final int method3616(double var0, double var2, double var4) {
+ double var6 = var4; // L: 9
+ double var8 = var4; // L: 10
+ double var10 = var4; // L: 11
+ if (0.0D != var2) { // L: 12
+ double var12;
+ if (var4 < 0.5D) { // L: 14
+ var12 = (1.0D + var2) * var4;
+ } else {
+ var12 = var4 + var2 - var2 * var4; // L: 15
+ }
+
+ double var14 = 2.0D * var4 - var12; // L: 16
+ double var16 = var0 + 0.3333333333333333D; // L: 17
+ if (var16 > 1.0D) { // L: 18
+ --var16;
+ }
+
+ double var20 = var0 - 0.3333333333333333D; // L: 20
+ if (var20 < 0.0D) { // L: 21
+ ++var20;
+ }
+
+ if (var16 * 6.0D < 1.0D) { // L: 22
+ var6 = var16 * (var12 - var14) * 6.0D + var14;
+ } else if (var16 * 2.0D < 1.0D) { // L: 23
+ var6 = var12;
+ } else if (3.0D * var16 < 2.0D) { // L: 24
+ var6 = (var12 - var14) * (0.6666666666666666D - var16) * 6.0D + var14;
+ } else {
+ var6 = var14; // L: 25
+ }
+
+ if (var0 * 6.0D < 1.0D) { // L: 26
+ var8 = var14 + var0 * (var12 - var14) * 6.0D;
+ } else if (2.0D * var0 < 1.0D) { // L: 27
+ var8 = var12;
+ } else if (3.0D * var0 < 2.0D) { // L: 28
+ var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14;
+ } else {
+ var8 = var14; // L: 29
+ }
+
+ if (6.0D * var20 < 1.0D) { // L: 30
+ var10 = var14 + 6.0D * (var12 - var14) * var20;
+ } else if (var20 * 2.0D < 1.0D) { // L: 31
+ var10 = var12;
+ } else if (var20 * 3.0D < 2.0D) { // L: 32
+ var10 = 6.0D * (var12 - var14) * (0.6666666666666666D - var20) + var14;
+ } else {
+ var10 = var14; // L: 33
+ }
+ }
+
+ int var22 = (int)(256.0D * var6); // L: 35
+ int var13 = (int)(256.0D * var8); // L: 36
+ int var23 = (int)(var10 * 256.0D); // L: 37
+ int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38
+ return var15; // L: 39
+ }
+
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
- garbageValue = "1341755485"
+ descriptor = "(ILbi;ZS)I",
+ garbageValue = "-18766"
)
- public static String method3524(CharSequence[] var0, int var1, int var2) {
- if (var2 == 0) { // L: 12
- return "";
- } else if (var2 == 1) { // L: 13
- CharSequence var10 = var0[var1]; // L: 14
- return var10 == null ? "null" : var10.toString(); // L: 15 16
+ static int method3617(int var0, Script var1, boolean var2) {
+ Widget var3;
+ if (var0 >= 2000) { // L: 828
+ var0 -= 1000; // L: 829
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 830
} else {
- int var3 = var2 + var1; // L: 18
- int var4 = 0; // L: 19
+ var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 832
+ }
- for (int var5 = var1; var5 < var3; ++var5) { // L: 20
- CharSequence var9 = var0[var5]; // L: 21
- if (var9 == null) { // L: 22
- var4 += 4;
- } else {
- var4 += var9.length(); // L: 23
- }
+ ChatChannel.invalidateWidget(var3); // L: 833
+ if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 834
+ if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 854
+ var3.modelType = 2; // L: 855
+ var3.modelId = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 856
+ return 1; // L: 857
+ } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 859
+ var3.modelType = 3; // L: 860
+ var3.modelId = class101.localPlayer.appearance.getChatHeadId(); // L: 861
+ return 1; // L: 862
+ } else {
+ return 2; // L: 864
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 835
+ int var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 836
+ int var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 837
+ var3.itemId = var4; // L: 838
+ var3.itemQuantity = var5; // L: 839
+ ItemComposition var6 = EnumComposition.ItemDefinition_get(var4); // L: 840
+ var3.modelAngleX = var6.xan2d; // L: 841
+ var3.modelAngleY = var6.yan2d; // L: 842
+ var3.modelAngleZ = var6.zan2d; // L: 843
+ var3.modelOffsetX = var6.offsetX2d; // L: 844
+ var3.modelOffsetY = var6.offsetY2d; // L: 845
+ var3.modelZoom = var6.zoom2d; // L: 846
+ if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
+ var3.itemQuantityMode = 0; // L: 847
+ } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 848
+ var3.itemQuantityMode = 1;
+ } else {
+ var3.itemQuantityMode = 2; // L: 849
}
- StringBuilder var8 = new StringBuilder(var4); // L: 25
-
- for (int var6 = var1; var6 < var3; ++var6) { // L: 26
- CharSequence var7 = var0[var6]; // L: 27
- if (var7 == null) { // L: 28
- var8.append("null");
- } else {
- var8.append(var7); // L: 29
- }
+ if (var3.field3424 > 0) { // L: 850
+ var3.modelZoom = var3.modelZoom * 32 / var3.field3424;
+ } else if (var3.rawWidth > 0) { // L: 851
+ var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
}
- return var8.toString(); // L: 31
+ return 1; // L: 852
}
}
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Llp;IIB)Lqr;",
- garbageValue = "73"
- )
- @Export("SpriteBuffer_getSprite")
- public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
- return !User.method6514(var0, var1, var2) ? null : ByteArrayPool.method6365(); // L: 64 65
- }
}
diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java
index 9ae2403d4c..293d2d39ef 100644
--- a/runescape-client/src/main/java/StudioGame.java
+++ b/runescape-client/src/main/java/StudioGame.java
@@ -4,83 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ke")
+@ObfuscatedName("kx")
@Implements("StudioGame")
public enum StudioGame implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Lkx;"
)
@Export("runescape")
runescape("runescape", "RuneScape", 0),
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Lkx;"
)
@Export("stellardawn")
stellardawn("stellardawn", "Stellar Dawn", 1),
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Lkx;"
)
@Export("game3")
game3("game3", "Game 3", 2),
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Lkx;"
)
@Export("game4")
game4("game4", "Game 4", 3),
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Lkx;"
)
@Export("game5")
game5("game5", "Game 5", 4),
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lke;"
+ descriptor = "Lkx;"
)
@Export("oldscape")
oldscape("oldscape", "RuneScape 2007", 5);
- @ObfuscatedName("jb")
- @ObfuscatedGetter(
- intValue = 1529760587
- )
- @Export("cameraYaw")
- static int cameraYaw;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("name")
public final String name;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -2065228417
+ intValue = 1771412669
)
@Export("id")
final int id;
StudioGame(String var3, String var4, int var5) {
this.name = var3; // L: 17
- this.id = var5;
+ this.id = var5; // L: 18
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id; // L: 22
}
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IB)Ljava/lang/String;",
- garbageValue = "-40"
+ descriptor = "(I)[Lqy;",
+ garbageValue = "-466654611"
)
- static String method5590(int var0) {
- return ""; // L: 18
+ @Export("FillMode_values")
+ public static FillMode[] FillMode_values() {
+ return new FillMode[]{FillMode.SOLID, FillMode.field4778, FillMode.field4783}; // L: 15
+ }
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(CI)Z",
+ garbageValue = "1723835093"
+ )
+ @Export("isCharPrintable")
+ public static boolean isCharPrintable(char var0) {
+ if (var0 >= ' ' && var0 <= '~') { // L: 197
+ return true;
+ } else if (var0 >= 160 && var0 <= 255) { // L: 198
+ return true;
+ } else {
+ return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 199
+ }
}
}
diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java
index eb28a08d9f..52b9cc6158 100644
--- a/runescape-client/src/main/java/Task.java
+++ b/runescape-client/src/main/java/Task.java
@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fl")
+@ObfuscatedName("fm")
@Implements("Task")
public class Task {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lfl;"
+ descriptor = "Lfm;"
)
@Export("next")
Task next;
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@Export("status")
public volatile int status;
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 179289705
+ intValue = -71704813
)
@Export("type")
int type;
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
@Export("intArgument")
public int intArgument;
- @ObfuscatedName("s")
+ @ObfuscatedName("g")
@Export("objectArgument")
Object objectArgument;
- @ObfuscatedName("r")
+ @ObfuscatedName("w")
@Export("result")
public volatile Object result;
Task() {
- this.status = 0; // L: 11
- } // L: 23
+ this.status = 0; // L: 10
+ } // L: 22
}
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index e786fe87da..4496135b88 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -7,31 +7,28 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fs")
+@ObfuscatedName("fr")
@Implements("TaskHandler")
public class TaskHandler implements Runnable {
- @ObfuscatedName("o")
- @Export("javaVendor")
- public static String javaVendor;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("javaVersion")
public static String javaVersion;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lfl;"
+ descriptor = "Lfm;"
)
@Export("current")
Task current;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lfl;"
+ descriptor = "Lfm;"
)
@Export("task")
Task task;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("thread")
Thread thread;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("isClosed")
boolean isClosed;
@@ -39,11 +36,11 @@ public class TaskHandler implements Runnable {
this.current = null; // L: 11
this.task = null; // L: 12
this.isClosed = false; // L: 14
- javaVendor = "Unknown"; // L: 20
+ class360.javaVendor = "Unknown"; // L: 20
javaVersion = "1.6"; // L: 21
try {
- javaVendor = System.getProperty("java.vendor"); // L: 23
+ class360.javaVendor = System.getProperty("java.vendor"); // L: 23
javaVersion = System.getProperty("java.version"); // L: 24
} catch (Exception var2) { // L: 26
}
@@ -55,10 +52,10 @@ public class TaskHandler implements Runnable {
this.thread.start(); // L: 31
} // L: 32
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1440718962"
+ descriptor = "(B)V",
+ garbageValue = "64"
)
@Export("close")
public final void close() {
@@ -74,15 +71,15 @@ public class TaskHandler implements Runnable {
} // L: 43
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IIILjava/lang/Object;I)Lfl;",
- garbageValue = "1484642782"
+ descriptor = "(IIILjava/lang/Object;B)Lfm;",
+ garbageValue = "0"
)
@Export("newTask")
final Task newTask(int var1, int var2, int var3, Object var4) {
- Task var5 = new Task(); // L: 90
- var5.type = var1; // L: 91
+ Task var5 = new Task();
+ var5.type = var1;
var5.intArgument = var2; // L: 92
var5.objectArgument = var4; // L: 93
synchronized(this) { // L: 94
@@ -98,20 +95,20 @@ public class TaskHandler implements Runnable {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;II)Lfl;",
- garbageValue = "1024019511"
+ descriptor = "(Ljava/lang/String;IB)Lfm;",
+ garbageValue = "-14"
)
@Export("newSocketTask")
public final Task newSocketTask(String var1, int var2) {
return this.newTask(1, var2, 0, var1); // L: 108
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Runnable;II)Lfl;",
- garbageValue = "1474796416"
+ descriptor = "(Ljava/lang/Runnable;II)Lfm;",
+ garbageValue = "966743438"
)
@Export("newThreadTask")
public final Task newThreadTask(Runnable var1, int var2) {
@@ -137,7 +134,7 @@ public class TaskHandler implements Runnable {
}
try {
- this.wait(); // L: 58
+ this.wait();
} catch (InterruptedException var8) { // L: 60
}
}
@@ -168,131 +165,77 @@ public class TaskHandler implements Runnable {
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "2007350025"
+ descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+ garbageValue = "-443449853"
)
- @Export("isKeyDown")
- public static final boolean isKeyDown() {
- synchronized(KeyHandler.KeyHandler_instance) { // L: 132
- if (KeyHandler.field144 == KeyHandler.field142) { // L: 133
- return false;
- } else {
- class12.field61 = KeyHandler.field122[KeyHandler.field142]; // L: 134
- InvDefinition.field1850 = KeyHandler.field136[KeyHandler.field142]; // L: 135
- KeyHandler.field142 = KeyHandler.field142 + 1 & 127; // L: 136
- return true; // L: 137
- }
+ public static String method3240(CharSequence var0) {
+ String var1 = class229.base37DecodeLong(class339.method6244(var0)); // L: 57
+ if (var1 == null) { // L: 58
+ var1 = "";
}
+
+ return var1; // L: 59
}
- @ObfuscatedName("is")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(IIIILjava/lang/String;I)V",
- garbageValue = "87331600"
+ descriptor = "(IIIZII)J",
+ garbageValue = "608136618"
)
- @Export("widgetDefaultMenuAction")
- static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
- Widget var5 = ApproximateRouteStrategy.getWidgetChild(var1, var2); // L: 9808
- if (var5 != null) { // L: 9809
- if (var5.onOp != null) { // L: 9810
- ScriptEvent var6 = new ScriptEvent(); // L: 9811
- var6.widget = var5; // L: 9812
- var6.opIndex = var0; // L: 9813
- var6.targetName = var4; // L: 9814
- var6.args = var5.onOp; // L: 9815
- class144.runScriptEvent(var6); // L: 9816
- }
+ @Export("calculateTag")
+ public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
+ long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 89
+ if (var3) { // L: 90
+ var5 |= 65536L;
+ }
- boolean var8 = true; // L: 9818
- if (var5.contentType > 0) { // L: 9819
- var8 = ReflectionCheck.method599(var5);
- }
+ return var5; // L: 91
+ }
- if (var8) { // L: 9820
- if (MenuAction.method1880(UrlRequester.getWidgetFlags(var5), var0 - 1)) { // L: 9821
- PacketBufferNode var7;
- if (var0 == 1) { // L: 9824
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3006, Client.packetWriter.isaacCipher); // L: 9826
- var7.packetBuffer.writeInt(var1); // L: 9827
- var7.packetBuffer.writeShort(var2); // L: 9828
- var7.packetBuffer.writeShort(var3); // L: 9829
- Client.packetWriter.addNode(var7); // L: 9830
+ @ObfuscatedName("jr")
+ @ObfuscatedSignature(
+ descriptor = "([Lkb;IB)V",
+ garbageValue = "79"
+ )
+ @Export("runComponentCloseListeners")
+ static final void runComponentCloseListeners(Widget[] var0, int var1) {
+ for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11586
+ Widget var3 = var0[var2]; // L: 11587
+ if (var3 != null) { // L: 11588
+ if (var3.type == 0) { // L: 11589
+ if (var3.children != null) { // L: 11590
+ runComponentCloseListeners(var3.children, var1);
}
- if (var0 == 2) { // L: 9832
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3032, Client.packetWriter.isaacCipher); // L: 9834
- var7.packetBuffer.writeInt(var1); // L: 9835
- var7.packetBuffer.writeShort(var2); // L: 9836
- var7.packetBuffer.writeShort(var3); // L: 9837
- Client.packetWriter.addNode(var7); // L: 9838
- }
-
- if (var0 == 3) { // L: 9840
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3011, Client.packetWriter.isaacCipher); // L: 9842
- var7.packetBuffer.writeInt(var1); // L: 9843
- var7.packetBuffer.writeShort(var2); // L: 9844
- var7.packetBuffer.writeShort(var3); // L: 9845
- Client.packetWriter.addNode(var7); // L: 9846
- }
-
- if (var0 == 4) { // L: 9848
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2956, Client.packetWriter.isaacCipher); // L: 9850
- var7.packetBuffer.writeInt(var1); // L: 9851
- var7.packetBuffer.writeShort(var2); // L: 9852
- var7.packetBuffer.writeShort(var3); // L: 9853
- Client.packetWriter.addNode(var7); // L: 9854
- }
-
- if (var0 == 5) { // L: 9856
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2960, Client.packetWriter.isaacCipher); // L: 9858
- var7.packetBuffer.writeInt(var1); // L: 9859
- var7.packetBuffer.writeShort(var2); // L: 9860
- var7.packetBuffer.writeShort(var3); // L: 9861
- Client.packetWriter.addNode(var7); // L: 9862
- }
-
- if (var0 == 6) { // L: 9864
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2968, Client.packetWriter.isaacCipher); // L: 9866
- var7.packetBuffer.writeInt(var1); // L: 9867
- var7.packetBuffer.writeShort(var2); // L: 9868
- var7.packetBuffer.writeShort(var3); // L: 9869
- Client.packetWriter.addNode(var7); // L: 9870
- }
-
- if (var0 == 7) { // L: 9872
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3002, Client.packetWriter.isaacCipher); // L: 9874
- var7.packetBuffer.writeInt(var1); // L: 9875
- var7.packetBuffer.writeShort(var2); // L: 9876
- var7.packetBuffer.writeShort(var3); // L: 9877
- Client.packetWriter.addNode(var7); // L: 9878
- }
-
- if (var0 == 8) { // L: 9880
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field2989, Client.packetWriter.isaacCipher); // L: 9882
- var7.packetBuffer.writeInt(var1); // L: 9883
- var7.packetBuffer.writeShort(var2); // L: 9884
- var7.packetBuffer.writeShort(var3); // L: 9885
- Client.packetWriter.addNode(var7); // L: 9886
- }
-
- if (var0 == 9) { // L: 9888
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3015, Client.packetWriter.isaacCipher); // L: 9890
- var7.packetBuffer.writeInt(var1); // L: 9891
- var7.packetBuffer.writeShort(var2); // L: 9892
- var7.packetBuffer.writeShort(var3); // L: 9893
- Client.packetWriter.addNode(var7); // L: 9894
- }
-
- if (var0 == 10) { // L: 9896
- var7 = WallDecoration.getPacketBufferNode(ClientPacket.field3043, Client.packetWriter.isaacCipher); // L: 9898
- var7.packetBuffer.writeInt(var1); // L: 9899
- var7.packetBuffer.writeShort(var2); // L: 9900
- var7.packetBuffer.writeShort(var3); // L: 9901
- Client.packetWriter.addNode(var7); // L: 9902
+ InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11591
+ if (var4 != null) { // L: 11592
+ class7.runIntfCloseListeners(var4.group, var1);
+ }
+ }
+
+ ScriptEvent var5;
+ if (var1 == 0 && var3.onDialogAbort != null) { // L: 11594
+ var5 = new ScriptEvent(); // L: 11595
+ var5.widget = var3; // L: 11596
+ var5.args = var3.onDialogAbort; // L: 11597
+ BoundaryObject.runScriptEvent(var5); // L: 11598
+ }
+
+ if (var1 == 1 && var3.onSubChange != null) { // L: 11600
+ if (var3.childIndex >= 0) { // L: 11601
+ Widget var6 = class140.getWidget(var3.id); // L: 11602
+ if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11603
+ continue;
+ }
}
+ var5 = new ScriptEvent(); // L: 11607
+ var5.widget = var3; // L: 11608
+ var5.args = var3.onSubChange; // L: 11609
+ BoundaryObject.runScriptEvent(var5); // L: 11610
}
}
}
- } // L: 9822 9904
+
+ } // L: 11613
}
diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java
index 2afc38c783..7b9ec356ec 100644
--- a/runescape-client/src/main/java/Texture.java
+++ b/runescape-client/src/main/java/Texture.java
@@ -3,46 +3,46 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("go")
+@ObfuscatedName("gd")
@Implements("Texture")
public class Texture extends Node {
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("Texture_animatedPixels")
static int[] Texture_animatedPixels;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("averageRGB")
int averageRGB;
- @ObfuscatedName("m")
- boolean field2332;
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
+ boolean field2293;
+ @ObfuscatedName("g")
@Export("fileIds")
int[] fileIds;
- @ObfuscatedName("s")
- int[] field2334;
- @ObfuscatedName("r")
- int[] field2335;
- @ObfuscatedName("v")
- int[] field2329;
+ @ObfuscatedName("w")
+ int[] field2301;
@ObfuscatedName("y")
+ int[] field2296;
+ @ObfuscatedName("i")
+ int[] field2295;
+ @ObfuscatedName("s")
@Export("animationDirection")
int animationDirection;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("animationSpeed")
int animationSpeed;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("pixels")
int[] pixels;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("isLoaded")
boolean isLoaded;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
Texture(Buffer var1) {
this.isLoaded = false; // L: 25
this.averageRGB = var1.readUnsignedShort(); // L: 29
- this.field2332 = var1.readUnsignedByte() == 1; // L: 30
+ this.field2293 = var1.readUnsignedByte() == 1; // L: 30
int var2 = var1.readUnsignedByte(); // L: 31
if (var2 >= 1 && var2 <= 4) { // L: 32
this.fileIds = new int[var2]; // L: 35
@@ -53,25 +53,25 @@ public class Texture extends Node {
}
if (var2 > 1) { // L: 37
- this.field2334 = new int[var2 - 1]; // L: 38
+ this.field2301 = new int[var2 - 1]; // L: 38
for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39
- this.field2334[var3] = var1.readUnsignedByte();
+ this.field2301[var3] = var1.readUnsignedByte();
}
}
if (var2 > 1) { // L: 41
- this.field2335 = new int[var2 - 1]; // L: 42
+ this.field2296 = new int[var2 - 1]; // L: 42
for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43
- this.field2335[var3] = var1.readUnsignedByte();
+ this.field2296[var3] = var1.readUnsignedByte();
}
}
- this.field2329 = new int[var2]; // L: 45
+ this.field2295 = new int[var2]; // L: 45
for (var3 = 0; var3 < var2; ++var3) { // L: 46
- this.field2329[var3] = var1.readInt();
+ this.field2295[var3] = var1.readInt();
}
this.animationDirection = var1.readUnsignedByte(); // L: 47
@@ -82,9 +82,9 @@ public class Texture extends Node {
}
} // L: 50
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(DILlp;)Z"
+ descriptor = "(DILlh;)Z"
)
@Export("load")
boolean load(double var1, int var3, AbstractArchive var4) {
@@ -99,11 +99,11 @@ public class Texture extends Node {
this.pixels = new int[var5]; // L: 57
for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58
- IndexedSprite var7 = class67.method1883(var4, this.fileIds[var6]); // L: 59
+ IndexedSprite var7 = AbstractSocket.method6819(var4, this.fileIds[var6]); // L: 59
var7.normalize(); // L: 60
byte[] var8 = var7.pixels; // L: 61
int[] var9 = var7.palette; // L: 62
- int var10 = this.field2329[var6]; // L: 63
+ int var10 = this.field2295[var6]; // L: 63
if ((var10 & -16777216) == 16777216) { // L: 64
}
@@ -134,7 +134,7 @@ public class Texture extends Node {
if (var6 == 0) { // L: 79
var11 = 0;
} else {
- var11 = this.field2334[var6 - 1]; // L: 80
+ var11 = this.field2301[var6 - 1]; // L: 80
}
if (var11 == 0) { // L: 81
@@ -178,13 +178,13 @@ public class Texture extends Node {
return true; // L: 105
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("reset")
void reset() {
this.pixels = null; // L: 109
} // L: 110
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("animate")
void animate(int var1) {
if (this.pixels != null) { // L: 113
diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java
index 40eaea82f2..f6f4f0d53f 100644
--- a/runescape-client/src/main/java/TextureLoader.java
+++ b/runescape-client/src/main/java/TextureLoader.java
@@ -3,36 +3,36 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hk")
+@ObfuscatedName("hl")
@Implements("TextureLoader")
public interface TextureLoader {
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)[I",
- garbageValue = "-1172311447"
+ descriptor = "(IB)[I",
+ garbageValue = "24"
)
@Export("getTexturePixels")
int[] getTexturePixels(int var1);
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-1180986754"
+ descriptor = "(IS)I",
+ garbageValue = "-3917"
)
@Export("getAverageTextureRGB")
int getAverageTextureRGB(int var1);
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(IB)Z",
- garbageValue = "53"
+ garbageValue = "-52"
)
- boolean vmethod4381(int var1);
+ boolean vmethod4538(int var1);
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "40"
+ descriptor = "(II)Z",
+ garbageValue = "-1596996574"
)
@Export("isLowDetail")
boolean isLowDetail(int var1);
diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java
index 5d831b8227..f3a9687873 100644
--- a/runescape-client/src/main/java/TextureProvider.java
+++ b/runescape-client/src/main/java/TextureProvider.java
@@ -4,51 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ht")
+@ObfuscatedName("hk")
@Implements("TextureProvider")
public class TextureProvider implements TextureLoader {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "[Lgo;"
+ descriptor = "[Lgd;"
)
@Export("textures")
Texture[] textures;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Llv;"
+ descriptor = "Llo;"
)
@Export("deque")
NodeDeque deque;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1556133807
+ intValue = -1240613953
)
@Export("capacity")
int capacity;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1550792351
+ intValue = 131497903
)
@Export("remaining")
int remaining;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("brightness")
double brightness;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 125957321
+ intValue = 2025819025
)
@Export("textureSize")
int textureSize;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("archive")
AbstractArchive archive;
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;IDI)V"
+ descriptor = "(Llh;Llh;IDI)V"
)
public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) {
this.deque = new NodeDeque(); // L: 9
@@ -71,10 +71,10 @@ public class TextureProvider implements TextureLoader {
} // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1270321324"
+ descriptor = "(B)I",
+ garbageValue = "-29"
)
@Export("getLoadedPercentage")
public int getLoadedPercentage() {
@@ -90,7 +90,7 @@ public class TextureProvider implements TextureLoader {
for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43
int var8 = var6[var7]; // L: 44
- if (this.archive.method5668(var8)) { // L: 46
+ if (this.archive.method5849(var8)) { // L: 46
++var2; // L: 47
}
}
@@ -104,17 +104,17 @@ public class TextureProvider implements TextureLoader {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("setBrightness")
public void setBrightness(double var1) {
this.brightness = var1; // L: 60
this.clear(); // L: 61
} // L: 62
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)[I",
- garbageValue = "-1172311447"
+ descriptor = "(IB)[I",
+ garbageValue = "24"
)
@Export("getTexturePixels")
public int[] getTexturePixels(int var1) {
@@ -144,39 +144,39 @@ public class TextureProvider implements TextureLoader {
return null; // L: 84
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-1180986754"
+ descriptor = "(IS)I",
+ garbageValue = "-3917"
)
@Export("getAverageTextureRGB")
public int getAverageTextureRGB(int var1) {
return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(IB)Z",
- garbageValue = "53"
+ garbageValue = "-52"
)
- public boolean vmethod4381(int var1) {
- return this.textures[var1].field2332; // L: 93
+ public boolean vmethod4538(int var1) {
+ return this.textures[var1].field2293; // L: 93
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "40"
+ descriptor = "(II)Z",
+ garbageValue = "-1596996574"
)
@Export("isLowDetail")
public boolean isLowDetail(int var1) {
return this.textureSize == 64; // L: 97
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "412770361"
+ garbageValue = "586737024"
)
@Export("clear")
public void clear() {
@@ -190,10 +190,10 @@ public class TextureProvider implements TextureLoader {
this.remaining = this.capacity; // L: 105
} // L: 106
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "1167642279"
+ garbageValue = "-924908553"
)
@Export("animate")
public void animate(int var1) {
@@ -207,59 +207,117 @@ public class TextureProvider implements TextureLoader {
} // L: 116
- @ObfuscatedName("ai")
+ @ObfuscatedName("ia")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-496024306"
+ descriptor = "(IIIILjava/lang/String;I)V",
+ garbageValue = "-18765802"
)
- static int method4246(int var0, Script var1, boolean var2) {
- if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4547
- if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4551
- if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4555
- if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4559
- if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4563
- if (var0 != 7031 && var0 != 7032) { // L: 4567
- if (var0 == 7033) { // L: 4572
- --class9.Interpreter_stringStackSize; // L: 4573
- return 1; // L: 4574
- } else if (var0 != 7036 && var0 != 7037) { // L: 4576
- if (var0 == 7038) { // L: 4580
- --class12.Interpreter_intStackSize; // L: 4581
- return 1; // L: 4582
- } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4584
- return 2; // L: 4588
- } else {
- --class12.Interpreter_intStackSize; // L: 4585
- return 1; // L: 4586
- }
- } else {
- class12.Interpreter_intStackSize -= 2; // L: 4577
- return 1; // L: 4578
- }
- } else {
- --class9.Interpreter_stringStackSize; // L: 4568
- --class12.Interpreter_intStackSize; // L: 4569
- return 1; // L: 4570
- }
- } else {
- --class12.Interpreter_intStackSize; // L: 4564
- return 1; // L: 4565
- }
- } else {
- class12.Interpreter_intStackSize -= 2; // L: 4560
- return 1; // L: 4561
- }
- } else {
- class12.Interpreter_intStackSize -= 2; // L: 4556
- return 1; // L: 4557
- }
- } else {
- class12.Interpreter_intStackSize -= 3; // L: 4552
- return 1; // L: 4553
+ @Export("widgetDefaultMenuAction")
+ static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
+ Widget var5 = ScriptFrame.getWidgetChild(var1, var2); // L: 9595
+ if (var5 != null) { // L: 9596
+ if (var5.onOp != null) { // L: 9597
+ ScriptEvent var6 = new ScriptEvent(); // L: 9598
+ var6.widget = var5; // L: 9599
+ var6.opIndex = var0; // L: 9600
+ var6.targetName = var4; // L: 9601
+ var6.args = var5.onOp; // L: 9602
+ BoundaryObject.runScriptEvent(var6); // L: 9603
+ }
+
+ boolean var11 = true; // L: 9605
+ if (var5.contentType > 0) { // L: 9606
+ var11 = Message.method1065(var5);
+ }
+
+ if (var11) { // L: 9607
+ int var8 = class124.getWidgetFlags(var5); // L: 9609
+ int var9 = var0 - 1; // L: 9610
+ boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9612
+ if (var7) { // L: 9614
+ PacketBufferNode var10;
+ if (var0 == 1) { // L: 9617
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2934, Client.packetWriter.isaacCipher); // L: 9619
+ var10.packetBuffer.writeInt(var1); // L: 9620
+ var10.packetBuffer.writeShort(var2); // L: 9621
+ var10.packetBuffer.writeShort(var3); // L: 9622
+ Client.packetWriter.addNode(var10); // L: 9623
+ }
+
+ if (var0 == 2) { // L: 9625
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2983, Client.packetWriter.isaacCipher); // L: 9627
+ var10.packetBuffer.writeInt(var1); // L: 9628
+ var10.packetBuffer.writeShort(var2); // L: 9629
+ var10.packetBuffer.writeShort(var3); // L: 9630
+ Client.packetWriter.addNode(var10); // L: 9631
+ }
+
+ if (var0 == 3) { // L: 9633
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2930, Client.packetWriter.isaacCipher); // L: 9635
+ var10.packetBuffer.writeInt(var1); // L: 9636
+ var10.packetBuffer.writeShort(var2); // L: 9637
+ var10.packetBuffer.writeShort(var3); // L: 9638
+ Client.packetWriter.addNode(var10); // L: 9639
+ }
+
+ if (var0 == 4) { // L: 9641
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2915, Client.packetWriter.isaacCipher); // L: 9643
+ var10.packetBuffer.writeInt(var1); // L: 9644
+ var10.packetBuffer.writeShort(var2); // L: 9645
+ var10.packetBuffer.writeShort(var3); // L: 9646
+ Client.packetWriter.addNode(var10); // L: 9647
+ }
+
+ if (var0 == 5) { // L: 9649
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 9651
+ var10.packetBuffer.writeInt(var1); // L: 9652
+ var10.packetBuffer.writeShort(var2); // L: 9653
+ var10.packetBuffer.writeShort(var3); // L: 9654
+ Client.packetWriter.addNode(var10); // L: 9655
+ }
+
+ if (var0 == 6) { // L: 9657
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 9659
+ var10.packetBuffer.writeInt(var1); // L: 9660
+ var10.packetBuffer.writeShort(var2); // L: 9661
+ var10.packetBuffer.writeShort(var3); // L: 9662
+ Client.packetWriter.addNode(var10); // L: 9663
+ }
+
+ if (var0 == 7) { // L: 9665
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2963, Client.packetWriter.isaacCipher); // L: 9667
+ var10.packetBuffer.writeInt(var1); // L: 9668
+ var10.packetBuffer.writeShort(var2); // L: 9669
+ var10.packetBuffer.writeShort(var3); // L: 9670
+ Client.packetWriter.addNode(var10); // L: 9671
+ }
+
+ if (var0 == 8) { // L: 9673
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2996, Client.packetWriter.isaacCipher); // L: 9675
+ var10.packetBuffer.writeInt(var1); // L: 9676
+ var10.packetBuffer.writeShort(var2); // L: 9677
+ var10.packetBuffer.writeShort(var3); // L: 9678
+ Client.packetWriter.addNode(var10); // L: 9679
+ }
+
+ if (var0 == 9) { // L: 9681
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 9683
+ var10.packetBuffer.writeInt(var1); // L: 9684
+ var10.packetBuffer.writeShort(var2); // L: 9685
+ var10.packetBuffer.writeShort(var3); // L: 9686
+ Client.packetWriter.addNode(var10); // L: 9687
+ }
+
+ if (var0 == 10) { // L: 9689
+ var10 = EnumComposition.getPacketBufferNode(ClientPacket.field2952, Client.packetWriter.isaacCipher); // L: 9691
+ var10.packetBuffer.writeInt(var1); // L: 9692
+ var10.packetBuffer.writeShort(var2); // L: 9693
+ var10.packetBuffer.writeShort(var3); // L: 9694
+ Client.packetWriter.addNode(var10); // L: 9695
+ }
+
+ }
}
- } else {
- class12.Interpreter_intStackSize -= 5; // L: 4548
- return 1; // L: 4549
}
- }
+ } // L: 9615 9697
}
diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java
index 4354334a53..b9590bf1ea 100644
--- a/runescape-client/src/main/java/Tile.java
+++ b/runescape-client/src/main/java/Tile.java
@@ -3,131 +3,130 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("gn")
+@ObfuscatedName("gy")
@Implements("Tile")
public final class Tile extends Node {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 887186055
+ intValue = -1461576443
)
@Export("plane")
int plane;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 719692751
+ intValue = 107736561
)
@Export("x")
int x;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 2070822957
+ intValue = -1903824993
)
@Export("y")
int y;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1571348595
+ intValue = 183262573
)
@Export("originalPlane")
int originalPlane;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lhr;"
- )
- @Export("paint")
- SceneTilePaint paint;
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Lhu;"
)
+ @Export("paint")
+ SceneTilePaint paint;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Lhs;"
+ )
@Export("model")
SceneTileModel model;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Lhc;"
+ descriptor = "Lhi;"
)
@Export("boundaryObject")
BoundaryObject boundaryObject;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Lhf;"
+ descriptor = "Lhr;"
)
@Export("wallDecoration")
WallDecoration wallDecoration;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Lga;"
+ descriptor = "Lge;"
)
@Export("floorDecoration")
FloorDecoration floorDecoration;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "Lgz;"
)
@Export("itemLayer")
ItemLayer itemLayer;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -1697073381
+ intValue = -1959220913
)
@Export("gameObjectsCount")
int gameObjectsCount;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "[Lhx;"
+ descriptor = "[Lhb;"
)
@Export("gameObjects")
GameObject[] gameObjects;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("gameObjectEdgeMasks")
int[] gameObjectEdgeMasks;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = -344605411
+ intValue = 1592606351
)
@Export("gameObjectsEdgeMask")
int gameObjectsEdgeMask;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = -1026469489
+ intValue = 876783023
)
@Export("minPlane")
int minPlane;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("drawPrimary")
boolean drawPrimary;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("drawSecondary")
boolean drawSecondary;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@Export("drawGameObjects")
boolean drawGameObjects;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = -1027035127
+ intValue = -1840099321
)
@Export("drawGameObjectEdges")
int drawGameObjectEdges;
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedGetter(
- intValue = 1807728235
+ intValue = 1630683853
)
- int field2372;
- @ObfuscatedName("f")
+ int field2333;
+ @ObfuscatedName("p")
@ObfuscatedGetter(
- intValue = -588428605
+ intValue = -1394148627
)
- int field2373;
- @ObfuscatedName("d")
+ int field2334;
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = -720858367
+ intValue = -1332026471
)
- int field2374;
- @ObfuscatedName("j")
+ int field2326;
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "Lgn;"
+ descriptor = "Lgy;"
)
@Export("linkedBelowTile")
Tile linkedBelowTile;
@@ -136,100 +135,31 @@ public final class Tile extends Node {
this.gameObjects = new GameObject[5]; // L: 17
this.gameObjectEdgeMasks = new int[5]; // L: 18
this.gameObjectsEdgeMask = 0; // L: 19
- this.originalPlane = this.plane = var1;
+ this.originalPlane = this.plane = var1; // L: 31
this.x = var2; // L: 32
this.y = var3; // L: 33
} // L: 34
- @ObfuscatedName("q")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(S)Lnw;",
- garbageValue = "-23548"
+ descriptor = "(IZB)Ljava/lang/String;",
+ garbageValue = "69"
)
- public static class388 method3904() {
- synchronized(class388.field4402) { // L: 27
- if (class388.field4401 == 0) { // L: 28
- return new class388();
- } else {
- class388.field4402[--class388.field4401].method6861(); // L: 30
- return class388.field4402[class388.field4401]; // L: 31
- }
- }
+ @Export("intToString")
+ public static String intToString(int var0, boolean var1) {
+ return var1 && var0 >= 0 ? class140.method3038(var0, 10, var1) : Integer.toString(var0); // L: 115 116
}
- @ObfuscatedName("h")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "1"
+ descriptor = "(IB)I",
+ garbageValue = "29"
)
- static int method3903(int var0, Script var1, boolean var2) {
- Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1312
- if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.x; // L: 1314
- return 1; // L: 1315
- } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.y; // L: 1318
- return 1; // L: 1319
- } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.width; // L: 1322
- return 1; // L: 1323
- } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.height; // L: 1326
- return 1; // L: 1327
- } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330
- return 1; // L: 1331
- } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334
- return 1; // L: 1335
+ public static int method4019(int var0) {
+ if (var0 > 0) { // L: 204
+ return 1;
} else {
- return 2; // L: 1337
- }
- }
-
- @ObfuscatedName("ay")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-61"
- )
- static int method3902(int var0, Script var1, boolean var2) {
- if (var0 == 7100) { // L: 4592
- ++class12.Interpreter_intStackSize; // L: 4593
- return 1; // L: 4594
- } else if (var0 == 7101) { // L: 4596
- class9.Interpreter_stringStackSize += 2; // L: 4597
- return 1; // L: 4598
- } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4600
- if (var0 == 7106) { // L: 4604
- ++class12.Interpreter_intStackSize; // L: 4605
- return 1; // L: 4606
- } else if (var0 == 7107) { // L: 4608
- ++class12.Interpreter_intStackSize; // L: 4609
- return 1; // L: 4610
- } else if (var0 == 7108) { // L: 4612
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = CollisionMap.method3788() ? 1 : 0; // L: 4613
- return 1; // L: 4614
- } else if (var0 == 7110) { // L: 4616
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4617
- return 1; // L: 4618
- } else if (var0 == 7120) { // L: 4620
- --class12.Interpreter_intStackSize; // L: 4621
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4622
- return 1; // L: 4623
- } else if (var0 == 7121) { // L: 4625
- class12.Interpreter_intStackSize -= 2; // L: 4626
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4627
- return 1; // L: 4628
- } else if (var0 == 7122) { // L: 4630
- class12.Interpreter_intStackSize -= 2; // L: 4631
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4632
- return 1; // L: 4633
- } else {
- return 2; // L: 4635
- }
- } else {
- ++class12.Interpreter_intStackSize; // L: 4601
- return 1; // L: 4602
+ return var0 < 0 ? -1 : 0; // L: 205 206
}
}
}
diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java
index 863a85cb0c..9ff4fdb2a0 100644
--- a/runescape-client/src/main/java/TileItem.java
+++ b/runescape-client/src/main/java/TileItem.java
@@ -4,29 +4,28 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cg")
+@ObfuscatedName("cy")
@Implements("TileItem")
public final class TileItem extends Renderable {
- @ObfuscatedName("sb")
- @ObfuscatedGetter(
- intValue = -1684889403
- )
- static int field1292;
- @ObfuscatedName("ev")
+ @ObfuscatedName("ar")
+ protected static String field1301;
+ @ObfuscatedName("aw")
+ static String field1299;
+ @ObfuscatedName("hi")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Lmt;"
)
- @Export("archive9")
- static Archive archive9;
- @ObfuscatedName("o")
+ @Export("fontBold12")
+ static Font fontBold12;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -2046412949
+ intValue = -1688540919
)
@Export("id")
int id;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 129863863
+ intValue = -895126303
)
@Export("quantity")
int quantity;
@@ -34,26 +33,22 @@ public final class TileItem extends Renderable {
TileItem() {
} // L: 11
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)Lhv;",
- garbageValue = "-238822980"
+ descriptor = "(I)Lhy;",
+ garbageValue = "1081110576"
)
@Export("getModel")
protected final Model getModel() {
- return FileSystem.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14
+ return EnumComposition.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14
}
- @ObfuscatedName("fk")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lgq;IIIB)V",
- garbageValue = "11"
+ descriptor = "(II)I",
+ garbageValue = "1179876648"
)
- static void method2407(SequenceDefinition var0, int var1, int var2, int var3) {
- if (Client.soundEffectCount < 50 && class12.clientPreferences.method2239() != 0) { // L: 3768
- if (var0.field2209 != null && var0.field2209.containsKey(var1)) { // L: 3769
- MouseHandler.method588((Integer)var0.field2209.get(var1), var2, var3); // L: 3770
- }
- }
- } // L: 3771
+ public static int method2414(int var0) {
+ return class7.method51(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 73
+ }
}
diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java
index f0a204ad90..88de70d846 100644
--- a/runescape-client/src/main/java/Tiles.java
+++ b/runescape-client/src/main/java/Tiles.java
@@ -1,398 +1,162 @@
-import java.applet.Applet;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("bn")
+@ObfuscatedName("bm")
@Implements("Tiles")
public final class Tiles {
- @ObfuscatedName("rx")
- static boolean field997;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("Tiles_heights")
static int[][][] Tiles_heights;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("Tiles_renderFlags")
static byte[][][] Tiles_renderFlags;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 7708309
+ intValue = -1266793715
)
@Export("Tiles_minPlane")
static int Tiles_minPlane;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("Tiles_underlays")
static byte[][][] Tiles_underlays;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("Tiles_overlays")
static byte[][][] Tiles_overlays;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("Tiles_shapes")
static byte[][][] Tiles_shapes;
- @ObfuscatedName("w")
- @Export("Tiles_hueMultiplier")
- static int[] Tiles_hueMultiplier;
- @ObfuscatedName("e")
- static final int[] field988;
- @ObfuscatedName("h")
- static final int[] field989;
- @ObfuscatedName("f")
- static final int[] field990;
- @ObfuscatedName("d")
- static final int[] field991;
- @ObfuscatedName("j")
- static final int[] field995;
- @ObfuscatedName("z")
- static final int[] field993;
- @ObfuscatedName("i")
+ @ObfuscatedName("g")
+ static byte[][][] field996;
+ @ObfuscatedName("s")
+ @Export("Tiles_saturation")
+ static int[] Tiles_saturation;
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "Ljj;"
+ )
+ @Export("musicTrack")
+ public static MusicTrack musicTrack;
+ @ObfuscatedName("l")
+ static final int[] field1007;
+ @ObfuscatedName("a")
+ static final int[] field1011;
+ @ObfuscatedName("p")
+ static final int[] field1003;
+ @ObfuscatedName("b")
+ static final int[] field1005;
+ @ObfuscatedName("n")
+ static final int[] field1006;
+ @ObfuscatedName("o")
+ static final int[] field1002;
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = -1755098149
+ intValue = -1814148363
)
@Export("rndHue")
static int rndHue;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedGetter(
- intValue = -243886671
+ intValue = -1220296573
)
@Export("rndLightness")
static int rndLightness;
- @ObfuscatedName("fv")
- @ObfuscatedGetter(
- intValue = -1283558205
- )
- @Export("worldPort")
- static int worldPort;
static {
Tiles_heights = new int[4][105][105]; // L: 16
Tiles_renderFlags = new byte[4][104][104]; // L: 17
Tiles_minPlane = 99; // L: 18
- field988 = new int[]{1, 2, 4, 8}; // L: 34
- field989 = new int[]{16, 32, 64, 128}; // L: 35
- field990 = new int[]{1, 0, -1, 0}; // L: 36
- field991 = new int[]{0, -1, 0, 1}; // L: 37
- field995 = new int[]{1, -1, -1, 1}; // L: 38
- field993 = new int[]{-1, -1, 1, 1}; // L: 39
+ field1007 = new int[]{1, 2, 4, 8}; // L: 34
+ field1011 = new int[]{16, 32, 64, 128}; // L: 35
+ field1003 = new int[]{1, 0, -1, 0}; // L: 36
+ field1005 = new int[]{0, -1, 0, 1}; // L: 37
+ field1006 = new int[]{1, -1, -1, 1}; // L: 38
+ field1002 = new int[]{-1, -1, 1, 1}; // L: 39
rndHue = (int)(Math.random() * 17.0D) - 8; // L: 40
rndLightness = (int)(Math.random() * 33.0D) - 16; // L: 41
}
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V",
- garbageValue = "-1322064070"
+ descriptor = "(I)V",
+ garbageValue = "2041916936"
)
- public static void method1996(Applet var0, String var1) {
- class29.field170 = var0; // L: 22
- if (var1 != null) { // L: 23
- class29.field168 = var1;
- }
-
- } // L: 24
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "128"
- )
- static final void method2017() {
- InterfaceParent.method2067("Your friend list is full. Max of 200 for free users, and 400 for members"); // L: 130
- } // L: 131
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "([BIIIIIIILgm;[Lgh;)V"
- )
- static final void method2033(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) {
- Buffer var10 = new Buffer(var0); // L: 283
- int var11 = -1; // L: 284
-
- while (true) {
- int var12 = var10.method7531(); // L: 286
- if (var12 == 0) { // L: 287
- return; // L: 342
+ static void method2065() {
+ synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 60
+ if (ArchiveDiskActionHandler.field3971 == 0) { // L: 61
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 62
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 63
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 64
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 65
}
- var11 += var12; // L: 288
- int var13 = 0; // L: 289
+ ArchiveDiskActionHandler.field3971 = 600; // L: 67
+ }
+ } // L: 69
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "([BIIIIIIILgg;[Lgv;)V"
+ )
+ static final void method2007(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) {
+ Buffer var10 = new Buffer(var0); // L: 260
+ int var11 = -1; // L: 261
+
+ while (true) {
+ int var12 = var10.method7770(); // L: 263
+ if (var12 == 0) { // L: 264
+ return; // L: 291
+ }
+
+ var11 += var12; // L: 265
+ int var13 = 0; // L: 266
while (true) {
- int var14 = var10.readUShortSmart(); // L: 291
- if (var14 == 0) { // L: 292
+ int var14 = var10.readUShortSmart(); // L: 268
+ if (var14 == 0) { // L: 269
break;
}
- var13 += var14 - 1; // L: 293
- int var15 = var13 & 63; // L: 294
- int var16 = var13 >> 6 & 63; // L: 295
- int var17 = var13 >> 12; // L: 296
- int var18 = var10.readUnsignedByte(); // L: 297
- int var19 = var18 >> 2; // L: 298
- int var20 = var18 & 3; // L: 299
- if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 300
- ObjectComposition var21 = class82.getObjectDefinition(var11); // L: 301
- int var24 = var16 & 7; // L: 304
- int var25 = var15 & 7; // L: 305
- int var27 = var21.sizeX; // L: 307
- int var28 = var21.sizeY; // L: 308
- int var29;
- if ((var20 & 1) == 1) { // L: 310
- var29 = var27; // L: 311
- var27 = var28; // L: 312
- var28 = var29; // L: 313
- }
-
- int var26 = var7 & 3; // L: 315
- int var23;
- if (var26 == 0) { // L: 316
- var23 = var24; // L: 317
- } else if (var26 == 1) { // L: 320
- var23 = var25; // L: 321
- } else if (var26 == 2) { // L: 324
- var23 = 7 - var24 - (var27 - 1); // L: 325
- } else {
- var23 = 7 - var25 - (var28 - 1); // L: 328
- }
-
- var29 = var2 + var23; // L: 330
- int var30 = var3 + class117.method2717(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 331
- if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { // L: 332
- int var31 = var1; // L: 333
- if ((Tiles_renderFlags[1][var29][var30] & 2) == 2) { // L: 334
- var31 = var1 - 1;
+ var13 += var14 - 1; // L: 270
+ int var15 = var13 & 63; // L: 271
+ int var16 = var13 >> 6 & 63; // L: 272
+ int var17 = var13 >> 12; // L: 273
+ int var18 = var10.readUnsignedByte(); // L: 274
+ int var19 = var18 >> 2; // L: 275
+ int var20 = var18 & 3; // L: 276
+ if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 277
+ ObjectComposition var21 = class162.getObjectDefinition(var11); // L: 278
+ int var22 = var2 + FloorOverlayDefinition.method3810(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 279
+ int var23 = var3 + class141.method3044(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 280
+ if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 281
+ int var24 = var1; // L: 282
+ if ((Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 283
+ var24 = var1 - 1;
}
- CollisionMap var32 = null; // L: 335
- if (var31 >= 0) { // L: 336
- var32 = var9[var31];
+ CollisionMap var25 = null; // L: 284
+ if (var24 >= 0) { // L: 285
+ var25 = var9[var24];
}
- class19.addObjects(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 337
+ class268.addObjects(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 286
}
}
}
}
}
- @ObfuscatedName("aj")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "16711680"
- )
- static int method2030(int var0, Script var1, boolean var2) {
- int var3;
- if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2892
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2893
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2894
- return 1; // L: 2895
- } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2897
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2898
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2899
- return 1; // L: 2900
- } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2902
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2903
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2904
- return 1; // L: 2905
- } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2907
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2908
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2909
- return 1; // L: 2910
- } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2912
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2913
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2914
- return 1; // L: 2915
- } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2917
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2918
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2919
- return 1; // L: 2920
- } else {
- int var13;
- if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2922
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2923
- var13 = Client.grandExchangeOffers[var3].status(); // L: 2924
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2925
- return 1; // L: 2926
- } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2928
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2929
- var13 = Client.grandExchangeOffers[var3].status(); // L: 2930
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2931
- return 1; // L: 2932
- } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2934
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2935
- var13 = Client.grandExchangeOffers[var3].status(); // L: 2936
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2937
- return 1; // L: 2938
- } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2940
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2941
- var13 = Client.grandExchangeOffers[var3].status(); // L: 2942
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2943
- return 1; // L: 2944
- } else {
- boolean var12;
- if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2946
- var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2947
- if (class120.grandExchangeEvents != null) { // L: 2948
- class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2949
- }
-
- return 1; // L: 2951
- } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2953
- var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2954
- if (class120.grandExchangeEvents != null) { // L: 2955
- class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2956
- }
-
- return 1; // L: 2958
- } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2960
- class12.Interpreter_intStackSize -= 2; // L: 2961
- var12 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] == 1; // L: 2962
- boolean var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 2963
- if (class120.grandExchangeEvents != null) { // L: 2964
- Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2965
- class120.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2966
- }
-
- return 1; // L: 2968
- } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2970
- var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2971
- if (class120.grandExchangeEvents != null) { // L: 2972
- class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2973
- }
-
- return 1; // L: 2975
- } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2977
- var12 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2978
- if (class120.grandExchangeEvents != null) { // L: 2979
- class120.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2980
- }
-
- return 1; // L: 2982
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2984
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class120.grandExchangeEvents == null ? 0 : class120.grandExchangeEvents.events.size(); // L: 2985
- return 1; // L: 2986
- } else {
- GrandExchangeEvent var4;
- if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2988
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2989
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 2990
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.world; // L: 2991
- return 1; // L: 2992
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2994
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2995
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 2996
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2997
- return 1; // L: 2998
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3000
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3001
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3002
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3003
- return 1; // L: 3004
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3006
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3007
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3008
- long var5 = class113.method2624() - UserComparator8.field1380 - var4.age; // L: 3009
- int var7 = (int)(var5 / 3600000L); // L: 3010
- int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3011
- int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3012
- String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3013
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var10; // L: 3014
- return 1; // L: 3015
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3017
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3018
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3019
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3020
- return 1; // L: 3021
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3023
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3024
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3025
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3026
- return 1; // L: 3027
- } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3029
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3030
- var4 = (GrandExchangeEvent)class120.grandExchangeEvents.events.get(var3); // L: 3031
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3032
- return 1; // L: 3033
- } else {
- return 2; // L: 3035
- }
- }
- }
- }
- }
-
- @ObfuscatedName("hp")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-47"
+ garbageValue = "-21"
)
- static final void method2031() {
- for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7873 7874 7917
- if (var0.hitpoints > 0) { // L: 7875
- --var0.hitpoints;
- }
-
- boolean var1;
- int var2;
- int var3;
- ObjectComposition var4;
- if (var0.hitpoints == 0) { // L: 7876
- if (var0.objectId >= 0) { // L: 7878
- var2 = var0.objectId; // L: 7880
- var3 = var0.field1129; // L: 7881
- var4 = class82.getObjectDefinition(var2); // L: 7883
- if (var3 == 11) { // L: 7884
- var3 = 10;
- }
-
- if (var3 >= 5 && var3 <= 8) { // L: 7885
- var3 = 4;
- }
-
- var1 = var4.method3589(var3); // L: 7886
- if (!var1) { // L: 7888
- continue;
- }
- }
-
- WorldMapData_1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1131, var0.field1129); // L: 7890
- var0.remove(); // L: 7891
- } else {
- if (var0.delay > 0) { // L: 7895
- --var0.delay;
- }
-
- if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7896
- if (var0.id >= 0) { // L: 7898
- var2 = var0.id; // L: 7900
- var3 = var0.field1126; // L: 7901
- var4 = class82.getObjectDefinition(var2); // L: 7903
- if (var3 == 11) { // L: 7904
- var3 = 10;
- }
-
- if (var3 >= 5 && var3 <= 8) { // L: 7905
- var3 = 4;
- }
-
- var1 = var4.method3589(var3); // L: 7906
- if (!var1) { // L: 7908
- continue;
- }
- }
-
- WorldMapData_1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1126); // L: 7910
- var0.delay = -1; // L: 7911
- if (var0.objectId == var0.id && var0.objectId == -1) { // L: 7912
- var0.remove();
- } else if (var0.objectId == var0.id && var0.orientation == var0.field1131 && var0.field1126 == var0.field1129) { // L: 7913
- var0.remove();
- }
- }
- }
- }
-
- } // L: 7919
+ static void method2021() {
+ Login.worldSelectOpen = false; // L: 1932
+ class16.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1933
+ Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1934
+ Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 1935
+ } // L: 1936
}
diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java
index 9635c6272a..f7712b607b 100644
--- a/runescape-client/src/main/java/Timer.java
+++ b/runescape-client/src/main/java/Timer.java
@@ -4,195 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mn")
+@ObfuscatedName("ms")
@Implements("Timer")
public class Timer {
- @ObfuscatedName("tn")
+ @ObfuscatedName("pd")
@ObfuscatedGetter(
- intValue = 593799609
+ intValue = -18121781
)
- static int field4239;
- @ObfuscatedName("fh")
- @Export("worldHost")
- static String worldHost;
- @ObfuscatedName("o")
+ @Export("widgetDragDuration")
+ static int widgetDragDuration;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- longValue = 6252735517652003957L
+ longValue = -7534706657050485889L
)
- long field4243;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- longValue = 6672603263529714973L
- )
- long field4234;
- @ObfuscatedName("l")
- public boolean field4235;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- longValue = 3502493809847278955L
- )
- long field4233;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- longValue = 1482756365689687747L
- )
- long field4237;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- longValue = 6358858334505222211L
- )
- long field4238;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 1223349955
- )
- int field4242;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = 2005745533
- )
- int field4240;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = 677343331
- )
- int field4241;
+ long field4229;
@ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -2040849017
+ longValue = -5833618965012635637L
)
- int field4236;
+ long field4222;
+ @ObfuscatedName("q")
+ public boolean field4223;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ longValue = 3038728060957111589L
+ )
+ long field4225;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ longValue = -6534297593738218343L
+ )
+ long field4224;
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ longValue = -6100054900427269931L
+ )
+ long field4226;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = 1919878609
+ )
+ int field4230;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = 804777017
+ )
+ int field4228;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 100565155
+ )
+ int field4227;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = -2082864779
+ )
+ int field4221;
public Timer() {
- this.field4243 = -1L; // L: 7
- this.field4234 = -1L; // L: 8
- this.field4235 = false; // L: 9
- this.field4233 = 0L; // L: 10
- this.field4237 = 0L; // L: 11
- this.field4238 = 0L; // L: 12
- this.field4242 = 0; // L: 13
- this.field4240 = 0; // L: 14
- this.field4241 = 0; // L: 15
- this.field4236 = 0; // L: 16
+ this.field4229 = -1L; // L: 7
+ this.field4222 = -1L; // L: 8
+ this.field4223 = false; // L: 9
+ this.field4225 = 0L; // L: 10
+ this.field4224 = 0L; // L: 11
+ this.field4226 = 0L; // L: 12
+ this.field4230 = 0; // L: 13
+ this.field4228 = 0; // L: 14
+ this.field4227 = 0; // L: 15
+ this.field4221 = 0; // L: 16
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1914622703"
+ garbageValue = "2014926456"
)
- public void method6374() {
- this.field4243 = class113.method2624(); // L: 19
+ public void method6509() {
+ this.field4229 = class115.method2692(); // L: 19
} // L: 20
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "521585779"
+ garbageValue = "-2107977295"
)
- public void method6375() {
- if (-1L != this.field4243) { // L: 23
- this.field4237 = class113.method2624() - this.field4243; // L: 24
- this.field4243 = -1L; // L: 25
+ public void method6510() {
+ if (-1L != this.field4229) { // L: 23
+ this.field4224 = class115.method2692() - this.field4229; // L: 24
+ this.field4229 = -1L; // L: 25
}
} // L: 27
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "744646168"
+ descriptor = "(IB)V",
+ garbageValue = "1"
)
- public void method6369(int var1) {
- this.field4234 = class113.method2624(); // L: 30
- this.field4242 = var1; // L: 31
+ public void method6528(int var1) {
+ this.field4222 = class115.method2692(); // L: 30
+ this.field4230 = var1; // L: 31
} // L: 32
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-689161961"
+ garbageValue = "-869956596"
)
- public void method6370() {
- if (this.field4234 != -1L) { // L: 35
- this.field4233 = class113.method2624() - this.field4234; // L: 36
- this.field4234 = -1L; // L: 37
+ public void method6511() {
+ if (-1L != this.field4222) { // L: 35
+ this.field4225 = class115.method2692() - this.field4222; // L: 36
+ this.field4222 = -1L; // L: 37
}
- ++this.field4241; // L: 39
- this.field4235 = true; // L: 40
+ ++this.field4227; // L: 39
+ this.field4223 = true; // L: 40
} // L: 41
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-607387453"
+ garbageValue = "665300300"
)
- public void method6371() {
- this.field4235 = false; // L: 44
- this.field4240 = 0; // L: 45
+ public void method6513() {
+ this.field4223 = false; // L: 44
+ this.field4228 = 0; // L: 45
} // L: 46
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1431625813"
+ garbageValue = "29951237"
)
- public void method6372() {
- this.method6370(); // L: 49
+ public void method6514() {
+ this.method6511(); // L: 49
} // L: 50
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "393397012"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1160086305"
)
@Export("write")
public void write(Buffer var1) {
- long var2 = this.field4237; // L: 53
- var2 /= 10L; // L: 55
- if (var2 < 0L) { // L: 56
- var2 = 0L;
- } else if (var2 > 65535L) { // L: 57
- var2 = 65535L;
- }
-
- var1.writeShort((int)var2); // L: 58
- long var4 = this.field4233; // L: 60
- var4 /= 10L; // L: 62
- if (var4 < 0L) { // L: 63
- var4 = 0L;
- } else if (var4 > 65535L) { // L: 64
- var4 = 65535L;
- }
-
- var1.writeShort((int)var4); // L: 65
- long var6 = this.field4238; // L: 67
- var6 /= 10L; // L: 69
- if (var6 < 0L) { // L: 70
- var6 = 0L;
- } else if (var6 > 65535L) { // L: 71
- var6 = 65535L;
- }
-
- var1.writeShort((int)var6); // L: 72
- var1.writeShort(this.field4242); // L: 74
- var1.writeShort(this.field4240); // L: 75
- var1.writeShort(this.field4241); // L: 76
- var1.writeShort(this.field4236); // L: 77
- } // L: 78
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Llp;Llp;Llp;Llp;I)V",
- garbageValue = "-1059775601"
- )
- public static void method6381(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
- class134.Widget_archive = var0; // L: 220
- class162.Widget_modelsArchive = var1; // L: 221
- WorldMapCacheName.Widget_spritesArchive = var2; // L: 222
- class93.Widget_fontsArchive = var3; // L: 223
- NetSocket.Widget_interfaceComponents = new Widget[class134.Widget_archive.getGroupCount()][]; // L: 224
- class120.Widget_loadedInterfaces = new boolean[class134.Widget_archive.getGroupCount()]; // L: 225
- } // L: 226
+ FloorOverlayDefinition.method3822(var1, this.field4224); // L: 53
+ FloorOverlayDefinition.method3822(var1, this.field4225); // L: 54
+ FloorOverlayDefinition.method3822(var1, this.field4226); // L: 55
+ var1.writeShort(this.field4230); // L: 56
+ var1.writeShort(this.field4228); // L: 57
+ var1.writeShort(this.field4227); // L: 58
+ var1.writeShort(this.field4221); // L: 59
+ } // L: 60
}
diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java
index b144b75fa7..1948a2906a 100644
--- a/runescape-client/src/main/java/TriBool.java
+++ b/runescape-client/src/main/java/TriBool.java
@@ -4,32 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nq")
+@ObfuscatedName("nt")
@Implements("TriBool")
public class TriBool {
- @ObfuscatedName("o")
+ @ObfuscatedName("uj")
+ @ObfuscatedGetter(
+ intValue = -1573630725
+ )
+ @Export("foundItemIndex")
+ static int foundItemIndex;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("TriBool_unknown")
public static final TriBool TriBool_unknown;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("TriBool_true")
public static final TriBool TriBool_true;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lnq;"
+ descriptor = "Lnt;"
)
@Export("TriBool_false")
public static final TriBool TriBool_false;
- @ObfuscatedName("w")
- @ObfuscatedGetter(
- intValue = 1003527319
- )
- static int field4339;
static {
TriBool_unknown = new TriBool(); // L: 4
@@ -40,17 +41,17 @@ public class TriBool {
TriBool() {
} // L: 8
- @ObfuscatedName("la")
+ @ObfuscatedName("fi")
@ObfuscatedSignature(
- descriptor = "(Lki;B)Ljava/lang/String;",
- garbageValue = "-92"
+ descriptor = "(ZI)V",
+ garbageValue = "114016538"
)
- @Export("Widget_getSpellActionName")
- static String Widget_getSpellActionName(Widget var0) {
- if (WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var0)) == 0) { // L: 12521
- return null;
+ static final void method6791(boolean var0) {
+ if (var0) { // L: 3020
+ Client.field515 = Login.field895 ? class124.field1544 : class124.field1550; // L: 3021
} else {
- return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12522 12523 12525
+ Client.field515 = class19.clientPreferences.parameters.containsKey(Projectile.method1950(Login.Login_username)) ? class124.field1546 : class124.field1543; // L: 3024
}
- }
+
+ } // L: 3026
}
diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java
index 945680c65a..bda4121708 100644
--- a/runescape-client/src/main/java/UrlRequest.java
+++ b/runescape-client/src/main/java/UrlRequest.java
@@ -1,58 +1,66 @@
import java.net.URL;
+import java.util.List;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cb")
+@ObfuscatedName("ct")
@Implements("UrlRequest")
public class UrlRequest {
- @ObfuscatedName("ef")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive11")
- static Archive archive11;
- @ObfuscatedName("o")
+ @ObfuscatedName("us")
+ static List field1373;
+ @ObfuscatedName("c")
@Export("url")
final URL url;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("isDone0")
volatile boolean isDone0;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("response0")
volatile byte[] response0;
UrlRequest(URL var1) {
- this.url = var1; // L: 115
- } // L: 116
+ this.url = var1; // L: 118
+ } // L: 119
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1235200526"
+ descriptor = "(B)Z",
+ garbageValue = "-60"
)
@Export("isDone")
public boolean isDone() {
- return this.isDone0; // L: 119
+ return this.isDone0; // L: 122
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)[B",
+ garbageValue = "-1112773966"
+ )
+ @Export("getResponse")
+ public byte[] getResponse() {
+ return this.response0; // L: 126
}
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)[B",
- garbageValue = "-1622605923"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-2136536725"
)
- @Export("getResponse")
- public byte[] getResponse() {
- return this.response0; // L: 123
+ public String method2553() {
+ return this.url.toString(); // L: 130
}
- @ObfuscatedName("l")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "28"
+ descriptor = "(ZZI)I",
+ garbageValue = "-1626715483"
)
- public String method2556() {
- return this.url.toString(); // L: 127
+ public static int method2557(boolean var0, boolean var1) {
+ byte var2 = 0; // L: 143
+ int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 144
+ return var3; // L: 145
}
}
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index f035f076cb..376cd22ab7 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -6,771 +6,189 @@ import java.util.LinkedList;
import java.util.Queue;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ce")
+@ObfuscatedName("cd")
@Implements("UrlRequester")
public abstract class UrlRequester implements Runnable {
- @ObfuscatedName("g")
+ @ObfuscatedName("vw")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Lll;"
)
- static IndexedSprite field1354;
- @ObfuscatedName("o")
- @Export("thread")
- final Thread thread;
- @ObfuscatedName("q")
+ public static class325 field1362;
+ @ObfuscatedName("c")
+ final Thread field1363;
+ @ObfuscatedName("v")
@Export("isClosed")
volatile boolean isClosed;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("requests")
Queue requests;
-
- UrlRequester() {
- this.requests = new LinkedList(); // L: 16
- this.thread = new Thread(this); // L: 19
- this.thread.setPriority(1); // L: 20
- this.thread.start(); // L: 21
- } // L: 22
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lcb;I)V",
- garbageValue = "717056983"
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = -1046925001
)
- abstract void vmethod2544(UrlRequest var1) throws IOException;
+ int field1360;
+
+ UrlRequester(int var1) {
+ this.requests = new LinkedList(); // L: 16
+ this.field1363 = new Thread(this); // L: 20
+ this.field1363.setPriority(1); // L: 21
+ this.field1363.start(); // L: 22
+ this.field1360 = var1; // L: 23
+ } // L: 24
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lct;I)V",
+ garbageValue = "1538294108"
+ )
+ abstract void vmethod2537(UrlRequest var1) throws IOException;
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/net/URLConnection;I)V",
+ garbageValue = "123786888"
+ )
+ void method2520(URLConnection var1) {
+ var1.setConnectTimeout(5000); // L: 52
+ var1.setReadTimeout(5000); // L: 53
+ var1.setUseCaches(false); // L: 54
+ var1.setRequestProperty("Connection", "close"); // L: 55
+ var1.setRequestProperty("User-Agent", "OldSchoolRuneScape/" + this.field1360); // L: 56
+ } // L: 57
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Ljava/net/URLConnection;B)V",
- garbageValue = "-70"
+ descriptor = "(Ljava/net/URLConnection;Lct;I)V",
+ garbageValue = "2137871662"
)
- void method2517(URLConnection var1) {
- var1.setConnectTimeout(5000); // L: 50
- var1.setReadTimeout(5000); // L: 51
- var1.setUseCaches(false); // L: 52
- var1.setRequestProperty("Connection", "close"); // L: 53
- } // L: 54
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Ljava/net/URLConnection;Lcb;B)V",
- garbageValue = "97"
- )
- void method2518(URLConnection var1, UrlRequest var2) {
- DataInputStream var3 = null; // L: 57
+ void method2522(URLConnection var1, UrlRequest var2) {
+ DataInputStream var3 = null; // L: 60
try {
- int var5 = var1.getContentLength();
- var3 = new DataInputStream(var1.getInputStream());
+ int var5 = var1.getContentLength(); // L: 63
+ var3 = new DataInputStream(var1.getInputStream()); // L: 64
byte[] var4;
- if (var5 >= 0) {
- var4 = new byte[var5];
- var3.readFully(var4);
+ if (var5 >= 0) { // L: 65
+ var4 = new byte[var5]; // L: 66
+ var3.readFully(var4); // L: 67
} else {
- var4 = new byte[0]; // L: 67
- byte[] var6 = class116.ByteArrayPool_getArray(5000); // L: 68
+ var4 = new byte[0]; // L: 70
+ byte[] var6 = class292.ByteArrayPool_getArray(5000); // L: 71
byte[] var8;
- for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 69 70 74
- var8 = new byte[var4.length + var7]; // L: 71
- System.arraycopy(var4, 0, var8, 0, var4.length); // L: 72
- System.arraycopy(var6, 0, var8, var4.length, var7); // L: 73
+ for (int var7 = var3.read(var6, 0, var6.length); var7 > -1; var4 = var8) { // L: 72 73 77
+ var8 = new byte[var4.length + var7]; // L: 74
+ System.arraycopy(var4, 0, var8, 0, var4.length); // L: 75
+ System.arraycopy(var6, 0, var8, var4.length, var7); // L: 76
}
- class168.ByteArrayPool_release(var6); // L: 76
+ class93.ByteArrayPool_release(var6); // L: 79
}
- var2.response0 = var4; // L: 78
- } catch (IOException var10) { // L: 80
+ var2.response0 = var4; // L: 81
+ } catch (IOException var10) { // L: 83
}
- if (var3 != null) { // L: 81
+ if (var3 != null) { // L: 84
try {
- var3.close(); // L: 83
- } catch (IOException var9) { // L: 85
+ var3.close(); // L: 86
+ } catch (IOException var9) { // L: 88
}
}
- } // L: 87
+ } // L: 90
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Ljava/net/URL;I)Lcb;",
- garbageValue = "-1608503592"
+ descriptor = "(Ljava/net/URL;I)Lct;",
+ garbageValue = "-682839730"
)
@Export("request")
public UrlRequest request(URL var1) {
- UrlRequest var2 = new UrlRequest(var1); // L: 90
- synchronized(this) { // L: 91
- this.requests.add(var2); // L: 92
- this.notify(); // L: 93
- return var2; // L: 95
+ UrlRequest var2 = new UrlRequest(var1); // L: 93
+ synchronized(this) { // L: 94
+ this.requests.add(var2); // L: 95
+ this.notify(); // L: 96
+ return var2; // L: 98
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "382803574"
+ garbageValue = "90163766"
)
@Export("close")
public void close() {
- this.isClosed = true; // L: 99
+ this.isClosed = true; // L: 102
try {
- synchronized(this) { // L: 101
- this.notify(); // L: 102
- } // L: 103
+ synchronized(this) { // L: 104
+ this.notify(); // L: 105
+ } // L: 106
- this.thread.join(); // L: 104
- } catch (InterruptedException var4) { // L: 106
+ this.field1363.join(); // L: 107
+ } catch (InterruptedException var4) { // L: 109
}
- } // L: 107
+ } // L: 110
public void run() {
- while (!this.isClosed) { // L: 26
+ while (!this.isClosed) { // L: 28
try {
UrlRequest var1;
- synchronized(this) { // L: 29
- var1 = (UrlRequest)this.requests.poll(); // L: 30
- if (var1 == null) { // L: 31
+ synchronized(this) { // L: 31
+ var1 = (UrlRequest)this.requests.poll(); // L: 32
+ if (var1 == null) { // L: 33
try {
- this.wait(); // L: 33
- } catch (InterruptedException var5) {
+ this.wait(); // L: 35
+ } catch (InterruptedException var5) { // L: 37
}
continue;
}
}
- this.vmethod2544(var1); // L: 39
- } catch (Exception var7) { // L: 41
- ArchiveDiskActionHandler.RunException_sendStackTrace((String)null, var7); // L: 42
+ this.vmethod2537(var1); // L: 41
+ } catch (Exception var7) { // L: 43
+ class249.RunException_sendStackTrace((String)null, var7); // L: 44
}
}
- } // L: 45
+ } // L: 47
- @ObfuscatedName("l")
+ @ObfuscatedName("gr")
@ObfuscatedSignature(
- descriptor = "([BB)[B",
- garbageValue = "21"
+ descriptor = "(B)V",
+ garbageValue = "64"
)
- static byte[] method2537(byte[] var0) {
- int var1 = var0.length; // L: 35
- byte[] var2 = new byte[var1]; // L: 36
- System.arraycopy(var0, 0, var2, 0, var1); // L: 37
- return var2; // L: 38
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "44420485"
- )
- public static void method2538(int var0) {
- class273.musicPlayerStatus = 1; // L: 58
- ClanChannelMember.musicTrackArchive = null; // L: 59
- StructComposition.musicTrackGroupId = -1; // L: 60
- FriendsList.musicTrackFileId = -1; // L: 61
- Clock.musicTrackVolume = 0; // L: 62
- VertexNormal.musicTrackBoolean = false; // L: 63
- GrandExchangeEvent.pcmSampleLength = var0; // L: 64
- } // L: 65
-
- @ObfuscatedName("gy")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "-127"
- )
- @Export("doCheat")
- static final void doCheat(String var0) {
- if (var0.equalsIgnoreCase("toggleroof")) { // L: 3894
- class12.clientPreferences.method2219(!class12.clientPreferences.method2222()); // L: 3895
- if (class12.clientPreferences.method2222()) { // L: 3896
- WorldMapEvent.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3897
- } else {
- WorldMapEvent.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3900
- }
- }
-
- if (var0.equalsIgnoreCase("displayfps")) { // L: 3903
- class12.clientPreferences.method2228();
- }
-
- if (var0.equalsIgnoreCase("renderself")) { // L: 3904
- Client.renderSelf = !Client.renderSelf;
- }
-
- if (var0.equalsIgnoreCase("mouseovertext")) {
- Client.showMouseOverText = !Client.showMouseOverText; // L: 3905
- }
-
- if (Client.staffModLevel >= 2) { // L: 3906
- if (var0.equalsIgnoreCase("errortest")) { // L: 3907
- throw new RuntimeException();
- }
-
- if (var0.equalsIgnoreCase("showcoord")) { // L: 3908
- ServerPacket.worldMap.showCoord = !ServerPacket.worldMap.showCoord;
- }
-
- if (var0.equalsIgnoreCase("fpson")) { // L: 3909
- class12.clientPreferences.method2227(true);
- }
-
- if (var0.equalsIgnoreCase("fpsoff")) { // L: 3910
- class12.clientPreferences.method2227(false);
- }
-
- if (var0.equalsIgnoreCase("gc")) { // L: 3911
- System.gc();
- }
-
- if (var0.equalsIgnoreCase("clientdrop")) { // L: 3912
- class129.method2812();
- }
- }
-
- PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2988, Client.packetWriter.isaacCipher); // L: 3915
- var1.packetBuffer.writeByte(var0.length() + 1); // L: 3916
- var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3917
- Client.packetWriter.addNode(var1); // L: 3918
- } // L: 3919
-
- @ObfuscatedName("hd")
- @ObfuscatedSignature(
- descriptor = "(Lci;B)V",
- garbageValue = "-115"
- )
- static final void method2536(PendingSpawn var0) {
- long var1 = 0L; // L: 7853
- int var3 = -1; // L: 7854
- int var4 = 0; // L: 7855
- int var5 = 0; // L: 7856
- if (var0.type == 0) { // L: 7857
- var1 = class175.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
- }
-
- if (var0.type == 1) { // L: 7858
- var1 = class175.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
- }
-
- if (var0.type == 2) { // L: 7859
- var1 = class175.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
- }
-
- if (var0.type == 3) {
- var1 = class175.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7860
- }
-
- if (0L != var1) { // L: 7861
- int var6 = class175.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7862
- var3 = NetSocket.Entity_unpackID(var1); // L: 7863
- var4 = var6 & 31; // L: 7864
- var5 = var6 >> 6 & 3; // L: 7865
- }
-
- var0.objectId = var3; // L: 7867
- var0.field1129 = var4; // L: 7868
- var0.field1131 = var5; // L: 7869
- } // L: 7870
-
- @ObfuscatedName("hn")
- @ObfuscatedSignature(
- descriptor = "(Lca;IILgd;I)V",
- garbageValue = "-1504276994"
- )
- static final void method2540(Player var0, int var1, int var2, class193 var3) {
- int var4 = var0.pathX[0]; // L: 8321
- int var5 = var0.pathY[0]; // L: 8322
- int var6 = var0.transformedSize(); // L: 8323
- if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8324
- if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8325
- int var8 = var0.transformedSize(); // L: 8327
- RouteStrategy var9 = class65.method1879(var1, var2); // L: 8328
- CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 8329
- int[] var11 = Client.field772; // L: 8330
- int[] var12 = Client.field773; // L: 8331
-
- int var13;
- int var14;
- for (var13 = 0; var13 < 128; ++var13) { // L: 8333
- for (var14 = 0; var14 < 128; ++var14) { // L: 8334
- class194.directions[var13][var14] = 0; // L: 8335
- class194.distances[var13][var14] = 99999999; // L: 8336
- }
- }
-
- int var15;
- int var16;
- byte var18;
- int var19;
- int var20;
- int var22;
- int var24;
- int var25;
- int var26;
- int var27;
- boolean var33;
- int var35;
- int var36;
- int var38;
- if (var8 == 1) { // L: 8340
- var33 = AbstractWorldMapIcon.method4863(var4, var5, var9, var10);
- } else {
- byte var17;
- byte var21;
- int[][] var23;
- boolean var34;
- if (var8 == 2) { // L: 8341
- var15 = var4; // L: 8344
- var16 = var5; // L: 8345
- var17 = 64; // L: 8346
- var18 = 64; // L: 8347
- var19 = var4 - var17; // L: 8348
- var20 = var5 - var18; // L: 8349
- class194.directions[var17][var18] = 99; // L: 8350
- class194.distances[var17][var18] = 0; // L: 8351
- var21 = 0; // L: 8352
- var22 = 0; // L: 8353
- class194.bufferX[var21] = var4; // L: 8354
- var38 = var21 + 1;
- class194.bufferY[var21] = var5; // L: 8355
- var23 = var10.flags; // L: 8356
-
- while (true) {
- if (var38 == var22) { // L: 8357
- Varps.field3348 = var15; // L: 8457
- class194.field2255 = var16; // L: 8458
- var34 = false; // L: 8459
- break;
- }
-
- var15 = class194.bufferX[var22]; // L: 8358
- var16 = class194.bufferY[var22]; // L: 8359
- var22 = var22 + 1 & 4095; // L: 8360
- var35 = var15 - var19; // L: 8361
- var36 = var16 - var20; // L: 8362
- var24 = var15 - var10.xInset; // L: 8363
- var25 = var16 - var10.yInset; // L: 8364
- if (var9.hasArrived(2, var15, var16, var10)) { // L: 8365
- Varps.field3348 = var15; // L: 8366
- class194.field2255 = var16; // L: 8367
- var34 = true; // L: 8368
- break;
- }
-
- var26 = class194.distances[var35][var36] + 1; // L: 8371
- if (var35 > 0 && class194.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0) { // L: 8372 8373 8374 8375
- class194.bufferX[var38] = var15 - 1; // L: 8376
- class194.bufferY[var38] = var16; // L: 8377
- var38 = var38 + 1 & 4095; // L: 8378
- class194.directions[var35 - 1][var36] = 2; // L: 8379
- class194.distances[var35 - 1][var36] = var26; // L: 8380
- }
-
- if (var35 < 126 && class194.directions[var35 + 1][var36] == 0 && (var23[var24 + 2][var25] & 19136899) == 0 && (var23[var24 + 2][var25 + 1] & 19136992) == 0) { // L: 8382 8383 8384 8385
- class194.bufferX[var38] = var15 + 1; // L: 8386
- class194.bufferY[var38] = var16; // L: 8387
- var38 = var38 + 1 & 4095; // L: 8388
- class194.directions[var35 + 1][var36] = 8; // L: 8389
- class194.distances[var35 + 1][var36] = var26; // L: 8390
- }
-
- if (var36 > 0 && class194.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0) { // L: 8392 8393 8394 8395
- class194.bufferX[var38] = var15; // L: 8396
- class194.bufferY[var38] = var16 - 1; // L: 8397
- var38 = var38 + 1 & 4095; // L: 8398
- class194.directions[var35][var36 - 1] = 1; // L: 8399
- class194.distances[var35][var36 - 1] = var26; // L: 8400
- }
-
- if (var36 < 126 && class194.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 2] & 19136824) == 0 && (var23[var24 + 1][var25 + 2] & 19136992) == 0) { // L: 8402 8403 8404 8405
- class194.bufferX[var38] = var15; // L: 8406
- class194.bufferY[var38] = var16 + 1; // L: 8407
- var38 = var38 + 1 & 4095; // L: 8408
- class194.directions[var35][var36 + 1] = 4; // L: 8409
- class194.distances[var35][var36 + 1] = var26; // L: 8410
- }
-
- if (var35 > 0 && var36 > 0 && class194.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25] & 19136830) == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24][var25 - 1] & 19136911) == 0) { // L: 8412 8413 8414 8415 8416
- class194.bufferX[var38] = var15 - 1; // L: 8417
- class194.bufferY[var38] = var16 - 1; // L: 8418
- var38 = var38 + 1 & 4095; // L: 8419
- class194.directions[var35 - 1][var36 - 1] = 3; // L: 8420
- class194.distances[var35 - 1][var36 - 1] = var26; // L: 8421
- }
-
- if (var35 < 126 && var36 > 0 && class194.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136911) == 0 && (var23[var24 + 2][var25 - 1] & 19136899) == 0 && (var23[var24 + 2][var25] & 19136995) == 0) { // L: 8423 8424 8425 8426 8427
- class194.bufferX[var38] = var15 + 1; // L: 8428
- class194.bufferY[var38] = var16 - 1; // L: 8429
- var38 = var38 + 1 & 4095; // L: 8430
- class194.directions[var35 + 1][var36 - 1] = 9; // L: 8431
- class194.distances[var35 + 1][var36 - 1] = var26; // L: 8432
- }
-
- if (var35 > 0 && var36 < 126 && class194.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136830) == 0 && (var23[var24 - 1][var25 + 2] & 19136824) == 0 && (var23[var24][var25 + 2] & 19137016) == 0) { // L: 8434 8435 8436 8437 8438
- class194.bufferX[var38] = var15 - 1; // L: 8439
- class194.bufferY[var38] = var16 + 1; // L: 8440
- var38 = var38 + 1 & 4095; // L: 8441
- class194.directions[var35 - 1][var36 + 1] = 6; // L: 8442
- class194.distances[var35 - 1][var36 + 1] = var26; // L: 8443
- }
-
- if (var35 < 126 && var36 < 126 && class194.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 2] & 19137016) == 0 && (var23[var24 + 2][var25 + 2] & 19136992) == 0 && (var23[var24 + 2][var25 + 1] & 19136995) == 0) { // L: 8445 8446 8447 8448 8449
- class194.bufferX[var38] = var15 + 1; // L: 8450
- class194.bufferY[var38] = var16 + 1; // L: 8451
- var38 = var38 + 1 & 4095; // L: 8452
- class194.directions[var35 + 1][var36 + 1] = 12; // L: 8453
- class194.distances[var35 + 1][var36 + 1] = var26; // L: 8454
- }
- }
-
- var33 = var34; // L: 8461
- } else {
- var15 = var4; // L: 8466
- var16 = var5; // L: 8467
- var17 = 64; // L: 8468
- var18 = 64; // L: 8469
- var19 = var4 - var17; // L: 8470
- var20 = var5 - var18; // L: 8471
- class194.directions[var17][var18] = 99; // L: 8472
- class194.distances[var17][var18] = 0; // L: 8473
- var21 = 0; // L: 8474
- var22 = 0; // L: 8475
- class194.bufferX[var21] = var4; // L: 8476
- var38 = var21 + 1;
- class194.bufferY[var21] = var5; // L: 8477
- var23 = var10.flags; // L: 8478
-
- label670:
- while (true) {
- label668:
- while (true) {
- do {
- do {
- do {
- label645:
- do {
- if (var38 == var22) { // L: 8479
- Varps.field3348 = var15; // L: 8599
- class194.field2255 = var16; // L: 8600
- var34 = false; // L: 8601
- break label670;
- }
-
- var15 = class194.bufferX[var22]; // L: 8480
- var16 = class194.bufferY[var22]; // L: 8481
- var22 = var22 + 1 & 4095; // L: 8482
- var35 = var15 - var19; // L: 8483
- var36 = var16 - var20; // L: 8484
- var24 = var15 - var10.xInset; // L: 8485
- var25 = var16 - var10.yInset; // L: 8486
- if (var9.hasArrived(var8, var15, var16, var10)) { // L: 8487
- Varps.field3348 = var15; // L: 8488
- class194.field2255 = var16; // L: 8489
- var34 = true; // L: 8490
- break label670;
- }
-
- var26 = class194.distances[var35][var36] + 1; // L: 8493
- if (var35 > 0 && class194.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + var8 - 1] & 19136824) == 0) { // L: 8494 8495 8496 8497
- var27 = 1;
-
- while (true) {
- if (var27 >= var8 - 1) {
- class194.bufferX[var38] = var15 - 1; // L: 8501
- class194.bufferY[var38] = var16; // L: 8502
- var38 = var38 + 1 & 4095; // L: 8503
- class194.directions[var35 - 1][var36] = 2; // L: 8504
- class194.distances[var35 - 1][var36] = var26; // L: 8505
- break;
- }
-
- if ((var23[var24 - 1][var27 + var25] & 19136830) != 0) { // L: 8499
- break;
- }
-
- ++var27; // L: 8498
- }
- }
-
- if (var35 < 128 - var8 && class194.directions[var35 + 1][var36] == 0 && (var23[var24 + var8][var25] & 19136899) == 0 && (var23[var8 + var24][var8 + var25 - 1] & 19136992) == 0) { // L: 8507 8508 8509 8510
- var27 = 1;
-
- while (true) {
- if (var27 >= var8 - 1) {
- class194.bufferX[var38] = var15 + 1; // L: 8514
- class194.bufferY[var38] = var16; // L: 8515
- var38 = var38 + 1 & 4095; // L: 8516
- class194.directions[var35 + 1][var36] = 8; // L: 8517
- class194.distances[var35 + 1][var36] = var26; // L: 8518
- break;
- }
-
- if ((var23[var24 + var8][var25 + var27] & 19136995) != 0) { // L: 8512
- break;
- }
-
- ++var27; // L: 8511
- }
- }
-
- if (var36 > 0 && class194.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + var8 - 1][var25 - 1] & 19136899) == 0) { // L: 8520 8521 8522 8523
- var27 = 1;
-
- while (true) {
- if (var27 >= var8 - 1) {
- class194.bufferX[var38] = var15; // L: 8527
- class194.bufferY[var38] = var16 - 1; // L: 8528
- var38 = var38 + 1 & 4095; // L: 8529
- class194.directions[var35][var36 - 1] = 1; // L: 8530
- class194.distances[var35][var36 - 1] = var26; // L: 8531
- break;
- }
-
- if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 8525
- break;
- }
-
- ++var27; // L: 8524
- }
- }
-
- if (var36 < 128 - var8 && class194.directions[var35][var36 + 1] == 0 && (var23[var24][var8 + var25] & 19136824) == 0 && (var23[var24 + var8 - 1][var25 + var8] & 19136992) == 0) { // L: 8533 8534 8535 8536
- var27 = 1;
-
- while (true) {
- if (var27 >= var8 - 1) {
- class194.bufferX[var38] = var15; // L: 8540
- class194.bufferY[var38] = var16 + 1; // L: 8541
- var38 = var38 + 1 & 4095; // L: 8542
- class194.directions[var35][var36 + 1] = 4; // L: 8543
- class194.distances[var35][var36 + 1] = var26; // L: 8544
- break;
- }
-
- if ((var23[var27 + var24][var8 + var25] & 19137016) != 0) { // L: 8538
- break;
- }
-
- ++var27; // L: 8537
- }
- }
-
- if (var35 > 0 && var36 > 0 && class194.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { // L: 8546 8547 8548
- var27 = 1;
-
- while (true) {
- if (var27 >= var8) {
- class194.bufferX[var38] = var15 - 1; // L: 8553
- class194.bufferY[var38] = var16 - 1; // L: 8554
- var38 = var38 + 1 & 4095; // L: 8555
- class194.directions[var35 - 1][var36 - 1] = 3; // L: 8556
- class194.distances[var35 - 1][var36 - 1] = var26; // L: 8557
- break;
- }
-
- if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { // L: 8550 8551
- break;
- }
-
- ++var27; // L: 8549
- }
- }
-
- if (var35 < 128 - var8 && var36 > 0 && class194.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { // L: 8559 8560 8561
- var27 = 1;
-
- while (true) {
- if (var27 >= var8) {
- class194.bufferX[var38] = var15 + 1; // L: 8566
- class194.bufferY[var38] = var16 - 1; // L: 8567
- var38 = var38 + 1 & 4095; // L: 8568
- class194.directions[var35 + 1][var36 - 1] = 9; // L: 8569
- class194.distances[var35 + 1][var36 - 1] = var26; // L: 8570
- break;
- }
-
- if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 8563 8564
- break;
- }
-
- ++var27; // L: 8562
- }
- }
-
- if (var35 > 0 && var36 < 128 - var8 && class194.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + var8] & 19136824) == 0) { // L: 8572 8573 8574
- for (var27 = 1; var27 < var8; ++var27) { // L: 8575
- if ((var23[var24 - 1][var25 + var27] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var8 + var25] & 19137016) != 0) { // L: 8576 8577
- continue label645;
- }
- }
-
- class194.bufferX[var38] = var15 - 1; // L: 8579
- class194.bufferY[var38] = var16 + 1; // L: 8580
- var38 = var38 + 1 & 4095; // L: 8581
- class194.directions[var35 - 1][var36 + 1] = 6; // L: 8582
- class194.distances[var35 - 1][var36 + 1] = var26; // L: 8583
- }
- } while(var35 >= 128 - var8); // L: 8585
- } while(var36 >= 128 - var8);
- } while(class194.directions[var35 + 1][var36 + 1] != 0); // L: 8586
- } while((var23[var24 + var8][var25 + var8] & 19136992) != 0); // L: 8587
-
- for (var27 = 1; var27 < var8; ++var27) { // L: 8588
- if ((var23[var27 + var24][var8 + var25] & 19137016) != 0 || (var23[var24 + var8][var25 + var27] & 19136995) != 0) { // L: 8589 8590
- continue label668;
- }
- }
-
- class194.bufferX[var38] = var15 + 1; // L: 8592
- class194.bufferY[var38] = var16 + 1; // L: 8593
- var38 = var38 + 1 & 4095; // L: 8594
- class194.directions[var35 + 1][var36 + 1] = 12; // L: 8595
- class194.distances[var35 + 1][var36 + 1] = var26; // L: 8596
- }
- }
-
- var33 = var34; // L: 8603
- }
- }
-
- int var7;
- label718: {
- var14 = var4 - 64; // L: 8605
- var15 = var5 - 64; // L: 8606
- var16 = Varps.field3348; // L: 8607
- var35 = class194.field2255; // L: 8608
- if (!var33) { // L: 8609
- var36 = Integer.MAX_VALUE; // L: 8611
- var19 = Integer.MAX_VALUE; // L: 8612
- byte var37 = 10; // L: 8613
- var38 = var9.approxDestinationX; // L: 8614
- var22 = var9.approxDestinationY; // L: 8615
- int var32 = var9.approxDestinationSizeX; // L: 8616
- var24 = var9.approxDestinationSizeY; // L: 8617
-
- for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { // L: 8618
- for (var26 = var22 - var37; var26 <= var22 + var37; ++var26) { // L: 8619
- var27 = var25 - var14; // L: 8620
- int var28 = var26 - var15; // L: 8621
- if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class194.distances[var27][var28] < 100) { // L: 8622 8623
- int var29 = 0; // L: 8624
- if (var25 < var38) { // L: 8625
- var29 = var38 - var25;
- } else if (var25 > var38 + var32 - 1) { // L: 8626
- var29 = var25 - (var32 + var38 - 1);
- }
-
- int var30 = 0; // L: 8627
- if (var26 < var22) { // L: 8628
- var30 = var22 - var26;
- } else if (var26 > var22 + var24 - 1) { // L: 8629
- var30 = var26 - (var22 + var24 - 1);
- }
-
- int var31 = var29 * var29 + var30 * var30; // L: 8630
- if (var31 < var36 || var36 == var31 && class194.distances[var27][var28] < var19) { // L: 8631
- var36 = var31; // L: 8632
- var19 = class194.distances[var27][var28]; // L: 8633
- var16 = var25; // L: 8634
- var35 = var26; // L: 8635
- }
- }
- }
- }
-
- if (var36 == Integer.MAX_VALUE) { // L: 8641
- var7 = -1; // L: 8642
- break label718;
- }
- }
-
- if (var4 == var16 && var35 == var5) { // L: 8651
- var11[0] = var16; // L: 8652
- var12[0] = var35; // L: 8653
- var7 = 0; // L: 8654
- } else {
- var18 = 0; // L: 8657
- class194.bufferX[var18] = var16; // L: 8660
- var36 = var18 + 1;
- class194.bufferY[var18] = var35; // L: 8661
-
- for (var19 = var20 = class194.directions[var16 - var14][var35 - var15]; var4 != var16 || var5 != var35; var19 = class194.directions[var16 - var14][var35 - var15]) { // L: 8662 8663 8673
- if (var19 != var20) { // L: 8664
- var20 = var19; // L: 8665
- class194.bufferX[var36] = var16; // L: 8666
- class194.bufferY[var36++] = var35; // L: 8667
- }
-
- if ((var19 & 2) != 0) { // L: 8669
- ++var16;
- } else if ((var19 & 8) != 0) { // L: 8670
- --var16;
- }
-
- if ((var19 & 1) != 0) { // L: 8671
- ++var35;
- } else if ((var19 & 4) != 0) { // L: 8672
- --var35;
- }
- }
-
- var38 = 0; // L: 8675
-
- while (var36-- > 0) { // L: 8676
- var11[var38] = class194.bufferX[var36]; // L: 8677
- var12[var38++] = class194.bufferY[var36]; // L: 8678
- if (var38 >= var11.length) { // L: 8679
- break;
- }
- }
-
- var7 = var38; // L: 8681
- }
- }
-
- var13 = var7; // L: 8683
- if (var7 >= 1) { // L: 8684
- for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 8685
- var0.method2119(Client.field772[var14], Client.field773[var14], var3);
- }
-
+ static final void method2536() {
+ int[] var0 = Players.Players_indices; // L: 3896
+
+ int var1;
+ for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3897
+ Player var4 = Client.players[var0[var1]]; // L: 3898
+ if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3899
+ --var4.overheadTextCyclesRemaining; // L: 3900
+ if (var4.overheadTextCyclesRemaining == 0) { // L: 3901
+ var4.overheadText = null;
}
}
}
- } // L: 8686
- @ObfuscatedName("id")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "16711680"
- )
- static final boolean method2539(int var0) {
- if (var0 < 0) { // L: 8901
- return false;
- } else {
- int var1 = Client.menuOpcodes[var0]; // L: 8902
- if (var1 >= 2000) { // L: 8903
- var1 -= 2000;
+ for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3904
+ int var2 = Client.npcIndices[var1]; // L: 3905
+ NPC var3 = Client.npcs[var2]; // L: 3906
+ if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3907
+ --var3.overheadTextCyclesRemaining; // L: 3908
+ if (var3.overheadTextCyclesRemaining == 0) { // L: 3909
+ var3.overheadText = null;
+ }
}
-
- return var1 == 1007; // L: 8904
}
- }
- @ObfuscatedName("lc")
- @ObfuscatedSignature(
- descriptor = "(Lki;B)I",
- garbageValue = "58"
- )
- @Export("getWidgetFlags")
- static int getWidgetFlags(Widget var0) {
- IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 12503
- return var1 != null ? var1.integer : var0.flags; // L: 12504 12505
- }
+ } // L: 3912
}
diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java
index 1c7ac15ce4..c076d857fb 100644
--- a/runescape-client/src/main/java/User.java
+++ b/runescape-client/src/main/java/User.java
@@ -4,23 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nb")
+@ObfuscatedName("ne")
@Implements("User")
public class User implements Comparable {
- @ObfuscatedName("fo")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1414295177
+ intValue = -13406753
)
- static int field4323;
- @ObfuscatedName("l")
+ static int field4308;
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lqv;"
+ descriptor = "Lqa;"
)
@Export("username")
Username username;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lqv;"
+ descriptor = "Lqa;"
)
@Export("previousUsername")
Username previousUsername;
@@ -28,50 +28,50 @@ public class User implements Comparable {
User() {
} // L: 9
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lnb;I)I",
- garbageValue = "434999779"
+ descriptor = "(Lne;B)I",
+ garbageValue = "-81"
)
@Export("compareTo_user")
public int compareTo_user(User var1) {
- return this.username.compareToTyped(var1.username);
+ return this.username.compareToTyped(var1.username); // L: 32
}
- @ObfuscatedName("j")
+ @ObfuscatedName("ac")
@ObfuscatedSignature(
- descriptor = "(B)Lqv;",
- garbageValue = "32"
+ descriptor = "(B)Lqa;",
+ garbageValue = "-97"
)
@Export("getUsername")
public Username getUsername() {
- return this.username; // L: 12
+ return this.username;
}
- @ObfuscatedName("z")
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-2016669072"
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "119"
)
@Export("getName")
public String getName() {
- return this.username == null ? "" : this.username.getName(); // L: 16 17
+ return this.username == null ? "" : this.username.getName(); // L: 17
}
- @ObfuscatedName("i")
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-1824467120"
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "-24"
)
@Export("getPreviousName")
public String getPreviousName() {
return this.previousUsername == null ? "" : this.previousUsername.getName();
}
- @ObfuscatedName("u")
+ @ObfuscatedName("am")
@ObfuscatedSignature(
- descriptor = "(Lqv;Lqv;I)V",
- garbageValue = "-2084414447"
+ descriptor = "(Lqa;Lqa;I)V",
+ garbageValue = "-639642586"
)
@Export("set")
void set(Username var1, Username var2) {
@@ -84,161 +84,45 @@ public class User implements Comparable {
}
public int compareTo(Object var1) {
- return this.compareTo_user((User)var1);
+ return this.compareTo_user((User)var1); // L: 36
}
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;Ljava/lang/String;B)I",
- garbageValue = "1"
+ descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
+ garbageValue = "-1413737997"
)
- public static int method6525(Buffer var0, String var1) {
- int var2 = var0.offset; // L: 18
- int var4 = var1.length(); // L: 21
- byte[] var5 = new byte[var4]; // L: 22
+ public static String method6679(CharSequence[] var0, int var1, int var2) {
+ if (var2 == 0) { // L: 12
+ return "";
+ } else if (var2 == 1) { // L: 13
+ CharSequence var10 = var0[var1]; // L: 14
+ return var10 == null ? "null" : var10.toString(); // L: 15 16
+ } else {
+ int var3 = var2 + var1; // L: 18
+ int var4 = 0; // L: 19
- for (int var6 = 0; var6 < var4; ++var6) { // L: 23
- char var7 = var1.charAt(var6); // L: 24
- if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25
- var5[var6] = (byte)var7;
- } else if (var7 == 8364) { // L: 26
- var5[var6] = -128;
- } else if (var7 == 8218) { // L: 27
- var5[var6] = -126;
- } else if (var7 == 402) { // L: 28
- var5[var6] = -125;
- } else if (var7 == 8222) { // L: 29
- var5[var6] = -124;
- } else if (var7 == 8230) { // L: 30
- var5[var6] = -123;
- } else if (var7 == 8224) { // L: 31
- var5[var6] = -122;
- } else if (var7 == 8225) { // L: 32
- var5[var6] = -121;
- } else if (var7 == 710) { // L: 33
- var5[var6] = -120;
- } else if (var7 == 8240) { // L: 34
- var5[var6] = -119;
- } else if (var7 == 352) { // L: 35
- var5[var6] = -118;
- } else if (var7 == 8249) { // L: 36
- var5[var6] = -117;
- } else if (var7 == 338) { // L: 37
- var5[var6] = -116;
- } else if (var7 == 381) { // L: 38
- var5[var6] = -114;
- } else if (var7 == 8216) { // L: 39
- var5[var6] = -111;
- } else if (var7 == 8217) { // L: 40
- var5[var6] = -110;
- } else if (var7 == 8220) { // L: 41
- var5[var6] = -109;
- } else if (var7 == 8221) { // L: 42
- var5[var6] = -108;
- } else if (var7 == 8226) { // L: 43
- var5[var6] = -107;
- } else if (var7 == 8211) {
- var5[var6] = -106; // L: 44
- } else if (var7 == 8212) { // L: 45
- var5[var6] = -105;
- } else if (var7 == 732) { // L: 46
- var5[var6] = -104;
- } else if (var7 == 8482) { // L: 47
- var5[var6] = -103;
- } else if (var7 == 353) { // L: 48
- var5[var6] = -102;
- } else if (var7 == 8250) { // L: 49
- var5[var6] = -101;
- } else if (var7 == 339) { // L: 50
- var5[var6] = -100;
- } else if (var7 == 382) { // L: 51
- var5[var6] = -98;
- } else if (var7 == 376) { // L: 52
- var5[var6] = -97;
- } else {
- var5[var6] = 63; // L: 53
+ for (int var5 = var1; var5 < var3; ++var5) { // L: 20
+ CharSequence var9 = var0[var5]; // L: 21
+ if (var9 == null) { // L: 22
+ var4 += 4;
+ } else {
+ var4 += var9.length(); // L: 23
+ }
}
- }
- var0.writeSmartByteShort(var5.length); // L: 58
- var0.offset += class282.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59
- return var0.offset - var2; // L: 60
- }
+ StringBuilder var8 = new StringBuilder(var4); // L: 25
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(Llp;IIB)Z",
- garbageValue = "94"
- )
- public static boolean method6514(AbstractArchive var0, int var1, int var2) {
- byte[] var3 = var0.takeFile(var1, var2); // L: 165
- if (var3 == null) { // L: 166
- return false;
- } else {
- RouteStrategy.SpriteBuffer_decode(var3); // L: 167
- return true; // L: 168
+ for (int var6 = var1; var6 < var3; ++var6) { // L: 26
+ CharSequence var7 = var0[var6]; // L: 27
+ if (var7 == null) { // L: 28
+ var8.append("null");
+ } else {
+ var8.append(var7); // L: 29
+ }
+ }
+
+ return var8.toString(); // L: 31
}
}
-
- @ObfuscatedName("hl")
- @ObfuscatedSignature(
- descriptor = "(IIIIIIII)V",
- garbageValue = "-2040403661"
- )
- static final void method6523(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
- int var8 = var6 - 334; // L: 5505
- if (var8 < 0) { // L: 5506
- var8 = 0;
- } else if (var8 > 100) { // L: 5507
- var8 = 100;
- }
-
- int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5508
- int var7 = var5 * var9 / 256; // L: 5509
- var8 = 2048 - var3 & 2047; // L: 5512
- var9 = 2048 - var4 & 2047; // L: 5513
- int var10 = 0; // L: 5514
- int var11 = 0; // L: 5515
- int var12 = var7; // L: 5516
- int var13;
- int var14;
- int var15;
- if (var8 != 0) { // L: 5517
- var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5518
- var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5519
- var15 = var11 * var14 - var13 * var7 >> 16; // L: 5520
- var12 = var13 * var11 + var14 * var7 >> 16; // L: 5521
- var11 = var15; // L: 5522
- }
-
- if (var9 != 0) { // L: 5524
- var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5525
- var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5526
- var15 = var14 * var10 + var12 * var13 >> 16; // L: 5527
- var12 = var14 * var12 - var13 * var10 >> 16; // L: 5528
- var10 = var15; // L: 5529
- }
-
- if (Client.isCameraLocked) { // L: 5531
- class271.field3221 = var0 - var10; // L: 5532
- Message.field469 = var1 - var11; // L: 5533
- NPC.field1262 = var2 - var12; // L: 5534
- Interpreter.field838 = var3; // L: 5535
- Timer.field4239 = var4; // L: 5536
- } else {
- class343.cameraX = var0 - var10; // L: 5539
- class295.cameraY = var1 - var11; // L: 5540
- FaceNormal.cameraZ = var2 - var12; // L: 5541
- GameEngine.cameraPitch = var3; // L: 5542
- StudioGame.cameraYaw = var4; // L: 5543
- }
-
- if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (HorizontalAlignment.oculusOrbFocalPointX >> 7 != ModelData0.localPlayer.x >> 7 || class28.oculusOrbFocalPointY >> 7 != ModelData0.localPlayer.y >> 7)) { // L: 5545 5546
- var13 = ModelData0.localPlayer.plane; // L: 5547
- var14 = (HorizontalAlignment.oculusOrbFocalPointX >> 7) + SecureRandomCallable.baseX; // L: 5548
- var15 = (class28.oculusOrbFocalPointY >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 5549
- class123.method2781(var14, var15, var13, true); // L: 5550
- }
-
- } // L: 5553
}
diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java
index eedd1f50f8..b9b174cda3 100644
--- a/runescape-client/src/main/java/UserComparator1.java
+++ b/runescape-client/src/main/java/UserComparator1.java
@@ -4,10 +4,10 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qp")
+@ObfuscatedName("qi")
@Implements("UserComparator1")
public class UserComparator1 implements Comparator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -15,10 +15,10 @@ public class UserComparator1 implements Comparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lnb;Lnb;I)I",
- garbageValue = "2106284151"
+ descriptor = "(Lne;Lne;B)I",
+ garbageValue = "12"
)
@Export("compare_bridged")
int compare_bridged(User var1, User var2) {
@@ -32,4 +32,35 @@ public class UserComparator1 implements Comparator {
public boolean equals(Object var1) {
return super.equals(var1); // L: 22
}
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "([BIIII[Lgv;S)V",
+ garbageValue = "-16264"
+ )
+ static final void method8020(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+ int var7;
+ int var8;
+ for (int var6 = 0; var6 < 4; ++var6) { // L: 93
+ for (var7 = 0; var7 < 64; ++var7) { // L: 94
+ for (var8 = 0; var8 < 64; ++var8) { // L: 95
+ if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96
+ int[] var10000 = var5[var6].flags[var7 + var1];
+ var10000[var8 + var2] &= -16777217;
+ }
+ }
+ }
+ }
+
+ Buffer var10 = new Buffer(var0); // L: 100
+
+ for (var7 = 0; var7 < 4; ++var7) { // L: 101
+ for (var8 = 0; var8 < 64; ++var8) { // L: 102
+ for (int var9 = 0; var9 < 64; ++var9) { // L: 103
+ Players.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104
+ }
+ }
+ }
+
+ } // L: 108
}
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index fdfbc56cf5..5f1472629e 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -2,17 +2,12 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("dj")
+@ObfuscatedName("dy")
@Implements("UserComparator10")
public class UserComparator10 extends AbstractUserComparator {
- @ObfuscatedName("rb")
- @ObfuscatedSignature(
- descriptor = "Let;"
- )
- @Export("guestClanChannel")
- static ClanChannel guestClanChannel;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -20,10 +15,10 @@ public class UserComparator10 extends AbstractUserComparator {
this.reversed = var1; // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;B)I",
- garbageValue = "-115"
+ descriptor = "(Lnm;Lnm;I)I",
+ garbageValue = "1111240808"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -37,4 +32,299 @@ public class UserComparator10 extends AbstractUserComparator {
public int compare(Object var1, Object var2) {
return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(ILqt;I)Lfy;",
+ garbageValue = "956626594"
+ )
+ public static class167 method2609(int var0, Buffer var1) {
+ int var2 = var1.readUnsignedByte(); // L: 24
+ boolean var3 = (var2 & 1) != 0; // L: 25
+ boolean var4 = (var2 & 2) != 0; // L: 26
+ class167 var5 = new class167(var0); // L: 27
+ int var6;
+ int[] var7;
+ boolean var8;
+ int var9;
+ short var10;
+ if (var3) { // L: 28
+ var6 = var1.readUnsignedByte(); // L: 29
+ var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32
+ var8 = var5.field1814 != null && var7.length == var5.field1814.length; // L: 33
+
+ for (var9 = 0; var9 < 2; ++var9) { // L: 34
+ if (var7[var9] != 15) { // L: 35
+ var10 = (short)var1.readUnsignedShort(); // L: 36
+ if (var8) { // L: 37
+ var5.field1814[var7[var9]] = var10; // L: 38
+ }
+ }
+ }
+ }
+
+ if (var4) { // L: 43
+ var6 = var1.readUnsignedByte(); // L: 44
+ var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47
+ var8 = var5.field1815 != null && var7.length == var5.field1815.length; // L: 48
+
+ for (var9 = 0; var9 < 2; ++var9) { // L: 49
+ if (var7[var9] != 15) { // L: 50
+ var10 = (short)var1.readUnsignedShort(); // L: 51
+ if (var8) { // L: 52
+ var5.field1815[var7[var9]] = var10; // L: 53
+ }
+ }
+ }
+ }
+
+ return var5; // L: 58
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "([BIIB)Z",
+ garbageValue = "75"
+ )
+ static final boolean method2611(byte[] var0, int var1, int var2) {
+ boolean var3 = true; // L: 188
+ Buffer var4 = new Buffer(var0); // L: 189
+ int var5 = -1; // L: 190
+
+ label68:
+ while (true) {
+ int var6 = var4.method7770(); // L: 192
+ if (var6 == 0) { // L: 193
+ return var3; // L: 224
+ }
+
+ var5 += var6; // L: 194
+ int var7 = 0; // L: 195
+ boolean var8 = false; // L: 196
+
+ while (true) {
+ int var9;
+ while (!var8) { // L: 198
+ var9 = var4.readUShortSmart(); // L: 204
+ if (var9 == 0) { // L: 205
+ continue label68;
+ }
+
+ var7 += var9 - 1; // L: 206
+ int var10 = var7 & 63; // L: 207
+ int var11 = var7 >> 6 & 63; // L: 208
+ int var12 = var4.readUnsignedByte() >> 2; // L: 209
+ int var13 = var11 + var1; // L: 210
+ int var14 = var10 + var2; // L: 211
+ if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 212
+ ObjectComposition var15 = class162.getObjectDefinition(var5); // L: 213
+ if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 214
+ if (!var15.needsModelFiles()) { // L: 215
+ ++Client.field547; // L: 216
+ var3 = false; // L: 217
+ }
+
+ var8 = true; // L: 219
+ }
+ }
+ }
+
+ var9 = var4.readUShortSmart(); // L: 199
+ if (var9 == 0) { // L: 200
+ break;
+ }
+
+ var4.readUnsignedByte(); // L: 201
+ }
+ }
+ }
+
+ @ObfuscatedName("d")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "80"
+ )
+ static int method2605(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2134
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.cycle; // L: 2135
+ return 1; // L: 2136
+ } else {
+ int var3;
+ int var4;
+ if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2138
+ class446.Interpreter_intStackSize -= 2; // L: 2139
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2140
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2141
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class152.method3147(var3, var4); // L: 2142
+ return 1; // L: 2143
+ } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2145
+ class446.Interpreter_intStackSize -= 2; // L: 2146
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2147
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2148
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Archive.ItemContainer_getCount(var3, var4); // L: 2149
+ return 1; // L: 2150
+ } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2152
+ class446.Interpreter_intStackSize -= 2; // L: 2153
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2154
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2155
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Bounds.method6922(var3, var4); // L: 2156
+ return 1; // L: 2157
+ } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2159
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2160
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Calendar.getInvDefinition(var3).size; // L: 2161
+ return 1; // L: 2162
+ } else if (var0 == ScriptOpcodes.STAT) { // L: 2164
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2165
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2166
+ return 1; // L: 2167
+ } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2169
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2170
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2171
+ return 1; // L: 2172
+ } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2174
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2175
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2176
+ return 1; // L: 2177
+ } else {
+ int var5;
+ if (var0 == ScriptOpcodes.COORD) { // L: 2179
+ var3 = PacketWriter.Client_plane; // L: 2180
+ var4 = (class101.localPlayer.x >> 7) + class28.baseX; // L: 2181
+ var5 = (class101.localPlayer.y >> 7) + WorldMapLabelSize.baseY; // L: 2182
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2183
+ return 1; // L: 2184
+ } else if (var0 == ScriptOpcodes.COORDX) { // L: 2186
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2187
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2188
+ return 1; // L: 2189
+ } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2191
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2192
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2193
+ return 1; // L: 2194
+ } else if (var0 == ScriptOpcodes.COORDY) { // L: 2196
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2197
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2198
+ return 1; // L: 2199
+ } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2201
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2202
+ return 1; // L: 2203
+ } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2205
+ class446.Interpreter_intStackSize -= 2; // L: 2206
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] + 32768; // L: 2207
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2208
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class152.method3147(var3, var4); // L: 2209
+ return 1; // L: 2210
+ } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2212
+ class446.Interpreter_intStackSize -= 2; // L: 2213
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] + 32768; // L: 2214
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2215
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Archive.ItemContainer_getCount(var3, var4); // L: 2216
+ return 1; // L: 2217
+ } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2219
+ class446.Interpreter_intStackSize -= 2; // L: 2220
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] + 32768; // L: 2221
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2222
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Bounds.method6922(var3, var4); // L: 2223
+ return 1; // L: 2224
+ } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2226
+ if (Client.staffModLevel >= 2) { // L: 2227
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.staffModLevel;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2228
+ }
+
+ return 1; // L: 2229
+ } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2231
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2232
+ return 1; // L: 2233
+ } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2235
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.worldId; // L: 2236
+ return 1; // L: 2237
+ } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2239
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2240
+ return 1; // L: 2241
+ } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2243
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.weight; // L: 2244
+ return 1; // L: 2245
+ } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2247
+ if (Client.playerMod) { // L: 2248
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2249
+ }
+
+ return 1; // L: 2250
+ } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2252
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2253
+ return 1; // L: 2254
+ } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2256
+ class446.Interpreter_intStackSize -= 4; // L: 2257
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2258
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2259
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 2260
+ int var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 2261
+ var3 += var4 << 14; // L: 2262
+ var3 += var5 << 28; // L: 2263
+ var3 += var6; // L: 2264
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 2265
+ return 1; // L: 2266
+ } else if (var0 == 3326) { // L: 2268
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.field605; // L: 2269
+ return 1; // L: 2270
+ } else if (var0 == 3327) { // L: 2272
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.field647; // L: 2273
+ return 1; // L: 2274
+ } else {
+ return 2; // L: 2276
+ }
+ }
+ }
+ }
+
+ @ObfuscatedName("kj")
+ @ObfuscatedSignature(
+ descriptor = "(IIIILqe;Lkp;I)V",
+ garbageValue = "-860665579"
+ )
+ @Export("worldToMinimap")
+ static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
+ int var6 = var3 * var3 + var2 * var2; // L: 12163
+ if (var6 > 4225 && var6 < 90000) { // L: 12164
+ int var7 = Client.camAngleY & 2047; // L: 12165
+ int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12166
+ int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12167
+ int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12168
+ int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12169
+ double var12 = Math.atan2((double)var10, (double)var11); // L: 12170
+ int var14 = var5.width / 2 - 25; // L: 12171
+ int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12172
+ int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12173
+ byte var17 = 20; // L: 12174
+ class344.redHintArrowSprite.method8179(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12175
+ } else {
+ ParamComposition.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12177
+ }
+
+ } // L: 12178
+
+ @ObfuscatedName("lq")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;B)Lkb;",
+ garbageValue = "111"
+ )
+ static Widget method2610(Widget var0) {
+ int var1 = class134.method2906(class124.getWidgetFlags(var0)); // L: 12295
+ if (var1 == 0) { // L: 12296
+ return null;
+ } else {
+ for (int var2 = 0; var2 < var1; ++var2) { // L: 12297
+ var0 = class140.getWidget(var0.parentId); // L: 12298
+ if (var0 == null) { // L: 12299
+ return null;
+ }
+ }
+
+ return var0; // L: 12301
+ }
+ }
}
diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java
index 7ce049d1c4..53870a5788 100644
--- a/runescape-client/src/main/java/UserComparator2.java
+++ b/runescape-client/src/main/java/UserComparator2.java
@@ -4,10 +4,10 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qn")
+@ObfuscatedName("qq")
@Implements("UserComparator2")
public class UserComparator2 implements Comparator {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -15,21 +15,21 @@ public class UserComparator2 implements Comparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lnb;Lnb;I)I",
- garbageValue = "-380169429"
+ descriptor = "(Lne;Lne;B)I",
+ garbageValue = "42"
)
@Export("compare_bridged")
int compare_bridged(User var1, User var2) {
return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14
}
- public int compare(Object var1, Object var2) {
- return this.compare_bridged((User)var1, (User)var2); // L: 18
- }
-
public boolean equals(Object var1) {
return super.equals(var1); // L: 22
}
+
+ public int compare(Object var1, Object var2) {
+ return this.compare_bridged((User)var1, (User)var2); // L: 18
+ }
}
diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java
index 0e549e6050..aa52f0c89d 100644
--- a/runescape-client/src/main/java/UserComparator3.java
+++ b/runescape-client/src/main/java/UserComparator3.java
@@ -1,23 +1,29 @@
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InvalidClassException;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.io.StreamCorruptedException;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Date;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.Reflection;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("dy")
+@ObfuscatedName("dr")
@Implements("UserComparator3")
public class UserComparator3 extends AbstractUserComparator {
- @ObfuscatedName("o")
+ @ObfuscatedName("tv")
+ @ObfuscatedGetter(
+ intValue = -120700993
+ )
+ static int field1391;
+ @ObfuscatedName("mc")
+ @ObfuscatedGetter(
+ intValue = 761312471
+ )
+ @Export("menuX")
+ static int menuX;
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -25,10 +31,10 @@ public class UserComparator3 extends AbstractUserComparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;B)I",
- garbageValue = "1"
+ descriptor = "(Lnm;Lnm;B)I",
+ garbageValue = "-18"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -43,144 +49,367 @@ public class UserComparator3 extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
}
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpc;I)V",
- garbageValue = "1236779387"
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "22"
)
- @Export("performReflectionCheck")
- public static void performReflectionCheck(PacketBuffer var0) {
- ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 25
- if (var1 != null) { // L: 26
- int var2 = var0.offset; // L: 27
- var0.writeInt(var1.id); // L: 28
+ @Export("readReflectionCheck")
+ public static void readReflectionCheck(Buffer var0, int var1) {
+ ReflectionCheck var2 = new ReflectionCheck(); // L: 133
+ var2.size = var0.readUnsignedByte(); // L: 134
+ var2.id = var0.readInt(); // L: 135
+ var2.operations = new int[var2.size]; // L: 136
+ var2.creationErrors = new int[var2.size]; // L: 137
+ var2.fields = new Field[var2.size]; // L: 138
+ var2.intReplaceValues = new int[var2.size]; // L: 139
+ var2.methods = new Method[var2.size]; // L: 140
+ var2.arguments = new byte[var2.size][][]; // L: 141
- for (int var3 = 0; var3 < var1.size; ++var3) { // L: 29
- if (var1.creationErrors[var3] != 0) { // L: 30
- var0.writeByte(var1.creationErrors[var3]); // L: 31
- } else {
- try {
- int var4 = var1.operations[var3]; // L: 35
- Field var5;
- int var6;
- if (var4 == 0) { // L: 36
- var5 = var1.fields[var3]; // L: 37
- var6 = Reflection.getInt(var5, (Object)null); // L: 38
- var0.writeByte(0); // L: 39
- var0.writeInt(var6); // L: 40
- } else if (var4 == 1) { // L: 42
- var5 = var1.fields[var3]; // L: 43
- Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 44
- var0.writeByte(0); // L: 45
- } else if (var4 == 2) { // L: 47
- var5 = var1.fields[var3]; // L: 48
- var6 = var5.getModifiers(); // L: 49
- var0.writeByte(0); // L: 50
- var0.writeInt(var6); // L: 51
+ for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142
+ try {
+ int var4 = var0.readUnsignedByte(); // L: 144
+ String var5;
+ String var6;
+ int var7;
+ if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145
+ if (var4 == 3 || var4 == 4) { // L: 155
+ var5 = var0.readStringCp1252NullTerminated(); // L: 156
+ var6 = var0.readStringCp1252NullTerminated(); // L: 157
+ var7 = var0.readUnsignedByte(); // L: 158
+ String[] var8 = new String[var7]; // L: 159
+
+ for (int var9 = 0; var9 < var7; ++var9) { // L: 160
+ var8[var9] = var0.readStringCp1252NullTerminated();
}
- Method var25;
- if (var4 != 3) { // L: 53
- if (var4 == 4) { // L: 73
- var25 = var1.methods[var3]; // L: 74
- var6 = var25.getModifiers(); // L: 75
- var0.writeByte(0); // L: 76
- var0.writeInt(var6); // L: 77
- }
- } else {
- var25 = var1.methods[var3]; // L: 54
- byte[][] var10 = var1.arguments[var3]; // L: 55
- Object[] var7 = new Object[var10.length]; // L: 56
-
- for (int var8 = 0; var8 < var10.length; ++var8) { // L: 57
- ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 58
- var7[var8] = var9.readObject(); // L: 59
- }
-
- Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 61
- if (var11 == null) { // L: 62
- var0.writeByte(0);
- } else if (var11 instanceof Number) { // L: 63
- var0.writeByte(1); // L: 64
- var0.writeLong(((Number)var11).longValue()); // L: 65
- } else if (var11 instanceof String) { // L: 67
- var0.writeByte(2); // L: 68
- var0.writeStringCp1252NullTerminated((String)var11); // L: 69
- } else {
- var0.writeByte(4); // L: 71
+ String var20 = var0.readStringCp1252NullTerminated(); // L: 161
+ byte[][] var10 = new byte[var7][]; // L: 162
+ int var12;
+ if (var4 == 3) { // L: 163
+ for (int var11 = 0; var11 < var7; ++var11) { // L: 164
+ var12 = var0.readInt(); // L: 165
+ var10[var11] = new byte[var12]; // L: 166
+ var0.readBytes(var10[var11], 0, var12); // L: 167
}
}
- } catch (ClassNotFoundException var13) { // L: 80
- var0.writeByte(-10); // L: 81
- } catch (InvalidClassException var14) { // L: 83
- var0.writeByte(-11); // L: 84
- } catch (StreamCorruptedException var15) { // L: 86
- var0.writeByte(-12); // L: 87
- } catch (OptionalDataException var16) { // L: 89
- var0.writeByte(-13); // L: 90
- } catch (IllegalAccessException var17) { // L: 92
- var0.writeByte(-14); // L: 93
- } catch (IllegalArgumentException var18) { // L: 95
- var0.writeByte(-15); // L: 96
- } catch (InvocationTargetException var19) { // L: 98
- var0.writeByte(-16); // L: 99
- } catch (SecurityException var20) { // L: 101
- var0.writeByte(-17); // L: 102
- } catch (IOException var21) { // L: 104
- var0.writeByte(-18); // L: 105
- } catch (NullPointerException var22) { // L: 107
- var0.writeByte(-19); // L: 108
- } catch (Exception var23) { // L: 110
- var0.writeByte(-20); // L: 111
- } catch (Throwable var24) { // L: 113
- var0.writeByte(-21); // L: 114
+
+ var2.operations[var3] = var4; // L: 170
+ Class[] var21 = new Class[var7]; // L: 171
+
+ for (var12 = 0; var12 < var7; ++var12) { // L: 172
+ var21[var12] = WorldMapRectangle.loadClassFromDescriptor(var8[var12]);
+ }
+
+ Class var22 = WorldMapRectangle.loadClassFromDescriptor(var20); // L: 173
+ if (WorldMapRectangle.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174
+ throw new SecurityException();
+ }
+
+ Method[] var13 = WorldMapRectangle.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175
+ Method[] var14 = var13; // L: 177
+
+ for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178
+ Method var16 = var14[var15]; // L: 179
+ if (Reflection.getMethodName(var16).equals(var6)) { // L: 181
+ Class[] var17 = Reflection.getParameterTypes(var16); // L: 182
+ if (var17.length == var21.length) { // L: 183
+ boolean var18 = true; // L: 184
+
+ for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185
+ if (var21[var19] != var17[var19]) { // L: 186
+ var18 = false; // L: 187
+ break; // L: 188
+ }
+ }
+
+ if (var18 && var22 == var16.getReturnType()) { // L: 191
+ var2.methods[var3] = var16; // L: 192
+ }
+ }
+ }
+ }
+
+ var2.arguments[var3] = var10; // L: 199
}
+ } else {
+ var5 = var0.readStringCp1252NullTerminated(); // L: 146
+ var6 = var0.readStringCp1252NullTerminated(); // L: 147
+ var7 = 0; // L: 148
+ if (var4 == 1) { // L: 149
+ var7 = var0.readInt();
+ }
+
+ var2.operations[var3] = var4; // L: 150
+ var2.intReplaceValues[var3] = var7; // L: 151
+ if (WorldMapRectangle.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152
+ throw new SecurityException();
+ }
+
+ var2.fields[var3] = Reflection.findField(WorldMapRectangle.loadClassFromDescriptor(var5), var6); // L: 153
+ }
+ } catch (ClassNotFoundException var24) { // L: 202
+ var2.creationErrors[var3] = -1; // L: 203
+ } catch (SecurityException var25) { // L: 205
+ var2.creationErrors[var3] = -2; // L: 206
+ } catch (NullPointerException var26) { // L: 208
+ var2.creationErrors[var3] = -3; // L: 209
+ } catch (Exception var27) { // L: 211
+ var2.creationErrors[var3] = -4; // L: 212
+ } catch (Throwable var28) { // L: 214
+ var2.creationErrors[var3] = -5; // L: 215
+ }
+ }
+
+ class33.reflectionChecks.addFirst(var2); // L: 218
+ } // L: 219
+
+ @ObfuscatedName("ae")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "13"
+ )
+ static int method2592(int var0, Script var1, boolean var2) {
+ String var3;
+ int var9;
+ if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3277
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3278
+ var9 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3279
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3280
+ return 1; // L: 3281
+ } else {
+ String var4;
+ if (var0 == ScriptOpcodes.APPEND) { // L: 3283
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3284
+ var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3285
+ var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3286
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3287
+ return 1; // L: 3288
+ } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3290
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3291
+ var9 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3292
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + Tile.intToString(var9, true); // L: 3293
+ return 1; // L: 3294
+ } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3296
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3297
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3298
+ return 1; // L: 3299
+ } else {
+ int var6;
+ int var10;
+ if (var0 == ScriptOpcodes.FROMDATE) { // L: 3301
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3302
+ long var13 = 86400000L * (11745L + (long)var10); // L: 3303
+ Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3304
+ var6 = Interpreter.Interpreter_calendar.get(5); // L: 3305
+ int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3306
+ int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3307
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3308
+ return 1; // L: 3309
+ } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3311
+ if (var0 == ScriptOpcodes.TOSTRING) { // L: 3319
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3320
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3321
+ return 1; // L: 3322
+ } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3324
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3325
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Tile.method4019(WorldMapSection0.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class134.clientLanguage)); // L: 3326
+ return 1; // L: 3327
+ } else {
+ int var5;
+ byte[] var11;
+ Font var12;
+ if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3329
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3330
+ class446.Interpreter_intStackSize -= 2; // L: 3331
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3332
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3333
+ var11 = AbstractByteArrayCopier.archive13.takeFile(var5, 0); // L: 3334
+ var12 = new Font(var11); // L: 3335
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3336
+ return 1; // L: 3337
+ } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3339
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3340
+ class446.Interpreter_intStackSize -= 2; // L: 3341
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3342
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3343
+ var11 = AbstractByteArrayCopier.archive13.takeFile(var5, 0); // L: 3344
+ var12 = new Font(var11); // L: 3345
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3346
+ return 1; // L: 3347
+ } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3349
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3350
+ var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3351
+ var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3352
+ if (Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1) { // L: 3353
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; // L: 3354
+ }
+
+ return 1; // L: 3355
+ } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3357
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3358
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3359
+ return 1; // L: 3360
+ } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3362
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3363
+ var9 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3364
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3365
+ return 1; // L: 3366
+ } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3368
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3369
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = StudioGame.isCharPrintable((char)var10) ? 1 : 0; // L: 3370
+ return 1; // L: 3371
+ } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3373
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3374
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = FloorOverlayDefinition.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3375
+ return 1; // L: 3376
+ } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3378
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3379
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapDecorationType.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3380
+ return 1; // L: 3381
+ } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3383
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3384
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class83.isDigit((char)var10) ? 1 : 0; // L: 3385
+ return 1; // L: 3386
+ } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3388
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3389
+ if (var3 != null) { // L: 3390
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.length();
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3391
+ }
+
+ return 1; // L: 3392
+ } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3394
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3395
+ class446.Interpreter_intStackSize -= 2; // L: 3396
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3397
+ var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3398
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3399
+ return 1; // L: 3400
+ } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3402
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3403
+ StringBuilder var15 = new StringBuilder(var3.length()); // L: 3404
+ boolean var16 = false; // L: 3405
+
+ for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3406
+ char var7 = var3.charAt(var6); // L: 3407
+ if (var7 == '<') { // L: 3408
+ var16 = true;
+ } else if (var7 == '>') { // L: 3409
+ var16 = false;
+ } else if (!var16) { // L: 3410
+ var15.append(var7);
+ }
+ }
+
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3412
+ return 1; // L: 3413
+ } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3415
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3416
+ var9 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3417
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3418
+ return 1; // L: 3419
+ } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3421
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3422
+ var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3423
+ var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3424
+ var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3425
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3426
+ return 1; // L: 3427
+ } else if (var0 == 4122) { // L: 3429
+ var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3430
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3431
+ return 1; // L: 3432
+ } else {
+ return 2; // L: 3434
+ }
+ }
+ } else {
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3312
+ var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3313
+ var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3314
+ if (class101.localPlayer.appearance != null && class101.localPlayer.appearance.isFemale) { // L: 3315
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4;
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 3316
+ }
+
+ return 1; // L: 3317
}
}
-
- var0.writeCrc(var2); // L: 117
- var1.remove(); // L: 118
}
- } // L: 119
+ }
- @ObfuscatedName("k")
+ @ObfuscatedName("bz")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lpu;",
- garbageValue = "-1588971004"
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "62"
)
- @Export("getPreferencesFile")
- public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
- File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 285
- if (var3.exists()) { // L: 286
- try {
- AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 288
- return var10; // L: 289
- } catch (IOException var9) { // L: 291
- }
- }
-
- String var4 = ""; // L: 293
- if (class11.cacheGamebuild == 33) { // L: 294
- var4 = "_rc";
- } else if (class11.cacheGamebuild == 34) { // L: 295
- var4 = "_wip";
- }
-
- File var5 = new File(BufferedSource.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 296
- AccessFile var6;
- if (!var2 && var5.exists()) { // L: 297
- try {
- var6 = new AccessFile(var5, "rw", 10000L); // L: 299
- return var6; // L: 300
- } catch (IOException var8) { // L: 302
- }
- }
-
- try {
- var6 = new AccessFile(var3, "rw", 10000L); // L: 305
- return var6; // L: 306
- } catch (IOException var7) { // L: 308
- throw new RuntimeException(); // L: 309
+ static int method2590(int var0, Script var1, boolean var2) {
+ if (var0 == 7600) { // L: 4891
+ --Interpreter.Interpreter_stringStackSize; // L: 4892
+ return 1; // L: 4893
+ } else if (var0 == 7601) { // L: 4895
+ --Interpreter.Interpreter_stringStackSize; // L: 4896
+ return 1; // L: 4897
+ } else if (var0 == 7602) { // L: 4899
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4900
+ return 1; // L: 4901
+ } else if (var0 == 7603) { // L: 4903
+ --class446.Interpreter_intStackSize; // L: 4904
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4905
+ return 1; // L: 4906
+ } else if (var0 == 7604) { // L: 4908
+ --Interpreter.Interpreter_stringStackSize; // L: 4909
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4910
+ return 1; // L: 4911
+ } else if (var0 == 7605) { // L: 4913
+ --class446.Interpreter_intStackSize; // L: 4914
+ return 1; // L: 4915
+ } else if (var0 == 7606) { // L: 4917
+ class446.Interpreter_intStackSize -= 2; // L: 4918
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4919
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4920
+ return 1; // L: 4921
+ } else if (var0 == 7607) { // L: 4923
+ return 1; // L: 4924
+ } else if (var0 == 7608) { // L: 4926
+ --Interpreter.Interpreter_stringStackSize; // L: 4927
+ return 1; // L: 4928
+ } else if (var0 == 7609) { // L: 4930
+ --Interpreter.Interpreter_stringStackSize; // L: 4931
+ return 1; // L: 4932
+ } else if (var0 == 7610) { // L: 4934
+ --Interpreter.Interpreter_stringStackSize; // L: 4935
+ return 1; // L: 4936
+ } else if (var0 == 7611) { // L: 4938
+ --class446.Interpreter_intStackSize; // L: 4939
+ return 1; // L: 4940
+ } else if (var0 == 7612) { // L: 4942
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4943
+ return 1; // L: 4944
+ } else if (var0 == 7613) { // L: 4946
+ --class446.Interpreter_intStackSize; // L: 4947
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4948
+ return 1; // L: 4949
+ } else if (var0 == 7614) { // L: 4951
+ return 1; // L: 4952
+ } else if (var0 == 7615) { // L: 4954
+ --Interpreter.Interpreter_stringStackSize; // L: 4955
+ return 1; // L: 4956
+ } else if (var0 == 7616) { // L: 4958
+ --Interpreter.Interpreter_stringStackSize; // L: 4959
+ class446.Interpreter_intStackSize -= 2; // L: 4960
+ return 1; // L: 4961
+ } else if (var0 == 7617) { // L: 4963
+ --Interpreter.Interpreter_stringStackSize; // L: 4964
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4965
+ return 1; // L: 4966
+ } else {
+ return 2; // L: 4968
}
}
}
diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java
index 7028866c75..0940eb56f1 100644
--- a/runescape-client/src/main/java/UserComparator4.java
+++ b/runescape-client/src/main/java/UserComparator4.java
@@ -4,16 +4,22 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cp")
+@ObfuscatedName("ch")
@Implements("UserComparator4")
public class UserComparator4 implements Comparator {
- @ObfuscatedName("iq")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "[Lqr;"
+ descriptor = "Llh;"
)
- @Export("headIconPkSprites")
- static SpritePixels[] headIconPkSprites;
- @ObfuscatedName("o")
+ @Export("ItemDefinition_archive")
+ static AbstractArchive ItemDefinition_archive;
+ @ObfuscatedName("ik")
+ @ObfuscatedSignature(
+ descriptor = "[Lqe;"
+ )
+ @Export("headIconHintSprites")
+ static SpritePixels[] headIconHintSprites;
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -21,57 +27,185 @@ public class UserComparator4 implements Comparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;I)I",
- garbageValue = "1947776738"
+ descriptor = "(Lnm;Lnm;B)I",
+ garbageValue = "-8"
)
@Export("compare_bridged")
int compare_bridged(Buddy var1, Buddy var2) {
return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14
}
- public boolean equals(Object var1) {
- return super.equals(var1); // L: 22
- }
-
public int compare(Object var1, Object var2) {
return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18
}
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)Lgk;",
- garbageValue = "-894640319"
- )
- public static HitSplatDefinition method2567(int var0) {
- HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
- if (var1 != null) {
- return var1;
- } else {
- byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0);
- var1 = new HitSplatDefinition();
- if (var2 != null) { // L: 56
- var1.decode(new Buffer(var2));
- }
-
- HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57
- return var1; // L: 58
- }
+ public boolean equals(Object var1) {
+ return super.equals(var1); // L: 22
}
- @ObfuscatedName("k")
+ @ObfuscatedName("hd")
@ObfuscatedSignature(
- descriptor = "(ILlp;IIIZI)V",
- garbageValue = "1953673398"
+ descriptor = "(ZLpq;I)V",
+ garbageValue = "1468501785"
)
- public static void method2573(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) {
- class273.musicPlayerStatus = 1; // L: 48
- ClanChannelMember.musicTrackArchive = var1; // L: 49
- StructComposition.musicTrackGroupId = var2; // L: 50
- FriendsList.musicTrackFileId = var3; // L: 51
- Clock.musicTrackVolume = var4; // L: 52
- VertexNormal.musicTrackBoolean = var5; // L: 53
- GrandExchangeEvent.pcmSampleLength = var0; // L: 54
- } // L: 55
+ @Export("updateNpcs")
+ static final void updateNpcs(boolean var0, PacketBuffer var1) {
+ Client.field615 = 0; // L: 7895
+ Client.field538 = 0; // L: 7896
+ GrandExchangeOfferUnitPriceComparator.method6024(); // L: 7897
+
+ int var2;
+ while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7900
+ var2 = var1.readBits(15); // L: 7901
+ if (var2 == 32767) { // L: 7902
+ break;
+ }
+
+ boolean var3 = false; // L: 7903
+ if (Client.npcs[var2] == null) { // L: 7904
+ Client.npcs[var2] = new NPC(); // L: 7905
+ var3 = true; // L: 7906
+ }
+
+ NPC var4 = Client.npcs[var2]; // L: 7908
+ Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7909
+ var4.npcCycle = Client.cycle; // L: 7910
+ int var5;
+ int var6;
+ int var7;
+ int var10;
+ if (class101.field1366) { // L: 7914
+ if (var0) { // L: 7915
+ var6 = var1.readBits(8); // L: 7916
+ if (var6 > 127) { // L: 7917
+ var6 -= 256;
+ }
+ } else {
+ var6 = var1.readBits(5); // L: 7920
+ if (var6 > 15) { // L: 7921
+ var6 -= 32;
+ }
+ }
+
+ boolean var8 = var1.readBits(1) == 1; // L: 7923
+ if (var8) { // L: 7924
+ var1.readBits(32); // L: 7925
+ }
+
+ var5 = var1.readBits(1); // L: 7927
+ int var9 = Client.defaultRotations[var1.readBits(3)]; // L: 7928
+ if (var3) { // L: 7929
+ var4.orientation = var4.rotation = var9;
+ }
+
+ if (var0) { // L: 7930
+ var7 = var1.readBits(8); // L: 7931
+ if (var7 > 127) { // L: 7932
+ var7 -= 256;
+ }
+ } else {
+ var7 = var1.readBits(5); // L: 7935
+ if (var7 > 15) { // L: 7936
+ var7 -= 32;
+ }
+ }
+
+ var10 = var1.readBits(1); // L: 7938
+ if (var10 == 1) { // L: 7939
+ Client.field539[++Client.field538 - 1] = var2;
+ }
+
+ var4.definition = BuddyRankComparator.getNpcDefinition(var1.readBits(14)); // L: 7940
+ } else {
+ int var12 = Client.defaultRotations[var1.readBits(3)]; // L: 7943
+ if (var3) { // L: 7944
+ var4.orientation = var4.rotation = var12;
+ }
+
+ if (var0) { // L: 7945
+ var6 = var1.readBits(8); // L: 7946
+ if (var6 > 127) { // L: 7947
+ var6 -= 256;
+ }
+ } else {
+ var6 = var1.readBits(5); // L: 7950
+ if (var6 > 15) { // L: 7951
+ var6 -= 32;
+ }
+ }
+
+ boolean var13 = var1.readBits(1) == 1; // L: 7953
+ if (var13) { // L: 7954
+ var1.readBits(32); // L: 7955
+ }
+
+ if (var0) { // L: 7957
+ var7 = var1.readBits(8); // L: 7958
+ if (var7 > 127) { // L: 7959
+ var7 -= 256;
+ }
+ } else {
+ var7 = var1.readBits(5); // L: 7962
+ if (var7 > 15) { // L: 7963
+ var7 -= 32;
+ }
+ }
+
+ var5 = var1.readBits(1); // L: 7965
+ var10 = var1.readBits(1); // L: 7966
+ if (var10 == 1) { // L: 7967
+ Client.field539[++Client.field538 - 1] = var2;
+ }
+
+ var4.definition = BuddyRankComparator.getNpcDefinition(var1.readBits(14)); // L: 7968
+ }
+
+ var4.field1205 = var4.definition.size; // L: 7970
+ var4.field1129 = var4.definition.rotation; // L: 7971
+ if (var4.field1129 == 0) { // L: 7972
+ var4.rotation = 0;
+ }
+
+ var4.walkSequence = var4.definition.walkSequence; // L: 7973
+ var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7974
+ var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7975
+ var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7976
+ var4.idleSequence = var4.definition.idleSequence; // L: 7977
+ var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7978
+ var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7979
+ var4.runSequence = var4.definition.field1931; // L: 7980
+ var4.field1180 = var4.definition.field1944; // L: 7981
+ var4.field1144 = var4.definition.field1932; // L: 7982
+ var4.field1145 = var4.definition.field1933; // L: 7983
+ var4.field1155 = var4.definition.field1934; // L: 7984
+ var4.field1179 = var4.definition.field1935; // L: 7985
+ var4.field1137 = var4.definition.field1936; // L: 7986
+ var4.field1149 = var4.definition.field1930; // L: 7987
+ var4.method2362(class101.localPlayer.pathX[0] + var6, class101.localPlayer.pathY[0] + var7, var5 == 1); // L: 7988
+ }
+
+ var1.exportIndex(); // L: 7990
+ SoundCache.method765(var1); // L: 7992
+
+ for (var2 = 0; var2 < Client.field615; ++var2) { // L: 7993
+ int var11 = Client.field616[var2]; // L: 7994
+ if (Client.npcs[var11].npcCycle != Client.cycle) { // L: 7995
+ Client.npcs[var11].definition = null; // L: 7996
+ Client.npcs[var11] = null; // L: 7997
+ }
+ }
+
+ if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8000
+ throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+ } else {
+ for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 8001
+ if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 8002
+ throw new RuntimeException(var2 + "," + Client.npcCount); // L: 8003
+ }
+ }
+
+ }
+ } // L: 8006
}
diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java
index 71bc4fa0da..68a336ddf5 100644
--- a/runescape-client/src/main/java/UserComparator5.java
+++ b/runescape-client/src/main/java/UserComparator5.java
@@ -1,18 +1,30 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dg")
+@ObfuscatedName("dz")
@Implements("UserComparator5")
public class UserComparator5 extends AbstractUserComparator {
- @ObfuscatedName("c")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "Lfo;"
+ descriptor = "Lex;"
)
- @Export("clock")
- static Clock clock;
- @ObfuscatedName("o")
+ static ClanChannel field1386;
+ @ObfuscatedName("ci")
+ @ObfuscatedSignature(
+ descriptor = "Lqu;"
+ )
+ static IndexedSprite field1385;
+ @ObfuscatedName("gx")
+ static String field1387;
+ @ObfuscatedName("pb")
+ @ObfuscatedGetter(
+ intValue = 1731263595
+ )
+ static int field1389;
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -20,19 +32,19 @@ public class UserComparator5 extends AbstractUserComparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;I)I",
- garbageValue = "1182231062"
+ descriptor = "(Lnm;Lnm;B)I",
+ garbageValue = "-4"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
- if (var1.world != 0) {
+ if (var1.world != 0) { // L: 14
if (var2.world == 0) {
- return this.reversed ? -1 : 1;
+ return this.reversed ? -1 : 1; // L: 15
}
} else if (var2.world != 0) {
- return this.reversed ? 1 : -1;
+ return this.reversed ? 1 : -1; // L: 18
}
return this.compareUser(var1, var2);
@@ -42,84 +54,121 @@ public class UserComparator5 extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2);
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(CI)B",
- garbageValue = "949320153"
+ descriptor = "(Ljava/lang/CharSequence;Lpe;I)Ljava/lang/String;",
+ garbageValue = "-1070606136"
)
- @Export("charToByteCp1252")
- public static byte charToByteCp1252(char var0) {
- byte var1;
- if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12
- var1 = (byte)var0;
- } else if (var0 == 8364) { // L: 13
- var1 = -128;
- } else if (var0 == 8218) { // L: 14
- var1 = -126;
- } else if (var0 == 402) { // L: 15
- var1 = -125;
- } else if (var0 == 8222) { // L: 16
- var1 = -124;
- } else if (var0 == 8230) { // L: 17
- var1 = -123;
- } else if (var0 == 8224) { // L: 18
- var1 = -122;
- } else if (var0 == 8225) { // L: 19
- var1 = -121;
- } else if (var0 == 710) { // L: 20
- var1 = -120;
- } else if (var0 == 8240) { // L: 21
- var1 = -119;
- } else if (var0 == 352) { // L: 22
- var1 = -118;
- } else if (var0 == 8249) { // L: 23
- var1 = -117;
- } else if (var0 == 338) { // L: 24
- var1 = -116;
- } else if (var0 == 381) { // L: 25
- var1 = -114;
- } else if (var0 == 8216) {
- var1 = -111; // L: 26
- } else if (var0 == 8217) { // L: 27
- var1 = -110;
- } else if (var0 == 8220) { // L: 28
- var1 = -109;
- } else if (var0 == 8221) { // L: 29
- var1 = -108;
- } else if (var0 == 8226) { // L: 30
- var1 = -107;
- } else if (var0 == 8211) { // L: 31
- var1 = -106;
- } else if (var0 == 8212) { // L: 32
- var1 = -105;
- } else if (var0 == 732) { // L: 33
- var1 = -104;
- } else if (var0 == 8482) { // L: 34
- var1 = -103;
- } else if (var0 == 353) { // L: 35
- var1 = -102;
- } else if (var0 == 8250) { // L: 36
- var1 = -101;
- } else if (var0 == 339) { // L: 37
- var1 = -100;
- } else if (var0 == 382) { // L: 38
- var1 = -98;
- } else if (var0 == 376) { // L: 39
- var1 = -97;
+ public static String method2580(CharSequence var0, LoginType var1) {
+ if (var0 == null) { // L: 20
+ return null;
} else {
- var1 = 63; // L: 40
+ int var2 = 0; // L: 21
+
+ int var3;
+ for (var3 = var0.length(); var2 < var3 && class154.method3163(var0.charAt(var2)); ++var2) { // L: 22 23
+ }
+
+ while (var3 > var2 && class154.method3163(var0.charAt(var3 - 1))) { // L: 24
+ --var3;
+ }
+
+ int var4 = var3 - var2; // L: 25
+ if (var4 >= 1) { // L: 27
+ byte var6;
+ if (var1 == null) { // L: 31
+ var6 = 12; // L: 32
+ } else {
+ switch(var1.field4618) { // L: 35
+ case 4:
+ var6 = 20; // L: 37
+ break; // L: 38
+ default:
+ var6 = 12; // L: 40
+ }
+ }
+
+ if (var4 <= var6) { // L: 44
+ StringBuilder var12 = new StringBuilder(var4); // L: 48
+
+ for (int var14 = var2; var14 < var3; ++var14) { // L: 49
+ char var7 = var0.charAt(var14); // L: 50
+ boolean var8;
+ if (Character.isISOControl(var7)) { // L: 53
+ var8 = false; // L: 54
+ } else if (FloorOverlayDefinition.isAlphaNumeric(var7)) { // L: 57
+ var8 = true; // L: 58
+ } else {
+ char[] var9 = class423.field4622; // L: 62
+ int var10 = 0;
+
+ label84:
+ while (true) {
+ char var11;
+ if (var10 >= var9.length) {
+ var9 = class423.field4625; // L: 72
+
+ for (var10 = 0; var10 < var9.length; ++var10) { // L: 73
+ var11 = var9[var10]; // L: 74
+ if (var11 == var7) { // L: 75
+ var8 = true; // L: 76
+ break label84; // L: 77
+ }
+ }
+
+ var8 = false; // L: 81
+ break;
+ }
+
+ var11 = var9[var10]; // L: 64
+ if (var7 == var11) { // L: 65
+ var8 = true; // L: 66
+ break; // L: 67
+ }
+
+ ++var10; // L: 63
+ }
+ }
+
+ if (var8) { // L: 83
+ char var13 = PacketBufferNode.method5203(var7); // L: 84
+ if (var13 != 0) { // L: 85
+ var12.append(var13); // L: 86
+ }
+ }
+ }
+
+ if (var12.length() == 0) { // L: 88
+ return null;
+ }
+
+ return var12.toString(); // L: 89
+ }
+ }
+
+ return null; // L: 46
}
-
- return var1; // L: 41
}
- @ObfuscatedName("y")
+ @ObfuscatedName("ks")
@ObfuscatedSignature(
- descriptor = "(CI)Z",
- garbageValue = "-1482615831"
+ descriptor = "(B)V",
+ garbageValue = "24"
)
- @Export("isCharAlphabetic")
- public static boolean isCharAlphabetic(char var0) {
- return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 146
- }
+ static final void method2586() {
+ Client.field525 = Client.cycleCntr; // L: 12220
+ class326.field4082 = true; // L: 12221
+ } // L: 12222
+
+ @ObfuscatedName("lh")
+ @ObfuscatedSignature(
+ descriptor = "(S)V",
+ garbageValue = "7108"
+ )
+ @Export("Clan_leaveChat")
+ static final void Clan_leaveChat() {
+ PacketBufferNode var0 = EnumComposition.getPacketBufferNode(ClientPacket.field2942, Client.packetWriter.isaacCipher); // L: 12243
+ var0.packetBuffer.writeByte(0); // L: 12244
+ Client.packetWriter.addNode(var0); // L: 12245
+ } // L: 12246
}
diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java
index 677a1ca92a..0cc7f2e6e9 100644
--- a/runescape-client/src/main/java/UserComparator6.java
+++ b/runescape-client/src/main/java/UserComparator6.java
@@ -1,86 +1,187 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("dd")
+@ObfuscatedName("dg")
@Implements("UserComparator6")
public class UserComparator6 extends AbstractUserComparator {
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = -1676231481
- )
- @Export("idxCount")
- public static int idxCount;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Lqr;"
- )
- @Export("leftTitleSprite")
- static SpritePixels leftTitleSprite;
- @ObfuscatedName("o")
+ @ObfuscatedName("w")
+ static byte[][][] field1415;
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
public UserComparator6(boolean var1) {
this.reversed = var1; // L: 10
- }
+ } // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;B)I",
- garbageValue = "7"
+ descriptor = "(Lnm;Lnm;I)I",
+ garbageValue = "1280649324"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
- if (var1.world != 0 && var2.world != 0) {
- return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername());
+ if (var1.world != 0 && var2.world != 0) { // L: 14
+ return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 15
} else {
return this.compareUser(var1, var2); // L: 17
}
}
public int compare(Object var1, Object var2) {
- return this.compareBuddy((Buddy)var1, (Buddy)var2);
+ return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
- garbageValue = "1"
+ descriptor = "(IB)Lpo;",
+ garbageValue = "20"
)
- public static String method2619(CharSequence var0) {
- int var1 = var0.length(); // L: 11
- StringBuilder var2 = new StringBuilder(var1); // L: 12
+ public static class435 method2626(int var0) {
+ class435 var1 = (class435)class435.PlayerAppearance_cachedModels.get((long)var0); // L: 23
+ if (var1 != null) { // L: 24
+ return var1;
+ } else {
+ byte[] var2 = class435.field4666.takeFile(39, var0); // L: 25
+ var1 = new class435(); // L: 26
+ if (var2 != null) { // L: 27
+ var1.method7592(new Buffer(var2));
+ }
- for (int var3 = 0; var3 < var1; ++var3) { // L: 13
- char var4 = var0.charAt(var3); // L: 14
- if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15
- if (var4 == ' ') { // L: 16
- var2.append('+');
+ var1.method7602(); // L: 28
+ class435.PlayerAppearance_cachedModels.put(var1, (long)var0); // L: 29
+ return var1; // L: 30
+ }
+ }
+
+ @ObfuscatedName("aj")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "2120403456"
+ )
+ static int method2628(int var0, Script var1, boolean var2) {
+ int var3;
+ if (var0 == ScriptOpcodes.OC_NAME) { // L: 3438
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3439
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = EnumComposition.ItemDefinition_get(var3).name; // L: 3440
+ return 1; // L: 3441
+ } else {
+ int var4;
+ ItemComposition var5;
+ if (var0 == ScriptOpcodes.OC_OP) { // L: 3443
+ class446.Interpreter_intStackSize -= 2; // L: 3444
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3445
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3446
+ var5 = EnumComposition.ItemDefinition_get(var3); // L: 3447
+ if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3448
} else {
- byte var5 = UserComparator5.charToByteCp1252(var4); // L: 18
- var2.append('%'); // L: 19
- int var6 = var5 >> 4 & 15; // L: 20
- if (var6 >= 10) { // L: 21
- var2.append((char)(var6 + 55));
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3449
+ }
+
+ return 1; // L: 3450
+ } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3452
+ class446.Interpreter_intStackSize -= 2; // L: 3453
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3454
+ var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3455
+ var5 = EnumComposition.ItemDefinition_get(var3); // L: 3456
+ if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3457
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3458
+ }
+
+ return 1; // L: 3459
+ } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3461
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3462
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = EnumComposition.ItemDefinition_get(var3).price; // L: 3463
+ return 1; // L: 3464
+ } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3466
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3467
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = EnumComposition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3468
+ return 1; // L: 3469
+ } else {
+ ItemComposition var7;
+ if (var0 == ScriptOpcodes.OC_CERT) { // L: 3471
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3472
+ var7 = EnumComposition.ItemDefinition_get(var3); // L: 3473
+ if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3474
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.note;
} else {
- var2.append((char)(var6 + 48)); // L: 22
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 3475
}
- var6 = var5 & 15; // L: 23
- if (var6 >= 10) { // L: 24
- var2.append((char)(var6 + 55));
+ return 1; // L: 3476
+ } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3478
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3479
+ var7 = EnumComposition.ItemDefinition_get(var3); // L: 3480
+ if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3481
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.note;
} else {
- var2.append((char)(var6 + 48));
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 3482
}
+
+ return 1; // L: 3483
+ } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3485
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3486
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = EnumComposition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3487
+ return 1; // L: 3488
+ } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3490
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3491
+ var7 = EnumComposition.ItemDefinition_get(var3); // L: 3492
+ if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3493
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.placeholder;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 3494
+ }
+
+ return 1; // L: 3495
+ } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3497
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3498
+ var7 = EnumComposition.ItemDefinition_get(var3); // L: 3499
+ if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3500
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.placeholder;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3; // L: 3501
+ }
+
+ return 1; // L: 3502
+ } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3504
+ String var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3505
+ var4 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3506
+ DevicePcmPlayerProvider.findItemDefinitions(var6, var4 == 1); // L: 3507
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = HealthBarUpdate.foundItemIdCount; // L: 3508
+ return 1; // L: 3509
+ } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3511
+ if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3516
+ TriBool.foundItemIndex = 0; // L: 3517
+ return 1; // L: 3518
+ } else if (var0 == 4213) { // L: 3520
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3521
+ var4 = EnumComposition.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3522
+ if (var4 == -1) { // L: 3523
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4; // L: 3524
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4 + 1; // L: 3527
+ }
+
+ return 1; // L: 3529
+ } else {
+ return 2; // L: 3531
+ }
+ } else {
+ if (class10.foundItemIds != null && TriBool.foundItemIndex < HealthBarUpdate.foundItemIdCount) { // L: 3512
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class10.foundItemIds[++TriBool.foundItemIndex - 1] & '\uffff'; // L: 3513
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1;
+ }
+
+ return 1; // L: 3514
}
- } else {
- var2.append(var4); // L: 25
}
}
-
- return var2.toString(); // L: 28
}
}
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index cdc2cf770a..fce3f874a4 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -3,16 +3,15 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dp")
+@ObfuscatedName("dd")
@Implements("UserComparator7")
public class UserComparator7 extends AbstractUserComparator {
- @ObfuscatedName("hv")
+ @ObfuscatedName("el")
@ObfuscatedSignature(
- descriptor = "Lce;"
+ descriptor = "Llc;"
)
- @Export("urlRequester")
- static UrlRequester urlRequester;
- @ObfuscatedName("o")
+ static Archive field1383;
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -20,10 +19,10 @@ public class UserComparator7 extends AbstractUserComparator {
this.reversed = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;B)I",
- garbageValue = "-76"
+ descriptor = "(Lnm;Lnm;I)I",
+ garbageValue = "-1964984147"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -38,22 +37,35 @@ public class UserComparator7 extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V",
- garbageValue = "-27109"
+ descriptor = "(IB)Lfs;",
+ garbageValue = "-125"
)
- @Export("addChatMessage")
- static void addChatMessage(int var0, String var1, String var2, String var3) {
- ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23
- if (var4 == null) { // L: 24
- var4 = new ChatChannel(); // L: 25
- Messages.Messages_channels.put(var0, var4); // L: 26
- }
+ @Export("getEnum")
+ 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 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31
+ var1 = new EnumComposition(); // L: 32
+ if (var2 != null) { // L: 33
+ var1.decode(new Buffer(var2));
+ }
- Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28
- Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29
- Messages.Messages_queue.add(var5); // L: 30
- Client.chatCycle = Client.cycleCntr; // L: 31
- } // L: 32
+ EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34
+ return var1; // L: 35
+ }
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lbr;",
+ garbageValue = "260622968"
+ )
+ @Export("Messages_getMessage")
+ static Message Messages_getMessage(int var0) {
+ return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40
+ }
}
diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java
index abb3747e83..719aedc303 100644
--- a/runescape-client/src/main/java/UserComparator8.java
+++ b/runescape-client/src/main/java/UserComparator8.java
@@ -1,23 +1,12 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dc")
+@ObfuscatedName("dm")
@Implements("UserComparator8")
public class UserComparator8 extends AbstractUserComparator {
- @ObfuscatedName("ut")
- @ObfuscatedGetter(
- longValue = -7758235146448266581L
- )
- static long field1380;
- @ObfuscatedName("qe")
- @ObfuscatedSignature(
- descriptor = "Loa;"
- )
- static class392 field1378;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -25,10 +14,10 @@ public class UserComparator8 extends AbstractUserComparator {
this.reversed = var1; // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;I)I",
- garbageValue = "-1656446017"
+ descriptor = "(Lnm;Lnm;I)I",
+ garbageValue = "1682683031"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -47,166 +36,55 @@ public class UserComparator8 extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25
}
- @ObfuscatedName("q")
+ @ObfuscatedName("if")
@ObfuscatedSignature(
- descriptor = "(Llp;IIIZI)V",
- garbageValue = "-1992647557"
+ descriptor = "(IIB)V",
+ garbageValue = "6"
)
- public static void method2574(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
- class273.musicPlayerStatus = 1; // L: 32
- ClanChannelMember.musicTrackArchive = var0; // L: 33
- StructComposition.musicTrackGroupId = var1; // L: 34
- FriendsList.musicTrackFileId = var2; // L: 35
- Clock.musicTrackVolume = var3; // L: 36
- VertexNormal.musicTrackBoolean = var4; // L: 37
- GrandExchangeEvent.pcmSampleLength = 10000; // L: 38
- } // L: 39
+ static void method2571(int var0, int var1) {
+ int var2 = TileItem.fontBold12.stringWidth("Choose Option"); // L: 8663
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "([Lbx;II[I[IB)V",
- garbageValue = "94"
- )
- @Export("sortWorlds")
- static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
- if (var1 < var2) { // L: 81
- int var5 = var1 - 1; // L: 82
- int var6 = var2 + 1; // L: 83
- int var7 = (var2 + var1) / 2; // L: 84
- World var8 = var0[var7]; // L: 85
- var0[var7] = var0[var1]; // L: 86
- var0[var1] = var8; // L: 87
-
- while (var5 < var6) { // L: 88
- boolean var9 = true; // L: 89
-
- int var10;
- int var11;
- int var12;
- do {
- --var6; // L: 91
-
- for (var10 = 0; var10 < 4; ++var10) { // L: 92
- if (var3[var10] == 2) { // L: 95
- var11 = var0[var6].index; // L: 96
- var12 = var8.index; // L: 97
- } else if (var3[var10] == 1) { // L: 99
- var11 = var0[var6].population; // L: 100
- var12 = var8.population; // L: 101
- if (var11 == -1 && var4[var10] == 1) { // L: 102
- var11 = 2001;
- }
-
- if (var12 == -1 && var4[var10] == 1) { // L: 103
- var12 = 2001;
- }
- } else if (var3[var10] == 3) { // L: 105
- var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106
- var12 = var8.isMembersOnly() ? 1 : 0; // L: 107
- } else {
- var11 = var0[var6].id; // L: 110
- var12 = var8.id; // L: 111
- }
-
- if (var11 != var12) { // L: 113
- if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117
- var9 = false; // L: 119
- }
- break;
- }
-
- if (var10 == 3) { // L: 114
- var9 = false;
- }
- }
- } while(var9);
-
- var9 = true; // L: 124
-
- do {
- ++var5; // L: 126
-
- for (var10 = 0; var10 < 4; ++var10) { // L: 127
- if (var3[var10] == 2) { // L: 130
- var11 = var0[var5].index; // L: 131
- var12 = var8.index; // L: 132
- } else if (var3[var10] == 1) { // L: 134
- var11 = var0[var5].population; // L: 135
- var12 = var8.population; // L: 136
- if (var11 == -1 && var4[var10] == 1) { // L: 137
- var11 = 2001;
- }
-
- if (var12 == -1 && var4[var10] == 1) {
- var12 = 2001; // L: 138
- }
- } else if (var3[var10] == 3) { // L: 140
- var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141
- var12 = var8.isMembersOnly() ? 1 : 0; // L: 142
- } else {
- var11 = var0[var5].id; // L: 145
- var12 = var8.id; // L: 146
- }
-
- if (var11 != var12) { // L: 148
- if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152
- var9 = false; // L: 154
- }
- break;
- }
-
- if (var10 == 3) { // L: 149
- var9 = false;
- }
- }
- } while(var9);
-
- if (var5 < var6) { // L: 159
- World var13 = var0[var5]; // L: 160
- var0[var5] = var0[var6]; // L: 161
- var0[var6] = var13; // L: 162
- }
+ int var3;
+ for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8664
+ Font var7 = TileItem.fontBold12; // L: 8665
+ String var8;
+ if (var3 < 0) { // L: 8668
+ var8 = ""; // L: 8669
+ } else if (Client.menuTargets[var3].length() > 0) { // L: 8672
+ var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3];
+ } else {
+ var8 = Client.menuActions[var3]; // L: 8673
}
- sortWorlds(var0, var1, var6, var3, var4); // L: 165
- sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166
- }
-
- } // L: 168
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "-27"
- )
- public static boolean method2581(int var0) {
- return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 232 233
- }
-
- @ObfuscatedName("jg")
- @ObfuscatedSignature(
- descriptor = "([Lki;Lki;ZI)V",
- garbageValue = "2006024990"
- )
- @Export("revalidateWidgetScroll")
- static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
- int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1123320165 * 1605814381 : var1.width * -1172311447 * -153829927; // L: 10765
- int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 530662929 * -578131215 : var1.height * 214283987 * -459533989; // L: 10766
- Language.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10767
- if (var1.children != null) { // L: 10768
- Language.resizeInterface(var1.children, var1.id, var3, var4, var2);
- }
-
- InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10769
- if (var5 != null) { // L: 10770
- int var6 = var5.group; // L: 10771
- if (WorldMapDecoration.loadInterface(var6)) { // L: 10773
- Language.resizeInterface(NetSocket.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10774
+ int var6 = var7.stringWidth(var8); // L: 8675
+ if (var6 > var2) { // L: 8676
+ var2 = var6;
}
}
- if (var1.contentType == 1337) { // L: 10777
+ var2 += 8; // L: 8678
+ var3 = Client.menuOptionsCount * 15 + 22; // L: 8679
+ int var4 = var0 - var2 / 2; // L: 8680
+ if (var2 + var4 > Script.canvasWidth) { // L: 8681
+ var4 = Script.canvasWidth - var2;
}
- } // L: 10778
+ if (var4 < 0) { // L: 8682
+ var4 = 0;
+ }
+
+ int var5 = var1; // L: 8683
+ if (var3 + var1 > class78.canvasHeight) { // L: 8684
+ var5 = class78.canvasHeight - var3;
+ }
+
+ if (var5 < 0) { // L: 8685
+ var5 = 0;
+ }
+
+ UserComparator3.menuX = var4; // L: 8686
+ ViewportMouse.menuY = var5; // L: 8687
+ Language.menuWidth = var2; // L: 8688
+ Player.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8689
+ } // L: 8690
}
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index 4e89d5904f..147bd7d861 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -1,19 +1,12 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dh")
+@ObfuscatedName("dv")
@Implements("UserComparator9")
public class UserComparator9 extends AbstractUserComparator {
- @ObfuscatedName("uo")
- @ObfuscatedGetter(
- intValue = 1940467607
- )
- @Export("foundItemIdCount")
- static int foundItemIdCount;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -21,10 +14,10 @@ public class UserComparator9 extends AbstractUserComparator {
this.reversed = var1; // L: 11
} // L: 12
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lns;Lns;B)I",
- garbageValue = "16"
+ descriptor = "(Lnm;Lnm;I)I",
+ garbageValue = "-582515893"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -39,12 +32,12 @@ public class UserComparator9 extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22
}
- @ObfuscatedName("b")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-652974265"
+ descriptor = "(B)[Ldt;",
+ garbageValue = "6"
)
- static final void method2601() {
- InterfaceParent.method2067("You can't add yourself to your own ignore list"); // L: 178
- } // L: 179
+ static class119[] method2599() {
+ return new class119[]{class119.field1497, class119.field1504, class119.field1505, class119.field1501, class119.field1492, class119.field1493, class119.field1494, class119.field1495, class119.field1496, class119.field1489, class119.field1498, class119.field1499, class119.field1500, class119.field1502, class119.field1488, class119.field1503, class119.field1491}; // L: 74
+ }
}
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index 80592102b9..6eecf7ff36 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -1,4 +1,3 @@
-import java.awt.Component;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
@@ -7,35 +6,46 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("nl")
+@ObfuscatedName("nq")
@Implements("UserList")
public abstract class UserList {
- @ObfuscatedName("r")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 2080752723
+ intValue = 909905761
+ )
+ static int field4319;
+ @ObfuscatedName("gj")
+ @ObfuscatedGetter(
+ longValue = 4805265675401059469L
+ )
+ static long field4320;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = -7454885
)
@Export("capacity")
final int capacity;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -1966841579
+ intValue = 790121473
)
@Export("size")
int size;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "[Lnb;"
+ descriptor = "[Lne;"
)
@Export("array")
User[] array;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("usernamesMap")
HashMap usernamesMap;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("previousUsernamesMap")
HashMap previousUsernamesMap;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("comparator")
Comparator comparator;
@@ -48,18 +58,18 @@ public abstract class UserList {
this.previousUsernamesMap = new HashMap(var1 / 8); // L: 20
} // L: 21
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lnb;",
- garbageValue = "-1695844600"
+ descriptor = "(S)Lne;",
+ garbageValue = "-7122"
)
@Export("newInstance")
abstract User newInstance();
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)[Lnb;",
- garbageValue = "1788836658"
+ descriptor = "(II)[Lne;",
+ garbageValue = "77510907"
)
@Export("newTypedArray")
abstract User[] newTypedArray(int var1);
@@ -67,7 +77,7 @@ public abstract class UserList {
@ObfuscatedName("ac")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1710894760"
+ garbageValue = "-1093942076"
)
@Export("clear")
public void clear() {
@@ -77,10 +87,10 @@ public abstract class UserList {
this.previousUsernamesMap.clear(); // L: 27
} // L: 28
- @ObfuscatedName("ab")
+ @ObfuscatedName("ae")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1290388264"
+ garbageValue = "1536599093"
)
@Export("getSize")
public int getSize() {
@@ -90,17 +100,17 @@ public abstract class UserList {
@ObfuscatedName("aj")
@ObfuscatedSignature(
descriptor = "(B)Z",
- garbageValue = "96"
+ garbageValue = "-84"
)
@Export("isFull")
public boolean isFull() {
return this.capacity == this.size; // L: 35
}
- @ObfuscatedName("ae")
+ @ObfuscatedName("am")
@ObfuscatedSignature(
- descriptor = "(Lqv;B)Z",
- garbageValue = "5"
+ descriptor = "(Lqa;I)Z",
+ garbageValue = "158740231"
)
@Export("contains")
public boolean contains(Username var1) {
@@ -111,41 +121,41 @@ public abstract class UserList {
}
}
- @ObfuscatedName("az")
+ @ObfuscatedName("an")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Lnb;",
- garbageValue = "1663082435"
+ descriptor = "(Lqa;I)Lne;",
+ garbageValue = "-1825895379"
)
@Export("getByUsername")
public User getByUsername(Username var1) {
- User var2 = this.getByCurrentUsername(var1);
- return var2 != null ? var2 : this.getByPreviousUsername(var1);
+ User var2 = this.getByCurrentUsername(var1); // L: 45
+ return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47
}
- @ObfuscatedName("ap")
+ @ObfuscatedName("af")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Lnb;",
- garbageValue = "-952962769"
+ descriptor = "(Lqa;I)Lne;",
+ garbageValue = "-1911478952"
)
@Export("getByCurrentUsername")
User getByCurrentUsername(Username var1) {
return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52
}
- @ObfuscatedName("as")
+ @ObfuscatedName("ax")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Lnb;",
- garbageValue = "-1144019727"
+ descriptor = "(Lqa;I)Lne;",
+ garbageValue = "-1437986613"
)
@Export("getByPreviousUsername")
User getByPreviousUsername(Username var1) {
return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57
}
- @ObfuscatedName("au")
+ @ObfuscatedName("ar")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Z",
- garbageValue = "-154697884"
+ descriptor = "(Lqa;I)Z",
+ garbageValue = "1135653093"
)
@Export("removeByUsername")
public final boolean removeByUsername(Username var1) {
@@ -158,10 +168,10 @@ public abstract class UserList {
}
}
- @ObfuscatedName("ak")
+ @ObfuscatedName("at")
@ObfuscatedSignature(
- descriptor = "(Lnb;I)V",
- garbageValue = "-625173400"
+ descriptor = "(Lne;B)V",
+ garbageValue = "6"
)
@Export("remove")
final void remove(User var1) {
@@ -172,20 +182,20 @@ public abstract class UserList {
}
} // L: 72
- @ObfuscatedName("af")
+ @ObfuscatedName("ag")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)Lnb;",
- garbageValue = "243716509"
+ descriptor = "(Lqa;I)Lne;",
+ garbageValue = "-54334639"
)
@Export("addLastNoPreviousUsername")
User addLastNoPreviousUsername(Username var1) {
return this.addLast(var1, (Username)null); // L: 75
}
- @ObfuscatedName("al")
+ @ObfuscatedName("aq")
@ObfuscatedSignature(
- descriptor = "(Lqv;Lqv;B)Lnb;",
- garbageValue = "96"
+ descriptor = "(Lqa;Lqa;I)Lne;",
+ garbageValue = "1549647050"
)
@Export("addLast")
User addLast(Username var1, Username var2) {
@@ -200,24 +210,24 @@ public abstract class UserList {
}
}
- @ObfuscatedName("aq")
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
- descriptor = "(II)Lnb;",
- garbageValue = "627727149"
+ descriptor = "(II)Lne;",
+ garbageValue = "487901750"
)
@Export("get")
public final User get(int var1) {
if (var1 >= 0 && var1 < this.size) { // L: 88
- return this.array[var1];
+ return this.array[var1]; // L: 89
} else {
- throw new ArrayIndexOutOfBoundsException(var1); // L: 89
+ throw new ArrayIndexOutOfBoundsException(var1);
}
}
- @ObfuscatedName("ad")
+ @ObfuscatedName("ai")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "771974288"
+ garbageValue = "-1528140588"
)
@Export("sort")
public final void sort() {
@@ -229,10 +239,10 @@ public abstract class UserList {
} // L: 99
- @ObfuscatedName("an")
+ @ObfuscatedName("az")
@ObfuscatedSignature(
- descriptor = "(Lnb;Lqv;Lqv;I)V",
- garbageValue = "2080271698"
+ descriptor = "(Lne;Lqa;Lqa;I)V",
+ garbageValue = "1207607045"
)
@Export("changeName")
final void changeName(User var1, Username var2, Username var3) {
@@ -241,10 +251,10 @@ public abstract class UserList {
this.mapPut(var1); // L: 104
} // L: 105
- @ObfuscatedName("aw")
+ @ObfuscatedName("av")
@ObfuscatedSignature(
- descriptor = "(Lnb;I)I",
- garbageValue = "969083323"
+ descriptor = "(Lne;I)I",
+ garbageValue = "-125620587"
)
@Export("indexOf")
final int indexOf(User var1) {
@@ -257,37 +267,33 @@ public abstract class UserList {
return -1; // L: 111
}
- @ObfuscatedName("ah")
+ @ObfuscatedName("aw")
@ObfuscatedSignature(
- descriptor = "(Lnb;B)V",
- garbageValue = "-1"
+ descriptor = "(Lne;S)V",
+ garbageValue = "-8938"
)
@Export("mapRemove")
final void mapRemove(User var1) {
- if (this.usernamesMap.remove(var1.username) == null) { // L: 115
- throw new IllegalStateException();
- } else {
- if (var1.previousUsername != null) {
- this.previousUsernamesMap.remove(var1.previousUsername); // L: 116
- }
-
+ if (var1.previousUsername != null) {
+ this.previousUsernamesMap.remove(var1.previousUsername); // L: 116
}
+
} // L: 117
- @ObfuscatedName("ao")
+ @ObfuscatedName("au")
@ObfuscatedSignature(
- descriptor = "(Lnb;I)V",
- garbageValue = "-1080072428"
+ descriptor = "(Lne;I)V",
+ garbageValue = "-133766134"
)
@Export("arrayAddLast")
final void arrayAddLast(User var1) {
this.array[++this.size - 1] = var1; // L: 120
} // L: 121
- @ObfuscatedName("av")
+ @ObfuscatedName("ay")
@ObfuscatedSignature(
- descriptor = "(Lnb;B)V",
- garbageValue = "1"
+ descriptor = "(Lne;I)V",
+ garbageValue = "-657827654"
)
@Export("mapPut")
final void mapPut(User var1) {
@@ -301,10 +307,10 @@ public abstract class UserList {
} // L: 131
- @ObfuscatedName("ai")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "324092894"
+ garbageValue = "1804205416"
)
@Export("arrayRemove")
final void arrayRemove(int var1) {
@@ -315,20 +321,20 @@ public abstract class UserList {
} // L: 138
- @ObfuscatedName("ay")
+ @ObfuscatedName("be")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1263316171"
+ descriptor = "(B)V",
+ garbageValue = "8"
)
@Export("removeComparator")
public final void removeComparator() {
this.comparator = null; // L: 144
} // L: 145
- @ObfuscatedName("aa")
+ @ObfuscatedName("bz")
@ObfuscatedSignature(
- descriptor = "(Ljava/util/Comparator;I)V",
- garbageValue = "1203709497"
+ descriptor = "(Ljava/util/Comparator;B)V",
+ garbageValue = "8"
)
@Export("addComparator")
public final void addComparator(Comparator var1) {
@@ -340,24 +346,360 @@ public abstract class UserList {
} // L: 154
- @ObfuscatedName("o")
+ @ObfuscatedName("ah")
@ObfuscatedSignature(
- descriptor = "(I)[Ljn;",
- garbageValue = "-1215110903"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-1639564322"
)
- static LoginPacket[] method6607() {
- return new LoginPacket[]{LoginPacket.field3195, LoginPacket.field3191, LoginPacket.field3194, LoginPacket.field3196, LoginPacket.field3193, LoginPacket.field3192}; // L: 22
- }
+ static int method6754(int var0, Script var1, boolean var2) {
+ int var3;
+ if (var0 == 6600) { // L: 4128
+ var3 = PacketWriter.Client_plane; // L: 4129
+ int var15 = (class101.localPlayer.x >> 7) + class28.baseX; // L: 4130
+ int var8 = (class101.localPlayer.y >> 7) + WorldMapLabelSize.baseY; // L: 4131
+ GrandExchangeOfferAgeComparator.getWorldMap().method7192(var3, var15, var8, true); // L: 4132
+ return 1; // L: 4133
+ } else {
+ WorldMapArea var9;
+ if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4135
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4136
+ String var16 = ""; // L: 4137
+ var9 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 4138
+ if (var9 != null) { // L: 4139
+ var16 = var9.getExternalName(); // L: 4140
+ }
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Ljava/awt/Component;I)V",
- garbageValue = "980107475"
- )
- static void method6543(Component var0) {
- var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43
- var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44
- var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45
- MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46
- } // L: 47
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; // L: 4142
+ return 1; // L: 4143
+ } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4145
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4146
+ GrandExchangeOfferAgeComparator.getWorldMap().setCurrentMapAreaId(var3); // L: 4147
+ return 1; // L: 4148
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4150
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getZoomLevel(); // L: 4151
+ return 1; // L: 4152
+ } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4154
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4155
+ GrandExchangeOfferAgeComparator.getWorldMap().setZoomPercentage(var3); // L: 4156
+ return 1; // L: 4157
+ } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4159
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4160
+ return 1; // L: 4161
+ } else {
+ Coord var14;
+ if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4163
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4164
+ GrandExchangeOfferAgeComparator.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4165
+ return 1; // L: 4166
+ } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4168
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4169
+ GrandExchangeOfferAgeComparator.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4170
+ return 1; // L: 4171
+ } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4173
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4174
+ GrandExchangeOfferAgeComparator.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4175
+ return 1; // L: 4176
+ } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4178
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4179
+ GrandExchangeOfferAgeComparator.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4180
+ return 1; // L: 4181
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4183
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayX(); // L: 4184
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayY(); // L: 4185
+ return 1; // L: 4186
+ } else {
+ WorldMapArea var11;
+ if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4188
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4189
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 4190
+ if (var11 == null) { // L: 4191
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4192
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4195
+ }
+
+ return 1; // L: 4197
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4199
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4200
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 4201
+ if (var11 == null) { // L: 4202
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4203
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4204
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4207
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4208
+ }
+
+ return 1; // L: 4210
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4212
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4213
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 4214
+ if (var11 == null) { // L: 4215
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4216
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4217
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4218
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4219
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4222
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4223
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4224
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4225
+ }
+
+ return 1; // L: 4227
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4229
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4230
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 4231
+ if (var11 == null) { // L: 4232
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4233
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4236
+ }
+
+ return 1; // L: 4238
+ } else if (var0 == 6615) { // L: 4240
+ var14 = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayCoord(); // L: 4241
+ if (var14 == null) { // L: 4242
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4243
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4244
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var14.x; // L: 4247
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var14.y; // L: 4248
+ }
+
+ return 1; // L: 4250
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4252
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().currentMapAreaId(); // L: 4253
+ return 1; // L: 4254
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4256
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4257
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().getCurrentMapArea(); // L: 4258
+ if (var11 == null) { // L: 4259
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4260
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4261
+ return 1; // L: 4262
+ } else {
+ int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4264
+ if (var12 == null) { // L: 4265
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4266
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4267
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var12[0]; // L: 4270
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var12[1]; // L: 4271
+ }
+
+ return 1; // L: 4273
+ }
+ } else {
+ Coord var5;
+ if (var0 == 6618) { // L: 4275
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4276
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().getCurrentMapArea(); // L: 4277
+ if (var11 == null) { // L: 4278
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4279
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4280
+ return 1; // L: 4281
+ } else {
+ var5 = var11.coord(var14.x, var14.y); // L: 4283
+ if (var5 == null) { // L: 4284
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4285
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.packed(); // L: 4288
+ }
+
+ return 1; // L: 4290
+ }
+ } else {
+ Coord var10;
+ if (var0 == 6619) { // L: 4292
+ class446.Interpreter_intStackSize -= 2; // L: 4293
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4294
+ var10 = new Coord(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 4295
+ ServerPacket.method5210(var3, var10, false); // L: 4296
+ return 1; // L: 4297
+ } else if (var0 == 6620) { // L: 4299
+ class446.Interpreter_intStackSize -= 2; // L: 4300
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4301
+ var10 = new Coord(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 4302
+ ServerPacket.method5210(var3, var10, true); // L: 4303
+ return 1; // L: 4304
+ } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4306
+ class446.Interpreter_intStackSize -= 2; // L: 4307
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4308
+ var10 = new Coord(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 4309
+ var9 = GrandExchangeOfferAgeComparator.getWorldMap().getMapArea(var3); // L: 4310
+ if (var9 == null) { // L: 4311
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4312
+ return 1; // L: 4313
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4315
+ return 1; // L: 4316
+ }
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4318
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayWith(); // L: 4319
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getDisplayHeight(); // L: 4320
+ return 1; // L: 4321
+ } else if (var0 == 6623) { // L: 4323
+ var14 = new Coord(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4324
+ var11 = GrandExchangeOfferAgeComparator.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4325
+ if (var11 == null) { // L: 4326
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4327
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var11.getId(); // L: 4330
+ }
+
+ return 1; // L: 4332
+ } else if (var0 == 6624) { // L: 4334
+ GrandExchangeOfferAgeComparator.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4335
+ return 1; // L: 4336
+ } else if (var0 == 6625) { // L: 4338
+ GrandExchangeOfferAgeComparator.getWorldMap().resetMaxFlashCount(); // L: 4339
+ return 1; // L: 4340
+ } else if (var0 == 6626) { // L: 4342
+ GrandExchangeOfferAgeComparator.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 4343
+ return 1; // L: 4344
+ } else if (var0 == 6627) { // L: 4346
+ GrandExchangeOfferAgeComparator.getWorldMap().resetCyclesPerFlash(); // L: 4347
+ return 1; // L: 4348
+ } else {
+ boolean var13;
+ if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4350
+ var13 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 4351
+ GrandExchangeOfferAgeComparator.getWorldMap().setPerpetualFlash(var13); // L: 4352
+ return 1; // L: 4353
+ } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4355
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4356
+ GrandExchangeOfferAgeComparator.getWorldMap().flashElement(var3); // L: 4357
+ return 1; // L: 4358
+ } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4360
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4361
+ GrandExchangeOfferAgeComparator.getWorldMap().flashCategory(var3); // L: 4362
+ return 1; // L: 4363
+ } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4365
+ GrandExchangeOfferAgeComparator.getWorldMap().stopCurrentFlashes(); // L: 4366
+ return 1; // L: 4367
+ } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4369
+ var13 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 4370
+ GrandExchangeOfferAgeComparator.getWorldMap().setElementsDisabled(var13); // L: 4371
+ return 1; // L: 4372
+ } else {
+ boolean var7;
+ if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4374
+ class446.Interpreter_intStackSize -= 2; // L: 4375
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4376
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1] == 1; // L: 4377
+ GrandExchangeOfferAgeComparator.getWorldMap().disableElement(var3, var7); // L: 4378
+ return 1; // L: 4379
+ } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4381
+ class446.Interpreter_intStackSize -= 2; // L: 4382
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4383
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1] == 1; // L: 4384
+ GrandExchangeOfferAgeComparator.getWorldMap().setCategoryDisabled(var3, var7); // L: 4385
+ return 1; // L: 4386
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4388
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4389
+ return 1; // L: 4390
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4392
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4393
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4394
+ return 1; // L: 4395
+ } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4397
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4398
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4399
+ return 1; // L: 4400
+ } else if (var0 == 6638) { // L: 4402
+ class446.Interpreter_intStackSize -= 2; // L: 4403
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 4404
+ var10 = new Coord(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 4405
+ var5 = GrandExchangeOfferAgeComparator.getWorldMap().method7235(var3, var10); // L: 4406
+ if (var5 == null) { // L: 4407
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4408
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.packed(); // L: 4411
+ }
+
+ return 1; // L: 4413
+ } else {
+ AbstractWorldMapIcon var6;
+ if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4415
+ var6 = GrandExchangeOfferAgeComparator.getWorldMap().iconStart(); // L: 4416
+ if (var6 == null) { // L: 4417
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4418
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4419
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4422
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4423
+ }
+
+ return 1; // L: 4425
+ } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4427
+ var6 = GrandExchangeOfferAgeComparator.getWorldMap().iconNext(); // L: 4428
+ if (var6 == null) { // L: 4429
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4430
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4431
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4434
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4435
+ }
+
+ return 1; // L: 4437
+ } else {
+ WorldMapElement var4;
+ if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4439
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4440
+ var4 = class432.WorldMapElement_get(var3); // L: 4441
+ if (var4.name == null) { // L: 4442
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4443
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; // L: 4446
+ }
+
+ return 1; // L: 4448
+ } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4450
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4451
+ var4 = class432.WorldMapElement_get(var3); // L: 4452
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.textSize; // L: 4453
+ return 1; // L: 4454
+ } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4456
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4457
+ var4 = class432.WorldMapElement_get(var3); // L: 4458
+ if (var4 == null) { // L: 4459
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4460
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.category; // L: 4463
+ }
+
+ return 1; // L: 4465
+ } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4467
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4468
+ var4 = class432.WorldMapElement_get(var3); // L: 4469
+ if (var4 == null) { // L: 4470
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4471
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4474
+ }
+
+ return 1; // L: 4476
+ } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4478
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class21.worldMapEvent.mapElement; // L: 4479
+ return 1; // L: 4480
+ } else if (var0 == 6698) { // L: 4482
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class21.worldMapEvent.coord1.packed(); // L: 4483
+ return 1; // L: 4484
+ } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4486
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class21.worldMapEvent.coord2.packed(); // L: 4487
+ return 1; // L: 4488
+ } else {
+ return 2; // L: 4490
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index 65da2f9313..2098d9bf40 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -3,62 +3,62 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qv")
+@ObfuscatedName("qa")
@Implements("Username")
public class Username implements Comparable {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("name")
String name;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("cleanName")
String cleanName;
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lpj;)V"
+ descriptor = "(Ljava/lang/String;Lpe;)V"
)
public Username(String var1, LoginType var2) {
this.name = var1; // L: 16
- this.cleanName = ArchiveDiskActionHandler.method5612(var1, var2); // L: 17
+ this.cleanName = UserComparator5.method2580(var1, var2); // L: 17
} // L: 18
public Username(String var1) {
this.name = var1; // L: 11
- this.cleanName = ArchiveDiskActionHandler.method5612(var1, LoginType.oldscape); // L: 12
+ this.cleanName = UserComparator5.method2580(var1, LoginType.oldscape); // L: 12
} // L: 13
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)Ljava/lang/String;",
- garbageValue = "523836369"
+ garbageValue = "1398829508"
)
@Export("getName")
public String getName() {
return this.name; // L: 21
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "23"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "1713644314"
)
- public String method8148() {
+ public String method8320() {
return this.cleanName; // L: 25
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(B)Z",
- garbageValue = "27"
+ garbageValue = "-54"
)
@Export("hasCleanName")
public boolean hasCleanName() {
return this.cleanName != null; // L: 29
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lqv;I)I",
- garbageValue = "1240776928"
+ descriptor = "(Lqa;I)I",
+ garbageValue = "113609215"
)
@Export("compareToTyped")
public int compareToTyped(Username var1) {
@@ -88,11 +88,11 @@ public class Username implements Comparable {
return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 46 47
}
- public int compareTo(Object var1) {
- return this.compareToTyped((Username)var1); // L: 65
- }
-
public String toString() {
return this.getName(); // L: 52
}
+
+ public int compareTo(Object var1) {
+ return this.compareToTyped((Username)var1); // L: 65
+ }
}
diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java
index 2dfb1987a9..736615a165 100644
--- a/runescape-client/src/main/java/Usernamed.java
+++ b/runescape-client/src/main/java/Usernamed.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nj")
+@ObfuscatedName("nv")
@Implements("Usernamed")
public interface Usernamed {
- @ObfuscatedName("lt")
+ @ObfuscatedName("la")
@ObfuscatedSignature(
- descriptor = "(B)Lqv;",
- garbageValue = "-38"
+ descriptor = "(I)Lqa;",
+ garbageValue = "1509373240"
)
@Export("username")
Username username();
diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java
index 90c27159ed..6901894f2c 100644
--- a/runescape-client/src/main/java/VarbitComposition.java
+++ b/runescape-client/src/main/java/VarbitComposition.java
@@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ge")
+@ObfuscatedName("gx")
@Implements("VarbitComposition")
public class VarbitComposition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("VarbitDefinition_archive")
public static AbstractArchive VarbitDefinition_archive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("VarbitDefinition_cached")
public static EvictingDualNodeHashTable VarbitDefinition_cached;
- @ObfuscatedName("m")
- static final int[] field2039;
- @ObfuscatedName("l")
+ @ObfuscatedName("e")
+ static final int[] field1998;
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 449659853
+ intValue = -1904553397
)
@Export("baseVar")
public int baseVar;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1293091049
+ intValue = 1678069445
)
@Export("startBit")
public int startBit;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1571653715
+ intValue = 1905765043
)
@Export("endBit")
public int endBit;
static {
VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
- field2039 = new int[32]; // L: 15
+ field1998 = new int[32]; // L: 15
int var0 = 2; // L: 18
for (int var1 = 0; var1 < 32; ++var1) { // L: 19
- field2039[var1] = var0 - 1; // L: 20
+ field1998[var1] = var0 - 1; // L: 20
var0 += var0; // L: 21
}
@@ -55,10 +55,10 @@ public class VarbitComposition extends DualNode {
VarbitComposition() {
} // L: 25
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1433634569"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-2021831653"
)
@Export("decode")
void decode(Buffer var1) {
@@ -72,10 +72,10 @@ public class VarbitComposition extends DualNode {
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "1729188867"
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "98"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
@@ -86,32 +86,4 @@ public class VarbitComposition extends DualNode {
}
} // L: 52
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(IIIZIB)J",
- garbageValue = "-48"
- )
- @Export("calculateTag")
- public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
- long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 88
- if (var3) { // L: 89
- var5 |= 65536L;
- }
-
- return var5; // L: 90
- }
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(IIIB)I",
- garbageValue = "-113"
- )
- static int method3489(int var0, int var1, int var2) {
- if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 912
- return 0;
- } else {
- return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 913
- }
- }
}
diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java
index cf901b4d6a..bd18340b9f 100644
--- a/runescape-client/src/main/java/VarcInt.java
+++ b/runescape-client/src/main/java/VarcInt.java
@@ -2,23 +2,26 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("fe")
+@ObfuscatedName("fg")
@Implements("VarcInt")
public class VarcInt extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("VarcInt_archive")
public static AbstractArchive VarcInt_archive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("VarcInt_cached")
public static EvictingDualNodeHashTable VarcInt_cached;
- @ObfuscatedName("l")
+ @ObfuscatedName("fg")
+ static String field1851;
+ @ObfuscatedName("q")
@Export("persist")
public boolean persist;
@@ -30,149 +33,83 @@ public class VarcInt extends DualNode {
this.persist = false; // L: 12
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-2122743256"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-101"
)
- public void method3315(Buffer var1) {
+ public void method3400(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte(); // L: 16
- if (var2 == 0) { // L: 17
- return; // L: 20
+ int var2 = var1.readUnsignedByte(); // L: 20
+ if (var2 == 0) { // L: 21
+ return; // L: 24
}
- this.method3316(var1, var2); // L: 18
+ this.method3402(var1, var2); // L: 22
}
}
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;IS)V",
- garbageValue = "223"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "2067647577"
)
- void method3316(Buffer var1, int var2) {
- if (var2 == 2) { // L: 23
- this.persist = true; // L: 24
+ void method3402(Buffer var1, int var2) {
+ if (var2 == 2) { // L: 27
+ this.persist = true; // L: 28
}
- } // L: 27
+ } // L: 31
- @ObfuscatedName("q")
- static boolean method3323(long var0) {
- return class357.method6392(var0) == 2; // L: 48
- }
-
- @ObfuscatedName("k")
+ @ObfuscatedName("an")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "1980570860"
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "81"
)
- public static int method3324(int var0) {
- var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 53
- var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 54
- var0 = var0 + (var0 >>> 4) & 252645135; // L: 55
- var0 += var0 >>> 8; // L: 56
- var0 += var0 >>> 16; // L: 57
- return var0 & 255; // L: 58
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(IIIZIZI)V",
- garbageValue = "447479880"
- )
- @Export("doWorldSorting")
- static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
- if (var0 < var1) { // L: 177
- int var6 = (var0 + var1) / 2; // L: 178
- int var7 = var0; // L: 179
- World var8 = World.World_worlds[var6]; // L: 180
- World.World_worlds[var6] = World.World_worlds[var1]; // L: 181
- World.World_worlds[var1] = var8; // L: 182
-
- for (int var9 = var0; var9 < var1; ++var9) { // L: 183
- World var11 = World.World_worlds[var9]; // L: 185
- int var12 = KeyHandler.compareWorlds(var11, var8, var2, var3); // L: 187
- int var10;
- if (var12 != 0) { // L: 188
- if (var3) { // L: 189
- var10 = -var12; // L: 190
- } else {
- var10 = var12; // L: 194
- }
- } else if (var4 == -1) { // L: 198
- var10 = 0; // L: 199
- } else {
- int var13 = KeyHandler.compareWorlds(var11, var8, var4, var5); // L: 202
- if (var5) { // L: 203
- var10 = -var13;
- } else {
- var10 = var13; // L: 204
- }
- }
-
- if (var10 <= 0) { // L: 206
- World var14 = World.World_worlds[var9]; // L: 207
- World.World_worlds[var9] = World.World_worlds[var7]; // L: 208
- World.World_worlds[var7++] = var14; // L: 209
- }
- }
-
- World.World_worlds[var1] = World.World_worlds[var7]; // L: 213
- World.World_worlds[var7] = var8; // L: 214
- doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215
- doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216
- }
-
- } // L: 218
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1070094417"
- )
- public static void method3321() {
- FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 82
- } // L: 83
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-396189333"
- )
- public static void method3325() {
- class453.SpriteBuffer_xOffsets = null; // L: 223
- class453.SpriteBuffer_yOffsets = null; // L: 224
- ScriptFrame.SpriteBuffer_spriteWidths = null; // L: 225
- class453.SpriteBuffer_spriteHeights = null; // L: 226
- Decimator.SpriteBuffer_spritePalette = null; // L: 227
- class127.SpriteBuffer_pixels = null; // L: 228
- } // L: 229
-
- @ObfuscatedName("ke")
- @ObfuscatedSignature(
- descriptor = "(IIIILqr;Lka;B)V",
- garbageValue = "-10"
- )
- @Export("worldToMinimap")
- static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
- int var6 = var3 * var3 + var2 * var2; // L: 12380
- if (var6 > 4225 && var6 < 90000) { // L: 12381
- int var7 = Client.camAngleY & 2047; // L: 12382
- int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12383
- int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12384
- int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12385
- int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12386
- double var12 = Math.atan2((double)var10, (double)var11); // L: 12387
- int var14 = var5.width / 2 - 25; // L: 12388
- int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12389
- int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12390
- byte var17 = 20; // L: 12391
- class344.redHintArrowSprite.method7992(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12392
+ static int method3411(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3754
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class9.getWindowedMode(); // L: 3755
+ return 1; // L: 3756
} else {
- PcmPlayer.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12394
- }
+ int var3;
+ if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3758
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3759
+ if (var3 == 1 || var3 == 2) { // L: 3760
+ WorldMapLabelSize.setWindowedMode(var3);
+ }
- } // L: 12395
+ return 1; // L: 3761
+ } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3763
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class19.clientPreferences.method2268(); // L: 3764
+ return 1; // L: 3765
+ } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3767
+ if (var0 == 5310) { // L: 3774
+ --class446.Interpreter_intStackSize; // L: 3775
+ return 1; // L: 3776
+ } else if (var0 == 5311) { // L: 3778
+ class446.Interpreter_intStackSize -= 2; // L: 3779
+ return 1; // L: 3780
+ } else if (var0 == 5312) { // L: 3782
+ --class446.Interpreter_intStackSize; // L: 3783
+ return 1; // L: 3784
+ } else if (var0 == 5350) { // L: 3786
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3787
+ --class446.Interpreter_intStackSize; // L: 3788
+ return 1; // L: 3789
+ } else if (var0 == 5351) { // L: 3791
+ --Interpreter.Interpreter_stringStackSize; // L: 3792
+ return 1; // L: 3793
+ } else {
+ return 2; // L: 3795
+ }
+ } else {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3768
+ if (var3 == 1 || var3 == 2) { // L: 3769
+ class19.clientPreferences.method2280(var3); // L: 3770
+ }
+
+ return 1; // L: 3772
+ }
+ }
+ }
}
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index c228c7a078..1c11230471 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -1,4 +1,6 @@
import java.io.EOFException;
+import java.io.File;
+import java.io.RandomAccessFile;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -8,70 +10,57 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
@Deprecated
-@ObfuscatedName("cu")
+@ObfuscatedName("ck")
@Implements("Varcs")
public class Varcs {
- @ObfuscatedName("dg")
+ @ObfuscatedName("t")
+ @Export("Tiles_lightness")
+ static int[] Tiles_lightness;
+ @ObfuscatedName("ez")
@ObfuscatedSignature(
- descriptor = "Lcv;"
+ descriptor = "Llc;"
)
- @Export("mouseRecorder")
- static MouseRecorder mouseRecorder;
- @ObfuscatedName("du")
- @ObfuscatedSignature(
- descriptor = "Lnf;"
- )
- @Export("js5Socket")
- static AbstractSocket js5Socket;
- @ObfuscatedName("fl")
- @ObfuscatedGetter(
- intValue = 731803613
- )
- static int field1329;
- @ObfuscatedName("hq")
- @ObfuscatedSignature(
- descriptor = "Lmx;"
- )
- @Export("fontPlain11")
- static Font fontPlain11;
- @ObfuscatedName("l")
+ @Export("archive5")
+ static Archive archive5;
+ @ObfuscatedName("q")
@Export("intsPersistence")
boolean[] intsPersistence;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("map")
Map map;
/** @deprecated */
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("strings")
String[] strings;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("unwrittenChanges")
boolean unwrittenChanges;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- longValue = -8040896661134893849L
+ longValue = -7650990867349600243L
)
- long field1324;
+ long field1321;
Varcs() {
this.unwrittenChanges = false; // L: 25
- int var1 = class356.archive2.getGroupFileCount(19); // L: 29
- this.map = new HashMap();
- this.intsPersistence = new boolean[var1];
+ int var1 = class140.archive2.getGroupFileCount(19); // L: 29
+ this.map = new HashMap(); // L: 30
+ this.intsPersistence = new boolean[var1]; // L: 31
int var2;
- for (var2 = 0; var2 < var1; ++var2) {
- VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2);
+ for (var2 = 0; var2 < var1; ++var2) { // L: 32
+ VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); // L: 35
VarcInt var3;
- if (var4 != null) {
- var3 = var4;
+ if (var4 != null) { // L: 36
+ var3 = var4; // L: 37
} else {
- byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2);
- var4 = new VarcInt();
+ byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 40
+ var4 = new VarcInt(); // L: 41
if (var5 != null) {
- var4.method3315(new Buffer(var5)); // L: 42
+ var4.method3400(new Buffer(var5)); // L: 42
}
VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 43
@@ -82,32 +71,32 @@ public class Varcs {
}
var2 = 0; // L: 49
- if (class356.archive2.method5634(15)) { // L: 50
- var2 = class356.archive2.getGroupFileCount(15); // L: 51
+ if (class140.archive2.method5806(15)) { // L: 50
+ var2 = class140.archive2.getGroupFileCount(15); // L: 51
}
this.strings = new String[var2]; // L: 53
this.read(); // L: 54
} // L: 55
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIB)V",
- garbageValue = "-43"
+ descriptor = "(III)V",
+ garbageValue = "-480825511"
)
@Export("setInt")
void setInt(int var1, int var2) {
this.map.put(var1, var2); // L: 58
- if (this.intsPersistence[var1]) {
- this.unwrittenChanges = true; // L: 59
+ if (this.intsPersistence[var1]) { // L: 59
+ this.unwrittenChanges = true;
}
} // L: 60
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-1629880183"
+ descriptor = "(IB)I",
+ garbageValue = "-27"
)
@Export("getInt")
int getInt(int var1) {
@@ -115,20 +104,20 @@ public class Varcs {
return var2 instanceof Integer ? (Integer)var2 : -1; // L: 64 65 67
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)V",
- garbageValue = "-89263666"
+ garbageValue = "-1848287137"
)
@Export("setString")
void setString(int var1, String var2) {
this.map.put(var1, var2); // L: 71
} // L: 72
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(II)Ljava/lang/String;",
- garbageValue = "1860266342"
+ garbageValue = "-1873976363"
)
@Export("getString")
String getString(int var1) {
@@ -138,10 +127,10 @@ public class Varcs {
/** @deprecated */
@Deprecated
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(ILjava/lang/String;I)V",
- garbageValue = "409167370"
+ garbageValue = "-1935222332"
)
@Export("setStringOld")
void setStringOld(int var1, String var2) {
@@ -150,20 +139,20 @@ public class Varcs {
/** @deprecated */
@Deprecated
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/String;",
- garbageValue = "2082376569"
+ descriptor = "(IB)Ljava/lang/String;",
+ garbageValue = "29"
)
@Export("getStringOld")
String getStringOld(int var1) {
return this.strings[var1]; // L: 89
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "181729030"
+ garbageValue = "654985106"
)
@Export("clearTransient")
void clearTransient() {
@@ -180,20 +169,20 @@ public class Varcs {
} // L: 101
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(ZI)Lpu;",
- garbageValue = "-1693869936"
+ descriptor = "(ZS)Lpn;",
+ garbageValue = "-4151"
)
@Export("getPreferencesFile")
AccessFile getPreferencesFile(boolean var1) {
- return UserComparator3.getPreferencesFile("2", ApproximateRouteStrategy.field473.name, var1); // L: 104
+ return class67.getPreferencesFile("2", class285.field3313.name, var1); // L: 104
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "82"
+ garbageValue = "117"
)
@Export("write")
void write() {
@@ -213,225 +202,386 @@ public class Varcs {
if (var7 instanceof Integer) { // L: 119
var2 += 4;
} else if (var7 instanceof String) { // L: 120
- var2 += class392.stringCp1252NullTerminatedByteSize((String)var7);
+ var2 += ScriptEvent.stringCp1252NullTerminatedByteSize((String)var7);
}
++var3; // L: 121
}
}
- Buffer var28 = new Buffer(var2); // L: 125
- var28.writeByte(2); // L: 126
- var28.writeShort(var3); // L: 127
- Iterator var29 = this.map.entrySet().iterator(); // L: 128
+ Buffer var24 = new Buffer(var2); // L: 125
+ var24.writeByte(2); // L: 126
+ var24.writeShort(var3); // L: 127
+ Iterator var25 = this.map.entrySet().iterator(); // L: 128
- label145:
- while (true) {
- Entry var17;
- int var18;
- do {
- if (!var29.hasNext()) {
- var1.write(var28.array, 0, var28.offset); // L: 162
- break label145;
- }
-
- var17 = (Entry)var29.next(); // L: 129
- var18 = (Integer)var17.getKey(); // L: 131
- } while(!this.intsPersistence[var18]); // L: 132
-
- var28.writeShort(var18); // L: 133
- Object var8 = var17.getValue(); // L: 134
- Class var10 = var8.getClass(); // L: 136
- class433[] var11 = new class433[]{class433.field4655, class433.field4656, class433.field4664}; // L: 141
- class433[] var12 = var11; // L: 143
- int var13 = 0;
-
- class433 var9;
- while (true) {
- if (var13 >= var12.length) {
- var9 = null; // L: 154
- break;
- }
-
- class433 var14 = var12[var13]; // L: 145
- if (var10 == var14.field4667) { // L: 147
- var9 = var14; // L: 148
- break; // L: 149
- }
-
- ++var13; // L: 144
+ while (var25.hasNext()) {
+ Entry var13 = (Entry)var25.next(); // L: 129
+ int var14 = (Integer)var13.getKey(); // L: 131
+ if (this.intsPersistence[var14]) { // L: 132
+ var24.writeShort(var14); // L: 133
+ Object var8 = var13.getValue(); // L: 134
+ class432 var9 = class432.method7561(var8.getClass()); // L: 135
+ var24.writeByte(var9.field4655); // L: 136
+ class428 var10 = class432.method7577(var8.getClass()); // L: 138
+ var10.vmethod7583(var8, var24); // L: 139
}
-
- var28.writeByte(var9.field4658); // L: 157
- class433.method7420(var8, var28); // L: 158
}
- } catch (Exception var26) { // L: 164
+
+ var1.write(var24.array, 0, var24.offset); // L: 144
+ } catch (Exception var22) { // L: 146
} finally {
try {
- var1.close(); // L: 167
- } catch (Exception var25) { // L: 169
+ var1.close(); // L: 149
+ } catch (Exception var21) { // L: 151
}
}
- this.unwrittenChanges = false; // L: 171
- this.field1324 = class113.method2624(); // L: 172
- } // L: 173
+ this.unwrittenChanges = false; // L: 153
+ this.field1321 = class115.method2692(); // L: 154
+ } // L: 155
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-16764"
+ descriptor = "(I)V",
+ garbageValue = "32768"
)
@Export("read")
void read() {
- AccessFile var1 = this.getPreferencesFile(false); // L: 176
+ AccessFile var1 = this.getPreferencesFile(false); // L: 158
- label214: {
+ label212: {
try {
- byte[] var2 = new byte[(int)var1.length()]; // L: 178
+ byte[] var2 = new byte[(int)var1.length()]; // L: 160
int var4;
- for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 179 180 183
- var4 = var1.read(var2, var3, var2.length - var3); // L: 181
- if (var4 == -1) { // L: 182
+ for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 161 162 165
+ var4 = var1.read(var2, var3, var2.length - var3); // L: 163
+ if (var4 == -1) { // L: 164
throw new EOFException();
}
}
- Buffer var15 = new Buffer(var2); // L: 185
- if (var15.array.length - var15.offset >= 1) {
- int var16 = var15.readUnsignedByte(); // L: 187
- if (var16 < 0 || var16 > 2) {
- return; // L: 188
- }
+ Buffer var14 = new Buffer(var2); // L: 167
+ if (var14.array.length - var14.offset < 1) {
+ return; // L: 168
+ }
+ int var15 = var14.readUnsignedByte(); // L: 169
+ if (var15 >= 0 && var15 <= 2) {
int var7;
int var8;
int var9;
- int var17;
- if (var16 >= 2) { // L: 189
- var17 = var15.readUnsignedShort(); // L: 190
+ int var16;
+ if (var15 >= 2) { // L: 171
+ var16 = var14.readUnsignedShort(); // L: 172
var7 = 0;
while (true) {
- if (var7 >= var17) {
- break label214;
+ if (var7 >= var16) {
+ break label212;
}
- var8 = var15.readUnsignedShort(); // L: 192
- var9 = var15.readUnsignedByte(); // L: 193
- class433[] var10 = new class433[]{class433.field4655, class433.field4656, class433.field4664}; // L: 196
- class433 var11 = (class433)class291.findEnumerated(var10, var9); // L: 198
- Object var12 = var11.method7423(var15); // L: 199
- if (this.intsPersistence[var8]) { // L: 200
- this.map.put(var8, var12); // L: 201
+ var8 = var14.readUnsignedShort(); // L: 174
+ var9 = var14.readUnsignedByte(); // L: 175
+ class432 var10 = (class432)Actor.findEnumerated(class432.method7566(), var9); // L: 176
+ Object var11 = var10.method7565(var14); // L: 177
+ if (this.intsPersistence[var8]) { // L: 178
+ this.map.put(var8, var11); // L: 179
}
- ++var7; // L: 191
+ ++var7; // L: 173
}
} else {
- var17 = var15.readUnsignedShort(); // L: 206
+ var16 = var14.readUnsignedShort(); // L: 184
- for (var7 = 0; var7 < var17; ++var7) { // L: 207
- var8 = var15.readUnsignedShort(); // L: 208
- var9 = var15.readInt(); // L: 209
- if (this.intsPersistence[var8]) { // L: 210
- this.map.put(var8, var9); // L: 211
+ for (var7 = 0; var7 < var16; ++var7) { // L: 185
+ var8 = var14.readUnsignedShort(); // L: 186
+ var9 = var14.readInt(); // L: 187
+ if (this.intsPersistence[var8]) { // L: 188
+ this.map.put(var8, var9); // L: 189
}
}
- var7 = var15.readUnsignedShort(); // L: 214
+ var7 = var14.readUnsignedShort(); // L: 192
var8 = 0;
while (true) {
if (var8 >= var7) {
- break label214;
+ break label212;
}
- var15.readUnsignedShort(); // L: 216
- var15.readStringCp1252NullTerminated(); // L: 217
- ++var8; // L: 215
+ var14.readUnsignedShort(); // L: 194
+ var14.readStringCp1252NullTerminated(); // L: 195
+ ++var8; // L: 193
}
}
}
- } catch (Exception var26) { // L: 221
- break label214;
+ } catch (Exception var25) { // L: 199
+ break label212;
} finally {
try {
- var1.close(); // L: 224
- } catch (Exception var25) { // L: 226
+ var1.close(); // L: 202
+ } catch (Exception var24) { // L: 204
}
}
- return; // L: 186
+ return; // L: 170
}
- this.unwrittenChanges = false; // L: 228
- } // L: 229
+ this.unwrittenChanges = false; // L: 206
+ } // L: 207
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-590305740"
+ garbageValue = "-1207260156"
)
@Export("tryWrite")
void tryWrite() {
- if (this.unwrittenChanges && this.field1324 < class113.method2624() - 60000L) { // L: 232
- this.write(); // L: 233
+ if (this.unwrittenChanges && this.field1321 < class115.method2692() - 60000L) { // L: 210
+ this.write(); // L: 211
}
- } // L: 235
+ } // L: 213
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "2147209332"
+ garbageValue = "-1353615463"
)
@Export("hasUnwrittenChanges")
boolean hasUnwrittenChanges() {
- return this.unwrittenChanges; // L: 238
+ return this.unwrittenChanges; // L: 216
}
- @ObfuscatedName("o")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-405806506"
+ descriptor = "(Ljava/io/File;ZI)Z",
+ garbageValue = "1566405601"
)
- static void method2466() {
- for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
- if (var0.stream1 != null) { // L: 31
- class122.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32
- var0.stream1 = null; // L: 33
+ static boolean method2474(File var0, boolean var1) {
+ try {
+ RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 234
+ int var3 = var2.read(); // L: 235
+ var2.seek(0L); // L: 236
+ var2.write(var3); // L: 237
+ var2.seek(0L); // L: 238
+ var2.close(); // L: 239
+ if (var1) { // L: 240
+ var0.delete();
}
- if (var0.stream2 != null) { // L: 35
- class122.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36
- var0.stream2 = null; // L: 37
+ return true; // L: 241
+ } catch (Exception var4) { // L: 243
+ return false; // L: 244
+ }
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-27"
+ )
+ static int method2475(int var0, Script var1, boolean var2) {
+ int var4 = -1; // L: 622
+ Widget var3;
+ if (var0 >= 2000) { // L: 623
+ var0 -= 1000; // L: 624
+ var4 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 625
+ var3 = class140.getWidget(var4); // L: 626
+ } else {
+ var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 628
+ }
+
+ if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 629
+ class446.Interpreter_intStackSize -= 2; // L: 630
+ var3.scrollX = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 631
+ if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 632
+ var3.scrollX = var3.scrollWidth - var3.width;
+ }
+
+ if (var3.scrollX < 0) { // L: 633
+ var3.scrollX = 0;
+ }
+
+ var3.scrollY = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 634
+ if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 635
+ var3.scrollY = var3.scrollHeight - var3.height;
+ }
+
+ if (var3.scrollY < 0) { // L: 636
+ var3.scrollY = 0;
+ }
+
+ ChatChannel.invalidateWidget(var3); // L: 637
+ return 1; // L: 638
+ } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 640
+ var3.color = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 641
+ ChatChannel.invalidateWidget(var3); // L: 642
+ return 1; // L: 643
+ } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 645
+ var3.fill = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 646
+ ChatChannel.invalidateWidget(var3); // L: 647
+ return 1; // L: 648
+ } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 650
+ var3.transparencyTop = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 651
+ ChatChannel.invalidateWidget(var3); // L: 652
+ return 1; // L: 653
+ } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 655
+ var3.lineWid = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 656
+ ChatChannel.invalidateWidget(var3); // L: 657
+ return 1; // L: 658
+ } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 660
+ var3.spriteId2 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 661
+ ChatChannel.invalidateWidget(var3); // L: 662
+ return 1; // L: 663
+ } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 665
+ var3.spriteAngle = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 666
+ ChatChannel.invalidateWidget(var3); // L: 667
+ return 1; // L: 668
+ } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 670
+ var3.spriteTiling = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 671
+ ChatChannel.invalidateWidget(var3); // L: 672
+ return 1; // L: 673
+ } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 675
+ var3.modelType = 1; // L: 676
+ var3.modelId = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 677
+ ChatChannel.invalidateWidget(var3); // L: 678
+ return 1; // L: 679
+ } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 681
+ class446.Interpreter_intStackSize -= 6; // L: 682
+ var3.modelOffsetX = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 683
+ var3.modelOffsetY = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 684
+ var3.modelAngleX = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 685
+ var3.modelAngleY = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 686
+ var3.modelAngleZ = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 4]; // L: 687
+ var3.modelZoom = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 5]; // L: 688
+ ChatChannel.invalidateWidget(var3); // L: 689
+ return 1; // L: 690
+ } else {
+ int var8;
+ if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 692
+ var8 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 693
+ if (var8 != var3.sequenceId) { // L: 694
+ var3.sequenceId = var8; // L: 695
+ var3.modelFrame = 0; // L: 696
+ var3.modelFrameCycle = 0; // L: 697
+ ChatChannel.invalidateWidget(var3); // L: 698
+ }
+
+ return 1; // L: 700
+ } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 702
+ var3.modelOrthog = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 703
+ ChatChannel.invalidateWidget(var3); // L: 704
+ return 1; // L: 705
+ } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 707
+ String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 708
+ if (!var7.equals(var3.text)) { // L: 709
+ var3.text = var7; // L: 710
+ ChatChannel.invalidateWidget(var3); // L: 711
+ }
+
+ return 1; // L: 713
+ } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 715
+ var3.fontId = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 716
+ ChatChannel.invalidateWidget(var3); // L: 717
+ return 1; // L: 718
+ } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 720
+ class446.Interpreter_intStackSize -= 3; // L: 721
+ var3.textXAlignment = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 722
+ var3.textYAlignment = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 723
+ var3.textLineHeight = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 724
+ ChatChannel.invalidateWidget(var3); // L: 725
+ return 1; // L: 726
+ } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 728
+ var3.textShadowed = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 729
+ ChatChannel.invalidateWidget(var3); // L: 730
+ return 1; // L: 731
+ } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 733
+ var3.outline = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 734
+ ChatChannel.invalidateWidget(var3); // L: 735
+ return 1; // L: 736
+ } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 738
+ var3.spriteShadow = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 739
+ ChatChannel.invalidateWidget(var3); // L: 740
+ return 1; // L: 741
+ } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 743
+ var3.spriteFlipV = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 744
+ ChatChannel.invalidateWidget(var3); // L: 745
+ return 1; // L: 746
+ } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 748
+ var3.spriteFlipH = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 749
+ ChatChannel.invalidateWidget(var3); // L: 750
+ return 1; // L: 751
+ } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 753
+ class446.Interpreter_intStackSize -= 2; // L: 754
+ var3.scrollWidth = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 755
+ var3.scrollHeight = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 756
+ ChatChannel.invalidateWidget(var3); // L: 757
+ if (var4 != -1 && var3.type == 0) { // L: 758
+ BufferedNetSocket.revalidateWidgetScroll(SoundCache.Widget_interfaceComponents[var4 >> 16], var3, false);
+ }
+
+ return 1; // L: 759
+ } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 761
+ class362.resumePauseWidget(var3.id, var3.childIndex); // L: 762
+ Client.meslayerContinueWidget = var3; // L: 763
+ ChatChannel.invalidateWidget(var3); // L: 764
+ return 1; // L: 765
+ } else if (var0 == 1122) { // L: 767
+ var3.spriteId = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 768
+ ChatChannel.invalidateWidget(var3); // L: 769
+ return 1; // L: 770
+ } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 772
+ var3.color2 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 773
+ ChatChannel.invalidateWidget(var3); // L: 774
+ return 1; // L: 775
+ } else if (var0 == 1124) { // L: 777
+ var3.transparencyBot = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 778
+ ChatChannel.invalidateWidget(var3); // L: 779
+ return 1; // L: 780
+ } else if (var0 == 1125) { // L: 782
+ var8 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 783
+ FillMode var6 = (FillMode)Actor.findEnumerated(StudioGame.FillMode_values(), var8); // L: 784
+ if (var6 != null) { // L: 785
+ var3.fillMode = var6; // L: 786
+ ChatChannel.invalidateWidget(var3); // L: 787
+ }
+
+ return 1; // L: 789
+ } else {
+ boolean var5;
+ if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 791
+ var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 792
+ var3.field3402 = var5; // L: 793
+ return 1; // L: 794
+ } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 796
+ var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 797
+ var3.modelTransparency = var5; // L: 798
+ return 1; // L: 799
+ } else if (var0 == 1128) { // L: 801
+ class446.Interpreter_intStackSize -= 2; // L: 802
+ return 1; // L: 803
+ } else if (var0 == 1129) { // L: 805
+ var3.field3405 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 806
+ ChatChannel.invalidateWidget(var3); // L: 807
+ return 1; // L: 808
+ } else if (var0 == 1130) { // L: 810
+ var3.method5619(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize], class138.urlRequester, BoundaryObject.method4536()); // L: 811
+ return 1; // L: 812
+ } else if (var0 == 1131) { // L: 814
+ class446.Interpreter_intStackSize -= 2; // L: 815
+ var3.method5621(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 816
+ return 1; // L: 817
+ } else if (var0 == 1132) { // L: 819
+ var3.method5622(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 820
+ return 1; // L: 821
+ } else {
+ return 2; // L: 823
+ }
}
}
-
- ObjectSound.objectSounds.clear(); // L: 40
- } // L: 41
-
- @ObfuscatedName("fe")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "32"
- )
- @Export("forceDisconnect")
- static final void forceDisconnect(int var0) {
- SecureRandomCallable.logOut(); // L: 3027
- switch(var0) { // L: 3028
- case 1:
- class126.method2799(24); // L: 3040
- class345.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3041
- break;
- case 2:
- class126.method2799(24); // L: 3032
- class345.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 3033
- }
-
- } // L: 3046
+ }
}
diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java
index 1292ae7b5d..88be9aeee8 100644
--- a/runescape-client/src/main/java/VarpDefinition.java
+++ b/runescape-client/src/main/java/VarpDefinition.java
@@ -1,142 +1,100 @@
-import java.io.File;
-import java.io.RandomAccessFile;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fi")
+@ObfuscatedName("fp")
@Implements("VarpDefinition")
public class VarpDefinition extends DualNode {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("VarpDefinition_archive")
public static AbstractArchive VarpDefinition_archive;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -230043691
+ intValue = 486330385
)
- @Export("VarpDefinition_fileCount")
- public static int VarpDefinition_fileCount;
- @ObfuscatedName("l")
+ public static int field1822;
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("VarpDefinition_cached")
public static EvictingDualNodeHashTable VarpDefinition_cached;
- @ObfuscatedName("ex")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive19")
- static Archive archive19;
- @ObfuscatedName("k")
+ @ObfuscatedName("ct")
+ static boolean field1821;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1780230935
+ intValue = -737478807
)
@Export("type")
public int type;
static {
- VarpDefinition_cached = new EvictingDualNodeHashTable(64);
+ VarpDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12
}
VarpDefinition() {
this.type = 0; // L: 13
} // L: 15
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-125"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1095475514"
)
@Export("decode")
void decode(Buffer var1) {
while (true) {
- int var2 = var1.readUnsignedByte();
- if (var2 == 0) {
+ int var2 = var1.readUnsignedByte(); // L: 29
+ if (var2 == 0) { // L: 30
return; // L: 33
}
- this.decodeNext(var1, var2);
+ this.decodeNext(var1, var2); // L: 31
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "29"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "1370423223"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
- if (var2 == 5) {
+ if (var2 == 5) { // L: 36
this.type = var1.readUnsignedShort();
}
} // L: 38
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)Ljava/io/File;",
- garbageValue = "1012009903"
+ descriptor = "(II)I",
+ garbageValue = "1678307117"
)
- @Export("getFile")
- static File getFile(String var0) {
- if (!FileSystem.FileSystem_hasPermissions) { // L: 16
- throw new RuntimeException("");
- } else {
- File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 17
- if (var1 != null) { // L: 18
- return var1;
- } else {
- File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19
- RandomAccessFile var3 = null; // L: 20
-
- try {
- File var4 = new File(var2.getParent()); // L: 22
- if (!var4.exists()) { // L: 23
- throw new RuntimeException("");
- } else {
- var3 = new RandomAccessFile(var2, "rw"); // L: 24
- int var5 = var3.read(); // L: 25
- var3.seek(0L); // L: 26
- var3.write(var5); // L: 27
- var3.seek(0L); // L: 28
- var3.close(); // L: 29
- FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30
- return var2; // L: 31
- }
- } catch (Exception var8) {
- try {
- if (var3 != null) { // L: 35
- var3.close(); // L: 36
- var3 = null; // L: 37
- }
- } catch (Exception var7) { // L: 40
- }
-
- throw new RuntimeException(); // L: 42
- }
- }
- }
+ public static int method3374(int var0) {
+ return class270.field3179[var0]; // L: 24
}
- @ObfuscatedName("o")
+ @ObfuscatedName("iy")
@ObfuscatedSignature(
- descriptor = "(IIII)I",
- garbageValue = "-1753178254"
+ descriptor = "(II)Z",
+ garbageValue = "1226531684"
)
- public static int method3273(int var0, int var1, int var2) {
- var2 &= 3; // L: 9
- if (var2 == 0) { // L: 10
- return var1;
- } else if (var2 == 1) { // L: 11
- return 7 - var0;
+ static final boolean method3373(int var0) {
+ if (var0 < 0) { // L: 8693
+ return false;
} else {
- return var2 == 2 ? 7 - var1 : var0; // L: 12
+ int var1 = Client.menuOpcodes[var0]; // L: 8694
+ if (var1 >= 2000) { // L: 8695
+ var1 -= 2000;
+ }
+
+ return var1 == 1007; // L: 8696
}
}
}
diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java
index 73b2534a15..9553cf74ae 100644
--- a/runescape-client/src/main/java/Varps.java
+++ b/runescape-client/src/main/java/Varps.java
@@ -1,26 +1,20 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kn")
+@ObfuscatedName("kr")
@Implements("Varps")
public class Varps {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("Varps_masks")
static int[] Varps_masks;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("Varps_temp")
public static int[] Varps_temp;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("Varps_main")
public static int[] Varps_main;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = -995653473
- )
- public static int field3348;
static {
Varps_masks = new int[32]; // L: 6
@@ -35,27 +29,22 @@ public class Varps {
Varps_main = new int[4000]; // L: 17
}
- @ObfuscatedName("kj")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-20299938"
+ descriptor = "(Ljava/lang/Object;ZB)[B",
+ garbageValue = "74"
)
- static final void method5366() {
- PacketBufferNode var0 = WallDecoration.getPacketBufferNode(ClientPacket.field3001, Client.packetWriter.isaacCipher); // L: 12197
- Client.packetWriter.addNode(var0); // L: 12198
- Interpreter.field833 = true; // L: 12199
-
- for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12200
- if (var1.type == 0 || var1.type == 3) { // L: 12201
- NetSocket.closeInterface(var1, true);
- }
+ public static byte[] method5530(Object var0, boolean var1) {
+ if (var0 == null) { // L: 21
+ return null;
+ } else if (var0 instanceof byte[]) { // L: 22
+ byte[] var3 = (byte[])((byte[])var0); // L: 23
+ return var1 ? MusicPatch.method5432(var3) : var3; // L: 24
+ } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27
+ AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28
+ return var2.get(); // L: 29
+ } else {
+ throw new IllegalArgumentException(); // L: 31
}
-
- if (Client.meslayerContinueWidget != null) { // L: 12203
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 12204
- Client.meslayerContinueWidget = null; // L: 12205
- }
-
- Interpreter.field833 = false; // L: 12207
- } // L: 12208
+ }
}
diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java
index 27a34afab2..4f35254581 100644
--- a/runescape-client/src/main/java/VertexNormal.java
+++ b/runescape-client/src/main/java/VertexNormal.java
@@ -3,35 +3,31 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("hq")
+@ObfuscatedName("hj")
@Implements("VertexNormal")
public class VertexNormal {
- @ObfuscatedName("y")
- @Export("musicTrackBoolean")
- public static boolean musicTrackBoolean;
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1611890735
+ intValue = 852204679
)
@Export("x")
int x;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1317140331
+ intValue = -2028083131
)
@Export("y")
int y;
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1313814185
+ intValue = 1173750943
)
@Export("z")
int z;
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -140777267
+ intValue = -860468825
)
@Export("magnitude")
int magnitude;
@@ -40,7 +36,7 @@ public class VertexNormal {
} // L: 9
@ObfuscatedSignature(
- descriptor = "(Lhq;)V"
+ descriptor = "(Lhj;)V"
)
VertexNormal(VertexNormal var1) {
this.x = var1.x; // L: 12
@@ -49,105 +45,62 @@ public class VertexNormal {
this.magnitude = var1.magnitude; // L: 15
} // L: 16
- @ObfuscatedName("r")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "([BIILgm;[Lgh;I)V",
- garbageValue = "1258473282"
+ descriptor = "(II)Z",
+ garbageValue = "886166360"
)
- static final void method4376(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) {
- Buffer var5 = new Buffer(var0); // L: 251
- int var6 = -1; // L: 252
+ public static boolean method4528(int var0) {
+ return var0 >= 0 && var0 < 112 ? KeyHandler.field136[var0] : false;
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "([BIILgg;[Lgv;I)V",
+ garbageValue = "-1413330538"
+ )
+ static final void method4527(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) {
+ Buffer var5 = new Buffer(var0); // L: 228
+ int var6 = -1; // L: 229
while (true) {
- int var7 = var5.method7531(); // L: 254
- if (var7 == 0) { // L: 255
- return; // L: 279
+ int var7 = var5.method7770(); // L: 231
+ if (var7 == 0) { // L: 232
+ return; // L: 256
}
- var6 += var7; // L: 256
- int var8 = 0; // L: 257
+ var6 += var7; // L: 233
+ int var8 = 0; // L: 234
while (true) {
- int var9 = var5.readUShortSmart(); // L: 259
- if (var9 == 0) { // L: 260
+ int var9 = var5.readUShortSmart(); // L: 236
+ if (var9 == 0) { // L: 237
break;
}
- var8 += var9 - 1; // L: 261
- int var10 = var8 & 63; // L: 262
- int var11 = var8 >> 6 & 63; // L: 263
- int var12 = var8 >> 12; // L: 264
- int var13 = var5.readUnsignedByte(); // L: 265
- int var14 = var13 >> 2; // L: 266
- int var15 = var13 & 3; // L: 267
- int var16 = var11 + var1; // L: 268
- int var17 = var10 + var2; // L: 269
- if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 270
- int var18 = var12; // L: 271
- if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 272
+ var8 += var9 - 1; // L: 238
+ int var10 = var8 & 63; // L: 239
+ int var11 = var8 >> 6 & 63; // L: 240
+ int var12 = var8 >> 12; // L: 241
+ int var13 = var5.readUnsignedByte(); // L: 242
+ int var14 = var13 >> 2; // L: 243
+ int var15 = var13 & 3; // L: 244
+ int var16 = var11 + var1; // L: 245
+ int var17 = var10 + var2; // L: 246
+ if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 247
+ int var18 = var12; // L: 248
+ if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 249
var18 = var12 - 1;
}
- CollisionMap var19 = null; // L: 273
- if (var18 >= 0) { // L: 274
+ CollisionMap var19 = null; // L: 250
+ if (var18 >= 0) { // L: 251
var19 = var4[var18];
}
- class19.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); // L: 275
+ class268.addObjects(var12, var16, var17, var6, var15, var14, var3, var19); // L: 252
}
}
}
}
-
- @ObfuscatedName("au")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "85"
- )
- static int method4377(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3744
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ClanChannelMember.getWindowedMode(); // L: 3745
- return 1; // L: 3746
- } else {
- int var3;
- if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3748
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3749
- if (var3 == 1 || var3 == 2) { // L: 3750
- Widget.setWindowedMode(var3);
- }
-
- return 1; // L: 3751
- } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3753
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2274(); // L: 3754
- return 1; // L: 3755
- } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3757
- if (var0 == 5310) { // L: 3764
- --class12.Interpreter_intStackSize; // L: 3765
- return 1; // L: 3766
- } else if (var0 == 5311) { // L: 3768
- class12.Interpreter_intStackSize -= 2; // L: 3769
- return 1; // L: 3770
- } else if (var0 == 5312) { // L: 3772
- --class12.Interpreter_intStackSize; // L: 3773
- return 1; // L: 3774
- } else if (var0 == 5350) { // L: 3776
- class9.Interpreter_stringStackSize -= 2; // L: 3777
- --class12.Interpreter_intStackSize; // L: 3778
- return 1; // L: 3779
- } else if (var0 == 5351) { // L: 3781
- --class9.Interpreter_stringStackSize; // L: 3782
- return 1; // L: 3783
- } else {
- return 2; // L: 3785
- }
- } else {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3758
- if (var3 == 1 || var3 == 2) { // L: 3759
- class12.clientPreferences.method2245(var3); // L: 3760
- }
-
- return 1; // L: 3762
- }
- }
- }
}
diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java
index a6e5daf503..91b4da97c1 100644
--- a/runescape-client/src/main/java/VerticalAlignment.java
+++ b/runescape-client/src/main/java/VerticalAlignment.java
@@ -3,112 +3,191 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("fk")
+@ObfuscatedName("ft")
@Implements("VerticalAlignment")
public enum VerticalAlignment implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lfk;"
+ descriptor = "Lft;"
)
- field2001(0, 0),
- @ObfuscatedName("q")
+ field1963(0, 0),
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lfk;"
+ descriptor = "Lft;"
)
@Export("VerticalAlignment_centered")
- VerticalAlignment_centered(1, 1),
- @ObfuscatedName("l")
+ VerticalAlignment_centered(2, 1),
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lfk;"
+ descriptor = "Lft;"
)
- field1994(2, 2);
+ field1961(1, 2);
- @ObfuscatedName("t")
- static int[][][] field1993;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1914691403
+ intValue = 131762217
)
@Export("value")
public final int value;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -156992359
+ intValue = -1885985175
)
@Export("id")
final int id;
VerticalAlignment(int var3, int var4) {
- this.value = var3; // L: 14
- this.id = var4; // L: 15
- } // L: 16
+ this.value = var3; // L: 18
+ this.id = var4;
+ }
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.id; // L: 20
+ return this.id;
}
- @ObfuscatedName("f")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1009266230"
+ descriptor = "([FIFZFZ[FI)I",
+ garbageValue = "1171943918"
)
- public static void method3446() {
- ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 547
- } // L: 548
+ public static int method3534(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) {
+ float var7 = 0.0F; // L: 15
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-27"
- )
- static int method3447(int var0, Script var1, boolean var2) {
- Widget var3;
- if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1410
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1411
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemId; // L: 1412
- return 1; // L: 1413
- } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1415
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1416
- if (var3.itemId != -1) { // L: 1417
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemQuantity;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1418
- }
+ for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16
+ var7 += Math.abs(var0[var8]); // L: 17
+ }
- return 1; // L: 1419
- } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1421
- int var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1422
- InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1423
- if (var4 != null) { // L: 1424
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1425
- }
-
- return 1; // L: 1426
- } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1428
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1429
- return 1; // L: 1430
- } else if (var0 == 1707) { // L: 1432
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1433
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.method5498() ? 1 : 0; // L: 1434
- return 1; // L: 1435
- } else if (var0 == 1708) { // L: 1437
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1438
- return class293.method5430(var3); // L: 1439
- } else if (var0 == 1708) { // L: 1441
- var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1442
- return class20.method269(var3); // L: 1443
+ float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1429; // L: 19
+ if (var7 <= var24) { // L: 20
+ return -1; // L: 21
} else {
- return 2; // L: 1445
+ float[] var9 = new float[var1 + 1]; // L: 23
+
+ int var10;
+ for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24
+ var9[var10] = var0[var10] * (1.0F / var7); // L: 25
+ }
+
+ while (Math.abs(var9[var1]) < var24) { // L: 27
+ --var1; // L: 28
+ }
+
+ var10 = 0; // L: 30
+ if (var1 == 0) { // L: 31
+ return var10; // L: 32
+ } else if (var1 == 1) { // L: 34
+ var6[0] = -var9[0] / var9[1]; // L: 35
+ boolean var22 = var3 ? var2 < var24 + var6[0] : var2 < var6[0] - var24; // L: 36
+ boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37
+ var10 = var22 && var23 ? 1 : 0; // L: 38
+ if (var10 > 0) { // L: 39
+ if (var3 && var6[0] < var2) { // L: 40
+ var6[0] = var2; // L: 41
+ } else if (var5 && var6[0] > var4) { // L: 43
+ var6[0] = var4; // L: 44
+ }
+ }
+
+ return var10; // L: 47
+ } else {
+ class389 var11 = new class389(var9, var1); // L: 50
+ float[] var12 = new float[var1 + 1]; // L: 51
+
+ for (int var13 = 1; var13 <= var1; ++var13) { // L: 52
+ var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53
+ }
+
+ float[] var21 = new float[var1 + 1]; // L: 55
+ int var14 = method3534(var12, var1 - 1, var2, false, var4, false, var21); // L: 56
+ if (var14 == -1) { // L: 57
+ return 0; // L: 58
+ } else {
+ boolean var15 = false; // L: 60
+ float var17 = 0.0F; // L: 62
+ float var18 = 0.0F;
+ float var19 = 0.0F;
+
+ for (int var20 = 0; var20 <= var14; ++var20) {
+ if (var10 > var1) {
+ return var10;
+ }
+
+ float var16;
+ if (var20 == 0) {
+ var16 = var2; // L: 68
+ var18 = FileSystem.method3281(var9, var1, var2);
+ if (Math.abs(var18) <= var24 && var3) { // L: 70
+ var6[var10++] = var2;
+ }
+ } else {
+ var16 = var19; // L: 73
+ var18 = var17; // L: 74
+ }
+
+ if (var14 == var20) { // L: 76
+ var19 = var4; // L: 77
+ var15 = false; // L: 78
+ } else {
+ var19 = var21[var20]; // L: 81
+ }
+
+ var17 = FileSystem.method3281(var9, var1, var19); // L: 83
+ if (var15) { // L: 84
+ var15 = false; // L: 85
+ } else if (Math.abs(var17) < var24) { // L: 88
+ if (var14 != var20 || var5) { // L: 89
+ var6[var10++] = var19; // L: 90
+ var15 = true; // L: 91
+ }
+ } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94
+ var6[var10++] = LoginType.method7453(var11, var16, var19, 0.0F); // L: 95
+ if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96
+ var6[var10 - 2] = 0.5F * (var6[var10 - 1] + var6[var10 - 2]); // L: 97
+ --var10; // L: 98
+ }
+ }
+ }
+
+ return var10; // L: 104
+ }
+ }
}
}
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "158220165"
+ )
+ @Export("clearItemContainer")
+ static void clearItemContainer(int var0) {
+ ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
+ if (var1 != null) { // L: 64
+ for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
+ var1.ids[var2] = -1; // L: 66
+ var1.quantities[var2] = 0; // L: 67
+ }
+
+ }
+ } // L: 69
+
+ @ObfuscatedName("iz")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)Lgu;",
+ garbageValue = "-19"
+ )
+ static RouteStrategy method3533(int var0, int var1) {
+ Client.field774.approxDestinationX = var0; // L: 8415
+ Client.field774.approxDestinationY = var1; // L: 8416
+ Client.field774.approxDestinationSizeX = 1; // L: 8417
+ Client.field774.approxDestinationSizeY = 1; // L: 8418
+ return Client.field774; // L: 8419
+ }
}
diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java
index 6cc89545e2..3700b77d15 100644
--- a/runescape-client/src/main/java/ViewportMouse.java
+++ b/runescape-client/src/main/java/ViewportMouse.java
@@ -3,47 +3,65 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("hi")
+@ObfuscatedName("he")
@Implements("ViewportMouse")
public class ViewportMouse {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("ViewportMouse_isInViewport")
public static boolean ViewportMouse_isInViewport;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1945056399
+ intValue = 953565199
)
@Export("ViewportMouse_x")
- static int ViewportMouse_x;
- @ObfuscatedName("l")
+ public static int ViewportMouse_x;
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1225811149
+ intValue = 573466939
)
@Export("ViewportMouse_y")
- static int ViewportMouse_y;
- @ObfuscatedName("k")
+ public static int ViewportMouse_y;
+ @ObfuscatedName("f")
@Export("ViewportMouse_false0")
- static boolean ViewportMouse_false0;
- @ObfuscatedName("a")
+ public static boolean ViewportMouse_false0;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1930165541
+ intValue = -1554423405
)
- static int field2635;
- @ObfuscatedName("s")
+ static int field2588;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -783601851
+ intValue = 1684293485
)
- static int field2630;
- @ObfuscatedName("b")
+ static int field2589;
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 608369071
+ intValue = 285393075
+ )
+ static int field2590;
+ @ObfuscatedName("r")
+ @ObfuscatedGetter(
+ intValue = 435239719
)
@Export("ViewportMouse_entityCount")
public static int ViewportMouse_entityCount;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("ViewportMouse_entityTags")
public static long[] ViewportMouse_entityTags;
+ @ObfuscatedName("jc")
+ @ObfuscatedGetter(
+ intValue = 1467826843
+ )
+ @Export("cameraPitch")
+ static int cameraPitch;
+ @ObfuscatedName("ms")
+ @ObfuscatedGetter(
+ intValue = 863753987
+ )
+ @Export("menuY")
+ static int menuY;
static {
ViewportMouse_isInViewport = false; // L: 4
@@ -54,690 +72,499 @@ public class ViewportMouse {
ViewportMouse_entityTags = new long[1000]; // L: 18
}
- @ObfuscatedName("q")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(Llp;III)Lqd;",
- garbageValue = "-1263011197"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1768529211"
)
- static IndexedSprite method4372(AbstractArchive var0, int var1, int var2) {
- if (!User.method6514(var0, var1, var2)) { // L: 45
- return null;
+ static int method4514(int var0, Script var1, boolean var2) {
+ Widget var3;
+ if (var0 >= 2000) { // L: 1041
+ var0 -= 1000; // L: 1042
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1043
} else {
- IndexedSprite var4 = new IndexedSprite(); // L: 48
- var4.width = class453.SpriteBuffer_spriteWidth; // L: 49
- var4.height = class453.SpriteBuffer_spriteHeight; // L: 50
- var4.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 51
- var4.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 52
- var4.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 53
- var4.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 54
- var4.palette = Decimator.SpriteBuffer_spritePalette; // L: 55
- var4.pixels = class127.SpriteBuffer_pixels[0]; // L: 56
- VarcInt.method3325(); // L: 57
- return var4; // L: 60
+ var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1045
}
+
+ String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1046
+ int[] var5 = null; // L: 1047
+ if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1048
+ int var6 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1049
+ if (var6 > 0) { // L: 1050
+ for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]) { // L: 1051 1052
+ }
+ }
+
+ var4 = var4.substring(0, var4.length() - 1); // L: 1054
+ }
+
+ Object[] var8 = new Object[var4.length() + 1]; // L: 1056
+
+ int var7;
+ for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1057
+ if (var4.charAt(var7 - 1) == 's') { // L: 1058
+ var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+ } else {
+ var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1059
+ }
+ }
+
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1061
+ if (var7 != -1) { // L: 1062
+ var8[0] = new Integer(var7);
+ } else {
+ var8 = null; // L: 1063
+ }
+
+ if (var0 == ScriptOpcodes.CC_SETONCLICK) {
+ var3.onClick = var8; // L: 1064
+ } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1065
+ var3.onHold = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1066
+ var3.onRelease = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1067
+ var3.onMouseOver = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1068
+ var3.onMouseLeave = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1069
+ var3.onDrag = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1070
+ var3.onTargetLeave = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1071
+ var3.onVarTransmit = var8; // L: 1072
+ var3.varTransmitTriggers = var5; // L: 1073
+ } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1075
+ var3.onTimer = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1076
+ var3.onOp = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1077
+ var3.onDragComplete = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1078
+ var3.onClickRepeat = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1079
+ var3.onMouseRepeat = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1080
+ var3.onInvTransmit = var8; // L: 1081
+ var3.invTransmitTriggers = var5; // L: 1082
+ } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1084
+ var3.onStatTransmit = var8; // L: 1085
+ var3.statTransmitTriggers = var5; // L: 1086
+ } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1088
+ var3.onTargetEnter = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1089
+ var3.onScroll = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1090
+ var3.onChatTransmit = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1091
+ var3.onKey = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1092
+ var3.onFriendTransmit = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1093
+ var3.onClanTransmit = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1094
+ var3.onMiscTransmit = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1095
+ var3.onDialogAbort = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1096
+ var3.onSubChange = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1097
+ var3.onStockTransmit = var8;
+ } else if (var0 == 1426) { // L: 1098
+ var3.field3494 = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1099
+ var3.onResize = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1100
+ var3.field3365 = var8;
+ } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1101
+ var3.field3353 = var8;
+ } else if (var0 == 1430) {
+ var3.field3516 = var8; // L: 1102
+ } else if (var0 == 1431) { // L: 1103
+ var3.field3513 = var8;
+ } else {
+ if (var0 != 1434) { // L: 1104
+ return 2; // L: 1105
+ }
+
+ var3.field3495 = var8;
+ }
+
+ var3.hasListener = true; // L: 1106
+ return 1; // L: 1107
}
- @ObfuscatedName("io")
+ @ObfuscatedName("fl")
@ObfuscatedSignature(
- descriptor = "([Lki;IIIIIIIII)V",
- garbageValue = "497797747"
+ descriptor = "(I)V",
+ garbageValue = "3487029"
)
- @Export("drawInterface")
- static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10217
- Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10218
+ @Export("load")
+ static void load() {
+ int var26;
+ if (Client.titleLoadingStage == 0) { // L: 1657
+ class356.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1658
- for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10219
- Widget var10 = var0[var9]; // L: 10220
- if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10221 10222
- int var11;
- if (var8 == -1) { // L: 10224
- Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10225
- Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10226
- Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10227
- Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10228
- var11 = ++Client.rootWidgetCount - 1; // L: 10229
+ for (var26 = 0; var26 < 4; ++var26) { // L: 1659
+ Client.collisionMaps[var26] = new CollisionMap(104, 104);
+ }
+
+ FloorUnderlayDefinition.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1660
+ Login.Login_loadingText = "Starting game engine..."; // L: 1661
+ Login.Login_loadingPercent = 5; // L: 1662
+ Client.titleLoadingStage = 20; // L: 1663
+ } else if (Client.titleLoadingStage == 20) { // L: 1666
+ Login.Login_loadingText = "Prepared visibility map"; // L: 1667
+ Login.Login_loadingPercent = 10; // L: 1668
+ Client.titleLoadingStage = 30; // L: 1669
+ } else if (Client.titleLoadingStage == 30) { // L: 1672
+ Varcs.archive5 = ModeWhere.newArchive(0, false, true, true, false); // L: 1673
+ WorldMapEvent.field2882 = ModeWhere.newArchive(1, false, true, true, false); // L: 1674
+ class140.archive2 = ModeWhere.newArchive(2, true, false, true, false); // L: 1675
+ class341.archive7 = ModeWhere.newArchive(3, false, true, true, false); // L: 1676
+ Client.archive4 = ModeWhere.newArchive(4, false, true, true, false); // L: 1677
+ WorldMapSectionType.archive9 = ModeWhere.newArchive(5, true, true, true, false); // L: 1678
+ class121.archive6 = ModeWhere.newArchive(6, true, true, true, false); // L: 1679
+ class10.archive11 = ModeWhere.newArchive(7, false, true, true, false); // L: 1680
+ class304.archive8 = ModeWhere.newArchive(8, false, true, true, false); // L: 1681
+ Language.field4098 = ModeWhere.newArchive(9, false, true, true, false); // L: 1682
+ ApproximateRouteStrategy.archive10 = ModeWhere.newArchive(10, false, true, true, false); // L: 1683
+ UserComparator7.field1383 = ModeWhere.newArchive(11, false, true, true, false); // L: 1684
+ class267.archive12 = ModeWhere.newArchive(12, false, true, true, false); // L: 1685
+ AbstractByteArrayCopier.archive13 = ModeWhere.newArchive(13, true, false, true, false); // L: 1686
+ WorldMapSprite.archive14 = ModeWhere.newArchive(14, false, true, true, false); // L: 1687
+ class67.archive15 = ModeWhere.newArchive(15, false, true, true, false); // L: 1688
+ class6.archive17 = ModeWhere.newArchive(17, true, true, true, false); // L: 1689
+ AbstractUserComparator.archive18 = ModeWhere.newArchive(18, false, true, true, false); // L: 1690
+ MouseHandler.archive19 = ModeWhere.newArchive(19, false, true, true, false); // L: 1691
+ class4.archive20 = ModeWhere.newArchive(20, false, true, true, false); // L: 1692
+ class132.field1588 = ModeWhere.newArchive(21, false, true, true, true); // L: 1693
+ Login.Login_loadingText = "Connecting to update server"; // L: 1694
+ Login.Login_loadingPercent = 20; // L: 1695
+ Client.titleLoadingStage = 40; // L: 1696
+ } else if (Client.titleLoadingStage != 40) { // L: 1699
+ Archive var20;
+ Archive var21;
+ Archive var22;
+ if (Client.titleLoadingStage == 45) { // L: 1747
+ KitDefinition.method3438(22050, !Client.isLowDetail, 2); // L: 1748
+ MidiPcmStream var25 = new MidiPcmStream(); // L: 1749
+ var25.method5304(9, 128); // L: 1750
+ AttackOption.pcmPlayer0 = BufferedNetSocket.method6849(GameEngine.taskHandler, 0, 22050); // L: 1751
+ AttackOption.pcmPlayer0.setStream(var25); // L: 1752
+ var20 = class67.archive15; // L: 1753
+ var21 = WorldMapSprite.archive14; // L: 1754
+ var22 = Client.archive4; // L: 1755
+ class272.musicPatchesArchive = var20; // L: 1757
+ class272.musicSamplesArchive = var21; // L: 1758
+ class28.soundEffectsArchive = var22; // L: 1759
+ class272.midiPcmStream = var25; // L: 1760
+ class238.pcmPlayer1 = BufferedNetSocket.method6849(GameEngine.taskHandler, 1, 2048); // L: 1762
+ class21.pcmStreamMixer = new PcmStreamMixer(); // L: 1763
+ class238.pcmPlayer1.setStream(class21.pcmStreamMixer); // L: 1764
+ WorldMapRegion.decimator = new Decimator(22050, PcmPlayer.field287); // L: 1765
+ Login.Login_loadingText = "Prepared sound engine"; // L: 1766
+ Login.Login_loadingPercent = 35; // L: 1767
+ Client.titleLoadingStage = 50; // L: 1768
+ class272.WorldMapElement_fonts = new Fonts(class304.archive8, AbstractByteArrayCopier.archive13); // L: 1769
+ } else if (Client.titleLoadingStage == 50) { // L: 1772
+ var26 = FontName.method7382().length; // L: 1773
+ Client.fontsMap = class272.WorldMapElement_fonts.createMap(FontName.method7382()); // L: 1774
+ if (Client.fontsMap.size() < var26) { // L: 1775
+ Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var26 + "%"; // L: 1776
+ Login.Login_loadingPercent = 40; // L: 1777
} else {
- var11 = var8; // L: 10231
+ MouseHandler.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1780
+ DevicePcmPlayerProvider.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1781
+ TileItem.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1782
+ Occluder.platformInfo = Client.platformInfoProvider.get(); // L: 1783
+ Login.Login_loadingText = "Loaded fonts"; // L: 1784
+ Login.Login_loadingPercent = 40; // L: 1785
+ Client.titleLoadingStage = 60; // L: 1786
}
-
- var10.rootIndex = var11; // L: 10232
- var10.cycle = Client.cycle; // L: 10233
- if (!var10.isIf3 || !class434.isComponentHidden(var10)) { // L: 10234
- if (var10.contentType > 0) { // L: 10235
- WorldMapDecorationType.method5575(var10);
- }
-
- int var12 = var10.x + var6; // L: 10236
- int var13 = var7 + var10.y; // L: 10237
- int var14 = var10.transparencyTop; // L: 10238
- int var15;
- int var16;
- if (var10 == Client.clickedWidget) { // L: 10239
- if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10240
- BuddyRankComparator.field1408 = var0; // L: 10241
- class151.field1729 = var6; // L: 10242
- class162.field1810 = var7; // L: 10243
- continue; // L: 10244
- }
-
- if (Client.isDraggingWidget && Client.field574) { // L: 10246
- var15 = MouseHandler.MouseHandler_x; // L: 10247
- var16 = MouseHandler.MouseHandler_y; // L: 10248
- var15 -= Client.widgetClickX; // L: 10249
- var16 -= Client.widgetClickY; // L: 10250
- if (var15 < Client.field747) { // L: 10251
- var15 = Client.field747;
- }
-
- if (var15 + var10.width > Client.field747 + Client.clickedWidgetParent.width) { // L: 10252
- var15 = Client.field747 + Client.clickedWidgetParent.width - var10.width;
- }
-
- if (var16 < Client.field674) { // L: 10253
- var16 = Client.field674;
- }
-
- if (var16 + var10.height > Client.field674 + Client.clickedWidgetParent.height) { // L: 10254
- var16 = Client.field674 + Client.clickedWidgetParent.height - var10.height;
- }
-
- var12 = var15; // L: 10255
- var13 = var16; // L: 10256
- }
-
- if (!var10.isScrollBar) { // L: 10258
- var14 = 128;
- }
- }
-
- int var17;
- int var18;
- int var19;
- int var20;
- int var21;
- int var22;
- if (var10.type == 2) { // L: 10264
- var15 = var2; // L: 10265
- var16 = var3; // L: 10266
- var17 = var4; // L: 10267
- var18 = var5; // L: 10268
- } else if (var10.type == 9) { // L: 10270
- var19 = var12; // L: 10271
- var20 = var13; // L: 10272
- var21 = var12 + var10.width; // L: 10273
- var22 = var13 + var10.height; // L: 10274
- if (var21 < var12) { // L: 10275
- var19 = var21; // L: 10277
- var21 = var12; // L: 10278
- }
-
- if (var22 < var13) { // L: 10280
- var20 = var22; // L: 10282
- var22 = var13; // L: 10283
- }
-
- ++var21; // L: 10285
- ++var22; // L: 10286
- var15 = var19 > var2 ? var19 : var2; // L: 10287
- var16 = var20 > var3 ? var20 : var3; // L: 10288
- var17 = var21 < var4 ? var21 : var4; // L: 10289
- var18 = var22 < var5 ? var22 : var5; // L: 10290
+ } else {
+ int var1;
+ if (Client.titleLoadingStage == 60) { // L: 1789
+ var26 = HealthBarUpdate.method2203(ApproximateRouteStrategy.archive10, class304.archive8); // L: 1790
+ var1 = Login.field924.length + Login.field916.length; // L: 1793
+ if (var26 < var1) { // L: 1796
+ Login.Login_loadingText = "Loading title screen - " + var26 * 100 / var1 + "%"; // L: 1797
+ Login.Login_loadingPercent = 50; // L: 1798
} else {
- var19 = var12 + var10.width; // L: 10293
- var20 = var13 + var10.height; // L: 10294
- var15 = var12 > var2 ? var12 : var2; // L: 10295
- var16 = var13 > var3 ? var13 : var3; // L: 10296
- var17 = var19 < var4 ? var19 : var4; // L: 10297
- var18 = var20 < var5 ? var20 : var5; // L: 10298
+ Login.Login_loadingText = "Loaded title screen"; // L: 1801
+ Login.Login_loadingPercent = 50; // L: 1802
+ HealthBarUpdate.updateGameState(5); // L: 1803
+ Client.titleLoadingStage = 70; // L: 1804
+ }
+ } else if (Client.titleLoadingStage == 70) { // L: 1807
+ if (!class140.archive2.isFullyLoaded()) { // L: 1808
+ Login.Login_loadingText = "Loading config - " + class140.archive2.loadPercent() + "%"; // L: 1809
+ Login.Login_loadingPercent = 60; // L: 1810
+ } else if (!class132.field1588.isFullyLoaded()) { // L: 1813
+ Login.Login_loadingText = "Loading config - " + (80 + class267.archive12.loadPercent() / 6) + "%"; // L: 1814
+ Login.Login_loadingPercent = 60; // L: 1815
+ } else {
+ class146.method3082(class140.archive2); // L: 1818
+ Archive var24 = class140.archive2; // L: 1819
+ FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var24; // L: 1821
+ var20 = class140.archive2; // L: 1823
+ var21 = class10.archive11; // L: 1824
+ KitDefinition.KitDefinition_archive = var20; // L: 1826
+ KitDefinition.KitDefinition_modelsArchive = var21; // L: 1827
+ KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1828
+ PacketWriter.method2517(class140.archive2, class10.archive11, Client.isLowDetail); // L: 1830
+ var22 = class140.archive2; // L: 1831
+ Archive var23 = class10.archive11; // L: 1832
+ NPCComposition.NpcDefinition_archive = var22; // L: 1834
+ NPCComposition.NpcDefinition_modelArchive = var23; // L: 1835
+ GrandExchangeOfferNameComparator.method5979(class140.archive2); // L: 1837
+ class114.method2636(class140.archive2, class10.archive11, Client.isMembersWorld, MouseHandler.fontPlain11); // L: 1838
+ SoundCache.method762(class140.archive2, Varcs.archive5, WorldMapEvent.field2882); // L: 1839
+ Archive var5 = class140.archive2; // L: 1840
+ Archive var6 = class10.archive11; // L: 1841
+ SpotAnimationDefinition.SpotAnimationDefinition_archive = var5; // L: 1843
+ class147.SpotAnimationDefinition_modelArchive = var6; // L: 1844
+ Archive var7 = class140.archive2; // L: 1846
+ VarbitComposition.VarbitDefinition_archive = var7; // L: 1848
+ Archive var8 = class140.archive2; // L: 1850
+ VarpDefinition.VarpDefinition_archive = var8; // L: 1852
+ VarpDefinition.field1822 = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1853
+ Archive var9 = class341.archive7; // L: 1855
+ Archive var10 = class10.archive11; // L: 1856
+ Archive var11 = class304.archive8; // L: 1857
+ Archive var12 = AbstractByteArrayCopier.archive13; // L: 1858
+ MusicPatchPcmStream.Widget_archive = var9; // L: 1860
+ class126.Widget_modelsArchive = var10; // L: 1861
+ StructComposition.Widget_spritesArchive = var11; // L: 1862
+ MilliClock.Widget_fontsArchive = var12; // L: 1863
+ SoundCache.Widget_interfaceComponents = new Widget[MusicPatchPcmStream.Widget_archive.getGroupCount()][]; // L: 1864
+ class228.Widget_loadedInterfaces = new boolean[MusicPatchPcmStream.Widget_archive.getGroupCount()]; // L: 1865
+ LoginScreenAnimation.method2233(class140.archive2); // L: 1867
+ WorldMapSection0.method4936(class140.archive2); // L: 1868
+ WorldMapLabel.method5000(class140.archive2); // L: 1869
+ Renderable.method4342(class140.archive2); // L: 1870
+ Archive var13 = class140.archive2; // L: 1871
+ ParamComposition.ParamDefinition_archive = var13; // L: 1873
+ class138.method2948(class140.archive2); // L: 1875
+ class116.method2700(class140.archive2); // L: 1876
+ AbstractWorldMapData.HitSplatDefinition_cachedSprites = new class427(class285.field3313, 54, class134.clientLanguage, class140.archive2); // L: 1877
+ ModeWhere.HitSplatDefinition_cached = new class427(class285.field3313, 47, class134.clientLanguage, class140.archive2); // L: 1878
+ class308.varcs = new Varcs(); // L: 1879
+ Archive var14 = class140.archive2; // L: 1880
+ Archive var15 = class304.archive8; // L: 1881
+ Archive var16 = AbstractByteArrayCopier.archive13; // L: 1882
+ HitSplatDefinition.HitSplatDefinition_archive = var14; // L: 1884
+ HitSplatDefinition.field2017 = var15; // L: 1885
+ class4.HitSplatDefinition_fontsArchive = var16; // L: 1886
+ Archive var17 = class140.archive2; // L: 1888
+ Archive var18 = class304.archive8; // L: 1889
+ HealthBarDefinition.HealthBarDefinition_archive = var17; // L: 1891
+ HealthBarDefinition.field1877 = var18; // L: 1892
+ class115.method2691(class140.archive2, class304.archive8); // L: 1894
+ Login.Login_loadingText = "Loaded config"; // L: 1895
+ Login.Login_loadingPercent = 60; // L: 1896
+ Client.titleLoadingStage = 80; // L: 1897
+ }
+ } else if (Client.titleLoadingStage == 80) { // L: 1900
+ var26 = 0; // L: 1901
+ if (class267.compass == null) { // L: 1902
+ class267.compass = class7.SpriteBuffer_getSprite(class304.archive8, LoginScreenAnimation.spriteIds.compass, 0);
+ } else {
+ ++var26; // L: 1903
}
- if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10300
- if (var10.contentType != 0) { // L: 10301
- if (var10.contentType == 1336) { // L: 10302
- if (class12.clientPreferences.method2229()) { // L: 10303
- var13 += 15; // L: 10304
- class149.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10305
- var13 += 15; // L: 10306
- Runtime var42 = Runtime.getRuntime(); // L: 10307
- var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10308
- var21 = 16776960; // L: 10309
- if (var20 > 327680 && !Client.isLowDetail) { // L: 10310
- var21 = 16711680;
- }
-
- class149.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10311
- var13 += 15; // L: 10312
- }
- continue;
- }
-
- if (var10.contentType == 1337) { // L: 10316
- Client.viewportX = var12; // L: 10317
- Client.viewportY = var13; // L: 10318
- ArchiveLoader.drawEntities(var12, var13, var10.width, var10.height); // L: 10319
- Client.field652[var10.rootIndex] = true; // L: 10320
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10321
- continue; // L: 10322
- }
-
- if (var10.contentType == 1338) { // L: 10324
- class19.drawMinimap(var10, var12, var13, var11); // L: 10325
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10326
- continue; // L: 10327
- }
-
- if (var10.contentType == 1339) { // L: 10329
- class18.drawCompass(var10, var12, var13, var11); // L: 10330
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10331
- continue; // L: 10332
- }
-
- if (var10.contentType == 1400) { // L: 10334
- ServerPacket.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10335
- }
-
- if (var10.contentType == 1401) { // L: 10337
- ServerPacket.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10338
- }
-
- if (var10.contentType == 1402) { // L: 10340
- class193.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10341
- }
- }
-
- if (var10.type == 0) { // L: 10344
- if (!var10.isIf3 && class434.isComponentHidden(var10) && var10 != class144.mousedOverWidgetIf1) { // L: 10345
- continue;
- }
-
- if (!var10.isIf3) { // L: 10346
- if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10347
- var10.scrollY = var10.scrollHeight - var10.height;
- }
-
- if (var10.scrollY < 0) { // L: 10348
- var10.scrollY = 0;
- }
- }
-
- drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10350
- if (var10.children != null) { // L: 10351
- drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
- }
-
- InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 10352
- if (var30 != null) { // L: 10353
- class175.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10354
- }
-
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10356
- Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10357
- } else if (var10.type == 11) { // L: 10359
- if (class434.isComponentHidden(var10) && var10 != class144.mousedOverWidgetIf1) { // L: 10360
- continue;
- }
-
- if (var10.children != null) { // L: 10361
- drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
- }
-
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10362
- Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10363
- }
-
- if (Client.isResizable || Client.field524[var11] || Client.gameDrawingMode > 1) { // L: 10365
- if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10366 10367
- JagexCache.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
- }
-
- if (var10.type != 1) { // L: 10369
- int var23;
- int var24;
- int var25;
- int var26;
- if (var10.type == 2) { // L: 10372
- var19 = 0; // L: 10373
-
- for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10374
- for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10375
- var22 = var12 + var21 * (var10.paddingX + 32); // L: 10376
- var23 = var13 + var20 * (var10.paddingY + 32); // L: 10377
- if (var19 < 20) { // L: 10378
- var22 += var10.inventoryXOffsets[var19]; // L: 10379
- var23 += var10.inventoryYOffsets[var19]; // L: 10380
- }
-
- if (var10.itemIds[var19] <= 0) { // L: 10382
- if (var10.inventorySprites != null && var19 < 20) { // L: 10427
- SpritePixels var46 = var10.getInventorySprite(var19); // L: 10428
- if (var46 != null) { // L: 10429
- var46.drawTransBgAt(var22, var23);
- } else if (Widget.field3407) { // L: 10430
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- }
- } else {
- boolean var37 = false; // L: 10383
- boolean var38 = false; // L: 10384
- var26 = var10.itemIds[var19] - 1; // L: 10385
- if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Canvas.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10386
- SpritePixels var35;
- if (Client.isItemSelected == 1 && var19 == PcmPlayer.selectedItemSlot && var10.id == class20.selectedItemWidget) { // L: 10388
- var35 = PacketWriter.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
- } else {
- var35 = PacketWriter.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10389
- }
-
- if (var35 != null) { // L: 10390
- if (var10 == Canvas.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10391
- var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10392
- var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10393
- if (var24 < 5 && var24 > -5) { // L: 10394
- var24 = 0;
- }
-
- if (var25 < 5 && var25 > -5) { // L: 10395
- var25 = 0;
- }
-
- if (Client.itemDragDuration < 5) { // L: 10396
- var24 = 0; // L: 10397
- var25 = 0; // L: 10398
- }
-
- var35.drawTransAt(var22 + var24, var25 + var23, 128); // L: 10400
- if (var1 != -1) { // L: 10401
- Widget var28 = var0[var1 & 65535]; // L: 10402
- int var29;
- if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10403
- var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field727 / 3; // L: 10404
- if (var29 > Client.field727 * 10) { // L: 10405
- var29 = Client.field727 * 10;
- }
-
- if (var29 > var28.scrollY) { // L: 10406
- var29 = var28.scrollY;
- }
-
- var28.scrollY -= var29; // L: 10407
- Client.draggedWidgetY += var29; // L: 10408
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var28); // L: 10409
- }
-
- if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10411
- var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field727 / 3; // L: 10412
- if (var29 > Client.field727 * 10) { // L: 10413
- var29 = Client.field727 * 10;
- }
-
- if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10414
- var29 = var28.scrollHeight - var28.height - var28.scrollY;
- }
-
- var28.scrollY += var29; // L: 10415
- Client.draggedWidgetY -= var29; // L: 10416
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var28); // L: 10417
- }
- }
- } else if (var10 == NPCComposition.field1991 && var19 == Client.field599) { // L: 10421
- var35.drawTransAt(var22, var23, 128);
- } else {
- var35.drawTransBgAt(var22, var23); // L: 10422
- }
- } else {
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 10424
- }
- }
- }
-
- ++var19; // L: 10432
- }
- }
- } else if (var10.type == 3) { // L: 10437
- if (class401.runCs1(var10)) { // L: 10439
- var19 = var10.color2; // L: 10440
- if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10441
- var19 = var10.mouseOverColor2;
- }
- } else {
- var19 = var10.color; // L: 10444
- if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10445
- var19 = var10.mouseOverColor;
- }
- }
-
- if (var10.fill) { // L: 10447
- switch(var10.fillMode.field4756) { // L: 10448
- case 1:
- Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10457
- break; // L: 10458
- case 2:
- Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10450
- break; // L: 10451
- default:
- if (var14 == 0) { // L: 10453
- Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
- } else {
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10454
- }
- }
- } else if (var14 == 0) { // L: 10462
- Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
- } else {
- Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10463
- }
- } else {
- Font var39;
- if (var10.type == 4) { // L: 10467
- var39 = var10.getFont(); // L: 10468
- if (var39 == null) { // L: 10469
- if (Widget.field3407) { // L: 10470
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- } else {
- String var44 = var10.text; // L: 10474
- if (class401.runCs1(var10)) { // L: 10475
- var20 = var10.color2; // L: 10476
- if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10477
- var20 = var10.mouseOverColor2;
- }
-
- if (var10.text2.length() > 0) { // L: 10478
- var44 = var10.text2;
- }
- } else {
- var20 = var10.color; // L: 10481
- if (var10 == class144.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10482
- var20 = var10.mouseOverColor;
- }
- }
-
- if (var10.isIf3 && var10.itemId != -1) { // L: 10484
- ItemComposition var45 = FileSystem.ItemDefinition_get(var10.itemId); // L: 10485
- var44 = var45.name; // L: 10486
- if (var44 == null) { // L: 10487
- var44 = "null";
- }
-
- if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10488
- var44 = class166.colorStartTag(16748608) + var44 + "" + " " + 'x' + class427.formatItemStacks(var10.itemQuantity);
- }
- }
-
- if (var10 == Client.meslayerContinueWidget) { // L: 10490
- var44 = "Please wait..."; // L: 10491
- var20 = var10.color; // L: 10492
- }
-
- if (!var10.isIf3) { // L: 10494
- var44 = Clock.method3248(var44, var10);
- }
-
- var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10495
- }
- } else if (var10.type == 5) { // L: 10498
- SpritePixels var40;
- if (!var10.isIf3) { // L: 10499
- var40 = var10.getSprite(class401.runCs1(var10), UserComparator7.urlRequester); // L: 10500
- if (var40 != null) { // L: 10501
- var40.drawTransBgAt(var12, var13);
- } else if (Widget.field3407) { // L: 10502
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- } else {
- if (var10.itemId != -1) { // L: 10506
- var40 = PacketWriter.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
- } else {
- var40 = var10.getSprite(false, UserComparator7.urlRequester); // L: 10507
- }
-
- if (var40 == null) { // L: 10508
- if (Widget.field3407) { // L: 10532
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- } else {
- var20 = var40.width; // L: 10509
- var21 = var40.height; // L: 10510
- if (!var10.spriteTiling) { // L: 10511
- var22 = var10.width * 4096 / var20; // L: 10525
- if (var10.spriteAngle != 0) { // L: 10526
- var40.method7951(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
- } else if (var14 != 0) { // L: 10527
- var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
- } else if (var20 == var10.width && var21 == var10.height) { // L: 10528
- var40.drawTransBgAt(var12, var13); // L: 10529
- } else {
- var40.drawScaledAt(var12, var13, var10.width, var10.height);
- }
- } else {
- Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10512
- var22 = (var20 - 1 + var10.width) / var20; // L: 10513
- var23 = (var21 - 1 + var10.height) / var21; // L: 10514
-
- for (var24 = 0; var24 < var22; ++var24) { // L: 10515
- for (var25 = 0; var25 < var23; ++var25) { // L: 10516
- if (var10.spriteAngle != 0) { // L: 10517
- var40.method7951(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
- } else if (var14 != 0) { // L: 10518
- var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
- } else {
- var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); // L: 10519
- }
- }
- }
-
- Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10522
- }
- }
- }
- } else {
- ItemComposition var33;
- if (var10.type == 6) { // L: 10536
- boolean var36 = class401.runCs1(var10); // L: 10537
- if (var36) { // L: 10539
- var20 = var10.sequenceId2;
- } else {
- var20 = var10.sequenceId; // L: 10540
- }
-
- Model var41 = null; // L: 10541
- var22 = 0; // L: 10542
- if (var10.itemId != -1) { // L: 10543
- var33 = FileSystem.ItemDefinition_get(var10.itemId); // L: 10544
- if (var33 != null) { // L: 10545
- var33 = var33.getCountObj(var10.itemQuantity); // L: 10546
- var41 = var33.getModel(1); // L: 10547
- if (var41 != null) { // L: 10548
- var41.calculateBoundsCylinder(); // L: 10549
- var22 = var41.height / 2; // L: 10550
- } else {
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10); // L: 10552
- }
- }
- } else if (var10.modelType == 5) { // L: 10555
- if (var10.modelId == 0) { // L: 10556
- var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
- } else {
- var41 = ModelData0.localPlayer.getModel(); // L: 10557
- }
- } else if (var20 == -1) { // L: 10559
- var41 = var10.getModel((SequenceDefinition)null, -1, var36, ModelData0.localPlayer.appearance); // L: 10560
- if (var41 == null && Widget.field3407) { // L: 10561
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- } else {
- SequenceDefinition var47 = class114.SequenceDefinition_get(var20); // L: 10564
- var41 = var10.getModel(var47, var10.modelFrame, var36, ModelData0.localPlayer.appearance); // L: 10565
- if (var41 == null && Widget.field3407) { // L: 10566
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- }
-
- Rasterizer3D.method3939(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10568
- var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10569
- var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10570
- if (var41 != null) { // L: 10571
- if (!var10.isIf3) { // L: 10572
- var41.method4272(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
- } else {
- var41.calculateBoundsCylinder(); // L: 10574
- if (var10.modelOrthog) { // L: 10575
- var41.method4273(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
- } else {
- var41.method4272(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10576
- }
- }
- }
-
- Rasterizer3D.Rasterizer3D_method3(); // L: 10579
- } else {
- if (var10.type == 7) { // L: 10582
- var39 = var10.getFont(); // L: 10583
- if (var39 == null) { // L: 10584
- if (Widget.field3407) { // L: 10585
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var10);
- }
- continue;
- }
-
- var20 = 0; // L: 10588
-
- for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10589
- for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10590
- if (var10.itemIds[var20] > 0) { // L: 10591
- var33 = FileSystem.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10592
- String var34;
- if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10594
- var34 = class166.colorStartTag(16748608) + var33.name + ""; // L: 10595
- } else {
- var34 = class166.colorStartTag(16748608) + var33.name + "" + " " + 'x' + class427.formatItemStacks(var10.itemQuantities[var20]);
- }
-
- var25 = var12 + var22 * (var10.paddingX + 115); // L: 10596
- var26 = var13 + (var10.paddingY + 12) * var21; // L: 10597
- if (var10.textXAlignment == 0) { // L: 10598
- var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
- } else if (var10.textXAlignment == 1) { // L: 10599
- var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
- } else {
- var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 10600
- }
- }
-
- ++var20; // L: 10602
- }
- }
- }
-
- if (var10.type == 8 && var10 == class113.field1422 && Client.field645 == Client.field702) { // L: 10606 10607
- var19 = 0; // L: 10608
- var20 = 0; // L: 10609
- Font var31 = class149.fontPlain12; // L: 10610
- String var32 = var10.text; // L: 10611
-
- String var43;
- for (var32 = Clock.method3248(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10613 10614 10626
- var24 = var32.indexOf("
"); // L: 10615
- if (var24 != -1) { // L: 10616
- var43 = var32.substring(0, var24); // L: 10617
- var32 = var32.substring(var24 + 4); // L: 10618
- } else {
- var43 = var32; // L: 10621
- var32 = ""; // L: 10622
- }
-
- var25 = var31.stringWidth(var43); // L: 10624
- if (var25 > var19) { // L: 10625
- var19 = var25;
- }
- }
-
- var19 += 6; // L: 10628
- var20 += 7; // L: 10629
- var24 = var12 + var10.width - 5 - var19; // L: 10630
- var25 = var13 + var10.height + 5; // L: 10631
- if (var24 < var12 + 5) { // L: 10632
- var24 = var12 + 5;
- }
-
- if (var19 + var24 > var4) { // L: 10633
- var24 = var4 - var19;
- }
-
- if (var20 + var25 > var5) { // L: 10634
- var25 = var5 - var20;
- }
-
- Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10635
- Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10636
- var32 = var10.text; // L: 10637
- var26 = var25 + var31.ascent + 2; // L: 10638
-
- for (var32 = Clock.method3248(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10639 10640 10651
- int var27 = var32.indexOf("
"); // L: 10641
- if (var27 != -1) { // L: 10642
- var43 = var32.substring(0, var27); // L: 10643
- var32 = var32.substring(var27 + 4); // L: 10644
- } else {
- var43 = var32; // L: 10647
- var32 = ""; // L: 10648
- }
-
- var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10650
- }
- }
-
- if (var10.type == 9) { // L: 10655
- if (var10.field3428) { // L: 10660
- var19 = var12; // L: 10661
- var20 = var13 + var10.height; // L: 10662
- var21 = var12 + var10.width; // L: 10663
- var22 = var13; // L: 10664
- } else {
- var19 = var12; // L: 10667
- var20 = var13; // L: 10668
- var21 = var12 + var10.width; // L: 10669
- var22 = var13 + var10.height; // L: 10670
- }
-
- if (var10.lineWid == 1) { // L: 10672
- Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10673
- } else {
- class433.method7433(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10676
- }
- }
- }
- }
- }
- }
- }
+ if (class344.redHintArrowSprite == null) { // L: 1904
+ class344.redHintArrowSprite = class7.SpriteBuffer_getSprite(class304.archive8, LoginScreenAnimation.spriteIds.field4367, 0);
+ } else {
+ ++var26; // L: 1905
}
+
+ if (class13.mapSceneSprites == null) { // L: 1906
+ class13.mapSceneSprites = ClanChannelMember.method2867(class304.archive8, LoginScreenAnimation.spriteIds.mapScenes, 0);
+ } else {
+ ++var26; // L: 1907
+ }
+
+ if (Message.headIconPkSprites == null) { // L: 1908
+ Message.headIconPkSprites = class430.method7547(class304.archive8, LoginScreenAnimation.spriteIds.headIconsPk, 0);
+ } else {
+ ++var26; // L: 1909
+ }
+
+ if (class28.headIconPrayerSprites == null) { // L: 1910
+ class28.headIconPrayerSprites = class430.method7547(class304.archive8, LoginScreenAnimation.spriteIds.field4374, 0);
+ } else {
+ ++var26; // L: 1911
+ }
+
+ if (UserComparator4.headIconHintSprites == null) { // L: 1912
+ UserComparator4.headIconHintSprites = class430.method7547(class304.archive8, LoginScreenAnimation.spriteIds.field4373, 0);
+ } else {
+ ++var26; // L: 1913
+ }
+
+ if (DynamicObject.mapMarkerSprites == null) { // L: 1914
+ DynamicObject.mapMarkerSprites = class430.method7547(class304.archive8, LoginScreenAnimation.spriteIds.field4372, 0);
+ } else {
+ ++var26; // L: 1915
+ }
+
+ if (BuddyRankComparator.crossSprites == null) { // L: 1916
+ BuddyRankComparator.crossSprites = class430.method7547(class304.archive8, LoginScreenAnimation.spriteIds.field4368, 0);
+ } else {
+ ++var26; // L: 1917
+ }
+
+ if (class9.mapDotSprites == null) { // L: 1918
+ class9.mapDotSprites = class430.method7547(class304.archive8, LoginScreenAnimation.spriteIds.field4371, 0);
+ } else {
+ ++var26; // L: 1919
+ }
+
+ if (class126.scrollBarSprites == null) { // L: 1920
+ class126.scrollBarSprites = ClanChannelMember.method2867(class304.archive8, LoginScreenAnimation.spriteIds.field4375, 0);
+ } else {
+ ++var26; // L: 1921
+ }
+
+ if (ClientPreferences.modIconSprites == null) { // L: 1922
+ ClientPreferences.modIconSprites = ClanChannelMember.method2867(class304.archive8, LoginScreenAnimation.spriteIds.field4376, 0);
+ } else {
+ ++var26; // L: 1923
+ }
+
+ if (var26 < 11) { // L: 1924
+ Login.Login_loadingText = "Loading sprites - " + var26 * 100 / 12 + "%"; // L: 1925
+ Login.Login_loadingPercent = 70; // L: 1926
+ } else {
+ AbstractFont.AbstractFont_modIconSprites = ClientPreferences.modIconSprites; // L: 1929
+ class344.redHintArrowSprite.normalize(); // L: 1930
+ var1 = (int)(Math.random() * 21.0D) - 10; // L: 1931
+ int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1932
+ int var3 = (int)(Math.random() * 21.0D) - 10; // L: 1933
+ int var4 = (int)(Math.random() * 41.0D) - 20; // L: 1934
+ class13.mapSceneSprites[0].shiftColors(var4 + var1, var4 + var2, var3 + var4); // L: 1935
+ Login.Login_loadingText = "Loaded sprites"; // L: 1936
+ Login.Login_loadingPercent = 70; // L: 1937
+ Client.titleLoadingStage = 90; // L: 1938
+ }
+ } else if (Client.titleLoadingStage == 90) { // L: 1941
+ if (!Language.field4098.isFullyLoaded()) { // L: 1942
+ Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1943
+ Login.Login_loadingPercent = 90; // L: 1944
+ } else {
+ class12.textureProvider = new TextureProvider(Language.field4098, class304.archive8, 20, class19.clientPreferences.method2254(), Client.isLowDetail ? 64 : 128); // L: 1947
+ Rasterizer3D.Rasterizer3D_setTextureLoader(class12.textureProvider); // L: 1948
+ Rasterizer3D.Rasterizer3D_setBrightness(class19.clientPreferences.method2254()); // L: 1949
+ Client.titleLoadingStage = 100; // L: 1950
+ }
+ } else if (Client.titleLoadingStage == 100) { // L: 1953
+ var26 = class12.textureProvider.getLoadedPercentage(); // L: 1954
+ if (var26 < 100) { // L: 1955
+ Login.Login_loadingText = "Loading textures - " + var26 + "%"; // L: 1956
+ Login.Login_loadingPercent = 90; // L: 1957
+ } else {
+ Login.Login_loadingText = "Loaded textures"; // L: 1960
+ Login.Login_loadingPercent = 90; // L: 1961
+ Client.titleLoadingStage = 110; // L: 1962
+ }
+ } else if (Client.titleLoadingStage == 110) { // L: 1965
+ ItemLayer.mouseRecorder = new MouseRecorder(); // L: 1966
+ GameEngine.taskHandler.newThreadTask(ItemLayer.mouseRecorder, 10); // L: 1967
+ Login.Login_loadingText = "Loaded input handler"; // L: 1968
+ Login.Login_loadingPercent = 92; // L: 1969
+ Client.titleLoadingStage = 120; // L: 1970
+ } else if (Client.titleLoadingStage == 120) { // L: 1973
+ if (!ApproximateRouteStrategy.archive10.tryLoadFileByNames("huffman", "")) { // L: 1974
+ Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1975
+ Login.Login_loadingPercent = 94; // L: 1976
+ } else {
+ Huffman var0 = new Huffman(ApproximateRouteStrategy.archive10.takeFileByNames("huffman", "")); // L: 1979
+ class281.huffman = var0; // L: 1981
+ Login.Login_loadingText = "Loaded wordpack"; // L: 1983
+ Login.Login_loadingPercent = 94; // L: 1984
+ Client.titleLoadingStage = 130; // L: 1985
+ }
+ } else if (Client.titleLoadingStage == 130) { // L: 1988
+ if (!class341.archive7.isFullyLoaded()) { // L: 1989
+ Login.Login_loadingText = "Loading interfaces - " + class341.archive7.loadPercent() * 4 / 5 + "%"; // L: 1990
+ Login.Login_loadingPercent = 96; // L: 1991
+ } else if (!class267.archive12.isFullyLoaded()) { // L: 1994
+ Login.Login_loadingText = "Loading interfaces - " + (80 + class267.archive12.loadPercent() / 6) + "%"; // L: 1995
+ Login.Login_loadingPercent = 96; // L: 1996
+ } else if (!AbstractByteArrayCopier.archive13.isFullyLoaded()) { // L: 1999
+ Login.Login_loadingText = "Loading interfaces - " + (96 + AbstractByteArrayCopier.archive13.loadPercent() / 50) + "%"; // L: 2000
+ Login.Login_loadingPercent = 96; // L: 2001
+ } else {
+ Login.Login_loadingText = "Loaded interfaces"; // L: 2004
+ Login.Login_loadingPercent = 98; // L: 2005
+ Client.titleLoadingStage = 140; // L: 2006
+ }
+ } else if (Client.titleLoadingStage == 140) { // L: 2009
+ Login.Login_loadingPercent = 100; // L: 2010
+ if (!MouseHandler.archive19.tryLoadGroupByName(WorldMapCacheName.field2867.name)) { // L: 2011
+ Login.Login_loadingText = "Loading world map - " + MouseHandler.archive19.groupLoadPercentByName(WorldMapCacheName.field2867.name) / 10 + "%"; // L: 2012
+ } else {
+ if (class121.worldMap == null) { // L: 2015
+ class121.worldMap = new WorldMap(); // L: 2016
+ class121.worldMap.init(MouseHandler.archive19, AbstractUserComparator.archive18, class4.archive20, TileItem.fontBold12, Client.fontsMap, class13.mapSceneSprites); // L: 2017
+ }
+
+ Login.Login_loadingText = "Loaded world map"; // L: 2019
+ Client.titleLoadingStage = 150; // L: 2020
+ }
+ } else if (Client.titleLoadingStage == 150) { // L: 2023
+ HealthBarUpdate.updateGameState(10); // L: 2024
}
}
- }
+ } else {
+ byte var19 = 0; // L: 1700
+ var26 = var19 + Varcs.archive5.percentage() * 4 / 100; // L: 1701
+ var26 += WorldMapEvent.field2882.percentage() * 4 / 100; // L: 1702
+ var26 += class140.archive2.percentage() * 2 / 100; // L: 1703
+ var26 += class341.archive7.percentage() * 2 / 100; // L: 1704
+ var26 += Client.archive4.percentage() * 6 / 100; // L: 1705
+ var26 += WorldMapSectionType.archive9.percentage() * 4 / 100; // L: 1706
+ var26 += class121.archive6.percentage() * 2 / 100; // L: 1707
+ var26 += class10.archive11.percentage() * 55 / 100; // L: 1708
+ var26 += class304.archive8.percentage() * 2 / 100; // L: 1709
+ var26 += Language.field4098.percentage() * 2 / 100; // L: 1710
+ var26 += ApproximateRouteStrategy.archive10.percentage() * 2 / 100; // L: 1711
+ var26 += UserComparator7.field1383.percentage() * 2 / 100; // L: 1712
+ var26 += class267.archive12.percentage() * 2 / 100; // L: 1713
+ var26 += AbstractByteArrayCopier.archive13.percentage() * 2 / 100; // L: 1714
+ var26 += WorldMapSprite.archive14.percentage() * 2 / 100; // L: 1715
+ var26 += class67.archive15.percentage() * 2 / 100; // L: 1716
+ var26 += MouseHandler.archive19.percentage() / 100; // L: 1717
+ var26 += AbstractUserComparator.archive18.percentage() / 100; // L: 1718
+ var26 += class4.archive20.percentage() / 100; // L: 1719
+ var26 += class132.field1588.percentage() / 100; // L: 1720
+ var26 += class6.archive17.method5795() && class6.archive17.isFullyLoaded() ? 1 : 0; // L: 1721
+ if (var26 != 100) { // L: 1722
+ if (var26 != 0) { // L: 1723
+ Login.Login_loadingText = "Checking for updates - " + var26 + "%";
+ }
- } // L: 10681
-
- @ObfuscatedName("ln")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-2073465048"
- )
- static void method4374(Buffer var0, int var1) {
- byte[] var2 = var0.array; // L: 12608
- if (Client.randomDatData == null) { // L: 12610
- Client.randomDatData = new byte[24];
- }
-
- class351.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 12611
- if (JagexCache.JagexCache_randomDat != null) { // L: 12614
- try {
- JagexCache.JagexCache_randomDat.seek(0L); // L: 12616
- JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12617
- } catch (Exception var4) { // L: 12619
+ Login.Login_loadingPercent = 30; // L: 1724
+ } else {
+ HealthBarUpdate.method2202(Varcs.archive5, "Animations"); // L: 1727
+ HealthBarUpdate.method2202(WorldMapEvent.field2882, "Skeletons"); // L: 1728
+ HealthBarUpdate.method2202(Client.archive4, "Sound FX"); // L: 1729
+ HealthBarUpdate.method2202(WorldMapSectionType.archive9, "Maps"); // L: 1730
+ HealthBarUpdate.method2202(class121.archive6, "Music Tracks"); // L: 1731
+ HealthBarUpdate.method2202(class10.archive11, "Models"); // L: 1732
+ HealthBarUpdate.method2202(class304.archive8, "Sprites"); // L: 1733
+ HealthBarUpdate.method2202(UserComparator7.field1383, "Music Jingles"); // L: 1734
+ HealthBarUpdate.method2202(WorldMapSprite.archive14, "Music Samples"); // L: 1735
+ HealthBarUpdate.method2202(class67.archive15, "Music Patches"); // L: 1736
+ HealthBarUpdate.method2202(MouseHandler.archive19, "World Map"); // L: 1737
+ HealthBarUpdate.method2202(AbstractUserComparator.archive18, "World Map Geography"); // L: 1738
+ HealthBarUpdate.method2202(class4.archive20, "World Map Ground"); // L: 1739
+ LoginScreenAnimation.spriteIds = new GraphicsDefaults(); // L: 1740
+ LoginScreenAnimation.spriteIds.decode(class6.archive17); // L: 1741
+ Login.Login_loadingText = "Loaded update list"; // L: 1742
+ Login.Login_loadingPercent = 30; // L: 1743
+ Client.titleLoadingStage = 45; // L: 1744
}
}
-
- } // L: 12622
+ } // L: 1664 1670 1697 1725 1745 1770 1778 1787 1799 1805 1811 1816 1898 1927 1939 1945 1951 1958 1963 1971 1977 1986 1992 1997 2002 2007 2013 2021 2025 2027
}
diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java
index c8b83914fc..5debb40e7d 100644
--- a/runescape-client/src/main/java/VorbisCodebook.java
+++ b/runescape-client/src/main/java/VorbisCodebook.java
@@ -2,122 +2,122 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("ay")
+@ObfuscatedName("au")
@Implements("VorbisCodebook")
public class VorbisCodebook {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("dimensions")
int dimensions;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("entries")
int entries;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("lengthMap")
int[] lengthMap;
- @ObfuscatedName("k")
- int[] field359;
- @ObfuscatedName("a")
- float[][] field356;
- @ObfuscatedName("m")
+ @ObfuscatedName("f")
+ int[] field357;
+ @ObfuscatedName("j")
+ float[][] field358;
+ @ObfuscatedName("e")
@Export("keys")
int[] keys;
VorbisCodebook() {
- VorbisSample.readBits(24); // L: 22
- this.dimensions = VorbisSample.readBits(16); // L: 23
- this.entries = VorbisSample.readBits(24); // L: 24
- this.lengthMap = new int[this.entries]; // L: 25
- boolean var1 = VorbisSample.readBit() != 0; // L: 26
+ VorbisSample.readBits(24); // L: 41
+ this.dimensions = VorbisSample.readBits(16); // L: 42
+ this.entries = VorbisSample.readBits(24); // L: 43
+ this.lengthMap = new int[this.entries]; // L: 44
+ boolean var1 = VorbisSample.readBit() != 0; // L: 45
int var2;
int var3;
int var5;
- if (var1) { // L: 27
- var2 = 0; // L: 28
+ if (var1) { // L: 46
+ var2 = 0; // L: 47
- for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33
- int var4 = VorbisSample.readBits(class143.iLog(this.entries - var2)); // L: 31
+ for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52
+ int var4 = VorbisSample.readBits(Messages.iLog(this.entries - var2)); // L: 50
- for (var5 = 0; var5 < var4; ++var5) { // L: 32
+ for (var5 = 0; var5 < var4; ++var5) { // L: 51
this.lengthMap[var2++] = var3;
}
}
} else {
- boolean var14 = VorbisSample.readBit() != 0; // L: 37
+ boolean var14 = VorbisSample.readBit() != 0; // L: 56
- for (var3 = 0; var3 < this.entries; ++var3) { // L: 38
- if (var14 && VorbisSample.readBit() == 0) { // L: 39
+ for (var3 = 0; var3 < this.entries; ++var3) { // L: 57
+ if (var14 && VorbisSample.readBit() == 0) { // L: 58
this.lengthMap[var3] = 0;
} else {
- this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40
+ this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59
}
}
}
- this.method980(); // L: 43
- var2 = VorbisSample.readBits(4); // L: 44
- if (var2 > 0) { // L: 45
- float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46
- float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47
- var5 = VorbisSample.readBits(4) + 1; // L: 48
- boolean var6 = VorbisSample.readBit() != 0; // L: 49
+ this.method955(); // L: 62
+ var2 = VorbisSample.readBits(4); // L: 63
+ if (var2 > 0) { // L: 64
+ float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65
+ float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 66
+ var5 = VorbisSample.readBits(4) + 1; // L: 67
+ boolean var6 = VorbisSample.readBit() != 0; // L: 68
int var7;
- if (var2 == 1) { // L: 51
+ if (var2 == 1) { // L: 70
var7 = mapType1QuantValues(this.entries, this.dimensions);
} else {
- var7 = this.entries * this.dimensions; // L: 52
+ var7 = this.entries * this.dimensions; // L: 71
}
- this.field359 = new int[var7]; // L: 53
+ this.field357 = new int[var7]; // L: 72
int var8;
- for (var8 = 0; var8 < var7; ++var8) { // L: 54
- this.field359[var8] = VorbisSample.readBits(var5);
+ for (var8 = 0; var8 < var7; ++var8) { // L: 73
+ this.field357[var8] = VorbisSample.readBits(var5);
}
- this.field356 = new float[this.entries][this.dimensions]; // L: 55
+ this.field358 = new float[this.entries][this.dimensions]; // L: 74
float var9;
int var10;
int var11;
- if (var2 == 1) { // L: 56
- for (var8 = 0; var8 < this.entries; ++var8) { // L: 57
- var9 = 0.0F; // L: 58
- var10 = 1; // L: 59
+ if (var2 == 1) { // L: 75
+ for (var8 = 0; var8 < this.entries; ++var8) { // L: 76
+ var9 = 0.0F; // L: 77
+ var10 = 1; // L: 78
- for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60
- int var12 = var8 / var10 % var7; // L: 61
- float var13 = (float)this.field359[var12] * var16 + var15 + var9; // L: 62
- this.field356[var8][var11] = var13; // L: 63
- if (var6) { // L: 64
+ for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79
+ int var12 = var8 / var10 % var7; // L: 80
+ float var13 = (float)this.field357[var12] * var16 + var15 + var9; // L: 81
+ this.field358[var8][var11] = var13; // L: 82
+ if (var6) { // L: 83
var9 = var13;
}
- var10 *= var7; // L: 65
+ var10 *= var7; // L: 84
}
}
} else {
- for (var8 = 0; var8 < this.entries; ++var8) { // L: 70
- var9 = 0.0F; // L: 71
- var10 = var8 * this.dimensions; // L: 72
+ for (var8 = 0; var8 < this.entries; ++var8) { // L: 89
+ var9 = 0.0F; // L: 90
+ var10 = var8 * this.dimensions; // L: 91
- for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73
- float var17 = (float)this.field359[var10] * var16 + var15 + var9; // L: 74
- this.field356[var8][var11] = var17; // L: 75
- if (var6) { // L: 76
+ for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92
+ float var17 = (float)this.field357[var10] * var16 + var15 + var9; // L: 93
+ this.field358[var8][var11] = var17; // L: 94
+ if (var6) { // L: 95
var9 = var17;
}
- ++var10; // L: 77
+ ++var10; // L: 96
}
}
}
}
- } // L: 82
+ } // L: 101
- @ObfuscatedName("q")
- void method980() {
- int[] var1 = new int[this.entries]; // L: 85
- int[] var2 = new int[33]; // L: 87
+ @ObfuscatedName("v")
+ void method955() {
+ int[] var1 = new int[this.entries]; // L: 104
+ int[] var2 = new int[33]; // L: 106
int var3;
int var4;
@@ -126,109 +126,132 @@ public class VorbisCodebook {
int var7;
int var8;
int var10;
- for (var3 = 0; var3 < this.entries; ++var3) { // L: 88
- var4 = this.lengthMap[var3]; // L: 89
- if (var4 != 0) { // L: 90
- var5 = 1 << 32 - var4; // L: 91
- var6 = var2[var4]; // L: 92
- var1[var3] = var6; // L: 93
+ for (var3 = 0; var3 < this.entries; ++var3) { // L: 107
+ var4 = this.lengthMap[var3]; // L: 108
+ if (var4 != 0) { // L: 109
+ var5 = 1 << 32 - var4; // L: 110
+ var6 = var2[var4]; // L: 111
+ var1[var3] = var6; // L: 112
int var12;
- if ((var6 & var5) != 0) { // L: 95
- var7 = var2[var4 - 1]; // L: 96
+ if ((var6 & var5) != 0) { // L: 114
+ var7 = var2[var4 - 1]; // L: 115
} else {
- var7 = var6 | var5; // L: 99
+ var7 = var6 | var5; // L: 118
- for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100
- var12 = var2[var8]; // L: 101
- if (var12 != var6) { // L: 102
+ for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119
+ var12 = var2[var8]; // L: 120
+ if (var12 != var6) { // L: 121
break;
}
- var10 = 1 << 32 - var8; // L: 103
- if ((var12 & var10) != 0) { // L: 104
- var2[var8] = var2[var8 - 1]; // L: 105
- break; // L: 106
+ var10 = 1 << 32 - var8; // L: 122
+ if ((var12 & var10) != 0) { // L: 123
+ var2[var8] = var2[var8 - 1]; // L: 124
+ break; // L: 125
}
- var2[var8] = var12 | var10; // L: 109
+ var2[var8] = var12 | var10; // L: 128
}
}
- var2[var4] = var7; // L: 115
+ var2[var4] = var7; // L: 134
- for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116
- var12 = var2[var8]; // L: 117
- if (var12 == var6) { // L: 118
+ for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135
+ var12 = var2[var8]; // L: 136
+ if (var12 == var6) { // L: 137
var2[var8] = var7;
}
}
}
}
- this.keys = new int[8]; // L: 122
- int var11 = 0; // L: 123
+ this.keys = new int[8]; // L: 141
+ int var11 = 0; // L: 142
- for (var3 = 0; var3 < this.entries; ++var3) { // L: 124
- var4 = this.lengthMap[var3]; // L: 125
- if (var4 != 0) { // L: 126
- var5 = var1[var3]; // L: 127
- var6 = 0; // L: 128
+ for (var3 = 0; var3 < this.entries; ++var3) { // L: 143
+ var4 = this.lengthMap[var3]; // L: 144
+ if (var4 != 0) { // L: 145
+ var5 = var1[var3]; // L: 146
+ var6 = 0; // L: 147
- for (var7 = 0; var7 < var4; ++var7) { // L: 129
- var8 = Integer.MIN_VALUE >>> var7; // L: 130
- if ((var5 & var8) != 0) { // L: 131
- if (this.keys[var6] == 0) { // L: 132
+ for (var7 = 0; var7 < var4; ++var7) { // L: 148
+ var8 = Integer.MIN_VALUE >>> var7; // L: 149
+ if ((var5 & var8) != 0) { // L: 150
+ if (this.keys[var6] == 0) { // L: 151
this.keys[var6] = var11;
}
- var6 = this.keys[var6]; // L: 133
+ var6 = this.keys[var6]; // L: 152
} else {
- ++var6; // L: 136
+ ++var6; // L: 155
}
- if (var6 >= this.keys.length) { // L: 138
- int[] var9 = new int[this.keys.length * 2]; // L: 139
+ if (var6 >= this.keys.length) { // L: 157
+ int[] var9 = new int[this.keys.length * 2]; // L: 158
- for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140
+ for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159
var9[var10] = this.keys[var10];
}
- this.keys = var9; // L: 141
+ this.keys = var9; // L: 160
}
- var8 >>>= 1; // L: 143
+ var8 >>>= 1; // L: 162
}
- this.keys[var6] = ~var3; // L: 145
- if (var6 >= var11) { // L: 146
+ this.keys[var6] = ~var3; // L: 164
+ if (var6 >= var11) { // L: 165
var11 = var6 + 1;
}
}
}
- } // L: 148
+ } // L: 167
- @ObfuscatedName("l")
- int method981() {
+ @ObfuscatedName("q")
+ int method956() {
int var1;
- for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152
+ for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171
}
- return ~this.keys[var1]; // L: 153
+ return ~this.keys[var1]; // L: 172
}
- @ObfuscatedName("k")
- float[] method982() {
- return this.field356[this.method981()]; // L: 157
+ @ObfuscatedName("f")
+ float[] method957() {
+ return this.field358[this.method956()]; // L: 176
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("mapType1QuantValues")
static int mapType1QuantValues(int var0, int var1) {
- int var2;
- for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; AttackOption.method2401(var2, var1) > var0; --var2) { // L: 16 17
- }
+ int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16
- return var2; // L: 18
+ while (true) {
+ int var4 = var2; // L: 19
+ int var5 = var1; // L: 20
+
+ int var6;
+ for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26
+ if ((var5 & 1) != 0) { // L: 24
+ var6 *= var4;
+ }
+
+ var4 *= var4; // L: 25
+ }
+
+ int var3;
+ if (var5 == 1) { // L: 28
+ var3 = var6 * var4; // L: 29
+ } else {
+ var3 = var6; // L: 32
+ }
+
+ if (var3 <= var0) { // L: 34
+ return var2; // L: 37
+ }
+
+ --var2; // L: 35
+ }
}
}
diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java
index e495acc337..434d34f9f8 100644
--- a/runescape-client/src/main/java/VorbisFloor.java
+++ b/runescape-client/src/main/java/VorbisFloor.java
@@ -2,43 +2,43 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("af")
+@ObfuscatedName("ax")
@Implements("VorbisFloor")
public class VorbisFloor {
- @ObfuscatedName("o")
- static final int[] field271;
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
+ static final int[] field264;
+ @ObfuscatedName("v")
@Export("VorbisFloor_decibelStatics")
static final float[] VorbisFloor_decibelStatics;
- @ObfuscatedName("v")
- static int[] field276;
- @ObfuscatedName("y")
- static int[] field269;
- @ObfuscatedName("c")
- static boolean[] field278;
- @ObfuscatedName("l")
- int[] field273;
- @ObfuscatedName("k")
+ @ObfuscatedName("i")
+ static int[] field271;
+ @ObfuscatedName("s")
+ static int[] field272;
+ @ObfuscatedName("t")
+ static boolean[] field273;
+ @ObfuscatedName("q")
+ int[] field262;
+ @ObfuscatedName("f")
@Export("multiplier")
int multiplier;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("partitionClassList")
int[] partitionClassList;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("classDimensions")
int[] classDimensions;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("classSubClasses")
int[] classSubClasses;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("classMasterbooks")
int[] classMasterbooks;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("subclassBooks")
int[][] subclassBooks;
static {
- field271 = new int[]{256, 128, 86, 64}; // L: 8
+ field264 = new int[]{256, 128, 86, 64}; // L: 8
VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9
}
@@ -92,30 +92,30 @@ public class VorbisFloor {
var5 += this.classDimensions[this.partitionClassList[var6]];
}
- this.field273 = new int[var5]; // L: 137
- this.field273[0] = 0; // L: 138
- this.field273[1] = 1 << var4; // L: 139
+ this.field262 = new int[var5]; // L: 137
+ this.field262[0] = 0; // L: 138
+ this.field262[1] = 1 << var4; // L: 139
var5 = 2; // L: 140
for (var6 = 0; var6 < var2; ++var6) { // L: 141
var7 = this.partitionClassList[var6]; // L: 142
for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143
- this.field273[var5++] = VorbisSample.readBits(var4);
+ this.field262[var5++] = VorbisSample.readBits(var4);
}
}
- if (field276 == null || field276.length < var5) { // L: 145
- field276 = new int[var5]; // L: 146
- field269 = new int[var5]; // L: 147
- field278 = new boolean[var5]; // L: 148
+ if (field271 == null || field271.length < var5) { // L: 145
+ field271 = new int[var5]; // L: 146
+ field272 = new int[var5]; // L: 147
+ field273 = new boolean[var5]; // L: 148
}
}
} // L: 150
- @ObfuscatedName("l")
- int method664(int var1, int var2, int var3, int var4, int var5) {
+ @ObfuscatedName("q")
+ int method638(int var1, int var2, int var3, int var4, int var5) {
int var6 = var4 - var2; // L: 50
int var7 = var3 - var1; // L: 51
int var8 = var6 < 0 ? -var6 : var6; // L: 52
@@ -124,8 +124,8 @@ public class VorbisFloor {
return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55
}
- @ObfuscatedName("k")
- void method665(int var1, int var2, int var3, int var4, float[] var5, int var6) {
+ @ObfuscatedName("f")
+ void method639(int var1, int var2, int var3, int var4, float[] var5, int var6) {
int var7 = var4 - var2; // L: 59
int var8 = var3 - var1; // L: 60
int var9 = var7 < 0 ? -var7 : var7; // L: 61
@@ -153,54 +153,54 @@ public class VorbisFloor {
} // L: 80
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("VarbisFloor_sort")
void VarbisFloor_sort(int var1, int var2) {
if (var1 < var2) { // L: 83
int var3 = var1; // L: 84
- int var4 = field276[var1]; // L: 85
- int var5 = field269[var1]; // L: 86
- boolean var6 = field278[var1]; // L: 87
+ int var4 = field271[var1]; // L: 85
+ int var5 = field272[var1]; // L: 86
+ boolean var6 = field273[var1]; // L: 87
for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88
- int var8 = field276[var7]; // L: 89
+ int var8 = field271[var7]; // L: 89
if (var8 < var4) { // L: 90
- field276[var3] = var8; // L: 91
- field269[var3] = field269[var7]; // L: 92
- field278[var3] = field278[var7]; // L: 93
+ field271[var3] = var8; // L: 91
+ field272[var3] = field272[var7]; // L: 92
+ field273[var3] = field273[var7]; // L: 93
++var3; // L: 94
- field276[var7] = field276[var3]; // L: 95
- field269[var7] = field269[var3]; // L: 96
- field278[var7] = field278[var3]; // L: 97
+ field271[var7] = field271[var3]; // L: 95
+ field272[var7] = field272[var3]; // L: 96
+ field273[var7] = field273[var3]; // L: 97
}
}
- field276[var3] = var4; // L: 100
- field269[var3] = var5; // L: 101
- field278[var3] = var6; // L: 102
+ field271[var3] = var4; // L: 100
+ field272[var3] = var5; // L: 101
+ field273[var3] = var6; // L: 102
this.VarbisFloor_sort(var1, var3 - 1); // L: 103
this.VarbisFloor_sort(var3 + 1, var2); // L: 104
}
} // L: 105
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("readSubmapFloor")
boolean readSubmapFloor() {
boolean var1 = VorbisSample.readBit() != 0; // L: 153
if (!var1) { // L: 154
return false;
} else {
- int var2 = this.field273.length; // L: 155
+ int var2 = this.field262.length; // L: 155
int var3;
for (var3 = 0; var3 < var2; ++var3) { // L: 156
- field276[var3] = this.field273[var3];
+ field271[var3] = this.field262[var3];
}
- var3 = field271[this.multiplier - 1]; // L: 157
- int var4 = class143.iLog(var3 - 1); // L: 158
- field269[0] = VorbisSample.readBits(var4); // L: 159
- field269[1] = VorbisSample.readBits(var4); // L: 160
+ var3 = field264[this.multiplier - 1]; // L: 157
+ int var4 = Messages.iLog(var3 - 1); // L: 158
+ field272[0] = VorbisSample.readBits(var4); // L: 159
+ field272[1] = VorbisSample.readBits(var4); // L: 160
int var5 = 2; // L: 161
for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162
@@ -210,13 +210,13 @@ public class VorbisFloor {
int var10 = (1 << var9) - 1; // L: 166
int var11 = 0; // L: 167
if (var9 > 0) { // L: 168
- var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method981();
+ var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method956();
}
for (int var12 = 0; var12 < var8; ++var12) { // L: 169
int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170
var11 >>>= var9; // L: 171
- field269[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method981() : 0; // L: 172
+ field272[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method956() : 0; // L: 172
}
}
@@ -224,12 +224,12 @@ public class VorbisFloor {
}
}
- @ObfuscatedName("p")
- void method668(float[] var1, int var2) {
- int var3 = this.field273.length; // L: 179
- int var4 = field271[this.multiplier - 1]; // L: 180
- boolean[] var5 = field278; // L: 181
- field278[1] = true; // L: 182
+ @ObfuscatedName("g")
+ void method643(float[] var1, int var2) {
+ int var3 = this.field262.length; // L: 179
+ int var4 = field264[this.multiplier - 1]; // L: 180
+ boolean[] var5 = field273; // L: 181
+ field273[1] = true; // L: 182
var5[0] = true; // L: 183
int var6;
@@ -238,37 +238,37 @@ public class VorbisFloor {
int var9;
int var10;
for (var6 = 2; var6 < var3; ++var6) { // L: 184
- var7 = method689(field276, var6); // L: 185
- var8 = method662(field276, var6); // L: 186
- var9 = this.method664(field276[var7], field269[var7], field276[var8], field269[var8], field276[var6]); // L: 187
- var10 = field269[var6]; // L: 188
+ var7 = method656(field271, var6); // L: 185
+ var8 = method637(field271, var6); // L: 186
+ var9 = this.method638(field271[var7], field272[var7], field271[var8], field272[var8], field271[var6]); // L: 187
+ var10 = field272[var6]; // L: 188
int var11 = var4 - var9; // L: 189
int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191
if (var10 != 0) { // L: 192
- boolean[] var14 = field278; // L: 193
- field278[var8] = true; // L: 195
+ boolean[] var14 = field273; // L: 193
+ field273[var8] = true; // L: 195
var14[var7] = true; // L: 196
- field278[var6] = true; // L: 197
+ field273[var6] = true; // L: 197
if (var10 >= var13) { // L: 198
- field269[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199
+ field272[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199
} else {
- field269[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202
+ field272[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202
}
} else {
- field278[var6] = false; // L: 206
- field269[var6] = var9; // L: 207
+ field273[var6] = false; // L: 206
+ field272[var6] = var9; // L: 207
}
}
this.VarbisFloor_sort(0, var3 - 1); // L: 210
var6 = 0; // L: 211
- var7 = field269[0] * this.multiplier; // L: 212
+ var7 = field272[0] * this.multiplier; // L: 212
for (var8 = 1; var8 < var3; ++var8) { // L: 213
- if (field278[var8]) { // L: 214
- var9 = field276[var8]; // L: 215
- var10 = field269[var8] * this.multiplier; // L: 216
- this.method665(var6, var7, var9, var10, var1, var2); // L: 217
+ if (field273[var8]) { // L: 214
+ var9 = field271[var8]; // L: 215
+ var10 = field272[var8] * this.multiplier; // L: 216
+ this.method639(var6, var7, var9, var10, var1, var2); // L: 217
if (var9 >= var2) { // L: 218
return;
}
@@ -286,8 +286,8 @@ public class VorbisFloor {
} // L: 225
- @ObfuscatedName("o")
- static int method689(int[] var0, int var1) {
+ @ObfuscatedName("c")
+ static int method656(int[] var0, int var1) {
int var2 = var0[var1]; // L: 22
int var3 = -1; // L: 23
int var4 = Integer.MIN_VALUE; // L: 24
@@ -303,8 +303,8 @@ public class VorbisFloor {
return var3; // L: 32
}
- @ObfuscatedName("q")
- static int method662(int[] var0, int var1) {
+ @ObfuscatedName("v")
+ static int method637(int[] var0, int var1) {
int var2 = var0[var1]; // L: 36
int var3 = -1; // L: 37
int var4 = Integer.MAX_VALUE; // L: 38
diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java
index 65b0a969e5..783c04c24f 100644
--- a/runescape-client/src/main/java/VorbisMapping.java
+++ b/runescape-client/src/main/java/VorbisMapping.java
@@ -5,16 +5,16 @@ import net.runelite.mapping.ObfuscatedName;
@ObfuscatedName("av")
@Implements("VorbisMapping")
public class VorbisMapping {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("submaps")
int submaps;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("mappingMux")
int mappingMux;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("submapFloor")
int[] submapFloor;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("submapResidue")
int[] submapResidue;
diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java
index 8df121206a..d5891e8ff5 100644
--- a/runescape-client/src/main/java/VorbisResidue.java
+++ b/runescape-client/src/main/java/VorbisResidue.java
@@ -2,28 +2,28 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("aw")
+@ObfuscatedName("ah")
@Implements("VorbisResidue")
public class VorbisResidue {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("residueType")
int residueType;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("begin")
int begin;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("end")
int end;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("partitionSize")
int partitionSize;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("classifications")
int classifications;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("classbook")
int classbook;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("cascade")
int[] cascade;
@@ -56,8 +56,8 @@ public class VorbisResidue {
} // L: 31
- @ObfuscatedName("o")
- void method793(float[] var1, int var2, boolean var3) {
+ @ObfuscatedName("c")
+ void method768(float[] var1, int var2, boolean var3) {
int var4;
for (var4 = 0; var4 < var2; ++var4) { // L: 34
var1[var4] = 0.0F;
@@ -76,7 +76,7 @@ public class VorbisResidue {
int var10;
int var11;
if (var8 == 0) { // L: 43
- var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method981(); // L: 45
+ var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method956(); // L: 45
for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46
if (var9 + var11 < var6) { // L: 47
@@ -98,7 +98,7 @@ public class VorbisResidue {
var15 = this.partitionSize / var14.dimensions; // L: 60
for (int var19 = 0; var19 < var15; ++var19) { // L: 61
- float[] var20 = var14.method982(); // L: 62
+ float[] var20 = var14.method957(); // L: 62
for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63
var1[var13 + var19 + var18 * var15] += var20[var18];
@@ -108,7 +108,7 @@ public class VorbisResidue {
var15 = 0; // L: 67
while (var15 < this.partitionSize) { // L: 68
- float[] var16 = var14.method982(); // L: 69
+ float[] var16 = var14.method957(); // L: 69
for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70
var1[var13 + var15] += var16[var17]; // L: 71
diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java
index 58fc6c6244..8ff5363772 100644
--- a/runescape-client/src/main/java/VorbisSample.java
+++ b/runescape-client/src/main/java/VorbisSample.java
@@ -6,112 +6,112 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("aa")
@Implements("VorbisSample")
public class VorbisSample extends Node {
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("VorbisSample_bytes")
static byte[] VorbisSample_bytes;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("VorbisSample_byteOffset")
static int VorbisSample_byteOffset;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("VorbisSample_bitOffset")
static int VorbisSample_bitOffset;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@Export("VorbisSample_blockSize0")
static int VorbisSample_blockSize0;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("VorbisSample_blockSize1")
static int VorbisSample_blockSize1;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "[Lay;"
+ descriptor = "[Lau;"
)
@Export("VorbisSample_codebooks")
static VorbisCodebook[] VorbisSample_codebooks;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "[Laf;"
+ descriptor = "[Lax;"
)
@Export("VorbisSample_floors")
static VorbisFloor[] VorbisSample_floors;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "[Law;"
+ descriptor = "[Lah;"
)
@Export("VorbisSample_residues")
static VorbisResidue[] VorbisSample_residues;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
descriptor = "[Lav;"
)
@Export("VorbisSample_mappings")
static VorbisMapping[] VorbisSample_mappings;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("VorbisSample_blockFlags")
static boolean[] VorbisSample_blockFlags;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@Export("VorbisSample_mapping")
static int[] VorbisSample_mapping;
+ @ObfuscatedName("x")
+ static boolean field377;
@ObfuscatedName("n")
- static boolean field373;
- @ObfuscatedName("j")
- static float[] field383;
- @ObfuscatedName("z")
- static float[] field384;
- @ObfuscatedName("i")
- static float[] field378;
- @ObfuscatedName("u")
- static float[] field386;
- @ObfuscatedName("ag")
- static float[] field387;
- @ObfuscatedName("ar")
- static float[] field388;
- @ObfuscatedName("am")
- static float[] field389;
- @ObfuscatedName("ac")
- static int[] field369;
- @ObfuscatedName("ab")
- static int[] field391;
+ static float[] field380;
@ObfuscatedName("o")
- byte[][] field368;
- @ObfuscatedName("q")
+ static float[] field383;
+ @ObfuscatedName("m")
+ static float[] field384;
+ @ObfuscatedName("d")
+ static float[] field385;
+ @ObfuscatedName("ad")
+ static float[] field386;
+ @ObfuscatedName("ak")
+ static float[] field387;
+ @ObfuscatedName("al")
+ static float[] field388;
+ @ObfuscatedName("ao")
+ static int[] field371;
+ @ObfuscatedName("ab")
+ static int[] field375;
+ @ObfuscatedName("c")
+ byte[][] field361;
+ @ObfuscatedName("v")
@Export("sampleRate")
int sampleRate;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("sampleCount")
int sampleCount;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("start")
int start;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("end")
int end;
- @ObfuscatedName("m")
- boolean field365;
@ObfuscatedName("e")
- float[] field379;
- @ObfuscatedName("h")
- int field380;
- @ObfuscatedName("f")
- int field377;
- @ObfuscatedName("d")
- boolean field382;
- @ObfuscatedName("aj")
+ boolean field378;
+ @ObfuscatedName("l")
+ float[] field389;
+ @ObfuscatedName("a")
+ int field379;
+ @ObfuscatedName("p")
+ int field376;
+ @ObfuscatedName("b")
+ boolean field360;
+ @ObfuscatedName("ap")
@Export("samples")
byte[] samples;
+ @ObfuscatedName("ac")
+ int field392;
@ObfuscatedName("ae")
int field393;
- @ObfuscatedName("az")
- int field394;
static {
- field373 = false; // L: 28
+ field377 = false; // L: 28
}
VorbisSample(byte[] var1) {
- this.read(var1); // L: 417
- } // L: 418
+ this.read(var1); // L: 401
+ } // L: 402
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("read")
void read(byte[] var1) {
Buffer var2 = new Buffer(var1); // L: 89
@@ -121,11 +121,11 @@ public class VorbisSample extends Node {
this.end = var2.readInt(); // L: 93
if (this.end < 0) { // L: 94
this.end = ~this.end; // L: 95
- this.field365 = true; // L: 96
+ this.field378 = true; // L: 96
}
int var3 = var2.readInt(); // L: 98
- this.field368 = new byte[var3][]; // L: 99
+ this.field361 = new byte[var3][]; // L: 99
for (int var4 = 0; var4 < var3; ++var4) { // L: 100
int var5 = 0; // L: 101
@@ -138,320 +138,320 @@ public class VorbisSample extends Node {
byte[] var7 = new byte[var5]; // L: 107
var2.readBytes(var7, 0, var5); // L: 108
- this.field368[var4] = var7; // L: 109
+ this.field361[var4] = var7; // L: 109
}
} // L: 111
- @ObfuscatedName("p")
- float[] method999(int var1) {
- VorbisSample_setData(this.field368[var1], 0); // L: 198
- readBit(); // L: 199
- int var2 = readBits(class143.iLog(VorbisSample_mapping.length - 1)); // L: 200
- boolean var3 = VorbisSample_blockFlags[var2]; // L: 201
- int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202
- boolean var5 = false; // L: 203
- boolean var6 = false; // L: 204
- if (var3) { // L: 205
- var5 = readBit() != 0; // L: 206
- var6 = readBit() != 0; // L: 207
+ @ObfuscatedName("g")
+ float[] method991(int var1) {
+ VorbisSample_setData(this.field361[var1], 0); // L: 182
+ readBit(); // L: 183
+ int var2 = readBits(Messages.iLog(VorbisSample_mapping.length - 1)); // L: 184
+ boolean var3 = VorbisSample_blockFlags[var2]; // L: 185
+ int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186
+ boolean var5 = false; // L: 187
+ boolean var6 = false; // L: 188
+ if (var3) { // L: 189
+ var5 = readBit() != 0; // L: 190
+ var6 = readBit() != 0; // L: 191
}
- int var7 = var4 >> 1; // L: 209
+ int var7 = var4 >> 1; // L: 193
int var8;
int var9;
int var10;
- if (var3 && !var5) { // L: 213
- var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214
- var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215
- var10 = VorbisSample_blockSize0 >> 1; // L: 216
+ if (var3 && !var5) { // L: 197
+ var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198
+ var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199
+ var10 = VorbisSample_blockSize0 >> 1; // L: 200
} else {
- var8 = 0; // L: 219
- var9 = var7; // L: 220
- var10 = var4 >> 1; // L: 221
+ var8 = 0; // L: 203
+ var9 = var7; // L: 204
+ var10 = var4 >> 1; // L: 205
}
int var11;
int var12;
int var13;
- if (var3 && !var6) { // L: 226
- var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227
- var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228
- var13 = VorbisSample_blockSize0 >> 1; // L: 229
+ if (var3 && !var6) { // L: 210
+ var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211
+ var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212
+ var13 = VorbisSample_blockSize0 >> 1; // L: 213
} else {
- var11 = var7; // L: 232
- var12 = var4; // L: 233
- var13 = var4 >> 1; // L: 234
+ var11 = var7; // L: 216
+ var12 = var4; // L: 217
+ var13 = var4 >> 1; // L: 218
}
- VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236
- int var16 = var14.mappingMux; // L: 239
- int var17 = var14.submapFloor[var16]; // L: 240
- boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241
- boolean var45 = var15; // L: 243
+ VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220
+ int var16 = var14.mappingMux; // L: 223
+ int var17 = var14.submapFloor[var16]; // L: 224
+ boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225
+ boolean var45 = var15; // L: 227
- for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244
- VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245
- float[] var44 = field383; // L: 246
- var42.method793(var44, var4 >> 1, var45); // L: 247
+ for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228
+ VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229
+ float[] var44 = field380; // L: 230
+ var42.method768(var44, var4 >> 1, var45); // L: 231
}
int var18;
- if (!var15) { // L: 250
- var17 = var14.mappingMux; // L: 251
- var18 = var14.submapFloor[var17]; // L: 252
- VorbisSample_floors[var18].method668(field383, var4 >> 1); // L: 253
+ if (!var15) { // L: 234
+ var17 = var14.mappingMux; // L: 235
+ var18 = var14.submapFloor[var17]; // L: 236
+ VorbisSample_floors[var18].method643(field380, var4 >> 1); // L: 237
}
int var19;
- if (var15) { // L: 256
- for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257
- field383[var17] = 0.0F;
+ if (var15) { // L: 240
+ for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241
+ field380[var17] = 0.0F;
}
} else {
- var17 = var4 >> 1; // L: 260
- var18 = var4 >> 2; // L: 261
- var19 = var4 >> 3; // L: 262
- float[] var20 = field383; // L: 263
+ var17 = var4 >> 1; // L: 244
+ var18 = var4 >> 2; // L: 245
+ var19 = var4 >> 3; // L: 246
+ float[] var20 = field380; // L: 247
int var21;
- for (var21 = 0; var21 < var17; ++var21) { // L: 264
+ for (var21 = 0; var21 < var17; ++var21) { // L: 248
var20[var21] *= 0.5F;
}
- for (var21 = var17; var21 < var4; ++var21) { // L: 265
+ for (var21 = var17; var21 < var4; ++var21) { // L: 249
var20[var21] = -var20[var4 - var21 - 1];
}
- float[] var40 = var3 ? field387 : field384; // L: 266
- float[] var22 = var3 ? field388 : field378; // L: 267
- float[] var23 = var3 ? field389 : field386; // L: 268
- int[] var24 = var3 ? field391 : field369; // L: 269
+ float[] var40 = var3 ? field386 : field383; // L: 250
+ float[] var22 = var3 ? field387 : field384; // L: 251
+ float[] var23 = var3 ? field388 : field385; // L: 252
+ int[] var24 = var3 ? field375 : field371; // L: 253
int var25;
float var26;
float var27;
float var28;
float var29;
- for (var25 = 0; var25 < var18; ++var25) { // L: 270
- var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271
- var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272
- var28 = var40[var25 * 2]; // L: 273
- var29 = var40[var25 * 2 + 1]; // L: 274
- var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275
- var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276
+ for (var25 = 0; var25 < var18; ++var25) { // L: 254
+ var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255
+ var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256
+ var28 = var40[var25 * 2]; // L: 257
+ var29 = var40[var25 * 2 + 1]; // L: 258
+ var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259
+ var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260
}
float var30;
float var31;
- for (var25 = 0; var25 < var19; ++var25) { // L: 278
- var26 = var20[var17 + var25 * 4 + 3]; // L: 279
- var27 = var20[var17 + var25 * 4 + 1]; // L: 280
- var28 = var20[var25 * 4 + 3]; // L: 281
- var29 = var20[var25 * 4 + 1]; // L: 282
- var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283
- var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284
- var30 = var40[var17 - 4 - var25 * 4]; // L: 285
- var31 = var40[var17 - 3 - var25 * 4]; // L: 286
- var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287
- var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288
+ for (var25 = 0; var25 < var19; ++var25) { // L: 262
+ var26 = var20[var17 + var25 * 4 + 3]; // L: 263
+ var27 = var20[var17 + var25 * 4 + 1]; // L: 264
+ var28 = var20[var25 * 4 + 3]; // L: 265
+ var29 = var20[var25 * 4 + 1]; // L: 266
+ var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267
+ var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268
+ var30 = var40[var17 - 4 - var25 * 4]; // L: 269
+ var31 = var40[var17 - 3 - var25 * 4]; // L: 270
+ var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271
+ var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272
}
- var25 = class143.iLog(var4 - 1); // L: 290
+ var25 = Messages.iLog(var4 - 1); // L: 274
int var46;
int var47;
int var48;
int var49;
- for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291
- var47 = var4 >> var46 + 2; // L: 292
- var48 = 8 << var46; // L: 293
+ for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275
+ var47 = var4 >> var46 + 2; // L: 276
+ var48 = 8 << var46; // L: 277
- for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294
- int var50 = var4 - var47 * var49 * 2; // L: 295
- int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296
+ for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278
+ int var50 = var4 - var47 * var49 * 2; // L: 279
+ int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280
- for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297
- int var33 = var32 * 4; // L: 298
- float var34 = var20[var50 - 1 - var33]; // L: 299
- float var35 = var20[var50 - 3 - var33]; // L: 300
- float var36 = var20[var51 - 1 - var33]; // L: 301
- float var37 = var20[var51 - 3 - var33]; // L: 302
- var20[var50 - 1 - var33] = var34 + var36; // L: 303
- var20[var50 - 3 - var33] = var35 + var37; // L: 304
- float var38 = var40[var32 * var48]; // L: 305
- float var39 = var40[var32 * var48 + 1]; // L: 306
- var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307
- var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308
+ for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281
+ int var33 = var32 * 4; // L: 282
+ float var34 = var20[var50 - 1 - var33]; // L: 283
+ float var35 = var20[var50 - 3 - var33]; // L: 284
+ float var36 = var20[var51 - 1 - var33]; // L: 285
+ float var37 = var20[var51 - 3 - var33]; // L: 286
+ var20[var50 - 1 - var33] = var34 + var36; // L: 287
+ var20[var50 - 3 - var33] = var35 + var37; // L: 288
+ float var38 = var40[var32 * var48]; // L: 289
+ float var39 = var40[var32 * var48 + 1]; // L: 290
+ var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291
+ var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292
}
}
}
- for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 312
- var47 = var24[var46]; // L: 313
- if (var46 < var47) { // L: 314
- var48 = var46 * 8; // L: 315
- var49 = var47 * 8; // L: 316
- var30 = var20[var48 + 1]; // L: 318
- var20[var48 + 1] = var20[var49 + 1]; // L: 319
- var20[var49 + 1] = var30; // L: 320
- var30 = var20[var48 + 3]; // L: 321
- var20[var48 + 3] = var20[var49 + 3]; // L: 322
- var20[var49 + 3] = var30; // L: 323
- var30 = var20[var48 + 5]; // L: 324
- var20[var48 + 5] = var20[var49 + 5]; // L: 325
- var20[var49 + 5] = var30; // L: 326
- var30 = var20[var48 + 7]; // L: 327
- var20[var48 + 7] = var20[var49 + 7]; // L: 328
- var20[var49 + 7] = var30; // L: 329
+ for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296
+ var47 = var24[var46]; // L: 297
+ if (var46 < var47) { // L: 298
+ var48 = var46 * 8; // L: 299
+ var49 = var47 * 8; // L: 300
+ var30 = var20[var48 + 1]; // L: 302
+ var20[var48 + 1] = var20[var49 + 1]; // L: 303
+ var20[var49 + 1] = var30; // L: 304
+ var30 = var20[var48 + 3]; // L: 305
+ var20[var48 + 3] = var20[var49 + 3]; // L: 306
+ var20[var49 + 3] = var30; // L: 307
+ var30 = var20[var48 + 5]; // L: 308
+ var20[var48 + 5] = var20[var49 + 5]; // L: 309
+ var20[var49 + 5] = var30; // L: 310
+ var30 = var20[var48 + 7]; // L: 311
+ var20[var48 + 7] = var20[var49 + 7]; // L: 312
+ var20[var49 + 7] = var30; // L: 313
}
}
- for (var46 = 0; var46 < var17; ++var46) { // L: 332
+ for (var46 = 0; var46 < var17; ++var46) { // L: 316
var20[var46] = var20[var46 * 2 + 1];
}
- for (var46 = 0; var46 < var19; ++var46) { // L: 333
- var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334
- var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335
- var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336
- var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337
+ for (var46 = 0; var46 < var19; ++var46) { // L: 317
+ var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318
+ var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319
+ var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320
+ var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321
}
- for (var46 = 0; var46 < var19; ++var46) { // L: 339
- var27 = var23[var46 * 2]; // L: 340
- var28 = var23[var46 * 2 + 1]; // L: 341
- var29 = var20[var17 + var46 * 2]; // L: 342
- var30 = var20[var17 + var46 * 2 + 1]; // L: 343
- var31 = var20[var4 - 2 - var46 * 2]; // L: 344
- float var52 = var20[var4 - 1 - var46 * 2]; // L: 345
- float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346
- var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347
- var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348
- var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349
- var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350
- var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351
+ for (var46 = 0; var46 < var19; ++var46) { // L: 323
+ var27 = var23[var46 * 2]; // L: 324
+ var28 = var23[var46 * 2 + 1]; // L: 325
+ var29 = var20[var17 + var46 * 2]; // L: 326
+ var30 = var20[var17 + var46 * 2 + 1]; // L: 327
+ var31 = var20[var4 - 2 - var46 * 2]; // L: 328
+ float var52 = var20[var4 - 1 - var46 * 2]; // L: 329
+ float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330
+ var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331
+ var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332
+ var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333
+ var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334
+ var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335
}
- for (var46 = 0; var46 < var18; ++var46) { // L: 353
- var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354
- var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355
+ for (var46 = 0; var46 < var18; ++var46) { // L: 337
+ var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338
+ var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339
}
- for (var46 = 0; var46 < var18; ++var46) { // L: 357
+ for (var46 = 0; var46 < var18; ++var46) { // L: 341
var20[var46 + (var4 - var18)] = -var20[var46];
}
- for (var46 = 0; var46 < var18; ++var46) { // L: 358
+ for (var46 = 0; var46 < var18; ++var46) { // L: 342
var20[var46] = var20[var18 + var46];
}
- for (var46 = 0; var46 < var18; ++var46) { // L: 359
+ for (var46 = 0; var46 < var18; ++var46) { // L: 343
var20[var18 + var46] = -var20[var18 - var46 - 1];
}
- for (var46 = 0; var46 < var18; ++var46) { // L: 360
+ for (var46 = 0; var46 < var18; ++var46) { // L: 344
var20[var17 + var46] = var20[var4 - var46 - 1];
}
float[] var10000;
- for (var46 = var8; var46 < var9; ++var46) { // L: 361
- var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362
- var10000 = field383; // L: 363
+ for (var46 = var8; var46 < var9; ++var46) { // L: 345
+ var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346
+ var10000 = field380; // L: 347
var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
}
- for (var46 = var11; var46 < var12; ++var46) { // L: 365
- var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366
- var10000 = field383; // L: 367
+ for (var46 = var11; var46 < var12; ++var46) { // L: 349
+ var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350
+ var10000 = field380; // L: 351
var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
}
}
- float[] var41 = null; // L: 370
- if (this.field380 > 0) { // L: 371
- var18 = var4 + this.field380 >> 2; // L: 372
- var41 = new float[var18]; // L: 373
+ float[] var41 = null; // L: 354
+ if (this.field379 > 0) { // L: 355
+ var18 = var4 + this.field379 >> 2; // L: 356
+ var41 = new float[var18]; // L: 357
int var43;
- if (!this.field382) { // L: 374
- for (var19 = 0; var19 < this.field377; ++var19) { // L: 375
- var43 = var19 + (this.field380 >> 1); // L: 376
- var41[var19] += this.field379[var43]; // L: 377
+ if (!this.field360) { // L: 358
+ for (var19 = 0; var19 < this.field376; ++var19) { // L: 359
+ var43 = var19 + (this.field379 >> 1); // L: 360
+ var41[var19] += this.field389[var43]; // L: 361
}
}
- if (!var15) { // L: 380
- for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381
- var43 = var41.length - (var4 >> 1) + var19; // L: 382
- var41[var43] += field383[var19]; // L: 383
+ if (!var15) { // L: 364
+ for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365
+ var43 = var41.length - (var4 >> 1) + var19; // L: 366
+ var41[var43] += field380[var19]; // L: 367
}
}
}
- float[] var54 = this.field379; // L: 387
- this.field379 = field383; // L: 388
- field383 = var54; // L: 389
- this.field380 = var4; // L: 390
- this.field377 = var12 - (var4 >> 1); // L: 391
- this.field382 = var15; // L: 392
- return var41; // L: 393
+ float[] var54 = this.field389; // L: 371
+ this.field389 = field380; // L: 372
+ field380 = var54; // L: 373
+ this.field379 = var4; // L: 374
+ this.field376 = var12 - (var4 >> 1); // L: 375
+ this.field360 = var15; // L: 376
+ return var41; // L: 377
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "([I)Lak;"
+ descriptor = "([I)Laf;"
)
@Export("toRawSound")
RawSound toRawSound(int[] var1) {
- if (var1 != null && var1[0] <= 0) { // L: 421
+ if (var1 != null && var1[0] <= 0) { // L: 405
return null;
} else {
- if (this.samples == null) { // L: 422
- this.field380 = 0; // L: 423
- this.field379 = new float[VorbisSample_blockSize1]; // L: 424
- this.samples = new byte[this.sampleCount]; // L: 425
- this.field393 = 0; // L: 426
- this.field394 = 0; // L: 427
+ if (this.samples == null) { // L: 406
+ this.field379 = 0; // L: 407
+ this.field389 = new float[VorbisSample_blockSize1]; // L: 408
+ this.samples = new byte[this.sampleCount]; // L: 409
+ this.field392 = 0; // L: 410
+ this.field393 = 0; // L: 411
}
- for (; this.field394 < this.field368.length; ++this.field394) { // L: 429 444
- if (var1 != null && var1[0] <= 0) { // L: 430
+ for (; this.field393 < this.field361.length; ++this.field393) { // L: 413 428
+ if (var1 != null && var1[0] <= 0) { // L: 414
return null;
}
- float[] var2 = this.method999(this.field394); // L: 431
- if (var2 != null) { // L: 432
- int var3 = this.field393; // L: 433
- int var4 = var2.length; // L: 434
- if (var4 > this.sampleCount - var3) { // L: 435
+ float[] var2 = this.method991(this.field393); // L: 415
+ if (var2 != null) { // L: 416
+ int var3 = this.field392; // L: 417
+ int var4 = var2.length; // L: 418
+ if (var4 > this.sampleCount - var3) { // L: 419
var4 = this.sampleCount - var3;
}
- for (int var5 = 0; var5 < var4; ++var5) { // L: 436
- int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437
- if ((var6 & -256) != 0) { // L: 438
+ for (int var5 = 0; var5 < var4; ++var5) { // L: 420
+ int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421
+ if ((var6 & -256) != 0) { // L: 422
var6 = ~var6 >> 31;
}
- this.samples[var3++] = (byte)(var6 - 128); // L: 439
+ this.samples[var3++] = (byte)(var6 - 128); // L: 423
}
- if (var1 != null) { // L: 441
- var1[0] -= var3 - this.field393;
+ if (var1 != null) { // L: 425
+ var1[0] -= var3 - this.field392;
}
- this.field393 = var3; // L: 442
+ this.field392 = var3; // L: 426
}
}
- this.field379 = null; // L: 446
- byte[] var7 = this.samples; // L: 447
- this.samples = null; // L: 448
- return new RawSound(this.sampleRate, var7, this.start, this.end, this.field365); // L: 449
+ this.field389 = null; // L: 430
+ byte[] var7 = this.samples; // L: 431
+ this.samples = null; // L: 432
+ return new RawSound(this.sampleRate, var7, this.start, this.end, this.field378); // L: 433
}
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("float32Unpack")
static float float32Unpack(int var0) {
int var1 = var0 & 2097151; // L: 47
@@ -464,7 +464,7 @@ public class VorbisSample extends Node {
return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("VorbisSample_setData")
static void VorbisSample_setData(byte[] var0, int var1) {
VorbisSample_bytes = var0; // L: 55
@@ -472,7 +472,7 @@ public class VorbisSample extends Node {
VorbisSample_bitOffset = 0; // L: 57
} // L: 58
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("readBit")
static int readBit() {
int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61
@@ -482,7 +482,7 @@ public class VorbisSample extends Node {
return var0; // L: 65
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@Export("readBits")
static int readBits(int var0) {
int var1 = 0; // L: 69
@@ -507,12 +507,12 @@ public class VorbisSample extends Node {
return var1; // L: 85
}
- @ObfuscatedName("m")
- static void method998(byte[] var0) {
+ @ObfuscatedName("e")
+ static void method984(byte[] var0) {
VorbisSample_setData(var0, 0); // L: 114
VorbisSample_blockSize0 = 1 << readBits(4); // L: 115
VorbisSample_blockSize1 = 1 << readBits(4); // L: 116
- field383 = new float[VorbisSample_blockSize1]; // L: 117
+ field380 = new float[VorbisSample_blockSize1]; // L: 117
int var1;
int var2;
@@ -524,133 +524,124 @@ public class VorbisSample extends Node {
var3 = var2 >> 1; // L: 120
var4 = var2 >> 2; // L: 121
var5 = var2 >> 3; // L: 122
- float[] var18 = new float[var3]; // L: 123
+ float[] var12 = new float[var3]; // L: 123
for (int var7 = 0; var7 < var4; ++var7) { // L: 124
- var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125
- var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126
+ var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125
+ var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126
}
- float[] var19 = new float[var3]; // L: 128
+ float[] var13 = new float[var3]; // L: 128
for (int var8 = 0; var8 < var4; ++var8) { // L: 129
- var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130
- var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131
+ var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130
+ var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131
}
- float[] var20 = new float[var4]; // L: 133
+ float[] var14 = new float[var4]; // L: 133
for (int var9 = 0; var9 < var5; ++var9) { // L: 134
- var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135
- var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136
+ var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135
+ var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136
}
- int[] var21 = new int[var5]; // L: 138
- int var10 = class143.iLog(var5 - 1); // L: 139
+ int[] var15 = new int[var5]; // L: 138
+ int var10 = Messages.iLog(var5 - 1); // L: 139
for (int var11 = 0; var11 < var5; ++var11) { // L: 140
- int var15 = var11; // L: 144
- int var16 = var10; // L: 145
-
- int var17;
- for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151
- var17 = var17 << 1 | var15 & 1; // L: 149
- var15 >>>= 1; // L: 150
- }
-
- var21[var11] = var17; // L: 155
+ var15[var11] = KeyHandler.method302(var11, var10);
}
- if (var1 != 0) { // L: 157
- field387 = var18; // L: 158
- field388 = var19; // L: 159
- field389 = var20; // L: 160
- field391 = var21; // L: 161
+ if (var1 != 0) { // L: 141
+ field386 = var12; // L: 142
+ field387 = var13; // L: 143
+ field388 = var14; // L: 144
+ field375 = var15; // L: 145
} else {
- field384 = var18; // L: 164
- field378 = var19; // L: 165
- field386 = var20; // L: 166
- field369 = var21; // L: 167
+ field383 = var12; // L: 148
+ field384 = var13; // L: 149
+ field385 = var14; // L: 150
+ field371 = var15; // L: 151
}
}
- var1 = readBits(8) + 1; // L: 170
- VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171
+ var1 = readBits(8) + 1; // L: 154
+ VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155
- for (var2 = 0; var2 < var1; ++var2) { // L: 172
+ for (var2 = 0; var2 < var1; ++var2) { // L: 156
VorbisSample_codebooks[var2] = new VorbisCodebook();
}
- var2 = readBits(6) + 1; // L: 174
+ var2 = readBits(6) + 1; // L: 158
- for (var3 = 0; var3 < var2; ++var3) { // L: 175
+ for (var3 = 0; var3 < var2; ++var3) { // L: 159
readBits(16);
}
- var2 = readBits(6) + 1; // L: 177
- VorbisSample_floors = new VorbisFloor[var2]; // L: 178
+ var2 = readBits(6) + 1; // L: 161
+ VorbisSample_floors = new VorbisFloor[var2]; // L: 162
- for (var3 = 0; var3 < var2; ++var3) { // L: 179
+ for (var3 = 0; var3 < var2; ++var3) { // L: 163
VorbisSample_floors[var3] = new VorbisFloor();
}
- var3 = readBits(6) + 1; // L: 180
- VorbisSample_residues = new VorbisResidue[var3]; // L: 181
+ var3 = readBits(6) + 1; // L: 164
+ VorbisSample_residues = new VorbisResidue[var3]; // L: 165
- for (var4 = 0; var4 < var3; ++var4) { // L: 182
+ for (var4 = 0; var4 < var3; ++var4) { // L: 166
VorbisSample_residues[var4] = new VorbisResidue();
}
- var4 = readBits(6) + 1; // L: 183
- VorbisSample_mappings = new VorbisMapping[var4]; // L: 184
+ var4 = readBits(6) + 1; // L: 167
+ VorbisSample_mappings = new VorbisMapping[var4]; // L: 168
- for (var5 = 0; var5 < var4; ++var5) { // L: 185
+ for (var5 = 0; var5 < var4; ++var5) { // L: 169
VorbisSample_mappings[var5] = new VorbisMapping();
}
- var5 = readBits(6) + 1; // L: 186
- VorbisSample_blockFlags = new boolean[var5]; // L: 187
- VorbisSample_mapping = new int[var5]; // L: 188
+ var5 = readBits(6) + 1; // L: 170
+ VorbisSample_blockFlags = new boolean[var5]; // L: 171
+ VorbisSample_mapping = new int[var5]; // L: 172
- for (int var6 = 0; var6 < var5; ++var6) { // L: 189
- VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190
- readBits(16); // L: 191
- readBits(16); // L: 192
- VorbisSample_mapping[var6] = readBits(8); // L: 193
+ for (int var6 = 0; var6 < var5; ++var6) { // L: 173
+ VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174
+ readBits(16); // L: 175
+ readBits(16); // L: 176
+ VorbisSample_mapping[var6] = readBits(8); // L: 177
}
- } // L: 195
+ } // L: 179
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(Llp;)Z"
+ descriptor = "(Llh;)Z"
)
- static boolean method1000(AbstractArchive var0) {
- if (!field373) { // L: 397
- byte[] var1 = var0.takeFile(0, 0); // L: 398
- if (var1 == null) { // L: 399
+ static boolean method970(AbstractArchive var0) {
+ if (!field377) { // L: 381
+ byte[] var1 = var0.takeFile(0, 0); // L: 382
+ if (var1 == null) { // L: 383
return false;
}
- method998(var1); // L: 400
- field373 = true; // L: 401
+ method984(var1); // L: 384
+ field377 = true; // L: 385
}
- return true; // L: 403
+ return true; // L: 387
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Llp;II)Laa;"
+ descriptor = "(Llh;II)Laa;"
)
@Export("readMusicSample")
static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) {
- if (!method1000(var0)) { // L: 407
- var0.tryLoadFile(var1, var2); // L: 408
- return null; // L: 409
+ if (!method970(var0)) { // L: 391
+ var0.tryLoadFile(var1, var2); // L: 392
+ return null; // L: 393
} else {
- byte[] var3 = var0.takeFile(var1, var2); // L: 411
- return var3 == null ? null : new VorbisSample(var3); // L: 412
+ byte[] var3 = var0.takeFile(var1, var2); // L: 395
+ return var3 == null ? null : new VorbisSample(var3); // L: 396
}
}
}
diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java
index 2f30542bb5..566e7f1651 100644
--- a/runescape-client/src/main/java/WallDecoration.java
+++ b/runescape-client/src/main/java/WallDecoration.java
@@ -4,81 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hf")
+@ObfuscatedName("hr")
@Implements("WallDecoration")
public final class WallDecoration {
@ObfuscatedName("c")
- @Export("Tiles_lightness")
- static int[] Tiles_lightness;
- @ObfuscatedName("ia")
- @ObfuscatedSignature(
- descriptor = "[Lqr;"
- )
- @Export("mapDotSprites")
- static SpritePixels[] mapDotSprites;
- @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = 1133434607
+ intValue = 1818161665
)
@Export("z")
int z;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -468638571
+ intValue = -394717143
)
@Export("x")
int x;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1248756677
+ intValue = -732373363
)
@Export("y")
int y;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 1886236557
+ intValue = -568181089
)
@Export("orientation")
int orientation;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -665264033
+ intValue = 1054718707
)
@Export("orientation2")
int orientation2;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -884502203
+ intValue = -1599500981
)
@Export("xOffset")
int xOffset;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -553687171
+ intValue = -1858126929
)
@Export("yOffset")
int yOffset;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("renderable1")
public Renderable renderable1;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Lgx;"
+ descriptor = "Lgj;"
)
@Export("renderable2")
public Renderable renderable2;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- longValue = -451444878306106685L
+ longValue = 1587928550129983111L
)
@Export("tag")
public long tag;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = 1120239
+ intValue = 1186627599
)
@Export("flags")
int flags;
@@ -88,63 +79,12 @@ public final class WallDecoration {
this.flags = 0; // L: 14
} // L: 16
- @ObfuscatedName("q")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Ljj;Lqh;B)Ljm;",
- garbageValue = "-72"
+ descriptor = "(IB)Z",
+ garbageValue = "106"
)
- @Export("getPacketBufferNode")
- public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
- PacketBufferNode var2 = FloorOverlayDefinition.method3700(); // L: 27
- var2.clientPacket = var0; // L: 28
- var2.clientPacketLength = var0.length; // L: 29
- if (var2.clientPacketLength == -1) { // L: 30
- var2.packetBuffer = new PacketBuffer(260);
- } else if (var2.clientPacketLength == -2) {
- var2.packetBuffer = new PacketBuffer(10000); // L: 31
- } else if (var2.clientPacketLength <= 18) { // L: 32
- var2.packetBuffer = new PacketBuffer(20);
- } else if (var2.clientPacketLength <= 98) { // L: 33
- var2.packetBuffer = new PacketBuffer(100);
- } else {
- var2.packetBuffer = new PacketBuffer(260); // L: 34
- }
-
- var2.packetBuffer.setIsaacCipher(var1); // L: 35
- var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36
- var2.index = 0; // L: 37
- return var2; // L: 38
- }
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-811937066"
- )
- static final int method4391() {
- return ViewportMouse.ViewportMouse_y; // L: 106
- }
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;II)V",
- garbageValue = "1555036135"
- )
- static final void method4392(String var0, int var1) {
- PacketBufferNode var2 = getPacketBufferNode(ClientPacket.field3026, Client.packetWriter.isaacCipher); // L: 236
- var2.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 237
- var2.packetBuffer.method7542(var1); // L: 238
- var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 239
- Client.packetWriter.addNode(var2); // L: 240
- } // L: 241
-
- @ObfuscatedName("jv")
- @ObfuscatedSignature(
- descriptor = "(S)Z",
- garbageValue = "20695"
- )
- @Export("getTapToDrop")
- static boolean getTapToDrop() {
- return Client.tapToDrop; // L: 11200
+ public static boolean method4551(int var0) {
+ return (var0 >> 22 & 1) != 0; // L: 29
}
}
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index a81b37936a..4faab18b95 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -7,718 +7,716 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ki")
+@ObfuscatedName("kb")
@Implements("Widget")
public class Widget extends Node {
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
- @Export("Widget_cachedSprites")
- public static EvictingDualNodeHashTable Widget_cachedSprites;
- @ObfuscatedName("ag")
+ public static EvictingDualNodeHashTable field3360;
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
- @Export("Widget_cachedModels")
- public static EvictingDualNodeHashTable Widget_cachedModels;
- @ObfuscatedName("ar")
+ public static EvictingDualNodeHashTable field3361;
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
- @Export("Widget_cachedFonts")
- public static EvictingDualNodeHashTable Widget_cachedFonts;
- @ObfuscatedName("am")
+ @Export("archive0")
+ public static EvictingDualNodeHashTable archive0;
+ @ObfuscatedName("al")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
- @Export("Widget_cachedSpriteMasks")
- public static EvictingDualNodeHashTable Widget_cachedSpriteMasks;
- @ObfuscatedName("ac")
+ @Export("archive1")
+ public static EvictingDualNodeHashTable archive1;
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "Lmh;"
+ descriptor = "Lmy;"
)
- static class362 field3390;
+ static class361 field3364;
@ObfuscatedName("ab")
@ObfuscatedSignature(
- descriptor = "Lmh;"
+ descriptor = "Lmy;"
)
- static class362 field3378;
- @ObfuscatedName("aj")
- public static boolean field3407;
- @ObfuscatedName("ae")
+ static class361 field3434;
+ @ObfuscatedName("ap")
+ public static boolean field3366;
+ @ObfuscatedName("ac")
@Export("isIf3")
public boolean isIf3;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@ObfuscatedGetter(
- intValue = 1115174973
+ intValue = -1038587213
)
@Export("id")
public int id;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedGetter(
- intValue = -776270713
+ intValue = 9919479
)
@Export("childIndex")
public int childIndex;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = -1972844397
+ intValue = -1118126063
)
@Export("type")
public int type;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = 235823181
+ intValue = 415919075
)
@Export("buttonType")
public int buttonType;
- @ObfuscatedName("ak")
+ @ObfuscatedName("af")
@ObfuscatedGetter(
- intValue = -388100275
+ intValue = -862979207
)
@Export("contentType")
public int contentType;
- @ObfuscatedName("af")
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = -396062445
+ intValue = 1309107069
)
@Export("xAlignment")
public int xAlignment;
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@ObfuscatedGetter(
- intValue = 678418613
+ intValue = -1417249065
)
@Export("yAlignment")
public int yAlignment;
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@ObfuscatedGetter(
- intValue = 1351515849
+ intValue = 273105613
)
@Export("widthAlignment")
public int widthAlignment;
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@ObfuscatedGetter(
- intValue = 1340623801
+ intValue = -1091004413
)
@Export("heightAlignment")
public int heightAlignment;
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@ObfuscatedGetter(
- intValue = 1043867923
+ intValue = 1898110743
)
@Export("rawX")
public int rawX;
- @ObfuscatedName("aw")
+ @ObfuscatedName("ah")
@ObfuscatedGetter(
- intValue = -2102072707
+ intValue = -1869502249
)
@Export("rawY")
public int rawY;
- @ObfuscatedName("ah")
+ @ObfuscatedName("ai")
@ObfuscatedGetter(
- intValue = -1127967955
+ intValue = 1783254653
)
@Export("rawWidth")
public int rawWidth;
- @ObfuscatedName("ao")
+ @ObfuscatedName("az")
@ObfuscatedGetter(
- intValue = 232379525
+ intValue = 1196896537
)
@Export("rawHeight")
public int rawHeight;
@ObfuscatedName("av")
@ObfuscatedGetter(
- intValue = 1835485941
+ intValue = 1812498029
)
@Export("x")
public int x;
- @ObfuscatedName("ai")
+ @ObfuscatedName("aw")
@ObfuscatedGetter(
- intValue = -2009390011
+ intValue = -2082347123
)
@Export("y")
public int y;
- @ObfuscatedName("ay")
+ @ObfuscatedName("au")
@ObfuscatedGetter(
- intValue = -1172311447
+ intValue = 2092161229
)
@Export("width")
public int width;
@ObfuscatedName("aa")
@ObfuscatedGetter(
- intValue = -459533989
+ intValue = 236010991
)
@Export("height")
public int height;
- @ObfuscatedName("ax")
+ @ObfuscatedName("ay")
@ObfuscatedGetter(
- intValue = -2136321081
+ intValue = 1874017121
)
- public int field3411;
- @ObfuscatedName("at")
+ public int field3385;
+ @ObfuscatedName("as")
@ObfuscatedGetter(
- intValue = 1059357481
+ intValue = -172663443
)
- public int field3494;
- @ObfuscatedName("br")
+ public int field3386;
+ @ObfuscatedName("be")
@ObfuscatedGetter(
- intValue = -906080451
+ intValue = 838621367
)
@Export("parentId")
public int parentId;
- @ObfuscatedName("ba")
+ @ObfuscatedName("bz")
@Export("isHidden")
public boolean isHidden;
- @ObfuscatedName("bk")
+ @ObfuscatedName("bp")
@ObfuscatedGetter(
- intValue = 577252931
+ intValue = -493284763
)
@Export("scrollX")
public int scrollX;
- @ObfuscatedName("bi")
+ @ObfuscatedName("bf")
@ObfuscatedGetter(
- intValue = -1581918007
+ intValue = 1748495919
)
@Export("scrollY")
public int scrollY;
- @ObfuscatedName("bc")
+ @ObfuscatedName("bg")
@ObfuscatedGetter(
- intValue = 1123320165
+ intValue = 1791635595
)
@Export("scrollWidth")
public int scrollWidth;
- @ObfuscatedName("bo")
+ @ObfuscatedName("br")
@ObfuscatedGetter(
- intValue = -578131215
+ intValue = -1042306339
)
@Export("scrollHeight")
public int scrollHeight;
- @ObfuscatedName("bl")
+ @ObfuscatedName("bn")
@ObfuscatedGetter(
- intValue = -979741419
+ intValue = -1451576805
)
@Export("color")
public int color;
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@ObfuscatedGetter(
- intValue = -792649141
+ intValue = 188440311
)
@Export("color2")
public int color2;
- @ObfuscatedName("bx")
+ @ObfuscatedName("bc")
@ObfuscatedGetter(
- intValue = 387100237
+ intValue = -2054568339
)
@Export("mouseOverColor")
public int mouseOverColor;
- @ObfuscatedName("bd")
+ @ObfuscatedName("bl")
@ObfuscatedGetter(
- intValue = -554834039
+ intValue = -20212915
)
@Export("mouseOverColor2")
public int mouseOverColor2;
- @ObfuscatedName("bj")
+ @ObfuscatedName("bv")
@Export("fill")
public boolean fill;
- @ObfuscatedName("be")
+ @ObfuscatedName("bt")
@ObfuscatedSignature(
- descriptor = "Lqw;"
+ descriptor = "Lqy;"
)
@Export("fillMode")
public FillMode fillMode;
- @ObfuscatedName("bf")
+ @ObfuscatedName("bh")
@ObfuscatedGetter(
- intValue = -193710345
+ intValue = -1829670381
)
@Export("transparencyTop")
public int transparencyTop;
- @ObfuscatedName("bz")
+ @ObfuscatedName("bs")
@ObfuscatedGetter(
- intValue = 992811287
+ intValue = 1998673549
)
@Export("transparencyBot")
public int transparencyBot;
- @ObfuscatedName("bv")
+ @ObfuscatedName("bk")
@ObfuscatedGetter(
- intValue = 184656457
+ intValue = 836809511
)
@Export("lineWid")
public int lineWid;
- @ObfuscatedName("bt")
- public boolean field3428;
- @ObfuscatedName("bu")
+ @ObfuscatedName("bb")
+ public boolean field3402;
+ @ObfuscatedName("ba")
@ObfuscatedGetter(
- intValue = -2014760189
+ intValue = -1629333209
)
@Export("spriteId2")
public int spriteId2;
- @ObfuscatedName("bq")
+ @ObfuscatedName("bu")
@ObfuscatedGetter(
- intValue = 286536551
+ intValue = 1981513631
)
@Export("spriteId")
public int spriteId;
- @ObfuscatedName("bh")
- public String field3431;
- @ObfuscatedName("bb")
+ @ObfuscatedName("bw")
+ public String field3405;
+ @ObfuscatedName("bi")
@ObfuscatedGetter(
- intValue = 1597579983
+ intValue = 1810600515
)
@Export("spriteAngle")
public int spriteAngle;
- @ObfuscatedName("bm")
+ @ObfuscatedName("bo")
@Export("spriteTiling")
public boolean spriteTiling;
- @ObfuscatedName("by")
+ @ObfuscatedName("bx")
@ObfuscatedGetter(
- intValue = 346905275
+ intValue = 1694605707
)
@Export("outline")
public int outline;
- @ObfuscatedName("bn")
+ @ObfuscatedName("bm")
@ObfuscatedGetter(
- intValue = -460120439
+ intValue = -85393371
)
@Export("spriteShadow")
public int spriteShadow;
- @ObfuscatedName("bg")
+ @ObfuscatedName("by")
@Export("spriteFlipV")
public boolean spriteFlipV;
- @ObfuscatedName("bp")
+ @ObfuscatedName("bj")
@Export("spriteFlipH")
public boolean spriteFlipH;
- @ObfuscatedName("bw")
+ @ObfuscatedName("bd")
@ObfuscatedGetter(
- intValue = 2112595825
+ intValue = -995090603
)
@Export("modelType")
public int modelType;
- @ObfuscatedName("co")
+ @ObfuscatedName("cr")
@ObfuscatedGetter(
- intValue = 288041705
+ intValue = -1782143991
)
@Export("modelId")
public int modelId;
- @ObfuscatedName("ck")
+ @ObfuscatedName("cq")
@ObfuscatedGetter(
- intValue = -1783833135
+ intValue = 1290197811
)
@Export("modelType2")
int modelType2;
- @ObfuscatedName("cr")
+ @ObfuscatedName("cw")
@ObfuscatedGetter(
- intValue = 1672879833
+ intValue = 656981263
)
@Export("modelId2")
int modelId2;
- @ObfuscatedName("cv")
+ @ObfuscatedName("cx")
@ObfuscatedGetter(
- intValue = 1814404803
+ intValue = 2070609235
)
@Export("sequenceId")
public int sequenceId;
- @ObfuscatedName("cs")
+ @ObfuscatedName("cc")
@ObfuscatedGetter(
- intValue = 2098504379
+ intValue = -256587501
)
@Export("sequenceId2")
public int sequenceId2;
@ObfuscatedName("cm")
@ObfuscatedGetter(
- intValue = 509392171
+ intValue = -1012716483
)
@Export("modelOffsetX")
public int modelOffsetX;
- @ObfuscatedName("ca")
+ @ObfuscatedName("ci")
@ObfuscatedGetter(
- intValue = -164846883
+ intValue = -572856693
)
@Export("modelOffsetY")
public int modelOffsetY;
- @ObfuscatedName("ci")
+ @ObfuscatedName("cg")
@ObfuscatedGetter(
- intValue = 1338987037
+ intValue = 477045813
)
@Export("modelAngleX")
public int modelAngleX;
- @ObfuscatedName("cx")
+ @ObfuscatedName("cj")
@ObfuscatedGetter(
- intValue = -245886579
+ intValue = 1709788917
)
@Export("modelAngleY")
public int modelAngleY;
- @ObfuscatedName("cn")
+ @ObfuscatedName("cp")
@ObfuscatedGetter(
- intValue = 1535139247
+ intValue = 318324183
)
@Export("modelAngleZ")
public int modelAngleZ;
- @ObfuscatedName("cc")
+ @ObfuscatedName("cf")
@ObfuscatedGetter(
- intValue = 1846491567
+ intValue = 2138854643
)
@Export("modelZoom")
public int modelZoom;
- @ObfuscatedName("cy")
+ @ObfuscatedName("cv")
@ObfuscatedGetter(
- intValue = 399903033
+ intValue = 257878607
)
- public int field3406;
- @ObfuscatedName("ct")
+ public int field3424;
+ @ObfuscatedName("cn")
@ObfuscatedGetter(
- intValue = -891150003
+ intValue = -408566491
)
- public int field3451;
- @ObfuscatedName("cd")
+ public int field3373;
+ @ObfuscatedName("co")
@Export("modelOrthog")
public boolean modelOrthog;
- @ObfuscatedName("cw")
+ @ObfuscatedName("cz")
@Export("modelTransparency")
public boolean modelTransparency;
- @ObfuscatedName("cf")
+ @ObfuscatedName("cu")
@ObfuscatedGetter(
- intValue = 2138903919
+ intValue = -1937000389
)
@Export("itemQuantityMode")
public int itemQuantityMode;
- @ObfuscatedName("cq")
+ @ObfuscatedName("ce")
@ObfuscatedGetter(
- intValue = -1797182937
+ intValue = 113073421
)
@Export("fontId")
public int fontId;
- @ObfuscatedName("cg")
+ @ObfuscatedName("cy")
@Export("text")
public String text;
- @ObfuscatedName("cl")
+ @ObfuscatedName("ca")
@Export("text2")
public String text2;
- @ObfuscatedName("cu")
+ @ObfuscatedName("ck")
@ObfuscatedGetter(
- intValue = 1967727263
+ intValue = -743795135
)
@Export("textLineHeight")
public int textLineHeight;
- @ObfuscatedName("ch")
+ @ObfuscatedName("cb")
@ObfuscatedGetter(
- intValue = 1185644193
+ intValue = -1036288673
)
@Export("textXAlignment")
public int textXAlignment;
- @ObfuscatedName("cz")
+ @ObfuscatedName("cs")
@ObfuscatedGetter(
- intValue = -1879071397
+ intValue = -933475705
)
@Export("textYAlignment")
public int textYAlignment;
- @ObfuscatedName("ce")
+ @ObfuscatedName("cd")
@Export("textShadowed")
public boolean textShadowed;
- @ObfuscatedName("cj")
+ @ObfuscatedName("cl")
@ObfuscatedGetter(
- intValue = 1427227403
+ intValue = 1948142259
)
@Export("paddingX")
public int paddingX;
- @ObfuscatedName("cb")
+ @ObfuscatedName("ct")
@ObfuscatedGetter(
- intValue = -91862955
+ intValue = 1944775287
)
@Export("paddingY")
public int paddingY;
- @ObfuscatedName("cp")
+ @ObfuscatedName("ch")
@Export("inventoryXOffsets")
public int[] inventoryXOffsets;
- @ObfuscatedName("dc")
+ @ObfuscatedName("dm")
@Export("inventoryYOffsets")
public int[] inventoryYOffsets;
- @ObfuscatedName("dp")
+ @ObfuscatedName("dd")
@Export("inventorySprites")
public int[] inventorySprites;
- @ObfuscatedName("dg")
+ @ObfuscatedName("dz")
@Export("itemActions")
public String[] itemActions;
- @ObfuscatedName("dy")
+ @ObfuscatedName("dr")
@ObfuscatedSignature(
- descriptor = "Leq;"
+ descriptor = "Les;"
)
- class155 field3408;
- @ObfuscatedName("dh")
+ class155 field3483;
+ @ObfuscatedName("dv")
@ObfuscatedGetter(
- intValue = -1702458807
+ intValue = 1506293413
)
- int field3391;
- @ObfuscatedName("dj")
- HashMap field3470;
- @ObfuscatedName("dx")
- HashMap field3471;
- @ObfuscatedName("do")
+ int field3443;
+ @ObfuscatedName("dy")
+ HashMap field3403;
+ @ObfuscatedName("ds")
+ HashMap field3415;
+ @ObfuscatedName("dp")
@ObfuscatedGetter(
- intValue = 1159870601
+ intValue = -2070315127
)
@Export("flags")
public int flags;
- @ObfuscatedName("di")
- public boolean field3473;
- @ObfuscatedName("de")
- public byte[][] field3474;
- @ObfuscatedName("db")
- public byte[][] field3419;
+ @ObfuscatedName("dx")
+ public boolean field3498;
+ @ObfuscatedName("dl")
+ public byte[][] field3448;
+ @ObfuscatedName("dc")
+ public byte[][] field3406;
@ObfuscatedName("dn")
- public int[] field3476;
- @ObfuscatedName("dz")
- public int[] field3481;
- @ObfuscatedName("ds")
+ public int[] field3450;
+ @ObfuscatedName("do")
+ public int[] field3451;
+ @ObfuscatedName("da")
@Export("dataText")
public String dataText;
- @ObfuscatedName("dt")
+ @ObfuscatedName("df")
@Export("actions")
public String[] actions;
- @ObfuscatedName("df")
+ @ObfuscatedName("dj")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lkb;"
)
@Export("parent")
public Widget parent;
- @ObfuscatedName("dm")
+ @ObfuscatedName("dk")
@ObfuscatedGetter(
- intValue = -899991807
+ intValue = 457867783
)
@Export("dragZoneSize")
public int dragZoneSize;
- @ObfuscatedName("dq")
+ @ObfuscatedName("du")
@ObfuscatedGetter(
- intValue = 799594581
+ intValue = -1514522147
)
@Export("dragThreshold")
public int dragThreshold;
- @ObfuscatedName("dw")
+ @ObfuscatedName("db")
@Export("isScrollBar")
public boolean isScrollBar;
- @ObfuscatedName("dk")
+ @ObfuscatedName("dh")
@Export("spellActionName")
public String spellActionName;
- @ObfuscatedName("du")
+ @ObfuscatedName("de")
@Export("hasListener")
public boolean hasListener;
- @ObfuscatedName("em")
+ @ObfuscatedName("ew")
@Export("onLoad")
public Object[] onLoad;
- @ObfuscatedName("eh")
+ @ObfuscatedName("ej")
@Export("onClick")
public Object[] onClick;
- @ObfuscatedName("ej")
+ @ObfuscatedName("eb")
@Export("onClickRepeat")
public Object[] onClickRepeat;
- @ObfuscatedName("en")
+ @ObfuscatedName("ez")
@Export("onRelease")
public Object[] onRelease;
- @ObfuscatedName("eb")
+ @ObfuscatedName("eg")
@Export("onHold")
public Object[] onHold;
@ObfuscatedName("ea")
@Export("onMouseOver")
public Object[] onMouseOver;
- @ObfuscatedName("er")
+ @ObfuscatedName("ed")
@Export("onMouseRepeat")
public Object[] onMouseRepeat;
@ObfuscatedName("eo")
@Export("onMouseLeave")
public Object[] onMouseLeave;
- @ObfuscatedName("ec")
+ @ObfuscatedName("eq")
@Export("onDrag")
public Object[] onDrag;
- @ObfuscatedName("ek")
+ @ObfuscatedName("en")
@Export("onDragComplete")
public Object[] onDragComplete;
- @ObfuscatedName("ed")
+ @ObfuscatedName("ei")
@Export("onTargetEnter")
public Object[] onTargetEnter;
- @ObfuscatedName("ew")
+ @ObfuscatedName("ec")
@Export("onTargetLeave")
public Object[] onTargetLeave;
- @ObfuscatedName("ev")
+ @ObfuscatedName("eh")
@Export("onVarTransmit")
public Object[] onVarTransmit;
- @ObfuscatedName("el")
+ @ObfuscatedName("ek")
@Export("varTransmitTriggers")
public int[] varTransmitTriggers;
- @ObfuscatedName("ef")
+ @ObfuscatedName("el")
@Export("onInvTransmit")
public Object[] onInvTransmit;
- @ObfuscatedName("ee")
+ @ObfuscatedName("eu")
@Export("invTransmitTriggers")
public int[] invTransmitTriggers;
- @ObfuscatedName("es")
+ @ObfuscatedName("ep")
@Export("onStatTransmit")
public Object[] onStatTransmit;
- @ObfuscatedName("eg")
+ @ObfuscatedName("em")
@Export("statTransmitTriggers")
public int[] statTransmitTriggers;
- @ObfuscatedName("et")
+ @ObfuscatedName("ex")
@Export("onTimer")
public Object[] onTimer;
- @ObfuscatedName("ex")
+ @ObfuscatedName("ey")
@Export("onOp")
public Object[] onOp;
- @ObfuscatedName("ei")
+ @ObfuscatedName("ev")
@Export("onScroll")
public Object[] onScroll;
- @ObfuscatedName("ey")
+ @ObfuscatedName("ee")
@Export("onChatTransmit")
public Object[] onChatTransmit;
- @ObfuscatedName("ep")
+ @ObfuscatedName("ef")
@Export("onKey")
public Object[] onKey;
- @ObfuscatedName("eu")
- public Object[] field3443;
- @ObfuscatedName("ez")
- public Object[] field3510;
- @ObfuscatedName("eq")
+ @ObfuscatedName("er")
+ public Object[] field3516;
+ @ObfuscatedName("et")
+ public Object[] field3513;
+ @ObfuscatedName("es")
@Export("onFriendTransmit")
public Object[] onFriendTransmit;
- @ObfuscatedName("fs")
+ @ObfuscatedName("fr")
@Export("onClanTransmit")
public Object[] onClanTransmit;
- @ObfuscatedName("fp")
- public Object[] field3513;
- @ObfuscatedName("fy")
- public Object[] field3456;
- @ObfuscatedName("fg")
+ @ObfuscatedName("fz")
+ public Object[] field3365;
+ @ObfuscatedName("fh")
+ public Object[] field3353;
+ @ObfuscatedName("fw")
@Export("onMiscTransmit")
public Object[] onMiscTransmit;
- @ObfuscatedName("fd")
+ @ObfuscatedName("fb")
@Export("onDialogAbort")
public Object[] onDialogAbort;
- @ObfuscatedName("fh")
+ @ObfuscatedName("fn")
@Export("onSubChange")
public Object[] onSubChange;
- @ObfuscatedName("fv")
+ @ObfuscatedName("fl")
@Export("onResize")
public Object[] onResize;
@ObfuscatedName("ff")
@Export("onStockTransmit")
public Object[] onStockTransmit;
- @ObfuscatedName("fz")
- public Object[] field3520;
- @ObfuscatedName("fl")
- public Object[] field3460;
- @ObfuscatedName("fq")
+ @ObfuscatedName("fm")
+ public Object[] field3494;
+ @ObfuscatedName("fo")
+ public Object[] field3495;
+ @ObfuscatedName("fv")
@Export("cs1Instructions")
public int[][] cs1Instructions;
- @ObfuscatedName("fo")
+ @ObfuscatedName("fy")
@Export("cs1Comparisons")
public int[] cs1Comparisons;
- @ObfuscatedName("fn")
+ @ObfuscatedName("fc")
@Export("cs1ComparisonValues")
public int[] cs1ComparisonValues;
- @ObfuscatedName("ft")
+ @ObfuscatedName("fp")
@ObfuscatedGetter(
- intValue = -1959307231
+ intValue = 1995877883
)
@Export("mouseOverRedirect")
public int mouseOverRedirect;
- @ObfuscatedName("fi")
+ @ObfuscatedName("fa")
@Export("spellName")
public String spellName;
- @ObfuscatedName("fx")
+ @ObfuscatedName("fg")
@Export("buttonText")
public String buttonText;
- @ObfuscatedName("fe")
+ @ObfuscatedName("fi")
@Export("itemIds")
public int[] itemIds;
- @ObfuscatedName("fb")
+ @ObfuscatedName("fe")
@Export("itemQuantities")
public int[] itemQuantities;
- @ObfuscatedName("fr")
+ @ObfuscatedName("fu")
@ObfuscatedGetter(
- intValue = -756375481
+ intValue = 402623915
)
@Export("itemId")
public int itemId;
- @ObfuscatedName("fu")
+ @ObfuscatedName("fs")
@ObfuscatedGetter(
- intValue = -572001819
+ intValue = 1163106397
)
@Export("itemQuantity")
public int itemQuantity;
- @ObfuscatedName("fc")
+ @ObfuscatedName("fk")
@ObfuscatedGetter(
- intValue = 564625883
+ intValue = -433476253
)
@Export("modelFrame")
public int modelFrame;
@ObfuscatedName("fj")
@ObfuscatedGetter(
- intValue = 1825821707
+ intValue = 1260061199
)
@Export("modelFrameCycle")
public int modelFrameCycle;
- @ObfuscatedName("fm")
+ @ObfuscatedName("ft")
@ObfuscatedSignature(
- descriptor = "[Lki;"
+ descriptor = "[Lkb;"
)
@Export("children")
public Widget[] children;
- @ObfuscatedName("fk")
+ @ObfuscatedName("fx")
@Export("containsMouse")
public boolean containsMouse;
- @ObfuscatedName("fw")
+ @ObfuscatedName("fd")
@Export("isClicked")
public boolean isClicked;
- @ObfuscatedName("fa")
+ @ObfuscatedName("fq")
@ObfuscatedGetter(
- intValue = -773430937
+ intValue = -991745953
)
- public int field3524;
- @ObfuscatedName("gj")
+ public int field3426;
+ @ObfuscatedName("gx")
@ObfuscatedGetter(
- intValue = 1877978217
+ intValue = 1109857383
)
- public int field3538;
- @ObfuscatedName("ge")
+ public int field3512;
+ @ObfuscatedName("gf")
@ObfuscatedGetter(
- intValue = -486342891
+ intValue = -666577749
)
- public int field3539;
- @ObfuscatedName("gv")
+ public int field3367;
+ @ObfuscatedName("gi")
@ObfuscatedGetter(
- intValue = -1612828663
+ intValue = -6385865
)
- public int field3540;
- @ObfuscatedName("gp")
+ public int field3514;
+ @ObfuscatedName("gr")
@ObfuscatedGetter(
- intValue = -1878678007
+ intValue = 1568734049
)
@Export("rootIndex")
public int rootIndex;
@ObfuscatedName("gk")
@ObfuscatedGetter(
- intValue = -2036768027
+ intValue = 426616237
)
@Export("cycle")
public int cycle;
- @ObfuscatedName("gy")
- public int[] field3527;
- @ObfuscatedName("gl")
+ @ObfuscatedName("gs")
+ public int[] field3517;
+ @ObfuscatedName("gp")
@Export("noClickThrough")
public boolean noClickThrough;
- @ObfuscatedName("gi")
+ @ObfuscatedName("gc")
@Export("noScrollThrough")
public boolean noScrollThrough;
- @ObfuscatedName("gq")
+ @ObfuscatedName("gv")
@Export("prioritizeMenuEntry")
public boolean prioritizeMenuEntry;
static {
- Widget_cachedSprites = new EvictingDualNodeHashTable(200); // L: 52
- Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 53
- Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 54
- Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 55
- field3390 = new class362(10, class360.field4274); // L: 56
- field3378 = new class362(10, class360.field4274); // L: 57
- field3407 = false; // L: 58
+ field3360 = new EvictingDualNodeHashTable(200); // L: 52
+ field3361 = new EvictingDualNodeHashTable(50); // L: 53
+ archive0 = new EvictingDualNodeHashTable(20); // L: 54
+ archive1 = new EvictingDualNodeHashTable(8); // L: 55
+ field3364 = new class361(10, class359.field4260); // L: 56
+ field3434 = new class361(10, class359.field4260); // L: 57
+ field3366 = false; // L: 58
}
public Widget() {
@@ -739,8 +737,8 @@ public class Widget extends Node {
this.y = 0; // L: 74
this.width = 0; // L: 75
this.height = 0; // L: 76
- this.field3411 = 1; // L: 77
- this.field3494 = 1; // L: 78
+ this.field3385 = 1; // L: 77
+ this.field3386 = 1; // L: 78
this.parentId = -1; // L: 79
this.isHidden = false; // L: 80
this.scrollX = 0; // L: 81
@@ -756,7 +754,7 @@ public class Widget extends Node {
this.transparencyTop = 0; // L: 91
this.transparencyBot = 0; // L: 92
this.lineWid = 1; // L: 93
- this.field3428 = false; // L: 94
+ this.field3402 = false; // L: 94
this.spriteId2 = -1; // L: 95
this.spriteId = -1; // L: 96
this.spriteAngle = 0; // L: 98
@@ -775,8 +773,8 @@ public class Widget extends Node {
this.modelAngleY = 0; // L: 113
this.modelAngleZ = 0; // L: 114
this.modelZoom = 100; // L: 115
- this.field3406 = 0; // L: 116
- this.field3451 = 0; // L: 117
+ this.field3424 = 0; // L: 116
+ this.field3373 = 0; // L: 117
this.modelOrthog = false; // L: 118
this.modelTransparency = false; // L: 119
this.itemQuantityMode = 2; // L: 120
@@ -789,9 +787,9 @@ public class Widget extends Node {
this.textShadowed = false; // L: 127
this.paddingX = 0; // L: 128
this.paddingY = 0; // L: 129
- this.field3391 = -1; // L: 135
+ this.field3443 = -1; // L: 135
this.flags = 0; // L: 139
- this.field3473 = false; // L: 140
+ this.field3498 = false; // L: 140
this.dataText = ""; // L: 149
this.parent = null; // L: 151
this.dragZoneSize = 0; // L: 152
@@ -808,10 +806,10 @@ public class Widget extends Node {
this.modelFrameCycle = 0; // L: 204
this.containsMouse = false; // L: 206
this.isClicked = false; // L: 207
- this.field3524 = -1; // L: 208
- this.field3538 = 0; // L: 209
- this.field3539 = 0; // L: 210
- this.field3540 = 0; // L: 211
+ this.field3426 = -1; // L: 208
+ this.field3512 = 0; // L: 209
+ this.field3367 = 0; // L: 210
+ this.field3514 = 0; // L: 211
this.rootIndex = -1; // L: 212
this.cycle = -1; // L: 213
this.noClickThrough = false; // L: 215
@@ -819,1097 +817,1100 @@ public class Widget extends Node {
this.prioritizeMenuEntry = false; // L: 217
}
- @ObfuscatedName("a")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-1773202641"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-47"
)
@Export("decodeLegacy")
void decodeLegacy(Buffer var1) {
- this.isIf3 = false; // L: 270
- this.type = var1.readUnsignedByte(); // L: 271
- this.buttonType = var1.readUnsignedByte(); // L: 272
- this.contentType = var1.readUnsignedShort(); // L: 273
- this.rawX = var1.readShort(); // L: 274
- this.rawY = var1.readShort(); // L: 275
- this.rawWidth = var1.readUnsignedShort(); // L: 276
- this.rawHeight = var1.readUnsignedShort(); // L: 277
- this.transparencyTop = var1.readUnsignedByte(); // L: 278
- this.parentId = var1.readUnsignedShort(); // L: 279
- if (this.parentId == 65535) { // L: 280
+ this.isIf3 = false; // L: 261
+ this.type = var1.readUnsignedByte(); // L: 262
+ this.buttonType = var1.readUnsignedByte(); // L: 263
+ this.contentType = var1.readUnsignedShort(); // L: 264
+ this.rawX = var1.readShort(); // L: 265
+ this.rawY = var1.readShort(); // L: 266
+ this.rawWidth = var1.readUnsignedShort(); // L: 267
+ this.rawHeight = var1.readUnsignedShort(); // L: 268
+ this.transparencyTop = var1.readUnsignedByte(); // L: 269
+ this.parentId = var1.readUnsignedShort(); // L: 270
+ if (this.parentId == 65535) { // L: 271
this.parentId = -1;
} else {
- this.parentId += this.id & -65536; // L: 281
+ this.parentId += this.id & -65536; // L: 272
}
- this.mouseOverRedirect = var1.readUnsignedShort(); // L: 282
- if (this.mouseOverRedirect == 65535) { // L: 283
+ this.mouseOverRedirect = var1.readUnsignedShort(); // L: 273
+ if (this.mouseOverRedirect == 65535) { // L: 274
this.mouseOverRedirect = -1;
}
- int var2 = var1.readUnsignedByte(); // L: 284
+ int var2 = var1.readUnsignedByte(); // L: 275
int var3;
- if (var2 > 0) { // L: 285
- this.cs1Comparisons = new int[var2]; // L: 286
- this.cs1ComparisonValues = new int[var2]; // L: 287
+ if (var2 > 0) { // L: 276
+ this.cs1Comparisons = new int[var2]; // L: 277
+ this.cs1ComparisonValues = new int[var2]; // L: 278
- for (var3 = 0; var3 < var2; ++var3) { // L: 288
- this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 289
- this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 290
+ for (var3 = 0; var3 < var2; ++var3) { // L: 279
+ this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 280
+ this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 281
}
}
- var3 = var1.readUnsignedByte(); // L: 293
+ var3 = var1.readUnsignedByte(); // L: 284
int var4;
int var5;
int var6;
- if (var3 > 0) { // L: 294
- this.cs1Instructions = new int[var3][]; // L: 295
+ if (var3 > 0) { // L: 285
+ this.cs1Instructions = new int[var3][]; // L: 286
- for (var4 = 0; var4 < var3; ++var4) { // L: 296
- var5 = var1.readUnsignedShort(); // L: 297
- this.cs1Instructions[var4] = new int[var5]; // L: 298
+ for (var4 = 0; var4 < var3; ++var4) { // L: 287
+ var5 = var1.readUnsignedShort(); // L: 288
+ this.cs1Instructions[var4] = new int[var5]; // L: 289
- for (var6 = 0; var6 < var5; ++var6) { // L: 299
- this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 300
- if (this.cs1Instructions[var4][var6] == 65535) { // L: 301
+ for (var6 = 0; var6 < var5; ++var6) { // L: 290
+ this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 291
+ if (this.cs1Instructions[var4][var6] == 65535) { // L: 292
this.cs1Instructions[var4][var6] = -1;
}
}
}
}
- if (this.type == 0) { // L: 305
- this.scrollHeight = var1.readUnsignedShort(); // L: 306
- this.isHidden = var1.readUnsignedByte() == 1; // L: 307
+ if (this.type == 0) { // L: 296
+ this.scrollHeight = var1.readUnsignedShort(); // L: 297
+ this.isHidden = var1.readUnsignedByte() == 1; // L: 298
}
- if (this.type == 1) { // L: 309
- var1.readUnsignedShort(); // L: 310
- var1.readUnsignedByte(); // L: 311
+ if (this.type == 1) { // L: 300
+ var1.readUnsignedShort(); // L: 301
+ var1.readUnsignedByte(); // L: 302
}
- if (this.type == 2) { // L: 313
- this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 314
- this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 315
- var4 = var1.readUnsignedByte(); // L: 316
- if (var4 == 1) { // L: 317
+ if (this.type == 2) { // L: 304
+ this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 305
+ this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 306
+ var4 = var1.readUnsignedByte(); // L: 307
+ if (var4 == 1) { // L: 308
this.flags |= 268435456;
}
- var5 = var1.readUnsignedByte(); // L: 318
- if (var5 == 1) { // L: 319
+ var5 = var1.readUnsignedByte(); // L: 309
+ if (var5 == 1) { // L: 310
this.flags |= 1073741824;
}
- var6 = var1.readUnsignedByte(); // L: 320
- if (var6 == 1) { // L: 321
+ var6 = var1.readUnsignedByte(); // L: 311
+ if (var6 == 1) { // L: 312
this.flags |= Integer.MIN_VALUE;
}
- int var7 = var1.readUnsignedByte(); // L: 322
- if (var7 == 1) { // L: 323
+ int var7 = var1.readUnsignedByte(); // L: 313
+ if (var7 == 1) { // L: 314
this.flags |= 536870912;
}
- this.paddingX = var1.readUnsignedByte(); // L: 324
- this.paddingY = var1.readUnsignedByte(); // L: 325
- this.inventoryXOffsets = new int[20]; // L: 326
- this.inventoryYOffsets = new int[20]; // L: 327
- this.inventorySprites = new int[20]; // L: 328
+ this.paddingX = var1.readUnsignedByte(); // L: 315
+ this.paddingY = var1.readUnsignedByte(); // L: 316
+ this.inventoryXOffsets = new int[20]; // L: 317
+ this.inventoryYOffsets = new int[20]; // L: 318
+ this.inventorySprites = new int[20]; // L: 319
int var8;
- for (var8 = 0; var8 < 20; ++var8) { // L: 329
- int var11 = var1.readUnsignedByte(); // L: 330
- if (var11 == 1) { // L: 331
- this.inventoryXOffsets[var8] = var1.readShort(); // L: 332
- this.inventoryYOffsets[var8] = var1.readShort(); // L: 333
- this.inventorySprites[var8] = var1.readInt(); // L: 334
+ for (var8 = 0; var8 < 20; ++var8) { // L: 320
+ int var11 = var1.readUnsignedByte(); // L: 321
+ if (var11 == 1) { // L: 322
+ this.inventoryXOffsets[var8] = var1.readShort(); // L: 323
+ this.inventoryYOffsets[var8] = var1.readShort(); // L: 324
+ this.inventorySprites[var8] = var1.readInt(); // L: 325
} else {
- this.inventorySprites[var8] = -1; // L: 336
+ this.inventorySprites[var8] = -1; // L: 327
}
}
- this.itemActions = new String[5]; // L: 338
+ this.itemActions = new String[5]; // L: 329
- for (var8 = 0; var8 < 5; ++var8) { // L: 339
- String var9 = var1.readStringCp1252NullTerminated(); // L: 340
- if (var9.length() > 0) { // L: 341
- this.itemActions[var8] = var9; // L: 342
- this.flags |= 1 << var8 + 23; // L: 343
+ for (var8 = 0; var8 < 5; ++var8) { // L: 330
+ String var9 = var1.readStringCp1252NullTerminated(); // L: 331
+ if (var9.length() > 0) { // L: 332
+ this.itemActions[var8] = var9; // L: 333
+ this.flags |= 1 << var8 + 23; // L: 334
}
}
}
- if (this.type == 3) { // L: 347
- this.fill = var1.readUnsignedByte() == 1; // L: 348
+ if (this.type == 3) { // L: 338
+ this.fill = var1.readUnsignedByte() == 1; // L: 339
}
- if (this.type == 4 || this.type == 1) { // L: 350
- this.textXAlignment = var1.readUnsignedByte(); // L: 351
- this.textYAlignment = var1.readUnsignedByte(); // L: 352
- this.textLineHeight = var1.readUnsignedByte(); // L: 353
- this.fontId = var1.readUnsignedShort(); // L: 354
- if (this.fontId == 65535) { // L: 355
+ if (this.type == 4 || this.type == 1) { // L: 341
+ this.textXAlignment = var1.readUnsignedByte(); // L: 342
+ this.textYAlignment = var1.readUnsignedByte(); // L: 343
+ this.textLineHeight = var1.readUnsignedByte(); // L: 344
+ this.fontId = var1.readUnsignedShort(); // L: 345
+ if (this.fontId == 65535) { // L: 346
this.fontId = -1;
}
- this.textShadowed = var1.readUnsignedByte() == 1; // L: 356
+ this.textShadowed = var1.readUnsignedByte() == 1; // L: 347
}
- if (this.type == 4) { // L: 358
- this.text = var1.readStringCp1252NullTerminated(); // L: 359
- this.text2 = var1.readStringCp1252NullTerminated(); // L: 360
+ if (this.type == 4) { // L: 349
+ this.text = var1.readStringCp1252NullTerminated(); // L: 350
+ this.text2 = var1.readStringCp1252NullTerminated(); // L: 351
}
- if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 362
+ if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 353
this.color = var1.readInt();
}
- if (this.type == 3 || this.type == 4) { // L: 363
- this.color2 = var1.readInt(); // L: 364
- this.mouseOverColor = var1.readInt(); // L: 365
- this.mouseOverColor2 = var1.readInt(); // L: 366
+ if (this.type == 3 || this.type == 4) { // L: 354
+ this.color2 = var1.readInt(); // L: 355
+ this.mouseOverColor = var1.readInt(); // L: 356
+ this.mouseOverColor2 = var1.readInt(); // L: 357
}
- if (this.type == 5) { // L: 368
- this.spriteId2 = var1.readInt(); // L: 369
- this.spriteId = var1.readInt(); // L: 370
+ if (this.type == 5) { // L: 359
+ this.spriteId2 = var1.readInt(); // L: 360
+ this.spriteId = var1.readInt(); // L: 361
}
- if (this.type == 6) { // L: 372
- this.modelType = 1; // L: 373
- this.modelId = var1.readUnsignedShort(); // L: 374
- if (this.modelId == 65535) { // L: 375
+ if (this.type == 6) { // L: 363
+ this.modelType = 1; // L: 364
+ this.modelId = var1.readUnsignedShort(); // L: 365
+ if (this.modelId == 65535) { // L: 366
this.modelId = -1;
}
- this.modelType2 = 1; // L: 376
- this.modelId2 = var1.readUnsignedShort(); // L: 377
- if (this.modelId2 == 65535) { // L: 378
+ this.modelType2 = 1; // L: 367
+ this.modelId2 = var1.readUnsignedShort(); // L: 368
+ if (this.modelId2 == 65535) { // L: 369
this.modelId2 = -1;
}
- this.sequenceId = var1.readUnsignedShort(); // L: 379
- if (this.sequenceId == 65535) { // L: 380
+ this.sequenceId = var1.readUnsignedShort(); // L: 370
+ if (this.sequenceId == 65535) { // L: 371
this.sequenceId = -1;
}
- this.sequenceId2 = var1.readUnsignedShort(); // L: 381
- if (this.sequenceId2 == 65535) { // L: 382
+ this.sequenceId2 = var1.readUnsignedShort(); // L: 372
+ if (this.sequenceId2 == 65535) { // L: 373
this.sequenceId2 = -1;
}
- this.modelZoom = var1.readUnsignedShort(); // L: 383
- this.modelAngleX = var1.readUnsignedShort(); // L: 384
- this.modelAngleY = var1.readUnsignedShort(); // L: 385
+ this.modelZoom = var1.readUnsignedShort(); // L: 374
+ this.modelAngleX = var1.readUnsignedShort(); // L: 375
+ this.modelAngleY = var1.readUnsignedShort(); // L: 376
}
- if (this.type == 7) { // L: 387
- this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 388
- this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 389
- this.textXAlignment = var1.readUnsignedByte(); // L: 390
- this.fontId = var1.readUnsignedShort(); // L: 391
- if (this.fontId == 65535) { // L: 392
+ if (this.type == 7) { // L: 378
+ this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 379
+ this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 380
+ this.textXAlignment = var1.readUnsignedByte(); // L: 381
+ this.fontId = var1.readUnsignedShort(); // L: 382
+ if (this.fontId == 65535) { // L: 383
this.fontId = -1;
}
- this.textShadowed = var1.readUnsignedByte() == 1; // L: 393
- this.color = var1.readInt(); // L: 394
- this.paddingX = var1.readShort(); // L: 395
- this.paddingY = var1.readShort(); // L: 396
- var4 = var1.readUnsignedByte(); // L: 397
- if (var4 == 1) { // L: 398
- this.flags |= 1073741824;
+ this.textShadowed = var1.readUnsignedByte() == 1; // L: 384
+ this.color = var1.readInt(); // L: 385
+ this.paddingX = var1.readShort(); // L: 386
+ this.paddingY = var1.readShort(); // L: 387
+ var4 = var1.readUnsignedByte(); // L: 388
+ if (var4 == 1) {
+ this.flags |= 1073741824; // L: 389
}
- this.itemActions = new String[5]; // L: 399
+ this.itemActions = new String[5]; // L: 390
- for (var5 = 0; var5 < 5; ++var5) { // L: 400
- String var10 = var1.readStringCp1252NullTerminated(); // L: 401
- if (var10.length() > 0) { // L: 402
- this.itemActions[var5] = var10; // L: 403
- this.flags |= 1 << var5 + 23; // L: 404
+ for (var5 = 0; var5 < 5; ++var5) { // L: 391
+ String var10 = var1.readStringCp1252NullTerminated(); // L: 392
+ if (var10.length() > 0) { // L: 393
+ this.itemActions[var5] = var10; // L: 394
+ this.flags |= 1 << var5 + 23; // L: 395
}
}
}
- if (this.type == 8) { // L: 408
- this.text = var1.readStringCp1252NullTerminated(); // L: 409
+ if (this.type == 8) { // L: 399
+ this.text = var1.readStringCp1252NullTerminated(); // L: 400
}
- if (this.buttonType == 2 || this.type == 2) { // L: 411
- this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 412
- this.spellName = var1.readStringCp1252NullTerminated(); // L: 413
- var4 = var1.readUnsignedShort() & 63; // L: 414
- this.flags |= var4 << 11; // L: 415
+ if (this.buttonType == 2 || this.type == 2) { // L: 402
+ this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 403
+ this.spellName = var1.readStringCp1252NullTerminated(); // L: 404
+ var4 = var1.readUnsignedShort() & 63; // L: 405
+ this.flags |= var4 << 11; // L: 406
}
- if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 417
- this.buttonText = var1.readStringCp1252NullTerminated(); // L: 418
- if (this.buttonText.length() == 0) { // L: 419
- if (this.buttonType == 1) { // L: 420
+ if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 408
+ this.buttonText = var1.readStringCp1252NullTerminated(); // L: 409
+ if (this.buttonText.length() == 0) { // L: 410
+ if (this.buttonType == 1) { // L: 411
this.buttonText = "Ok";
}
- if (this.buttonType == 4) { // L: 421
+ if (this.buttonType == 4) { // L: 412
this.buttonText = "Select";
}
- if (this.buttonType == 5) { // L: 422
+ if (this.buttonType == 5) { // L: 413
this.buttonText = "Select";
}
- if (this.buttonType == 6) { // L: 423
+ if (this.buttonType == 6) { // L: 414
this.buttonText = "Continue";
}
}
}
- if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 426
- this.flags |= 4194304; // L: 427
+ if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 417
+ this.flags |= 4194304; // L: 418
}
- if (this.buttonType == 6) { // L: 429
- this.flags |= 1; // L: 430
+ if (this.buttonType == 6) { // L: 420
+ this.flags |= 1; // L: 421
}
- } // L: 432
+ } // L: 423
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-659209979"
+ descriptor = "(Lqt;S)V",
+ garbageValue = "18120"
)
@Export("decode")
void decode(Buffer var1) {
- var1.readUnsignedByte(); // L: 435
- this.isIf3 = true; // L: 436
- this.type = var1.readUnsignedByte(); // L: 437
- this.contentType = var1.readUnsignedShort(); // L: 438
- this.rawX = var1.readShort(); // L: 439
- this.rawY = var1.readShort(); // L: 440
- this.rawWidth = var1.readUnsignedShort(); // L: 441
- if (this.type == 9) { // L: 442
+ var1.readUnsignedByte(); // L: 426
+ this.isIf3 = true; // L: 427
+ this.type = var1.readUnsignedByte(); // L: 428
+ this.contentType = var1.readUnsignedShort(); // L: 429
+ this.rawX = var1.readShort(); // L: 430
+ this.rawY = var1.readShort(); // L: 431
+ this.rawWidth = var1.readUnsignedShort(); // L: 432
+ if (this.type == 9) { // L: 433
this.rawHeight = var1.readShort();
} else {
- this.rawHeight = var1.readUnsignedShort(); // L: 443
+ this.rawHeight = var1.readUnsignedShort(); // L: 434
}
- this.widthAlignment = var1.readByte(); // L: 444
- this.heightAlignment = var1.readByte(); // L: 445
- this.xAlignment = var1.readByte(); // L: 446
- this.yAlignment = var1.readByte(); // L: 447
- this.parentId = var1.readUnsignedShort(); // L: 448
- if (this.parentId == 65535) { // L: 449
+ this.widthAlignment = var1.readByte(); // L: 435
+ this.heightAlignment = var1.readByte(); // L: 436
+ this.xAlignment = var1.readByte(); // L: 437
+ this.yAlignment = var1.readByte(); // L: 438
+ this.parentId = var1.readUnsignedShort(); // L: 439
+ if (this.parentId == 65535) { // L: 440
this.parentId = -1;
} else {
- this.parentId += this.id & -65536; // L: 450
+ this.parentId += this.id & -65536; // L: 441
}
- this.isHidden = var1.readUnsignedByte() == 1; // L: 451
- if (this.type == 0) { // L: 452
- this.scrollWidth = var1.readUnsignedShort(); // L: 453
- this.scrollHeight = var1.readUnsignedShort(); // L: 454
- this.noClickThrough = var1.readUnsignedByte() == 1; // L: 455
+ this.isHidden = var1.readUnsignedByte() == 1; // L: 442
+ if (this.type == 0) { // L: 443
+ this.scrollWidth = var1.readUnsignedShort(); // L: 444
+ this.scrollHeight = var1.readUnsignedShort(); // L: 445
+ this.noClickThrough = var1.readUnsignedByte() == 1; // L: 446
}
- if (this.type == 5) { // L: 457
- this.spriteId2 = var1.readInt(); // L: 458
- this.spriteAngle = var1.readUnsignedShort(); // L: 459
- this.spriteTiling = var1.readUnsignedByte() == 1; // L: 460
- this.transparencyTop = var1.readUnsignedByte(); // L: 461
- this.outline = var1.readUnsignedByte(); // L: 462
- this.spriteShadow = var1.readInt(); // L: 463
- this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 464
- this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 465
+ if (this.type == 5) { // L: 448
+ this.spriteId2 = var1.readInt(); // L: 449
+ this.spriteAngle = var1.readUnsignedShort(); // L: 450
+ this.spriteTiling = var1.readUnsignedByte() == 1; // L: 451
+ this.transparencyTop = var1.readUnsignedByte(); // L: 452
+ this.outline = var1.readUnsignedByte(); // L: 453
+ this.spriteShadow = var1.readInt(); // L: 454
+ this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 455
+ this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 456
}
- if (this.type == 6) { // L: 467
- this.modelType = 1; // L: 468
- this.modelId = var1.readUnsignedShort(); // L: 469
- if (this.modelId == 65535) { // L: 470
+ if (this.type == 6) { // L: 458
+ this.modelType = 1; // L: 459
+ this.modelId = var1.readUnsignedShort(); // L: 460
+ if (this.modelId == 65535) { // L: 461
this.modelId = -1;
}
- this.modelOffsetX = var1.readShort(); // L: 471
- this.modelOffsetY = var1.readShort(); // L: 472
- this.modelAngleX = var1.readUnsignedShort(); // L: 473
- this.modelAngleY = var1.readUnsignedShort(); // L: 474
- this.modelAngleZ = var1.readUnsignedShort(); // L: 475
- this.modelZoom = var1.readUnsignedShort(); // L: 476
- this.sequenceId = var1.readUnsignedShort(); // L: 477
- if (this.sequenceId == 65535) { // L: 478
+ this.modelOffsetX = var1.readShort(); // L: 462
+ this.modelOffsetY = var1.readShort(); // L: 463
+ this.modelAngleX = var1.readUnsignedShort(); // L: 464
+ this.modelAngleY = var1.readUnsignedShort(); // L: 465
+ this.modelAngleZ = var1.readUnsignedShort(); // L: 466
+ this.modelZoom = var1.readUnsignedShort(); // L: 467
+ this.sequenceId = var1.readUnsignedShort(); // L: 468
+ if (this.sequenceId == 65535) { // L: 469
this.sequenceId = -1;
}
- this.modelOrthog = var1.readUnsignedByte() == 1; // L: 479
- var1.readUnsignedShort(); // L: 480
- if (this.widthAlignment != 0) { // L: 481
- this.field3406 = var1.readUnsignedShort();
+ this.modelOrthog = var1.readUnsignedByte() == 1; // L: 470
+ var1.readUnsignedShort(); // L: 471
+ if (this.widthAlignment != 0) { // L: 472
+ this.field3424 = var1.readUnsignedShort();
}
- if (this.heightAlignment != 0) { // L: 482
- var1.readUnsignedShort(); // L: 483
+ if (this.heightAlignment != 0) { // L: 473
+ var1.readUnsignedShort(); // L: 474
}
}
- if (this.type == 4) { // L: 486
- this.fontId = var1.readUnsignedShort(); // L: 487
- if (this.fontId == 65535) { // L: 488
+ if (this.type == 4) { // L: 477
+ this.fontId = var1.readUnsignedShort(); // L: 478
+ if (this.fontId == 65535) { // L: 479
this.fontId = -1;
}
- this.text = var1.readStringCp1252NullTerminated(); // L: 489
- this.textLineHeight = var1.readUnsignedByte(); // L: 490
- this.textXAlignment = var1.readUnsignedByte(); // L: 491
- this.textYAlignment = var1.readUnsignedByte(); // L: 492
- this.textShadowed = var1.readUnsignedByte() == 1; // L: 493
+ this.text = var1.readStringCp1252NullTerminated(); // L: 480
+ this.textLineHeight = var1.readUnsignedByte(); // L: 481
+ this.textXAlignment = var1.readUnsignedByte(); // L: 482
+ this.textYAlignment = var1.readUnsignedByte(); // L: 483
+ this.textShadowed = var1.readUnsignedByte() == 1; // L: 484
+ this.color = var1.readInt(); // L: 485
+ }
+
+ if (this.type == 3) { // L: 487
+ this.color = var1.readInt(); // L: 488
+ this.fill = var1.readUnsignedByte() == 1; // L: 489
+ this.transparencyTop = var1.readUnsignedByte(); // L: 490
+ }
+
+ if (this.type == 9) { // L: 492
+ this.lineWid = var1.readUnsignedByte(); // L: 493
this.color = var1.readInt(); // L: 494
+ this.field3402 = var1.readUnsignedByte() == 1; // L: 495
}
- if (this.type == 3) { // L: 496
- this.color = var1.readInt(); // L: 497
- this.fill = var1.readUnsignedByte() == 1; // L: 498
- this.transparencyTop = var1.readUnsignedByte(); // L: 499
- }
+ this.flags = var1.readMedium(); // L: 497
+ this.dataText = var1.readStringCp1252NullTerminated(); // L: 498
+ int var2 = var1.readUnsignedByte(); // L: 499
+ if (var2 > 0) { // L: 500
+ this.actions = new String[var2]; // L: 501
- if (this.type == 9) { // L: 501
- this.lineWid = var1.readUnsignedByte(); // L: 502
- this.color = var1.readInt(); // L: 503
- this.field3428 = var1.readUnsignedByte() == 1; // L: 504
- }
-
- this.flags = var1.readMedium(); // L: 506
- this.dataText = var1.readStringCp1252NullTerminated(); // L: 507
- int var2 = var1.readUnsignedByte(); // L: 508
- if (var2 > 0) { // L: 509
- this.actions = new String[var2]; // L: 510
-
- for (int var3 = 0; var3 < var2; ++var3) { // L: 511
+ for (int var3 = 0; var3 < var2; ++var3) { // L: 502
this.actions[var3] = var1.readStringCp1252NullTerminated();
}
}
- this.dragZoneSize = var1.readUnsignedByte(); // L: 513
- this.dragThreshold = var1.readUnsignedByte(); // L: 514
- this.isScrollBar = var1.readUnsignedByte() == 1; // L: 515
- this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 516
- this.onLoad = this.readListener(var1); // L: 517
- this.onMouseOver = this.readListener(var1); // L: 518
- this.onMouseLeave = this.readListener(var1); // L: 519
- this.onTargetLeave = this.readListener(var1); // L: 520
- this.onTargetEnter = this.readListener(var1); // L: 521
- this.onVarTransmit = this.readListener(var1); // L: 522
- this.onInvTransmit = this.readListener(var1); // L: 523
- this.onStatTransmit = this.readListener(var1); // L: 524
- this.onTimer = this.readListener(var1); // L: 525
- this.onOp = this.readListener(var1); // L: 526
- this.onMouseRepeat = this.readListener(var1); // L: 527
- this.onClick = this.readListener(var1); // L: 528
- this.onClickRepeat = this.readListener(var1); // L: 529
- this.onRelease = this.readListener(var1); // L: 530
- this.onHold = this.readListener(var1); // L: 531
- this.onDrag = this.readListener(var1); // L: 532
- this.onDragComplete = this.readListener(var1); // L: 533
- this.onScroll = this.readListener(var1); // L: 534
- this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 535
- this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 536
- this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 537
- } // L: 538
+ this.dragZoneSize = var1.readUnsignedByte(); // L: 504
+ this.dragThreshold = var1.readUnsignedByte(); // L: 505
+ this.isScrollBar = var1.readUnsignedByte() == 1; // L: 506
+ this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 507
+ this.onLoad = this.readListener(var1); // L: 508
+ this.onMouseOver = this.readListener(var1); // L: 509
+ this.onMouseLeave = this.readListener(var1); // L: 510
+ this.onTargetLeave = this.readListener(var1); // L: 511
+ this.onTargetEnter = this.readListener(var1); // L: 512
+ this.onVarTransmit = this.readListener(var1); // L: 513
+ this.onInvTransmit = this.readListener(var1); // L: 514
+ this.onStatTransmit = this.readListener(var1); // L: 515
+ this.onTimer = this.readListener(var1); // L: 516
+ this.onOp = this.readListener(var1); // L: 517
+ this.onMouseRepeat = this.readListener(var1); // L: 518
+ this.onClick = this.readListener(var1); // L: 519
+ this.onClickRepeat = this.readListener(var1); // L: 520
+ this.onRelease = this.readListener(var1); // L: 521
+ this.onHold = this.readListener(var1); // L: 522
+ this.onDrag = this.readListener(var1); // L: 523
+ this.onDragComplete = this.readListener(var1); // L: 524
+ this.onScroll = this.readListener(var1); // L: 525
+ this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 526
+ this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 527
+ this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 528
+ } // L: 529
- @ObfuscatedName("p")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)[Ljava/lang/Object;",
- garbageValue = "1297123633"
+ descriptor = "(Lqt;B)[Ljava/lang/Object;",
+ garbageValue = "109"
)
@Export("readListener")
Object[] readListener(Buffer var1) {
- int var2 = var1.readUnsignedByte(); // L: 541
- if (var2 == 0) { // L: 542
+ int var2 = var1.readUnsignedByte(); // L: 532
+ if (var2 == 0) { // L: 533
return null;
} else {
- Object[] var3 = new Object[var2]; // L: 543
+ Object[] var3 = new Object[var2]; // L: 534
- for (int var4 = 0; var4 < var2; ++var4) { // L: 544
- int var5 = var1.readUnsignedByte(); // L: 545
+ for (int var4 = 0; var4 < var2; ++var4) { // L: 535
+ int var5 = var1.readUnsignedByte(); // L: 536
if (var5 == 0) {
- var3[var4] = new Integer(var1.readInt()); // L: 546
- } else if (var5 == 1) { // L: 547
+ var3[var4] = new Integer(var1.readInt()); // L: 537
+ } else if (var5 == 1) { // L: 538
var3[var4] = var1.readStringCp1252NullTerminated();
}
}
- this.hasListener = true; // L: 549
- return var3; // L: 550
- }
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(Lpx;S)[I",
- garbageValue = "-14146"
- )
- @Export("readListenerTriggers")
- int[] readListenerTriggers(Buffer var1) {
- int var2 = var1.readUnsignedByte(); // L: 554
- if (var2 == 0) { // L: 555
- return null;
- } else {
- int[] var3 = new int[var2]; // L: 556
-
- for (int var4 = 0; var4 < var2; ++var4) { // L: 557
- var3[var4] = var1.readInt(); // L: 558
- }
-
- return var3; // L: 560
- }
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "986584305"
- )
- @Export("swapItems")
- public void swapItems(int var1, int var2) {
- int var3 = this.itemIds[var2]; // L: 564
- this.itemIds[var2] = this.itemIds[var1]; // L: 565
- this.itemIds[var1] = var3; // L: 566
- var3 = this.itemQuantities[var2]; // L: 567
- this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 568
- this.itemQuantities[var1] = var3; // L: 569
- } // L: 570
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(ZLce;I)Lqr;",
- garbageValue = "1939454695"
- )
- @Export("getSprite")
- public SpritePixels getSprite(boolean var1, UrlRequester var2) {
- field3407 = false; // L: 573
- if (this.field3431 != null) { // L: 574
- SpritePixels var3 = this.method5546(var2); // L: 575
- if (var3 != null) { // L: 576
- return var3; // L: 577
- }
- }
-
- int var7;
- if (var1) { // L: 581
- var7 = this.spriteId;
- } else {
- var7 = this.spriteId2; // L: 582
- }
-
- if (var7 == -1) { // L: 583
- return null;
- } else {
- long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var7 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 584
- SpritePixels var6 = (SpritePixels)Widget_cachedSprites.get(var4); // L: 585
- if (var6 != null) { // L: 586
- return var6;
- } else {
- var6 = StructComposition.SpriteBuffer_getSprite(WorldMapCacheName.Widget_spritesArchive, var7, 0); // L: 587
- if (var6 == null) { // L: 588
- field3407 = true; // L: 589
- return null; // L: 590
- } else {
- this.method5442(var6); // L: 592
- Widget_cachedSprites.put(var6, var4); // L: 593
- return var6; // L: 594
- }
- }
- }
- }
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(Lce;I)Lqr;",
- garbageValue = "-503493635"
- )
- SpritePixels method5546(UrlRequester var1) {
- if (!this.method5499()) { // L: 598
- return this.method5519(var1); // L: 599
- } else {
- String var2 = this.field3431 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 601
- SpritePixels var3 = (SpritePixels)field3378.method6413(var2); // L: 602
- if (var3 == null) { // L: 603
- SpritePixels var4 = this.method5519(var1); // L: 604
- if (var4 != null) { // L: 605
- var3 = var4.method8001(); // L: 606
- this.method5442(var3); // L: 607
- field3378.method6402(var2, var3); // L: 608
- }
- }
-
- return var3; // L: 611
- }
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(Lce;I)Lqr;",
- garbageValue = "1002412597"
- )
- SpritePixels method5519(UrlRequester var1) {
- if (this.field3431 != null && var1 != null) { // L: 615
- class291 var2 = (class291)field3390.method6413(this.field3431); // L: 616
- if (var2 == null) { // L: 617
- var2 = new class291(this.field3431, var1); // L: 618
- field3390.method6402(this.field3431, var2); // L: 619
- }
-
- return var2.method5391(); // L: 621
- } else {
- return null; // L: 623
- }
- }
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "205888634"
- )
- boolean method5499() {
- return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; // L: 627
- }
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(Lqr;B)V",
- garbageValue = "-110"
- )
- void method5442(SpritePixels var1) {
- if (this.spriteFlipV) { // L: 631
- var1.flipVertically();
- }
-
- if (this.spriteFlipH) { // L: 632
- var1.flipHorizontally();
- }
-
- if (this.outline > 0) { // L: 633
- var1.pad(this.outline);
- }
-
- if (this.outline >= 1) { // L: 634
- var1.outline(1);
- }
-
- if (this.outline >= 2) {
- var1.outline(16777215); // L: 635
- }
-
- if (this.spriteShadow != 0) { // L: 636
- var1.shadow(this.spriteShadow);
- }
-
- } // L: 637
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(I)Lmx;",
- garbageValue = "797268567"
- )
- @Export("getFont")
- public Font getFont() {
- field3407 = false; // L: 640
- if (this.fontId == -1) { // L: 641
- return null;
- } else {
- Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 642
- if (var1 != null) { // L: 643
- return var1;
- } else {
- var1 = class387.method6781(WorldMapCacheName.Widget_spritesArchive, class93.Widget_fontsArchive, this.fontId, 0); // L: 644
- if (var1 != null) {
- Widget_cachedFonts.put(var1, (long)this.fontId); // L: 645
- } else {
- field3407 = true; // L: 646
- }
-
- return var1; // L: 647
- }
+ this.hasListener = true; // L: 540
+ return var3; // L: 541
}
}
@ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(II)Lqr;",
- garbageValue = "122047479"
+ descriptor = "(Lqt;I)[I",
+ garbageValue = "-346146000"
)
- @Export("getInventorySprite")
- public SpritePixels getInventorySprite(int var1) {
- field3407 = false; // L: 651
- if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 652
- int var2 = this.inventorySprites[var1]; // L: 653
- if (var2 == -1) { // L: 654
- return null;
+ @Export("readListenerTriggers")
+ int[] readListenerTriggers(Buffer var1) {
+ int var2 = var1.readUnsignedByte(); // L: 545
+ if (var2 == 0) { // L: 546
+ return null;
+ } else {
+ int[] var3 = new int[var2]; // L: 547
+
+ for (int var4 = 0; var4 < var2; ++var4) { // L: 548
+ var3[var4] = var1.readInt(); // L: 549
+ }
+
+ return var3; // L: 551
+ }
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)V",
+ garbageValue = "39"
+ )
+ @Export("swapItems")
+ public void swapItems(int var1, int var2) {
+ int var3 = this.itemIds[var2]; // L: 555
+ this.itemIds[var2] = this.itemIds[var1]; // L: 556
+ this.itemIds[var1] = var3; // L: 557
+ var3 = this.itemQuantities[var2]; // L: 558
+ this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 559
+ this.itemQuantities[var1] = var3; // L: 560
+ } // L: 561
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(ZLcd;B)Lqe;",
+ garbageValue = "84"
+ )
+ @Export("getSprite")
+ public SpritePixels getSprite(boolean var1, UrlRequester var2) {
+ field3366 = false; // L: 564
+ if (this.field3405 != null) { // L: 565
+ SpritePixels var3 = this.method5607(var2); // L: 566
+ if (var3 != null) { // L: 567
+ return var3; // L: 568
+ }
+ }
+
+ int var7;
+ if (var1) { // L: 572
+ var7 = this.spriteId;
+ } else {
+ var7 = this.spriteId2; // L: 573
+ }
+
+ if (var7 == -1) { // L: 574
+ return null;
+ } else {
+ long var4 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var7 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 575
+ SpritePixels var6 = (SpritePixels)field3360.get(var4); // L: 576
+ if (var6 != null) { // L: 577
+ return var6;
} else {
- SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 655
- if (var3 != null) { // L: 656
- return var3;
+ var6 = class7.SpriteBuffer_getSprite(StructComposition.Widget_spritesArchive, var7, 0); // L: 578
+ if (var6 == null) { // L: 579
+ field3366 = true; // L: 580
+ return null; // L: 581
} else {
- var3 = StructComposition.SpriteBuffer_getSprite(WorldMapCacheName.Widget_spritesArchive, var2, 0); // L: 657
- if (var3 != null) { // L: 658
- Widget_cachedSprites.put(var3, (long)var2);
- } else {
- field3407 = true; // L: 659
- }
-
- return var3; // L: 660
- }
- }
- } else {
- return null;
- }
- }
-
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "(Lgq;IZLkp;I)Lhv;",
- garbageValue = "-1604059191"
- )
- @Export("getModel")
- public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) {
- field3407 = false; // L: 664
- int var5;
- int var6;
- if (var3) { // L: 667
- var5 = this.modelType2; // L: 668
- var6 = this.modelId2; // L: 669
- } else {
- var5 = this.modelType; // L: 672
- var6 = this.modelId; // L: 673
- }
-
- if (var5 == 0) { // L: 675
- return null;
- } else if (var5 == 1 && var6 == -1) { // L: 676
- return null;
- } else {
- Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 677
- if (var7 == null) { // L: 678
- ModelData var8;
- if (var5 == 1) { // L: 680
- var8 = ModelData.ModelData_get(class162.Widget_modelsArchive, var6, 0); // L: 681
- if (var8 == null) { // L: 682
- field3407 = true; // L: 683
- return null; // L: 684
- }
-
- var7 = var8.toModel(64, 768, -50, -10, -50); // L: 686
- }
-
- if (var5 == 2) { // L: 688
- var8 = WorldMapSectionType.getNpcDefinition(var6).getModelData(); // L: 689
- if (var8 == null) { // L: 690
- field3407 = true; // L: 691
- return null; // L: 692
- }
-
- var7 = var8.toModel(64, 768, -50, -10, -50); // L: 694
- }
-
- if (var5 == 3) { // L: 696
- if (var4 == null) { // L: 697
- return null;
- }
-
- var8 = var4.getModelData(); // L: 698
- if (var8 == null) { // L: 699
- field3407 = true; // L: 700
- return null; // L: 701
- }
-
- var7 = var8.toModel(64, 768, -50, -10, -50); // L: 703
- }
-
- if (var5 == 4) { // L: 705
- ItemComposition var9 = FileSystem.ItemDefinition_get(var6); // L: 706
- var8 = var9.getModelData(10); // L: 707
- if (var8 == null) { // L: 708
- field3407 = true; // L: 709
- return null; // L: 710
- }
-
- var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 712
- }
-
- Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 714
- }
-
- if (var1 != null) { // L: 716
- var7 = var1.transformWidgetModel(var7, var2); // L: 717
- }
-
- return var7; // L: 719
- }
- }
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(ZI)Lka;",
- garbageValue = "1947856981"
- )
- @Export("getSpriteMask")
- public SpriteMask getSpriteMask(boolean var1) {
- if (this.spriteId == -1) { // L: 723
- var1 = false;
- }
-
- int var2 = var1 ? this.spriteId * 286536551 * 2004629591 : this.spriteId2 * -1501605973 * -2014760189; // L: 724
- if (var2 == -1) { // L: 725
- return null;
- } else {
- long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.spriteShadow << 40); // L: 726
- SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 727
- if (var5 != null) { // L: 728
- return var5;
- } else {
- SpritePixels var6 = this.getSprite(var1, (UrlRequester)null); // L: 729
- if (var6 == null) { // L: 730
- return null;
- } else {
- SpritePixels var7 = var6.copyNormalized(); // L: 731
- int[] var8 = new int[var7.subHeight]; // L: 732
- int[] var9 = new int[var7.subHeight]; // L: 733
-
- for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 734
- int var11 = 0; // L: 735
- int var12 = var7.subWidth; // L: 736
-
- int var13;
- for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 737
- if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 738
- var11 = var13; // L: 739
- break;
- }
- }
-
- for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 743
- if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 744
- var12 = var13 + 1; // L: 745
- break;
- }
- }
-
- var8[var10] = var11; // L: 749
- var9[var10] = var12 - var11; // L: 750
- }
-
- var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 752
- Widget_cachedSpriteMasks.put(var5, var3); // L: 753
- return var5; // L: 754
+ this.method5699(var6); // L: 583
+ field3360.put(var6, var4); // L: 584
+ return var6; // L: 585
}
}
}
}
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;B)V",
- garbageValue = "-39"
- )
- @Export("setAction")
- public void setAction(int var1, String var2) {
- if (this.actions == null || this.actions.length <= var1) { // L: 758
- String[] var3 = new String[var1 + 1]; // L: 759
- if (this.actions != null) { // L: 760
- for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 761
- var3[var4] = this.actions[var4];
- }
- }
-
- this.actions = var3; // L: 763
- }
-
- this.actions[var1] = var2; // L: 765
- } // L: 766
-
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1684340581"
- )
- public boolean method5448() {
- return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338; // L: 769
- }
-
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lce;J)V"
- )
- public void method5449(String var1, UrlRequester var2, long var3) {
- if (this.type == 11 && -1L != var3) { // L: 773
- var1 = var1.replaceAll("%userid%", Long.toString(var3)); // L: 774
- this.field3408 = new class155(); // L: 775
- if (!this.field3408.method3085(var1, var2)) { // L: 776
- this.field3408 = null; // L: 777
- } else {
- if (this.field3470 == null || this.field3471 == null) { // L: 780
- this.method5450(); // L: 781
- }
-
- }
- }
- } // L: 778 783
-
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1904926209"
- )
- void method5450() {
- this.field3470 = new HashMap(); // L: 786
- this.field3471 = new HashMap(); // L: 787
- } // L: 788
-
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-118212999"
- )
- public void method5451(int var1, int var2) {
- if (this.type == 11) { // L: 791
- if (this.field3470 == null) { // L: 792
- this.method5450();
- }
-
- this.field3470.put(var1, var2); // L: 793
- }
- } // L: 794
-
- @ObfuscatedName("z")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;II)V",
- garbageValue = "-2090155850"
- )
- public void method5468(String var1, int var2) {
- if (this.type == 11) { // L: 797
- if (this.field3471 == null) { // L: 798
- this.method5450();
- }
-
- this.field3471.put(var1, var2); // L: 799
- }
- } // L: 800
-
@ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(IIIII)Z",
- garbageValue = "-1974836941"
+ descriptor = "(Lcd;I)Lqe;",
+ garbageValue = "1267758311"
)
- public boolean method5474(int var1, int var2, int var3, int var4) {
- if (this.type == 11 && this.field3408 != null && this.method5498()) { // L: 803
- var1 -= var3; // L: 804
- var2 -= var4; // L: 805
- int var5 = (int)(this.field3408.method3071()[0] * (float)this.width); // L: 806
- int var6 = (int)(this.field3408.method3071()[1] * (float)this.height); // L: 807
- int var7 = var5 + (int)(this.field3408.method3071()[2] * (float)this.width); // L: 808
- int var8 = var6 + (int)(this.field3408.method3071()[3] * (float)this.height); // L: 809
- return var1 >= var5 && var2 >= var6 && var1 < var7 && var2 < var8; // L: 810
+ SpritePixels method5607(UrlRequester var1) {
+ if (!this.method5611()) { // L: 589
+ return this.method5610(var1); // L: 590
} else {
- return false;
+ String var2 = this.field3405 + (this.spriteFlipV ? 1 : 0) + (this.spriteFlipH ? 1 : 0) + this.outline + this.spriteShadow; // L: 592
+ SpritePixels var3 = (SpritePixels)field3434.method6538(var2); // L: 593
+ if (var3 == null) { // L: 594
+ SpritePixels var4 = this.method5610(var1); // L: 595
+ if (var4 != null) { // L: 596
+ var3 = var4.method8151(); // L: 597
+ this.method5699(var3); // L: 598
+ field3434.method6539(var2, var3); // L: 599
+ }
+ }
+
+ return var3; // L: 602
+ }
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(Lcd;I)Lqe;",
+ garbageValue = "-1472222097"
+ )
+ SpritePixels method5610(UrlRequester var1) {
+ if (this.field3405 != null && var1 != null) { // L: 606
+ class290 var2 = (class290)field3364.method6538(this.field3405); // L: 607
+ if (var2 == null) { // L: 608
+ var2 = new class290(this.field3405, var1); // L: 609
+ field3364.method6539(this.field3405, var2); // L: 610
+ }
+
+ return var2.method5562(); // L: 612
+ } else {
+ return null; // L: 614
+ }
+ }
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "2722954"
+ )
+ boolean method5611() {
+ return this.spriteFlipV || this.spriteFlipH || this.outline != 0 || this.spriteShadow != 0; // L: 618
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(Lqe;I)V",
+ garbageValue = "1165836984"
+ )
+ void method5699(SpritePixels var1) {
+ if (this.spriteFlipV) { // L: 622
+ var1.flipVertically();
+ }
+
+ if (this.spriteFlipH) { // L: 623
+ var1.flipHorizontally();
+ }
+
+ if (this.outline > 0) { // L: 624
+ var1.pad(this.outline);
+ }
+
+ if (this.outline >= 1) { // L: 625
+ var1.outline(1);
+ }
+
+ if (this.outline >= 2) {
+ var1.outline(16777215); // L: 626
+ }
+
+ if (this.spriteShadow != 0) { // L: 627
+ var1.shadow(this.spriteShadow);
+ }
+
+ } // L: 628
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lmt;",
+ garbageValue = "1724756527"
+ )
+ @Export("getFont")
+ public Font getFont() {
+ field3366 = false; // L: 631
+ if (this.fontId == -1) { // L: 632
+ return null;
+ } else {
+ Font var1 = (Font)archive0.get((long)this.fontId); // L: 633
+ if (var1 != null) { // L: 634
+ return var1;
+ } else {
+ AbstractArchive var3 = StructComposition.Widget_spritesArchive; // L: 636
+ AbstractArchive var4 = MilliClock.Widget_fontsArchive; // L: 637
+ int var5 = this.fontId; // L: 638
+ Font var2;
+ if (!Ignored.method6774(var3, var5, 0)) { // L: 640
+ var2 = null; // L: 641
+ } else {
+ byte[] var7 = var4.takeFile(var5, 0); // L: 645
+ Font var6;
+ if (var7 == null) { // L: 647
+ var6 = null; // L: 648
+ } else {
+ Font var8 = new Font(var7, class426.SpriteBuffer_xOffsets, class142.SpriteBuffer_yOffsets, class359.SpriteBuffer_spriteWidths, class456.SpriteBuffer_spriteHeights, class13.SpriteBuffer_spritePalette, class421.SpriteBuffer_pixels); // L: 651
+ class426.SpriteBuffer_xOffsets = null; // L: 653
+ class142.SpriteBuffer_yOffsets = null; // L: 654
+ class359.SpriteBuffer_spriteWidths = null; // L: 655
+ class456.SpriteBuffer_spriteHeights = null; // L: 656
+ class13.SpriteBuffer_spritePalette = null; // L: 657
+ class421.SpriteBuffer_pixels = null; // L: 658
+ var6 = var8; // L: 660
+ }
+
+ var2 = var6; // L: 662
+ }
+
+ if (var2 != null) { // L: 665
+ archive0.put(var2, (long)this.fontId);
+ } else {
+ field3366 = true; // L: 666
+ }
+
+ return var2; // L: 667
+ }
}
}
@ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1289380657"
+ descriptor = "(II)Lqe;",
+ garbageValue = "1707735518"
)
- public boolean method5498() {
- return this.field3391 == 2; // L: 814
- }
-
- @ObfuscatedName("ag")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "-2103754718"
- )
- public int method5455(String var1) {
- return this.type == 11 && this.field3408 != null && this.method5498() ? this.field3408.method3066(var1) : -1; // L: 818 819 821
- }
-
- @ObfuscatedName("ar")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
- garbageValue = "-386169422"
- )
- public String method5523(String var1) {
- return this.type == 11 && this.field3408 != null && this.method5498() ? this.field3408.method3097(var1) : null; // L: 825 826
- }
-
- @ObfuscatedName("am")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1984681933"
- )
- public int method5457() {
- return this.field3471 != null && this.field3471.size() > 0 ? 1 : 0; // L: 830
- }
-
- @ObfuscatedName("ac")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "126"
- )
- public int method5458() {
- if (this.type == 11 && this.field3408 != null && this.field3471 != null && !this.field3471.isEmpty()) { // L: 834
- String var1 = this.field3408.method3075(); // L: 835
- return var1 != null && this.field3471.containsKey(this.field3408.method3075()) ? (Integer)this.field3471.get(var1) : -1; // L: 836 837 839
- } else {
- return -1;
- }
- }
-
- @ObfuscatedName("ab")
- @ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "-24"
- )
- public String method5480() {
- if (this.type == 11 && this.field3408 != null) { // L: 843
- String var1 = this.field3408.method3075(); // L: 844
- Iterator var2 = this.field3408.method3072().iterator(); // L: 845
-
- while (var2.hasNext()) {
- class166 var3 = (class166)var2.next(); // L: 846
- String var4 = String.format("%%%S%%", var3.method3226()); // L: 848
- if (var3.vmethod3227() == 0) { // L: 849
- var1.replaceAll(var4, Integer.toString(var3.vmethod3228())); // L: 850
+ @Export("getInventorySprite")
+ public SpritePixels getInventorySprite(int var1) {
+ field3366 = false; // L: 671
+ if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 672
+ int var2 = this.inventorySprites[var1]; // L: 673
+ if (var2 == -1) { // L: 674
+ return null;
+ } else {
+ SpritePixels var3 = (SpritePixels)field3360.get((long)var2); // L: 675
+ if (var3 != null) { // L: 676
+ return var3;
} else {
- var1.replaceAll(var4, var3.vmethod3238()); // L: 853
- }
- }
-
- return var1; // L: 857
- } else {
- return null; // L: 856
- }
- }
-
- @ObfuscatedName("aj")
- @ObfuscatedSignature(
- descriptor = "(I)[I",
- garbageValue = "-216583671"
- )
- public int[] method5460() {
- if (this.type == 11 && this.field3408 != null) { // L: 861
- int[] var1 = new int[3]; // L: 862
- int var2 = 0; // L: 863
- Iterator var3 = this.field3408.method3072().iterator(); // L: 864
-
- while (var3.hasNext()) {
- class166 var4 = (class166)var3.next(); // L: 865
- if (!var4.method3226().equals("user_id")) { // L: 867
- if (var4.vmethod3227() != 0) { // L: 868
- return null; // L: 875
+ var3 = class7.SpriteBuffer_getSprite(StructComposition.Widget_spritesArchive, var2, 0); // L: 677
+ if (var3 != null) { // L: 678
+ field3360.put(var3, (long)var2);
+ } else {
+ field3366 = true; // L: 679
}
- var1[var2++] = var4.vmethod3228(); // L: 869
- if (var2 > 3) { // L: 870
- return null; // L: 871
- }
+ return var3; // L: 680
}
}
-
- return var1; // L: 880
} else {
return null;
}
}
- @ObfuscatedName("ae")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(Lce;I)Z",
- garbageValue = "1243855497"
+ descriptor = "(Lgc;IZLkt;S)Lhy;",
+ garbageValue = "-28815"
)
- public boolean method5517(UrlRequester var1) {
- if (this.type == 11 && this.field3408 != null) { // L: 884
- this.field3408.method3064(var1); // L: 885
- if (this.field3408.method3067() != this.field3391) { // L: 886
- this.field3391 = this.field3408.method3067(); // L: 887
- if (this.field3391 >= 100) { // L: 888
- return true; // L: 889
+ @Export("getModel")
+ public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) {
+ field3366 = false; // L: 684
+ int var5;
+ int var6;
+ if (var3) { // L: 687
+ var5 = this.modelType2; // L: 688
+ var6 = this.modelId2; // L: 689
+ } else {
+ var5 = this.modelType; // L: 692
+ var6 = this.modelId; // L: 693
+ }
+
+ if (var5 == 0) { // L: 695
+ return null;
+ } else if (var5 == 1 && var6 == -1) { // L: 696
+ return null;
+ } else {
+ Model var7 = (Model)field3361.get((long)(var6 + (var5 << 16))); // L: 697
+ if (var7 == null) { // L: 698
+ ModelData var8;
+ if (var5 == 1) { // L: 700
+ var8 = ModelData.ModelData_get(class126.Widget_modelsArchive, var6, 0); // L: 701
+ if (var8 == null) { // L: 702
+ field3366 = true; // L: 703
+ return null; // L: 704
+ }
+
+ var7 = var8.toModel(64, 768, -50, -10, -50); // L: 706
}
- if (this.field3391 == 2) { // L: 891
- this.method5462(); // L: 892
- return true; // L: 893
+ if (var5 == 2) { // L: 708
+ var8 = BuddyRankComparator.getNpcDefinition(var6).getModelData(); // L: 709
+ if (var8 == null) { // L: 710
+ field3366 = true; // L: 711
+ return null; // L: 712
+ }
+
+ var7 = var8.toModel(64, 768, -50, -10, -50); // L: 714
+ }
+
+ if (var5 == 3) { // L: 716
+ if (var4 == null) { // L: 717
+ return null;
+ }
+
+ var8 = var4.getModelData(); // L: 718
+ if (var8 == null) { // L: 719
+ field3366 = true; // L: 720
+ return null; // L: 721
+ }
+
+ var7 = var8.toModel(64, 768, -50, -10, -50); // L: 723
+ }
+
+ if (var5 == 4) { // L: 725
+ ItemComposition var9 = EnumComposition.ItemDefinition_get(var6); // L: 726
+ var8 = var9.getModelData(10); // L: 727
+ if (var8 == null) { // L: 728
+ field3366 = true; // L: 729
+ return null; // L: 730
+ }
+
+ var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 732
+ }
+
+ field3361.put(var7, (long)(var6 + (var5 << 16))); // L: 734
+ }
+
+ if (var1 != null) { // L: 736
+ var7 = var1.transformWidgetModel(var7, var2); // L: 737
+ }
+
+ return var7; // L: 739
+ }
+ }
+
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(ZB)Lkp;",
+ garbageValue = "11"
+ )
+ @Export("getSpriteMask")
+ public SpriteMask getSpriteMask(boolean var1) {
+ if (this.spriteId == -1) { // L: 743
+ var1 = false;
+ }
+
+ int var2 = var1 ? this.spriteId * 1981513631 * -444474273 : this.spriteId2 * -1629333209 * -646609257; // L: 744
+ if (var2 == -1) { // L: 745
+ return null;
+ } else {
+ long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 746
+ SpriteMask var5 = (SpriteMask)archive1.get(var3); // L: 747
+ if (var5 != null) { // L: 748
+ return var5;
+ } else {
+ SpritePixels var6 = this.getSprite(var1, (UrlRequester)null); // L: 749
+ if (var6 == null) { // L: 750
+ return null;
+ } else {
+ SpritePixels var7 = var6.copyNormalized(); // L: 751
+ int[] var8 = new int[var7.subHeight]; // L: 752
+ int[] var9 = new int[var7.subHeight]; // L: 753
+
+ for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 754
+ int var11 = 0; // L: 755
+ int var12 = var7.subWidth; // L: 756
+
+ int var13;
+ for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 757
+ if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 758
+ var11 = var13; // L: 759
+ break;
+ }
+ }
+
+ for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 763
+ if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 764
+ var12 = var13 + 1; // L: 765
+ break;
+ }
+ }
+
+ var8[var10] = var11; // L: 769
+ var9[var10] = var12 - var11; // L: 770
+ }
+
+ var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 772
+ archive1.put(var5, var3); // L: 773
+ return var5; // L: 774
+ }
+ }
+ }
+ }
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(ILjava/lang/String;B)V",
+ garbageValue = "-32"
+ )
+ @Export("setAction")
+ public void setAction(int var1, String var2) {
+ if (this.actions == null || this.actions.length <= var1) { // L: 778
+ String[] var3 = new String[var1 + 1]; // L: 779
+ if (this.actions != null) { // L: 780
+ for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 781
+ var3[var4] = this.actions[var4];
}
}
- return false; // L: 896
+ this.actions = var3; // L: 783
+ }
+
+ this.actions[var1] = var2; // L: 785
+ } // L: 786
+
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "-816942050"
+ )
+ public boolean method5618() {
+ return !this.isIf3 || this.type == 0 || this.type == 11 || this.hasListener || this.contentType == 1338; // L: 789
+ }
+
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;Lcd;J)V"
+ )
+ public void method5619(String var1, UrlRequester var2, long var3) {
+ if (this.type == 11 && var3 != -1L) { // L: 793
+ var1 = var1.replaceAll("%userid%", Long.toString(var3)); // L: 794
+ this.field3483 = new class155(); // L: 795
+ if (!this.field3483.method3174(var1, var2)) { // L: 796
+ this.field3483 = null; // L: 797
+ } else {
+ if (this.field3403 == null || this.field3415 == null) { // L: 800
+ this.method5668(); // L: 801
+ }
+
+ }
+ }
+ } // L: 798 803
+
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-443886653"
+ )
+ void method5668() {
+ this.field3403 = new HashMap(); // L: 806
+ this.field3415 = new HashMap(); // L: 807
+ } // L: 808
+
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "(IIS)V",
+ garbageValue = "7845"
+ )
+ public void method5621(int var1, int var2) {
+ if (this.type == 11) { // L: 811
+ if (this.field3403 == null) { // L: 812
+ this.method5668();
+ }
+
+ this.field3403.put(var1, var2); // L: 813
+ }
+ } // L: 814
+
+ @ObfuscatedName("n")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;IB)V",
+ garbageValue = "3"
+ )
+ public void method5622(String var1, int var2) {
+ if (this.type == 11) { // L: 817
+ if (this.field3415 == null) { // L: 818
+ this.method5668();
+ }
+
+ this.field3415.put(var1, var2); // L: 819
+ }
+ } // L: 820
+
+ @ObfuscatedName("o")
+ @ObfuscatedSignature(
+ descriptor = "(IIIII)Z",
+ garbageValue = "-1298089118"
+ )
+ public boolean method5623(int var1, int var2, int var3, int var4) {
+ if (this.type == 11 && this.field3483 != null && this.method5680()) { // L: 823
+ var1 -= var3; // L: 824
+ var2 -= var4; // L: 825
+ int var5 = (int)(this.field3483.method3182()[0] * (float)this.width); // L: 826
+ int var6 = (int)(this.field3483.method3182()[1] * (float)this.height); // L: 827
+ int var7 = var5 + (int)(this.field3483.method3182()[2] * (float)this.width); // L: 828
+ int var8 = var6 + (int)(this.field3483.method3182()[3] * (float)this.height); // L: 829
+ return var1 >= var5 && var2 >= var6 && var1 < var7 && var2 < var8; // L: 830
} else {
return false;
}
}
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ descriptor = "(B)Z",
+ garbageValue = "-26"
+ )
+ public boolean method5680() {
+ return this.field3443 == 2; // L: 834
+ }
+
+ @ObfuscatedName("d")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)I",
+ garbageValue = "1088006631"
+ )
+ public int method5625(String var1) {
+ return this.type == 11 && this.field3483 != null && this.method5680() ? this.field3483.method3196(var1) : -1; // L: 838 839 841
+ }
+
+ @ObfuscatedName("ad")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
+ garbageValue = "1684221351"
+ )
+ public String method5626(String var1) {
+ return this.type == 11 && this.field3483 != null && this.method5680() ? this.field3483.method3178(var1) : null; // L: 845 846
+ }
+
+ @ObfuscatedName("ak")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1532573495"
+ )
+ public int method5627() {
+ return this.field3415 != null && this.field3415.size() > 0 ? 1 : 0; // L: 850
+ }
+
+ @ObfuscatedName("al")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1221314363"
+ )
+ public int method5709() {
+ if (this.type == 11 && this.field3483 != null && this.field3415 != null && !this.field3415.isEmpty()) { // L: 854
+ String var1 = this.field3483.method3201(); // L: 855
+ return var1 != null && this.field3415.containsKey(this.field3483.method3201()) ? (Integer)this.field3415.get(var1) : -1; // L: 856 857 859
+ } else {
+ return -1;
+ }
+ }
+
+ @ObfuscatedName("ao")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "339767953"
+ )
+ public String method5629() {
+ if (this.type == 11 && this.field3483 != null) { // L: 863
+ String var1 = this.field3483.method3201(); // L: 864
+ Iterator var2 = this.field3483.method3183().iterator(); // L: 865
+
+ while (var2.hasNext()) {
+ class165 var3 = (class165)var2.next(); // L: 866
+ String var4 = String.format("%%%S%%", var3.method3315()); // L: 868
+ if (var3.vmethod3314() == 0) { // L: 869
+ var1.replaceAll(var4, Integer.toString(var3.vmethod3318())); // L: 870
+ } else {
+ var1.replaceAll(var4, var3.vmethod3320()); // L: 873
+ }
+ }
+
+ return var1; // L: 877
+ } else {
+ return null; // L: 876
+ }
+ }
+
+ @ObfuscatedName("ab")
+ @ObfuscatedSignature(
+ descriptor = "(B)[I",
+ garbageValue = "111"
+ )
+ public int[] method5630() {
+ if (this.type == 11 && this.field3483 != null) { // L: 881
+ int[] var1 = new int[3]; // L: 882
+ int var2 = 0; // L: 883
+ Iterator var3 = this.field3483.method3183().iterator(); // L: 884
+
+ while (var3.hasNext()) {
+ class165 var4 = (class165)var3.next(); // L: 885
+ if (!var4.method3315().equals("user_id")) { // L: 887
+ if (var4.vmethod3314() != 0) { // L: 888
+ return null; // L: 895
+ }
+
+ var1[var2++] = var4.vmethod3318(); // L: 889
+ if (var2 > 3) { // L: 890
+ return null; // L: 891
+ }
+ }
+ }
+
+ return var1; // L: 900
+ } else {
+ return null;
+ }
+ }
+
@ObfuscatedName("ap")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "7"
+ descriptor = "(Lcd;B)Z",
+ garbageValue = "4"
)
- void method5462() {
- this.noClickThrough = true; // L: 917
- ArrayList var1 = this.field3408.method3110(); // L: 918
- ArrayList var2 = this.field3408.method3069(); // L: 919
- int var3 = var1.size() + var2.size(); // L: 920
- this.children = new Widget[var3]; // L: 921
- int var4 = 0; // L: 922
+ public boolean method5628(UrlRequester var1) {
+ if (this.type == 11 && this.field3483 != null) { // L: 904
+ this.field3483.method3175(var1); // L: 905
+ if (this.field3483.method3176() != this.field3443) { // L: 906
+ this.field3443 = this.field3483.method3176(); // L: 907
+ if (this.field3443 >= 100) { // L: 908
+ return true; // L: 909
+ }
+
+ if (this.field3443 == 2) { // L: 911
+ this.method5632(); // L: 912
+ return true; // L: 913
+ }
+ }
+
+ return false; // L: 916
+ } else {
+ return false;
+ }
+ }
+
+ @ObfuscatedName("ae")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1057032420"
+ )
+ void method5632() {
+ this.noClickThrough = true; // L: 937
+ ArrayList var1 = this.field3483.method3179(); // L: 938
+ ArrayList var2 = this.field3483.method3190(); // L: 939
+ int var3 = var1.size() + var2.size(); // L: 940
+ this.children = new Widget[var3]; // L: 941
+ int var4 = 0; // L: 942
Iterator var5;
Widget var7;
- for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 923 930
- class160 var6 = (class160)var5.next(); // L: 924
- var7 = class273.method5077(5, this, var4, 0, 0, 0, 0, var6.field1782); // L: 926
- var7.field3431 = var6.field1783.method2556(); // L: 927
- class291 var8 = new class291(var6.field1783); // L: 928
- field3390.method6402(var7.field3431, var8); // L: 929
+ for (var5 = var1.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 943 950
+ class160 var6 = (class160)var5.next(); // L: 944
+ var7 = class11.method97(5, this, var4, 0, 0, 0, 0, var6.field1770); // L: 946
+ var7.field3405 = var6.field1772.method2553(); // L: 947
+ class290 var8 = new class290(var6.field1772); // L: 948
+ field3364.method6539(var7.field3405, var8); // L: 949
}
- for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 933 941
- class162 var9 = (class162)var5.next(); // L: 934
- var7 = class273.method5077(4, this, var4, 0, 0, 0, 0, var9.field1804); // L: 936
- var7.text = var9.field1803; // L: 937
- var7.fontId = (Integer)this.field3470.get(var9.field1807); // L: 938
- var7.textXAlignment = var9.field1811; // L: 939
- var7.textYAlignment = var9.field1806; // L: 940
+ for (var5 = var2.iterator(); var5.hasNext(); this.children[var4++] = var7) { // L: 953 961
+ class161 var9 = (class161)var5.next(); // L: 954
+ var7 = class11.method97(4, this, var4, 0, 0, 0, 0, var9.field1776); // L: 956
+ var7.text = var9.field1775; // L: 957
+ var7.fontId = (Integer)this.field3403.get(var9.field1779); // L: 958
+ var7.textXAlignment = var9.field1773; // L: 959
+ var7.textYAlignment = var9.field1777; // L: 960
}
- } // L: 944
+ } // L: 964
- @ObfuscatedName("gz")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "543446302"
+ descriptor = "(I)V",
+ garbageValue = "-827050905"
)
- @Export("setWindowedMode")
- static void setWindowedMode(int var0) {
- Client.field711 = 0L; // L: 4345
- if (var0 >= 2) { // L: 4346
- Client.isResizable = true;
- } else {
- Client.isResizable = false; // L: 4347
- }
-
- if (ClanChannelMember.getWindowedMode() == 1) { // L: 4348
- class82.client.setMaxCanvasSize(765, 503); // L: 4349
- } else {
- class82.client.setMaxCanvasSize(7680, 2160); // L: 4352
- }
-
- if (Client.gameState >= 25) { // L: 4354
- PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field3054, Client.packetWriter.isaacCipher); // L: 4356
- var1.packetBuffer.writeByte(ClanChannelMember.getWindowedMode()); // L: 4357
- var1.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 4358
- var1.packetBuffer.writeShort(class433.canvasHeight); // L: 4359
- Client.packetWriter.addNode(var1); // L: 4360
- }
-
- } // L: 4362
+ public static void method5711() {
+ KitDefinition.KitDefinition_cached.clear(); // L: 130
+ } // L: 131
}
diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java
index 6ca477c7f1..b70911e267 100644
--- a/runescape-client/src/main/java/World.java
+++ b/runescape-client/src/main/java/World.java
@@ -1,78 +1,66 @@
-import java.awt.Desktop;
-import java.awt.Desktop.Action;
-import java.net.URI;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bx")
+@ObfuscatedName("bc")
@Implements("World")
public class World {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("HealthBarDefinition_archive")
- public static AbstractArchive HealthBarDefinition_archive;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "[Lbx;"
- )
- @Export("World_worlds")
- static World[] World_worlds;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -49642273
+ intValue = 1243814163
)
@Export("World_count")
static int World_count;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1914794519
+ intValue = 1265990767
)
@Export("World_listCount")
static int World_listCount;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("World_sortOption2")
static int[] World_sortOption2;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("World_sortOption1")
static int[] World_sortOption1;
- @ObfuscatedName("y")
+ @ObfuscatedName("bx")
+ @Export("otp")
+ static String otp;
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -2104390663
+ intValue = -1195695549
)
@Export("id")
int id;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -1147317399
+ intValue = 1566282553
)
@Export("properties")
int properties;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = -1040415463
+ intValue = 856262613
)
@Export("population")
int population;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("host")
String host;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("activity")
String activity;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 1070673927
+ intValue = -951869585
)
@Export("location")
int location;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = 1367786099
+ intValue = 1645334635
)
@Export("index")
int index;
@@ -87,179 +75,123 @@ public class World {
World() {
} // L: 27
- @ObfuscatedName("r")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1167895037"
+ descriptor = "(B)Z",
+ garbageValue = "-1"
)
@Export("isMembersOnly")
boolean isMembersOnly() {
- return (1 & this.properties) != 0; // L: 257
+ return (1 & this.properties) != 0; // L: 247
}
- @ObfuscatedName("v")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-1033703792"
+ garbageValue = "2111399818"
)
- boolean method1615() {
- return (2 & this.properties) != 0; // L: 261
- }
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(S)Z",
- garbageValue = "20770"
- )
- @Export("isPvp")
- boolean isPvp() {
- return (4 & this.properties) != 0; // L: 265
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "87"
- )
- boolean method1644() {
- return (8 & this.properties) != 0;
- }
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "78921463"
- )
- @Export("isDeadman")
- boolean isDeadman() {
- return (536870912 & this.properties) != 0; // L: 273
- }
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1500446551"
- )
- @Export("isBeta")
- boolean isBeta() {
- return (33554432 & this.properties) != 0; // L: 277
+ boolean method1628() {
+ return (2 & this.properties) != 0; // L: 251
}
@ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-97"
+ descriptor = "(I)Z",
+ garbageValue = "-1146943017"
)
- boolean method1619() {
- return (1073741824 & this.properties) != 0; // L: 281
+ @Export("isPvp")
+ boolean isPvp() {
+ return (4 & this.properties) != 0; // L: 255
}
- @ObfuscatedName("o")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(Llp;I)V",
- garbageValue = "-1000029725"
+ descriptor = "(I)Z",
+ garbageValue = "2013300690"
)
- public static void method1662(AbstractArchive var0) {
- StructComposition.StructDefinition_archive = var0; // L: 19
- } // L: 20
+ boolean method1594() {
+ return (8 & this.properties) != 0; // L: 259
+ }
- @ObfuscatedName("l")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZB)V",
- garbageValue = "59"
+ descriptor = "(I)Z",
+ garbageValue = "-2131603316"
)
- static void method1663(String var0, boolean var1, String var2, boolean var3) {
- if (var1) { // L: 31
- if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 32
- try {
- Desktop.getDesktop().browse(new URI(var0)); // L: 34
- return; // L: 35
- } catch (Exception var5) { // L: 37
+ @Export("isDeadman")
+ boolean isDeadman() {
+ return (536870912 & this.properties) != 0; // L: 263
+ }
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "1130172337"
+ )
+ @Export("isBeta")
+ boolean isBeta() {
+ return (33554432 & this.properties) != 0; // L: 267
+ }
+
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "(B)Z",
+ garbageValue = "119"
+ )
+ boolean method1597() {
+ return (1073741824 & this.properties) != 0; // L: 271
+ }
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(B)Lfv;",
+ garbageValue = "-7"
+ )
+ public static Clock method1601() {
+ try {
+ return new NanoClock(); // L: 8
+ } catch (Throwable var1) { // L: 10
+ return new MilliClock(); // L: 11
+ }
+ }
+
+ @ObfuscatedName("hk")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1666471855"
+ )
+ static final void method1627() {
+ for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4850 4851 4868
+ if (var0.plane == PacketWriter.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4852
+ if (Client.cycle >= var0.cycleStart) { // L: 4853
+ if (var0.targetIndex > 0) { // L: 4854
+ NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4855
+ if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4856
+ var0.setDestination(var1.x, var1.y, SceneTilePaint.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle);
+ }
+ }
+
+ if (var0.targetIndex < 0) { // L: 4858
+ int var2 = -var0.targetIndex - 1; // L: 4860
+ Player var3;
+ if (var2 == Client.localPlayerIndex) { // L: 4861
+ var3 = class101.localPlayer;
+ } else {
+ var3 = Client.players[var2]; // L: 4862
+ }
+
+ if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) {
+ var0.setDestination(var3.x, var3.y, SceneTilePaint.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4863
+ }
+ }
+
+ var0.advance(Client.field555); // L: 4865
+ class356.scene.drawEntity(PacketWriter.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4866
}
- }
-
- if (class29.field168.startsWith("win") && !var3) { // L: 39 40
- Skills.method5578(var0, 0, "openjs"); // L: 42
- return; // L: 44
- }
-
- if (class29.field168.startsWith("mac")) { // L: 47
- Skills.method5578(var0, 1, var2); // L: 48
- return; // L: 49
- }
-
- Skills.method5578(var0, 2, "openjs"); // L: 52
- } else {
- Skills.method5578(var0, 3, "openjs"); // L: 57
- }
-
- } // L: 60
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(IIIB)V",
- garbageValue = "-105"
- )
- static final void method1661(int var0, int var1, int var2) {
- int var3;
- for (var3 = 0; var3 < 8; ++var3) { // L: 153
- for (int var4 = 0; var4 < 8; ++var4) { // L: 154
- Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0;
+ } else {
+ var0.remove();
}
}
- if (var1 > 0) { // L: 156
- for (var3 = 1; var3 < 8; ++var3) { // L: 157
- Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2];
- }
- }
-
- if (var2 > 0) { // L: 159
- for (var3 = 1; var3 < 8; ++var3) { // L: 160
- Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1];
- }
- }
-
- if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 162
- Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2];
- } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 163
- Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1];
- } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 164
- Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1];
- }
-
- } // L: 165
-
- @ObfuscatedName("ab")
- @ObfuscatedSignature(
- descriptor = "(Lao;B)V",
- garbageValue = "1"
- )
- @Export("PcmStream_disable")
- static final void PcmStream_disable(PcmStream var0) {
- var0.active = false; // L: 266
- if (var0.sound != null) { // L: 267
- var0.sound.position = 0;
- }
-
- for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
- PcmStream_disable(var1); // L: 268
- }
-
- } // L: 269
-
- @ObfuscatedName("kk")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "64"
- )
- static final void method1664(int var0) {
- var0 = Math.max(Math.min(var0, 100), 0); // L: 12037
- var0 = 100 - var0; // L: 12038
- float var1 = (float)var0 / 200.0F + 0.5F; // L: 12039
- Rasterizer3D.Rasterizer3D_setBrightness((double)var1); // L: 12041
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness((double)var1); // L: 12042
- VerticalAlignment.method3446(); // L: 12043
- class12.clientPreferences.method2232((double)var1); // L: 12044
- } // L: 12046
+ } // L: 4870
}
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index b497d610b9..3bdb469704 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("op")
+@ObfuscatedName("oe")
@Implements("WorldMap")
public class WorldMap {
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("fontNameVerdana11")
static final FontName fontNameVerdana11;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("fontNameVerdana13")
static final FontName fontNameVerdana13;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Lpi;"
+ descriptor = "Lpd;"
)
@Export("fontNameVerdana15")
static final FontName fontNameVerdana15;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("WorldMap_archive")
AbstractArchive WorldMap_archive;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("WorldMap_geographyArchive")
AbstractArchive WorldMap_geographyArchive;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("WorldMap_groundArchive")
AbstractArchive WorldMap_groundArchive;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Lmx;"
+ descriptor = "Lmt;"
)
@Export("font")
Font font;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("fonts")
HashMap fonts;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "[Lqd;"
+ descriptor = "[Lqu;"
)
@Export("mapSceneSprites")
IndexedSprite[] mapSceneSprites;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@Export("details")
HashMap details;
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "Lhm;"
+ descriptor = "Lhg;"
)
@Export("mainMapArea")
WorldMapArea mainMapArea;
- @ObfuscatedName("n")
+ @ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "Lhm;"
+ descriptor = "Lhg;"
)
@Export("currentMapArea")
WorldMapArea currentMapArea;
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ descriptor = "Lhg;"
+ )
+ WorldMapArea field4550;
+ @ObfuscatedName("a")
@ObfuscatedSignature(
descriptor = "Lhm;"
)
- WorldMapArea field4570;
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "Lhp;"
- )
@Export("worldMapManager")
WorldMapManager worldMapManager;
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "Loy;"
+ descriptor = "Lox;"
)
@Export("cacheLoader")
WorldMapArchiveLoader cacheLoader;
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedGetter(
- intValue = -1559878287
+ intValue = 1280824469
)
@Export("centerTileX")
int centerTileX;
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedGetter(
- intValue = -666870475
+ intValue = -310067487
)
@Export("centerTileY")
int centerTileY;
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = -1443106973
+ intValue = -1880779153
)
@Export("worldMapTargetX")
int worldMapTargetX;
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = 868076553
+ intValue = -723853881
)
@Export("worldMapTargetY")
int worldMapTargetY;
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@Export("zoom")
float zoom;
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@Export("zoomTarget")
float zoomTarget;
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@ObfuscatedGetter(
- intValue = 995814995
+ intValue = -562089369
)
@Export("worldMapDisplayWidth")
int worldMapDisplayWidth;
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@ObfuscatedGetter(
- intValue = 38560009
+ intValue = -1885245943
)
@Export("worldMapDisplayHeight")
int worldMapDisplayHeight;
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@ObfuscatedGetter(
- intValue = -156430915
+ intValue = 1139632457
)
@Export("worldMapDisplayX")
int worldMapDisplayX;
@ObfuscatedName("ab")
@ObfuscatedGetter(
- intValue = 851387081
+ intValue = -1859750739
)
@Export("worldMapDisplayY")
int worldMapDisplayY;
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@ObfuscatedGetter(
- intValue = 1687396607
+ intValue = 847440549
)
@Export("maxFlashCount")
int maxFlashCount;
- @ObfuscatedName("ae")
+ @ObfuscatedName("ac")
@ObfuscatedGetter(
- intValue = 1963218407
+ intValue = 415648465
)
@Export("cyclesPerFlash")
int cyclesPerFlash;
- @ObfuscatedName("az")
+ @ObfuscatedName("ae")
@Export("perpetualFlash")
boolean perpetualFlash;
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@Export("flashingElements")
HashSet flashingElements;
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedGetter(
- intValue = -603667465
+ intValue = 1913006969
)
@Export("flashCount")
int flashCount;
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedGetter(
- intValue = -127369607
+ intValue = -998053929
)
@Export("flashCycle")
int flashCycle;
- @ObfuscatedName("ak")
- @ObfuscatedGetter(
- intValue = -2064512495
- )
- int field4541;
@ObfuscatedName("af")
@ObfuscatedGetter(
- intValue = 2057640455
+ intValue = -1595444339
)
- int field4551;
- @ObfuscatedName("al")
+ int field4546;
+ @ObfuscatedName("ax")
@ObfuscatedGetter(
- intValue = -2141365015
+ intValue = 1517937465
)
- int field4529;
+ int field4547;
+ @ObfuscatedName("ar")
+ @ObfuscatedGetter(
+ intValue = -510236727
+ )
+ int field4539;
+ @ObfuscatedName("at")
+ @ObfuscatedGetter(
+ intValue = 376848179
+ )
+ int field4567;
+ @ObfuscatedName("ag")
+ @ObfuscatedGetter(
+ longValue = -999650809358427355L
+ )
+ long field4534;
@ObfuscatedName("aq")
@ObfuscatedGetter(
- intValue = -958570419
+ intValue = -410641503
)
- int field4553;
- @ObfuscatedName("ad")
- @ObfuscatedGetter(
- longValue = -5163791974859805081L
- )
- long field4554;
- @ObfuscatedName("an")
- @ObfuscatedGetter(
- intValue = 1120511121
- )
- int field4555;
- @ObfuscatedName("aw")
- @ObfuscatedGetter(
- intValue = -3362241
- )
- int field4549;
+ int field4551;
@ObfuscatedName("ah")
- boolean field4557;
+ @ObfuscatedGetter(
+ intValue = 597430499
+ )
+ int field4552;
@ObfuscatedName("ai")
+ boolean field4514;
+ @ObfuscatedName("aw")
@Export("enabledElements")
HashSet enabledElements;
- @ObfuscatedName("ay")
+ @ObfuscatedName("au")
@Export("enabledCategories")
HashSet enabledCategories;
@ObfuscatedName("aa")
@Export("enabledElementIds")
HashSet enabledElementIds;
- @ObfuscatedName("ax")
- HashSet field4534;
- @ObfuscatedName("at")
+ @ObfuscatedName("ay")
+ HashSet field4561;
+ @ObfuscatedName("as")
@Export("elementsDisabled")
boolean elementsDisabled;
- @ObfuscatedName("br")
+ @ObfuscatedName("be")
@ObfuscatedGetter(
- intValue = 1230820063
+ intValue = -1332813641
)
- int field4564;
- @ObfuscatedName("bk")
+ int field4559;
+ @ObfuscatedName("bp")
@Export("menuOpcodes")
final int[] menuOpcodes;
- @ObfuscatedName("bi")
- List field4566;
- @ObfuscatedName("bc")
+ @ObfuscatedName("bf")
+ List field4548;
+ @ObfuscatedName("bg")
@Export("iconIterator")
Iterator iconIterator;
- @ObfuscatedName("bo")
- HashSet field4522;
- @ObfuscatedName("bl")
+ @ObfuscatedName("br")
+ HashSet field4531;
+ @ObfuscatedName("bn")
@ObfuscatedSignature(
descriptor = "Lkd;"
)
@Export("mouseCoord")
Coord mouseCoord;
- @ObfuscatedName("bs")
+ @ObfuscatedName("bq")
@Export("showCoord")
public boolean showCoord;
- @ObfuscatedName("bx")
+ @ObfuscatedName("bc")
@ObfuscatedSignature(
- descriptor = "Lqr;"
+ descriptor = "Lqe;"
)
@Export("sprite")
SpritePixels sprite;
- @ObfuscatedName("bd")
+ @ObfuscatedName("bl")
@ObfuscatedGetter(
- intValue = -1650255965
+ intValue = 781783389
)
@Export("cachedPixelsPerTile")
int cachedPixelsPerTile;
- @ObfuscatedName("bj")
+ @ObfuscatedName("bv")
@ObfuscatedGetter(
- intValue = -52298735
+ intValue = 1609384449
)
@Export("minCachedTileX")
int minCachedTileX;
- @ObfuscatedName("be")
+ @ObfuscatedName("bt")
@ObfuscatedGetter(
- intValue = -708034989
+ intValue = -15655745
)
@Export("minCachedTileY")
int minCachedTileY;
- @ObfuscatedName("bf")
+ @ObfuscatedName("bh")
@ObfuscatedGetter(
- intValue = 2043409555
+ intValue = -772484837
)
- int field4575;
+ int field4560;
static {
fontNameVerdana11 = FontName.FontName_verdana11; // L: 46
@@ -304,30 +304,30 @@ public class WorldMap {
this.flashingElements = null; // L: 71
this.flashCount = -1; // L: 72
this.flashCycle = -1; // L: 73
- this.field4541 = -1; // L: 74
- this.field4551 = -1; // L: 75
- this.field4529 = -1; // L: 76
- this.field4553 = -1; // L: 77
- this.field4557 = true; // L: 81
+ this.field4546 = -1; // L: 74
+ this.field4547 = -1; // L: 75
+ this.field4539 = -1; // L: 76
+ this.field4567 = -1; // L: 77
+ this.field4514 = true; // L: 81
this.enabledElements = new HashSet(); // L: 84
this.enabledCategories = new HashSet(); // L: 85
this.enabledElementIds = new HashSet(); // L: 86
- this.field4534 = new HashSet(); // L: 87
+ this.field4561 = new HashSet(); // L: 87
this.elementsDisabled = false; // L: 88
- this.field4564 = 0; // L: 89
+ this.field4559 = 0; // L: 89
this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91
- this.field4522 = new HashSet(); // L: 94
+ this.field4531 = new HashSet(); // L: 94
this.mouseCoord = null; // L: 95
this.showCoord = false; // L: 96
this.minCachedTileX = -1; // L: 99
this.minCachedTileY = -1; // L: 100
- this.field4575 = -1; // L: 101
+ this.field4560 = -1; // L: 101
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;Llp;Lmx;Ljava/util/HashMap;[Lqd;I)V",
- garbageValue = "-1151544367"
+ descriptor = "(Llh;Llh;Llh;Lmt;Ljava/util/HashMap;[Lqu;B)V",
+ garbageValue = "35"
)
@Export("init")
public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) {
@@ -341,7 +341,7 @@ public class WorldMap {
this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112
this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113
this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114
- int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2910.name); // L: 115
+ int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2867.name); // L: 115
int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116
this.details = new HashMap(var8.length); // L: 117
@@ -356,1107 +356,1244 @@ public class WorldMap {
}
this.setCurrentMapArea(this.mainMapArea); // L: 127
- this.field4570 = null; // L: 128
+ this.field4550 = null; // L: 128
} // L: 129
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "2022922542"
+ )
+ public void method7182() {
+ WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133
+ } // L: 135
+
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1737616762"
- )
- public void method7023() {
- class175.method3380(); // L: 132
- } // L: 133
-
- @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(IIZIIIII)V",
- garbageValue = "794881818"
+ garbageValue = "885172006"
)
@Export("onCycle")
public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) {
- if (this.cacheLoader.isLoaded()) { // L: 136
- this.smoothZoom(); // L: 139
- this.scrollToTarget(); // L: 140
- if (var3) { // L: 141
- int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 144
- int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 145
- List var10 = this.worldMapManager.method4645(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 146
- HashSet var11 = new HashSet(); // L: 147
+ if (this.cacheLoader.isLoaded()) { // L: 138
+ this.smoothZoom(); // L: 141
+ this.scrollToTarget(); // L: 142
+ if (var3) { // L: 143
+ int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146
+ int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147
+ List var10 = this.worldMapManager.method4819(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148
+ HashSet var11 = new HashSet(); // L: 149
Iterator var12;
AbstractWorldMapIcon var13;
ScriptEvent var14;
WorldMapEvent var15;
- for (var12 = var10.iterator(); var12.hasNext(); class144.runScriptEvent(var14)) { // L: 148 161
- var13 = (AbstractWorldMapIcon)var12.next(); // L: 149
- var11.add(var13); // L: 151
- var14 = new ScriptEvent(); // L: 152
- var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 153
- var14.setArgs(new Object[]{var15, var1, var2}); // L: 154
- if (this.field4522.contains(var13)) { // L: 155
- var14.setType(17); // L: 156
+ for (var12 = var10.iterator(); var12.hasNext(); BoundaryObject.runScriptEvent(var14)) { // L: 150 163
+ var13 = (AbstractWorldMapIcon)var12.next(); // L: 151
+ var11.add(var13); // L: 153
+ var14 = new ScriptEvent(); // L: 154
+ var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155
+ var14.setArgs(new Object[]{var15, var1, var2}); // L: 156
+ if (this.field4531.contains(var13)) { // L: 157
+ var14.setType(17); // L: 158
} else {
- var14.setType(15); // L: 159
+ var14.setType(15); // L: 161
}
}
- var12 = this.field4522.iterator(); // L: 164
+ var12 = this.field4531.iterator(); // L: 166
while (var12.hasNext()) {
- var13 = (AbstractWorldMapIcon)var12.next(); // L: 165
- if (!var11.contains(var13)) { // L: 167
- var14 = new ScriptEvent(); // L: 168
- var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 169
- var14.setArgs(new Object[]{var15, var1, var2}); // L: 170
- var14.setType(16); // L: 171
- class144.runScriptEvent(var14); // L: 172
+ var13 = (AbstractWorldMapIcon)var12.next(); // L: 167
+ if (!var11.contains(var13)) { // L: 169
+ var14 = new ScriptEvent(); // L: 170
+ var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171
+ var14.setArgs(new Object[]{var15, var1, var2}); // L: 172
+ var14.setType(16); // L: 173
+ BoundaryObject.runScriptEvent(var14); // L: 174
}
}
- this.field4522 = var11; // L: 176
+ this.field4531 = var11; // L: 178
}
}
- } // L: 137 142 177
+ } // L: 139 144 179
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IIZZI)V",
- garbageValue = "1498569206"
+ descriptor = "(IIZZS)V",
+ garbageValue = "13586"
)
- public void method7025(int var1, int var2, boolean var3, boolean var4) {
- long var5 = class113.method2624(); // L: 180
- this.method7026(var1, var2, var4, var5); // L: 181
- if (this.hasTarget() || !var4 && !var3) { // L: 182
- this.method7030(); // L: 196
- } else {
- if (var4) { // L: 183
- this.field4529 = var1; // L: 184
- this.field4553 = var2; // L: 185
- this.field4541 = this.centerTileX; // L: 186
- this.field4551 = this.centerTileY; // L: 187
+ public void method7307(int var1, int var2, boolean var3, boolean var4) {
+ long var5;
+ label40: {
+ var5 = class115.method2692(); // L: 182
+ this.method7217(var1, var2, var4, var5); // L: 183
+ if (!this.hasTarget() && (var4 || var3)) { // L: 185
+ boolean var7 = Client.clickedWidget != null; // L: 188
+ if (!var7) { // L: 190
+ if (var4) { // L: 191
+ this.field4539 = var1; // L: 192
+ this.field4567 = var2; // L: 193
+ this.field4546 = this.centerTileX; // L: 194
+ this.field4547 = this.centerTileY; // L: 195
+ }
+
+ if (this.field4546 != -1) { // L: 197
+ int var8 = var1 - this.field4539; // L: 198
+ int var9 = var2 - this.field4567; // L: 199
+ this.setWorldMapPosition(this.field4546 - (int)((float)var8 / this.zoomTarget), (int)((float)var9 / this.zoomTarget) + this.field4547, false); // L: 200
+ }
+ break label40;
+ }
}
- if (this.field4541 != -1) { // L: 189
- int var7 = var1 - this.field4529; // L: 190
- int var8 = var2 - this.field4553; // L: 191
- this.setWorldMapPosition(this.field4541 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4551, false); // L: 192
- }
+ this.method7189(); // L: 205
}
- if (var4) { // L: 198
- this.field4554 = var5; // L: 199
- this.field4555 = var1; // L: 200
- this.field4549 = var2; // L: 201
+ if (var4) { // L: 207
+ this.field4534 = var5; // L: 208
+ this.field4551 = var1; // L: 209
+ this.field4552 = var2; // L: 210
}
- } // L: 203
+ } // L: 212
- @ObfuscatedName("a")
- void method7026(int var1, int var2, boolean var3, long var4) {
- if (this.currentMapArea != null) { // L: 206
- int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 207
- int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 208
- this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 209
- if (this.mouseCoord != null && var3) { // L: 210
- boolean var8 = Client.staffModLevel >= 2; // L: 213
- if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 215
- class123.method2781(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 216
+ @ObfuscatedName("j")
+ void method7217(int var1, int var2, boolean var3, long var4) {
+ if (this.currentMapArea != null) { // L: 215
+ int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 216
+ int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 217
+ this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 218
+ if (this.mouseCoord != null && var3) { // L: 219
+ boolean var8 = Client.staffModLevel >= 2; // L: 222
+ int var10;
+ int var11;
+ if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 224
+ int var14 = this.mouseCoord.x; // L: 225
+ var10 = this.mouseCoord.y; // L: 226
+ var11 = this.mouseCoord.plane; // L: 227
+ PacketBufferNode var12 = EnumComposition.getPacketBufferNode(ClientPacket.field2966, Client.packetWriter.isaacCipher); // L: 230
+ var12.packetBuffer.method7763(var11); // L: 231
+ var12.packetBuffer.writeIntME(var10); // L: 232
+ var12.packetBuffer.method7760(0); // L: 233
+ var12.packetBuffer.writeIntME(var14); // L: 234
+ Client.packetWriter.addNode(var12); // L: 235
} else {
- boolean var9 = true; // L: 219
- if (this.field4557) { // L: 220
- int var10 = var1 - this.field4555; // L: 221
- int var11 = var2 - this.field4549; // L: 222
- if (var4 - this.field4554 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 223
- var9 = false; // L: 224
+ boolean var9 = true; // L: 239
+ if (this.field4514) { // L: 240
+ var10 = var1 - this.field4551; // L: 241
+ var11 = var2 - this.field4552; // L: 242
+ if (var4 - this.field4534 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 243
+ var9 = false; // L: 244
}
}
- if (var9) { // L: 227
- PacketBufferNode var12 = WallDecoration.getPacketBufferNode(ClientPacket.field2974, Client.packetWriter.isaacCipher); // L: 228
- var12.packetBuffer.writeIntME(this.mouseCoord.packed()); // L: 229
- Client.packetWriter.addNode(var12); // L: 230
- this.field4554 = 0L; // L: 231
+ if (var9) { // L: 247
+ PacketBufferNode var13 = EnumComposition.getPacketBufferNode(ClientPacket.field2990, Client.packetWriter.isaacCipher); // L: 248
+ var13.packetBuffer.method7783(this.mouseCoord.packed()); // L: 249
+ Client.packetWriter.addNode(var13); // L: 250
+ this.field4534 = 0L; // L: 251
}
}
}
} else {
- this.mouseCoord = null; // L: 236
+ this.mouseCoord = null; // L: 256
}
- } // L: 237
+ } // L: 257
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "19"
+ descriptor = "(I)V",
+ garbageValue = "-454245958"
)
@Export("smoothZoom")
void smoothZoom() {
- if (class127.field1570 != null) { // L: 240
- this.zoom = this.zoomTarget; // L: 241
+ if (UrlRequester.field1362 != null) { // L: 260
+ this.zoom = this.zoomTarget; // L: 261
} else {
- if (this.zoom < this.zoomTarget) { // L: 244
- this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 245
+ if (this.zoom < this.zoomTarget) { // L: 264
+ this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 265
}
- if (this.zoom > this.zoomTarget) { // L: 247
- this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 248
+ if (this.zoom > this.zoomTarget) { // L: 267
+ this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 268
}
}
- } // L: 242 250
+ } // L: 262 270
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "32"
+ descriptor = "(I)V",
+ garbageValue = "1467959919"
)
@Export("scrollToTarget")
void scrollToTarget() {
- if (this.hasTarget()) { // L: 253
- int var1 = this.worldMapTargetX - this.centerTileX; // L: 256
- int var2 = this.worldMapTargetY - this.centerTileY; // L: 257
- if (var1 != 0) { // L: 258
- var1 /= Math.min(8, Math.abs(var1)); // L: 259
+ if (this.hasTarget()) { // L: 273
+ int var1 = this.worldMapTargetX - this.centerTileX; // L: 276
+ int var2 = this.worldMapTargetY - this.centerTileY; // L: 277
+ if (var1 != 0) { // L: 278
+ var1 /= Math.min(8, Math.abs(var1)); // L: 279
}
- if (var2 != 0) { // L: 261
- var2 /= Math.min(8, Math.abs(var2)); // L: 262
+ if (var2 != 0) { // L: 281
+ var2 /= Math.min(8, Math.abs(var2)); // L: 282
}
- this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 264
- if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 265
- this.worldMapTargetX = -1; // L: 266
- this.worldMapTargetY = -1; // L: 267
+ this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 284
+ if (this.centerTileX == this.worldMapTargetX && this.worldMapTargetY == this.centerTileY) { // L: 285
+ this.worldMapTargetX = -1; // L: 286
+ this.worldMapTargetY = -1; // L: 287
}
}
- } // L: 254 269
+ } // L: 274 289
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(IIZI)V",
- garbageValue = "-590255884"
+ garbageValue = "715686977"
)
@Export("setWorldMapPosition")
final void setWorldMapPosition(int var1, int var2, boolean var3) {
- this.centerTileX = var1; // L: 272
- this.centerTileY = var2; // L: 273
- class113.method2624(); // L: 274
+ this.centerTileX = var1; // L: 292
+ this.centerTileY = var2; // L: 293
+ class115.method2692(); // L: 294
if (var3) {
- this.method7030(); // L: 275
+ this.method7189(); // L: 295
}
- } // L: 276
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-25932"
- )
- final void method7030() {
- this.field4553 = -1; // L: 279
- this.field4529 = -1; // L: 280
- this.field4551 = -1; // L: 281
- this.field4541 = -1; // L: 282
- } // L: 283
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-1296861681"
- )
- @Export("hasTarget")
- boolean hasTarget() {
- return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 286
- }
+ } // L: 296
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(IIIB)Lhm;",
- garbageValue = "0"
+ descriptor = "(I)V",
+ garbageValue = "119146039"
+ )
+ final void method7189() {
+ this.field4567 = -1; // L: 299
+ this.field4539 = -1; // L: 300
+ this.field4547 = -1; // L: 301
+ this.field4546 = -1; // L: 302
+ } // L: 303
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "-352879133"
+ )
+ @Export("hasTarget")
+ boolean hasTarget() {
+ return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 306
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(IIIB)Lhg;",
+ garbageValue = "-123"
)
@Export("mapAreaAtCoord")
public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
- Iterator var4 = this.details.values().iterator(); // L: 290
+ Iterator var4 = this.details.values().iterator(); // L: 310
WorldMapArea var5;
do {
if (!var4.hasNext()) {
- return null; // L: 298
+ return null; // L: 318
}
- var5 = (WorldMapArea)var4.next(); // L: 291
- } while(!var5.containsCoord(var1, var2, var3)); // L: 293
+ var5 = (WorldMapArea)var4.next(); // L: 311
+ } while(!var5.containsCoord(var1, var2, var3)); // L: 313
- return var5; // L: 294
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(IIIZI)V",
- garbageValue = "-844627629"
- )
- public void method7033(int var1, int var2, int var3, boolean var4) {
- WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 302
- if (var5 == null) { // L: 303
- if (!var4) { // L: 304
- return; // L: 307
- }
-
- var5 = this.mainMapArea; // L: 305
- }
-
- boolean var6 = false; // L: 309
- if (var5 != this.field4570 || var4) { // L: 310
- this.field4570 = var5; // L: 311
- this.setCurrentMapArea(var5); // L: 312
- var6 = true; // L: 313
- }
-
- if (var6 || var4) { // L: 315
- this.jump(var1, var2, var3); // L: 316
- }
-
- } // L: 318
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1202100696"
- )
- @Export("setCurrentMapAreaId")
- public void setCurrentMapAreaId(int var1) {
- WorldMapArea var2 = this.getMapArea(var1); // L: 321
- if (var2 != null) { // L: 322
- this.setCurrentMapArea(var2); // L: 323
- }
-
- } // L: 325
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "4"
- )
- @Export("currentMapAreaId")
- public int currentMapAreaId() {
- return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 328 329 331
+ return var5; // L: 314
}
@ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(B)Lhm;",
- garbageValue = "-1"
+ descriptor = "(IIIZI)V",
+ garbageValue = "-1521542752"
)
- @Export("getCurrentMapArea")
- public WorldMapArea getCurrentMapArea() {
- return this.currentMapArea; // L: 335
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-1586709252"
- )
- @Export("setCurrentMapArea")
- void setCurrentMapArea(WorldMapArea var1) {
- if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 339
- this.initializeWorldMapManager(var1); // L: 342
- this.jump(-1, -1, -1); // L: 343
- }
- } // L: 340 344
-
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-2105521397"
- )
- @Export("initializeWorldMapManager")
- void initializeWorldMapManager(WorldMapArea var1) {
- this.currentMapArea = var1; // L: 347
- this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 348
- this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 349
- } // L: 350
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(Lhm;Lkd;Lkd;ZS)V",
- garbageValue = "1536"
- )
- public void method7039(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
- if (var1 != null) { // L: 353
- if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 356
- this.initializeWorldMapManager(var1); // L: 357
+ public void method7192(int var1, int var2, int var3, boolean var4) {
+ WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 322
+ if (var5 == null) { // L: 323
+ if (!var4) { // L: 324
+ return; // L: 327
}
- if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 359
- this.jump(var2.plane, var2.x, var2.y); // L: 363
- } else {
- this.jump(var3.plane, var3.x, var3.y); // L: 360
- }
-
- }
- } // L: 354 365
-
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "-1915895673"
- )
- @Export("jump")
- void jump(int var1, int var2, int var3) {
- if (this.currentMapArea != null) { // L: 368
- int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 371
- if (var4 == null) { // L: 372
- var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 373
- }
-
- this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 375
- this.worldMapTargetX = -1; // L: 376
- this.worldMapTargetY = -1; // L: 377
- this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 378
- this.zoomTarget = this.zoom; // L: 379
- this.field4566 = null; // L: 380
- this.iconIterator = null; // L: 381
- this.worldMapManager.clearIcons(); // L: 382
- }
- } // L: 369 383
-
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "(IIIIII)V",
- garbageValue = "1672527404"
- )
- @Export("draw")
- public void draw(int var1, int var2, int var3, int var4, int var5) {
- int[] var6 = new int[4]; // L: 386
- Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 387
- Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 388
- Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 389
- int var7 = this.cacheLoader.getPercentLoaded(); // L: 390
- if (var7 < 100) { // L: 391
- this.drawLoading(var1, var2, var3, var4, var7); // L: 392
- } else {
- if (!this.worldMapManager.isLoaded()) { // L: 395
- this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 396
- if (!this.worldMapManager.isLoaded()) { // L: 397
- return; // L: 398
- }
- }
-
- if (this.flashingElements != null) { // L: 401
- ++this.flashCycle; // L: 402
- if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 403
- this.flashCycle = 0; // L: 404
- ++this.flashCount; // L: 405
- }
-
- if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 407
- this.flashingElements = null; // L: 408
- }
- }
-
- int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 411
- int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 412
- this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 413
- boolean var10;
- if (!this.elementsDisabled) { // L: 414
- var10 = false; // L: 415
- if (var5 - this.field4564 > 100) { // L: 416
- this.field4564 = var5; // L: 417
- var10 = true; // L: 418
- }
-
- this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4534, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 420
- }
-
- this.method7043(var1, var2, var3, var4, var8, var9); // L: 422
- var10 = Client.staffModLevel >= 2; // L: 425
- if (var10 && this.showCoord && this.mouseCoord != null) { // L: 427
- this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
- }
-
- this.worldMapDisplayWidth = var8; // L: 428
- this.worldMapDisplayHeight = var9; // L: 429
- this.worldMapDisplayX = var1; // L: 430
- this.worldMapDisplayY = var2; // L: 431
- Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 432
- }
- } // L: 393 433
-
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "(IIIIIII)Z",
- garbageValue = "65408"
- )
- boolean method7128(int var1, int var2, int var3, int var4, int var5, int var6) {
- if (this.sprite == null) { // L: 436
- return true;
- } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 437
- if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) {
- return true;
- } else if (this.field4575 != Client.field767) {
- return true;
- } else if (var3 <= 0 && var4 <= 0) {
- return var3 + var1 < var5 || var2 + var4 < var6;
- } else {
- return true;
- }
- } else {
- return true;
- }
- }
-
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "(IIIIIII)V",
- garbageValue = "-1887694051"
- )
- void method7043(int var1, int var2, int var3, int var4, int var5, int var6) {
- if (class127.field1570 != null) { // L: 446
- int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 447
- int var8 = var3 + 512; // L: 448
- int var9 = var4 + 512; // L: 449
- float var10 = 1.0F; // L: 450
- var8 = (int)((float)var8 / var10); // L: 451
- var9 = (int)((float)var9 / var10); // L: 452
- int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 453
- int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 454
- int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 455
- int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 456
- if (this.method7128(var8, var9, var13, var14, var3, var4)) { // L: 457
- if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 458
- Arrays.fill(this.sprite.pixels, 0); // L: 461
- } else {
- this.sprite = new SpritePixels(var8, var9); // L: 459
- }
-
- this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 462
- this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 463
- this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 464
- class127.field1570.method5852(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 465
- this.field4575 = Client.field767; // L: 466
- var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 467
- var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 468
- }
-
- Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 470
- if (var10 == 1.0F) { // L: 471
- this.sprite.method7970(var13, var14, 192); // L: 472
- } else {
- this.sprite.method8030(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); // L: 475
- }
+ var5 = this.mainMapArea; // L: 325
}
- } // L: 478
-
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "(IIIIB)V",
- garbageValue = "0"
- )
- @Export("drawOverview")
- public void drawOverview(int var1, int var2, int var3, int var4) {
- if (this.cacheLoader.isLoaded()) { // L: 481
- if (!this.worldMapManager.isLoaded()) { // L: 484
- this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 485
- if (!this.worldMapManager.isLoaded()) { // L: 486
- return; // L: 487
- }
- }
-
- this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 490
+ boolean var6 = false; // L: 329
+ if (var5 != this.field4550 || var4) { // L: 330
+ this.field4550 = var5; // L: 331
+ this.setCurrentMapArea(var5); // L: 332
+ var6 = true; // L: 333
}
- } // L: 482 491
+
+ if (var6 || var4) { // L: 335
+ this.jump(var1, var2, var3); // L: 336
+ }
+
+ } // L: 338
@ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "-35"
+ descriptor = "(II)V",
+ garbageValue = "-1883142675"
)
- @Export("setZoomPercentage")
- public void setZoomPercentage(int var1) {
- this.zoomTarget = this.getZoomFromPercentage(var1); // L: 494
- } // L: 495
+ @Export("setCurrentMapAreaId")
+ public void setCurrentMapAreaId(int var1) {
+ WorldMapArea var2 = this.getMapArea(var1); // L: 341
+ if (var2 != null) { // L: 342
+ this.setCurrentMapArea(var2); // L: 343
+ }
- @ObfuscatedName("i")
+ } // L: 345
+
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(IIIIII)V",
- garbageValue = "-1894387769"
+ descriptor = "(B)I",
+ garbageValue = "-126"
)
- @Export("drawLoading")
- void drawLoading(int var1, int var2, int var3, int var4, int var5) {
- byte var6 = 20; // L: 498
- int var7 = var3 / 2 + var1; // L: 499
- int var8 = var4 / 2 + var2 - 18 - var6; // L: 500
- Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 501
- Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 502
- Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 503
- this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 504
- } // L: 505
+ @Export("currentMapAreaId")
+ public int currentMapAreaId() {
+ return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 348 349 351
+ }
@ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(IB)F",
+ descriptor = "(I)Lhg;",
+ garbageValue = "2042436529"
+ )
+ @Export("getCurrentMapArea")
+ public WorldMapArea getCurrentMapArea() {
+ return this.currentMapArea; // L: 355
+ }
+
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "(Lhg;I)V",
+ garbageValue = "-1953611759"
+ )
+ @Export("setCurrentMapArea")
+ void setCurrentMapArea(WorldMapArea var1) {
+ if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 359
+ this.initializeWorldMapManager(var1); // L: 362
+ this.jump(-1, -1, -1); // L: 363
+ }
+ } // L: 360 364
+
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(Lhg;I)V",
+ garbageValue = "254842140"
+ )
+ @Export("initializeWorldMapManager")
+ void initializeWorldMapManager(WorldMapArea var1) {
+ this.currentMapArea = var1; // L: 367
+ this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 368
+ this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 369
+ } // L: 370
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(Lhg;Lkd;Lkd;ZI)V",
+ garbageValue = "812023779"
+ )
+ public void method7292(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
+ if (var1 != null) { // L: 373
+ if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 376
+ this.initializeWorldMapManager(var1); // L: 377
+ }
+
+ if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 379
+ this.jump(var2.plane, var2.x, var2.y); // L: 383
+ } else {
+ this.jump(var3.plane, var3.x, var3.y); // L: 380
+ }
+
+ }
+ } // L: 374 385
+
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)V",
+ garbageValue = "-462860729"
+ )
+ @Export("jump")
+ void jump(int var1, int var2, int var3) {
+ if (this.currentMapArea != null) { // L: 388
+ int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 391
+ if (var4 == null) { // L: 392
+ var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 393
+ }
+
+ this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 395
+ this.worldMapTargetX = -1; // L: 396
+ this.worldMapTargetY = -1; // L: 397
+ this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 398
+ this.zoomTarget = this.zoom; // L: 399
+ this.field4548 = null; // L: 400
+ this.iconIterator = null; // L: 401
+ this.worldMapManager.clearIcons(); // L: 402
+ }
+ } // L: 389 403
+
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIB)V",
garbageValue = "0"
)
+ @Export("draw")
+ public void draw(int var1, int var2, int var3, int var4, int var5) {
+ int[] var6 = new int[4]; // L: 406
+ Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 407
+ Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 408
+ Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 409
+ int var7 = this.cacheLoader.getPercentLoaded(); // L: 410
+ if (var7 < 100) { // L: 411
+ this.drawLoading(var1, var2, var3, var4, var7); // L: 412
+ } else {
+ if (!this.worldMapManager.isLoaded()) { // L: 415
+ this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 416
+ if (!this.worldMapManager.isLoaded()) { // L: 417
+ return; // L: 418
+ }
+ }
+
+ if (this.flashingElements != null) { // L: 421
+ ++this.flashCycle; // L: 422
+ if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 423
+ this.flashCycle = 0; // L: 424
+ ++this.flashCount; // L: 425
+ }
+
+ if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 427
+ this.flashingElements = null; // L: 428
+ }
+ }
+
+ int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 431
+ int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 432
+ this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 433
+ boolean var10;
+ if (!this.elementsDisabled) { // L: 434
+ var10 = false; // L: 435
+ if (var5 - this.field4559 > 100) { // L: 436
+ this.field4559 = var5; // L: 437
+ var10 = true; // L: 438
+ }
+
+ this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4561, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 440
+ }
+
+ this.method7202(var1, var2, var3, var4, var8, var9); // L: 442
+ var10 = Client.staffModLevel >= 2; // L: 445
+ if (var10 && this.showCoord && this.mouseCoord != null) { // L: 447
+ this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
+ }
+
+ this.worldMapDisplayWidth = var8; // L: 448
+ this.worldMapDisplayHeight = var9; // L: 449
+ this.worldMapDisplayX = var1; // L: 450
+ this.worldMapDisplayY = var2; // L: 451
+ Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 452
+ }
+ } // L: 413 453
+
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIIB)Z",
+ garbageValue = "39"
+ )
+ boolean method7201(int var1, int var2, int var3, int var4, int var5, int var6) {
+ if (this.sprite == null) { // L: 456
+ return true;
+ } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 457
+ if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 458
+ return true;
+ } else if (this.field4560 != Client.field770) { // L: 459
+ return true;
+ } else if (var3 <= 0 && var4 <= 0) { // L: 460
+ return var3 + var1 < var5 || var2 + var4 < var6; // L: 461
+ } else {
+ return true; // L: 462
+ }
+ } else {
+ return true;
+ }
+ }
+
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIII)V",
+ garbageValue = "273043499"
+ )
+ void method7202(int var1, int var2, int var3, int var4, int var5, int var6) {
+ if (UrlRequester.field1362 != null) { // L: 466
+ int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 467
+ int var8 = var3 + 512; // L: 468
+ int var9 = var4 + 512; // L: 469
+ float var10 = 1.0F; // L: 470
+ var8 = (int)((float)var8 / var10); // L: 471
+ var9 = (int)((float)var9 / var10); // L: 472
+ int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 473
+ int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 474
+ int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 475
+ int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 476
+ if (this.method7201(var8, var9, var13, var14, var3, var4)) { // L: 477
+ if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 478
+ Arrays.fill(this.sprite.pixels, 0); // L: 481
+ } else {
+ this.sprite = new SpritePixels(var8, var9); // L: 479
+ }
+
+ this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 482
+ this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 483
+ this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 484
+ UrlRequester.field1362.method6046(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 485
+ this.field4560 = Client.field770; // L: 486
+ var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 487
+ var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 488
+ }
+
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 490
+ if (1.0F == var10) { // L: 491
+ this.sprite.method8171(var13, var14, 192); // L: 492
+ } else {
+ this.sprite.method8155(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); // L: 495
+ }
+ }
+
+ } // L: 498
+
+ @ObfuscatedName("n")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIB)V",
+ garbageValue = "-9"
+ )
+ @Export("drawOverview")
+ public void drawOverview(int var1, int var2, int var3, int var4) {
+ if (this.cacheLoader.isLoaded()) { // L: 501
+ if (!this.worldMapManager.isLoaded()) { // L: 504
+ this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 505
+ if (!this.worldMapManager.isLoaded()) { // L: 506
+ return; // L: 507
+ }
+ }
+
+ this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 510
+ }
+ } // L: 502 511
+
+ @ObfuscatedName("o")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1059944700"
+ )
+ @Export("setZoomPercentage")
+ public void setZoomPercentage(int var1) {
+ this.zoomTarget = this.getZoomFromPercentage(var1); // L: 514
+ } // L: 515
+
+ @ObfuscatedName("m")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIII)V",
+ garbageValue = "-884095682"
+ )
+ @Export("drawLoading")
+ void drawLoading(int var1, int var2, int var3, int var4, int var5) {
+ byte var6 = 20; // L: 518
+ int var7 = var3 / 2 + var1; // L: 519
+ int var8 = var4 / 2 + var2 - 18 - var6; // L: 520
+ Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 521
+ Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 522
+ Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 523
+ this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 524
+ } // L: 525
+
+ @ObfuscatedName("d")
+ @ObfuscatedSignature(
+ descriptor = "(II)F",
+ garbageValue = "-1978346324"
+ )
@Export("getZoomFromPercentage")
float getZoomFromPercentage(int var1) {
- if (var1 == 25) { // L: 508
+ if (var1 == 25) { // L: 528
return 1.0F;
- } else if (var1 == 37) { // L: 509
+ } else if (var1 == 37) { // L: 529
return 1.5F;
- } else if (var1 == 50) { // L: 510
- return 2.0F;
- } else if (var1 == 75) { // L: 511
+ } else if (var1 == 50) {
+ return 2.0F; // L: 530
+ } else if (var1 == 75) { // L: 531
return 3.0F;
} else {
- return var1 == 100 ? 4.0F : 8.0F; // L: 512 513
+ return var1 == 100 ? 4.0F : 8.0F; // L: 532 533
}
}
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1554124121"
+ garbageValue = "1581963366"
)
@Export("getZoomLevel")
public int getZoomLevel() {
- if (1.0D == (double)this.zoomTarget) { // L: 517
+ if ((double)this.zoomTarget == 1.0D) { // L: 537
return 25;
- } else if ((double)this.zoomTarget == 1.5D) { // L: 518
+ } else if (1.5D == (double)this.zoomTarget) { // L: 538
return 37;
- } else if ((double)this.zoomTarget == 2.0D) { // L: 519
+ } else if (2.0D == (double)this.zoomTarget) { // L: 539
return 50;
- } else if (3.0D == (double)this.zoomTarget) { // L: 520
+ } else if ((double)this.zoomTarget == 3.0D) { // L: 540
return 75;
} else {
- return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 521 522
+ return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 541 542
}
}
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-685965798"
+ descriptor = "(B)V",
+ garbageValue = "31"
)
@Export("loadCache")
public void loadCache() {
- this.cacheLoader.load(); // L: 526
- } // L: 527
+ this.cacheLoader.load(); // L: 546
+ } // L: 547
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "103"
+ descriptor = "(I)Z",
+ garbageValue = "1992211650"
)
@Export("isCacheLoaded")
public boolean isCacheLoaded() {
- return this.cacheLoader.isLoaded(); // L: 530
+ return this.cacheLoader.isLoaded(); // L: 550
}
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "(II)Lhm;",
- garbageValue = "-1055675937"
+ descriptor = "(II)Lhg;",
+ garbageValue = "488070761"
)
@Export("getMapArea")
public WorldMapArea getMapArea(int var1) {
- Iterator var2 = this.details.values().iterator(); // L: 534
+ Iterator var2 = this.details.values().iterator(); // L: 554
WorldMapArea var3;
do {
if (!var2.hasNext()) {
- return null; // L: 542
+ return null; // L: 562
}
- var3 = (WorldMapArea)var2.next(); // L: 535
- } while(var3.getId() != var1); // L: 537
+ var3 = (WorldMapArea)var2.next(); // L: 555
+ } while(var3.getId() != var1); // L: 557
- return var3; // L: 538
+ return var3; // L: 558
}
@ObfuscatedName("ab")
@ObfuscatedSignature(
descriptor = "(III)V",
- garbageValue = "140352993"
+ garbageValue = "-2000292746"
)
@Export("setWorldMapPositionTarget")
public void setWorldMapPositionTarget(int var1, int var2) {
- if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 546
- this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 549
- this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 550
+ if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 566
+ this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 569
+ this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 570
}
- } // L: 547 551
-
- @ObfuscatedName("aj")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-2137393480"
- )
- @Export("setWorldMapPositionTargetInstant")
- public void setWorldMapPositionTargetInstant(int var1, int var2) {
- if (this.currentMapArea != null) { // L: 554
- this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 557
- this.worldMapTargetX = -1; // L: 558
- this.worldMapTargetY = -1; // L: 559
- }
- } // L: 555 560
-
- @ObfuscatedName("ae")
- @ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "-1942446245"
- )
- @Export("jumpToSourceCoord")
- public void jumpToSourceCoord(int var1, int var2, int var3) {
- if (this.currentMapArea != null) { // L: 563
- int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 566
- if (var4 != null) { // L: 567
- this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 568
- }
-
- }
- } // L: 564 570
-
- @ObfuscatedName("az")
- @ObfuscatedSignature(
- descriptor = "(IIIB)V",
- garbageValue = "-124"
- )
- @Export("jumpToSourceCoordInstant")
- public void jumpToSourceCoordInstant(int var1, int var2, int var3) {
- if (this.currentMapArea != null) { // L: 573
- int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 576
- if (var4 != null) { // L: 577
- this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 578
- }
-
- }
- } // L: 574 580
+ } // L: 567 571
@ObfuscatedName("ap")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "1697646850"
+ )
+ @Export("setWorldMapPositionTargetInstant")
+ public void setWorldMapPositionTargetInstant(int var1, int var2) {
+ if (this.currentMapArea != null) { // L: 574
+ this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 577
+ this.worldMapTargetX = -1; // L: 578
+ this.worldMapTargetY = -1; // L: 579
+ }
+ } // L: 575 580
+
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "(IIIB)V",
+ garbageValue = "49"
+ )
+ @Export("jumpToSourceCoord")
+ public void jumpToSourceCoord(int var1, int var2, int var3) {
+ if (this.currentMapArea != null) { // L: 583
+ int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 586
+ if (var4 != null) { // L: 587
+ this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 588
+ }
+
+ }
+ } // L: 584 590
+
+ @ObfuscatedName("ae")
+ @ObfuscatedSignature(
+ descriptor = "(IIIB)V",
+ garbageValue = "16"
+ )
+ @Export("jumpToSourceCoordInstant")
+ public void jumpToSourceCoordInstant(int var1, int var2, int var3) {
+ if (this.currentMapArea != null) { // L: 593
+ int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 596
+ if (var4 != null) { // L: 597
+ this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 598
+ }
+
+ }
+ } // L: 594 600
+
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1016539998"
+ garbageValue = "1624577008"
)
@Export("getDisplayX")
public int getDisplayX() {
- return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 583 584 586
+ return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 603 604 606
}
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1846299210"
+ garbageValue = "-1104957899"
)
@Export("getDisplayY")
public int getDisplayY() {
- return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 590 591 593
+ return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 610 611 613
}
- @ObfuscatedName("au")
+ @ObfuscatedName("an")
@ObfuscatedSignature(
descriptor = "(B)Lkd;",
- garbageValue = "82"
+ garbageValue = "-42"
)
@Export("getDisplayCoord")
public Coord getDisplayCoord() {
- return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 597 598 600
- }
-
- @ObfuscatedName("ak")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "227293520"
- )
- @Export("getDisplayWith")
- public int getDisplayWith() {
- return this.worldMapDisplayWidth; // L: 604
+ return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 617 618 620
}
@ObfuscatedName("af")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "751565182"
+ garbageValue = "-1921682831"
+ )
+ @Export("getDisplayWith")
+ public int getDisplayWith() {
+ return this.worldMapDisplayWidth; // L: 624
+ }
+
+ @ObfuscatedName("ax")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1280379372"
)
@Export("getDisplayHeight")
public int getDisplayHeight() {
- return this.worldMapDisplayHeight; // L: 608
+ return this.worldMapDisplayHeight; // L: 628
}
- @ObfuscatedName("al")
+ @ObfuscatedName("ar")
@ObfuscatedSignature(
descriptor = "(IB)V",
- garbageValue = "0"
+ garbageValue = "-43"
)
@Export("setMaxFlashCount")
public void setMaxFlashCount(int var1) {
- if (var1 >= 1) { // L: 612
- this.maxFlashCount = var1; // L: 613
+ if (var1 >= 1) { // L: 632
+ this.maxFlashCount = var1; // L: 633
}
- } // L: 615
+ } // L: 635
- @ObfuscatedName("aq")
+ @ObfuscatedName("at")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-78"
+ descriptor = "(I)V",
+ garbageValue = "753498595"
)
@Export("resetMaxFlashCount")
public void resetMaxFlashCount() {
- this.maxFlashCount = 3; // L: 618
- } // L: 619
+ this.maxFlashCount = 3; // L: 638
+ } // L: 639
- @ObfuscatedName("ad")
+ @ObfuscatedName("ag")
@ObfuscatedSignature(
descriptor = "(II)V",
- garbageValue = "-986945169"
+ garbageValue = "2030876969"
)
@Export("setCyclesPerFlash")
public void setCyclesPerFlash(int var1) {
- if (var1 >= 1) { // L: 622
- this.cyclesPerFlash = var1; // L: 623
+ if (var1 >= 1) { // L: 642
+ this.cyclesPerFlash = var1; // L: 643
}
- } // L: 625
+ } // L: 645
- @ObfuscatedName("an")
+ @ObfuscatedName("aq")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1484398671"
+ garbageValue = "-563581056"
)
@Export("resetCyclesPerFlash")
public void resetCyclesPerFlash() {
- this.cyclesPerFlash = 50; // L: 628
- } // L: 629
-
- @ObfuscatedName("aw")
- @ObfuscatedSignature(
- descriptor = "(ZB)V",
- garbageValue = "-124"
- )
- @Export("setPerpetualFlash")
- public void setPerpetualFlash(boolean var1) {
- this.perpetualFlash = var1; // L: 632
- } // L: 633
+ this.cyclesPerFlash = 50; // L: 648
+ } // L: 649
@ObfuscatedName("ah")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1858255498"
+ descriptor = "(ZI)V",
+ garbageValue = "1949039555"
)
- @Export("flashElement")
- public void flashElement(int var1) {
- this.flashingElements = new HashSet(); // L: 636
- this.flashingElements.add(var1); // L: 637
- this.flashCount = 0; // L: 638
- this.flashCycle = 0; // L: 639
- } // L: 640
-
- @ObfuscatedName("ao")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "337507514"
- )
- @Export("flashCategory")
- public void flashCategory(int var1) {
- this.flashingElements = new HashSet(); // L: 643
- this.flashCount = 0; // L: 644
- this.flashCycle = 0; // L: 645
-
- for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 646
- if (class120.WorldMapElement_get(var2) != null && class120.WorldMapElement_get(var2).category == var1) { // L: 647 650
- this.flashingElements.add(class120.WorldMapElement_get(var2).objectId); // L: 651
- }
- }
-
- } // L: 654
-
- @ObfuscatedName("av")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "1"
- )
- @Export("stopCurrentFlashes")
- public void stopCurrentFlashes() {
- this.flashingElements = null; // L: 657
- } // L: 658
+ @Export("setPerpetualFlash")
+ public void setPerpetualFlash(boolean var1) {
+ this.perpetualFlash = var1; // L: 652
+ } // L: 653
@ObfuscatedName("ai")
@ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "-1466489938"
+ descriptor = "(II)V",
+ garbageValue = "1359240412"
+ )
+ @Export("flashElement")
+ public void flashElement(int var1) {
+ this.flashingElements = new HashSet(); // L: 656
+ this.flashingElements.add(var1); // L: 657
+ this.flashCount = 0; // L: 658
+ this.flashCycle = 0; // L: 659
+ } // L: 660
+
+ @ObfuscatedName("az")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1059835143"
+ )
+ @Export("flashCategory")
+ public void flashCategory(int var1) {
+ this.flashingElements = new HashSet(); // L: 663
+ this.flashCount = 0; // L: 664
+ this.flashCycle = 0; // L: 665
+
+ for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 666
+ if (class432.WorldMapElement_get(var2) != null && class432.WorldMapElement_get(var2).category == var1) { // L: 667 670
+ this.flashingElements.add(class432.WorldMapElement_get(var2).objectId); // L: 671
+ }
+ }
+
+ } // L: 674
+
+ @ObfuscatedName("av")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1504784158"
+ )
+ @Export("stopCurrentFlashes")
+ public void stopCurrentFlashes() {
+ this.flashingElements = null; // L: 677
+ } // L: 678
+
+ @ObfuscatedName("aw")
+ @ObfuscatedSignature(
+ descriptor = "(ZS)V",
+ garbageValue = "6222"
)
@Export("setElementsDisabled")
public void setElementsDisabled(boolean var1) {
- this.elementsDisabled = !var1; // L: 661
- } // L: 662
+ this.elementsDisabled = !var1; // L: 681
+ } // L: 682
+
+ @ObfuscatedName("au")
+ @ObfuscatedSignature(
+ descriptor = "(IZI)V",
+ garbageValue = "230935257"
+ )
+ @Export("disableElement")
+ public void disableElement(int var1, boolean var2) {
+ if (!var2) { // L: 685
+ this.enabledElements.add(var1); // L: 686
+ } else {
+ this.enabledElements.remove(var1); // L: 689
+ }
+
+ this.method7233(); // L: 691
+ } // L: 692
@ObfuscatedName("ay")
@ObfuscatedSignature(
descriptor = "(IZI)V",
- garbageValue = "-380169429"
- )
- @Export("disableElement")
- public void disableElement(int var1, boolean var2) {
- if (!var2) { // L: 665
- this.enabledElements.add(var1); // L: 666
- } else {
- this.enabledElements.remove(var1); // L: 669
- }
-
- this.method7074(); // L: 671
- } // L: 672
-
- @ObfuscatedName("aa")
- @ObfuscatedSignature(
- descriptor = "(IZB)V",
- garbageValue = "9"
+ garbageValue = "-1347113189"
)
@Export("setCategoryDisabled")
public void setCategoryDisabled(int var1, boolean var2) {
- if (!var2) { // L: 675
- this.enabledCategories.add(var1); // L: 676
+ if (!var2) { // L: 695
+ this.enabledCategories.add(var1); // L: 696
} else {
- this.enabledCategories.remove(var1); // L: 679
+ this.enabledCategories.remove(var1); // L: 699
}
- for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 681
- if (class120.WorldMapElement_get(var3) != null && class120.WorldMapElement_get(var3).category == var1) { // L: 682 685
- int var4 = class120.WorldMapElement_get(var3).objectId; // L: 686
- if (!var2) { // L: 687
- this.enabledElementIds.add(var4); // L: 688
+ for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 701
+ if (class432.WorldMapElement_get(var3) != null && class432.WorldMapElement_get(var3).category == var1) { // L: 702 705
+ int var4 = class432.WorldMapElement_get(var3).objectId; // L: 706
+ if (!var2) { // L: 707
+ this.enabledElementIds.add(var4); // L: 708
} else {
- this.enabledElementIds.remove(var4); // L: 691
+ this.enabledElementIds.remove(var4); // L: 711
}
}
}
- this.method7074(); // L: 695
- } // L: 696
+ this.method7233(); // L: 715
+ } // L: 716
- @ObfuscatedName("ax")
+ @ObfuscatedName("as")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1930846128"
+ descriptor = "(B)Z",
+ garbageValue = "51"
)
@Export("getElementsDisabled")
public boolean getElementsDisabled() {
- return !this.elementsDisabled; // L: 699
+ return !this.elementsDisabled; // L: 719
}
- @ObfuscatedName("at")
+ @ObfuscatedName("be")
@ObfuscatedSignature(
descriptor = "(IB)Z",
- garbageValue = "63"
+ garbageValue = "74"
)
@Export("isElementDisabled")
public boolean isElementDisabled(int var1) {
- return !this.enabledElements.contains(var1); // L: 703
+ return !this.enabledElements.contains(var1); // L: 723
}
- @ObfuscatedName("br")
+ @ObfuscatedName("bz")
@ObfuscatedSignature(
- descriptor = "(IS)Z",
- garbageValue = "1000"
+ descriptor = "(IB)Z",
+ garbageValue = "-104"
)
@Export("isCategoryDisabled")
public boolean isCategoryDisabled(int var1) {
- return !this.enabledCategories.contains(var1); // L: 707
+ return !this.enabledCategories.contains(var1); // L: 727
}
- @ObfuscatedName("bc")
+ @ObfuscatedName("bp")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-2064216648"
+ garbageValue = "493716456"
)
- void method7074() {
- this.field4534.clear(); // L: 711
- this.field4534.addAll(this.enabledElements); // L: 712
- this.field4534.addAll(this.enabledElementIds); // L: 713
- } // L: 714
+ void method7233() {
+ this.field4561.clear(); // L: 731
+ this.field4561.addAll(this.enabledElements); // L: 732
+ this.field4561.addAll(this.enabledElementIds); // L: 733
+ } // L: 734
- @ObfuscatedName("bo")
+ @ObfuscatedName("bf")
@ObfuscatedSignature(
descriptor = "(IIIIIII)V",
- garbageValue = "1625310918"
+ garbageValue = "1554810691"
)
@Export("addElementMenuOptions")
public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) {
- if (this.cacheLoader.isLoaded()) { // L: 717
- int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 720
- int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 721
- List var9 = this.worldMapManager.method4645(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 722
- if (!var9.isEmpty()) { // L: 723
+ if (this.cacheLoader.isLoaded()) { // L: 737
+ int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 740
+ int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 741
+ List var9 = this.worldMapManager.method4819(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 742
+ if (!var9.isEmpty()) { // L: 743
Iterator var10 = var9.iterator();
boolean var13;
do {
- if (!var10.hasNext()) { // L: 726
- return; // L: 742
+ if (!var10.hasNext()) { // L: 746
+ return; // L: 762
}
- AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 727
- WorldMapElement var12 = class120.WorldMapElement_get(var11.getElement()); // L: 729
- var13 = false; // L: 730
+ AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 747
+ WorldMapElement var12 = class432.WorldMapElement_get(var11.getElement()); // L: 749
+ var13 = false; // L: 750
- for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 731
- if (var12.menuActions[var14] != null) { // L: 732
- Projectile.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 733
- var13 = true; // L: 734
+ for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 751
+ if (var12.menuActions[var14] != null) { // L: 752
+ class4.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 753
+ var13 = true; // L: 754
}
}
- } while(!var13); // L: 737
+ } while(!var13); // L: 757
}
}
- } // L: 718 724 738
+ } // L: 738 744 758
- @ObfuscatedName("bl")
+ @ObfuscatedName("bg")
@ObfuscatedSignature(
- descriptor = "(ILkd;I)Lkd;",
- garbageValue = "-1588915400"
+ descriptor = "(ILkd;S)Lkd;",
+ garbageValue = "-7526"
)
- public Coord method7076(int var1, Coord var2) {
- if (!this.cacheLoader.isLoaded()) { // L: 745
- return null; // L: 746
- } else if (!this.worldMapManager.isLoaded()) { // L: 748
- return null; // L: 749
- } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 751
- return null; // L: 752
+ public Coord method7235(int var1, Coord var2) {
+ if (!this.cacheLoader.isLoaded()) { // L: 765
+ return null; // L: 766
+ } else if (!this.worldMapManager.isLoaded()) { // L: 768
+ return null; // L: 769
+ } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 771
+ return null; // L: 772
} else {
- HashMap var3 = this.worldMapManager.buildIcons(); // L: 754
- List var4 = (List)var3.get(var1); // L: 755
- if (var4 != null && !var4.isEmpty()) { // L: 756
- AbstractWorldMapIcon var5 = null; // L: 759
- int var6 = -1; // L: 760
- Iterator var7 = var4.iterator(); // L: 761
+ HashMap var3 = this.worldMapManager.buildIcons(); // L: 774
+ List var4 = (List)var3.get(var1); // L: 775
+ if (var4 != null && !var4.isEmpty()) { // L: 776
+ AbstractWorldMapIcon var5 = null; // L: 779
+ int var6 = -1; // L: 780
+ Iterator var7 = var4.iterator(); // L: 781
while (true) {
AbstractWorldMapIcon var8;
int var11;
do {
if (!var7.hasNext()) {
- return var5.coord2; // L: 776
+ return var5.coord2; // L: 796
}
- var8 = (AbstractWorldMapIcon)var7.next(); // L: 762
- int var9 = var8.coord2.x - var2.x; // L: 764
- int var10 = var8.coord2.y - var2.y; // L: 765
- var11 = var10 * var10 + var9 * var9; // L: 766
- if (var11 == 0) { // L: 767
- return var8.coord2; // L: 768
+ var8 = (AbstractWorldMapIcon)var7.next(); // L: 782
+ int var9 = var8.coord2.x - var2.x; // L: 784
+ int var10 = var8.coord2.y - var2.y; // L: 785
+ var11 = var9 * var9 + var10 * var10; // L: 786
+ if (var11 == 0) { // L: 787
+ return var8.coord2; // L: 788
}
- } while(var11 >= var6 && var5 != null); // L: 770
+ } while(var11 >= var6 && var5 != null); // L: 790
- var5 = var8; // L: 771
- var6 = var11; // L: 772
+ var5 = var8; // L: 791
+ var6 = var11; // L: 792
}
} else {
- return null; // L: 757
+ return null; // L: 777
}
}
}
- @ObfuscatedName("bs")
+ @ObfuscatedName("br")
@ObfuscatedSignature(
descriptor = "(IILkd;Lkd;I)V",
- garbageValue = "-887021024"
+ garbageValue = "-880651836"
)
@Export("worldMapMenuAction")
public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) {
- ScriptEvent var5 = new ScriptEvent(); // L: 780
- WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 781
- var5.setArgs(new Object[]{var6}); // L: 782
- switch(var1) { // L: 783
+ ScriptEvent var5 = new ScriptEvent(); // L: 800
+ WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 801
+ var5.setArgs(new Object[]{var6}); // L: 802
+ switch(var1) { // L: 803
case 1008:
- var5.setType(10); // L: 796
- break; // L: 797
+ var5.setType(10); // L: 826
+ break;
case 1009:
- var5.setType(11); // L: 806
- break;
+ var5.setType(11); // L: 811
+ break; // L: 812
case 1010:
- var5.setType(12); // L: 786
- break;
+ var5.setType(12); // L: 816
+ break; // L: 817
case 1011:
- var5.setType(13); // L: 791
- break; // L: 792
+ var5.setType(13); // L: 821
+ break; // L: 822
case 1012:
- var5.setType(14); // L: 801
+ var5.setType(14); // L: 806
}
- class144.runScriptEvent(var5); // L: 810
- } // L: 811
+ BoundaryObject.runScriptEvent(var5); // L: 830
+ } // L: 831
- @ObfuscatedName("bx")
+ @ObfuscatedName("bn")
@ObfuscatedSignature(
- descriptor = "(I)Liw;",
- garbageValue = "-1807679022"
+ descriptor = "(I)Lim;",
+ garbageValue = "-1835543472"
)
@Export("iconStart")
public AbstractWorldMapIcon iconStart() {
- if (!this.cacheLoader.isLoaded()) { // L: 814
- return null; // L: 815
- } else if (!this.worldMapManager.isLoaded()) { // L: 817
- return null; // L: 818
+ if (!this.cacheLoader.isLoaded()) { // L: 834
+ return null; // L: 835
+ } else if (!this.worldMapManager.isLoaded()) { // L: 837
+ return null; // L: 838
} else {
- HashMap var1 = this.worldMapManager.buildIcons(); // L: 820
- this.field4566 = new LinkedList(); // L: 821
- Iterator var2 = var1.values().iterator(); // L: 822
+ HashMap var1 = this.worldMapManager.buildIcons(); // L: 840
+ this.field4548 = new LinkedList(); // L: 841
+ Iterator var2 = var1.values().iterator(); // L: 842
while (var2.hasNext()) {
- List var3 = (List)var2.next(); // L: 823
- this.field4566.addAll(var3); // L: 825
+ List var3 = (List)var2.next(); // L: 843
+ this.field4548.addAll(var3); // L: 845
}
- this.iconIterator = this.field4566.iterator(); // L: 828
- return this.iconNext(); // L: 829
+ this.iconIterator = this.field4548.iterator(); // L: 848
+ return this.iconNext(); // L: 849
}
}
- @ObfuscatedName("bd")
+ @ObfuscatedName("bq")
@ObfuscatedSignature(
- descriptor = "(B)Liw;",
- garbageValue = "-86"
+ descriptor = "(B)Lim;",
+ garbageValue = "-29"
)
@Export("iconNext")
public AbstractWorldMapIcon iconNext() {
- if (this.iconIterator == null) { // L: 833
- return null; // L: 834
+ if (this.iconIterator == null) { // L: 853
+ return null; // L: 854
} else {
AbstractWorldMapIcon var1;
do {
- if (!this.iconIterator.hasNext()) { // L: 836
- return null; // L: 842
+ if (!this.iconIterator.hasNext()) { // L: 856
+ return null; // L: 862
}
- var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 837
- } while(var1.getElement() == -1); // L: 838
+ var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 857
+ } while(var1.getElement() == -1); // L: 858
- return var1; // L: 839
+ return var1; // L: 859
}
}
- @ObfuscatedName("i")
+ @ObfuscatedName("hx")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "21"
+ descriptor = "(I)V",
+ garbageValue = "-110608054"
)
- protected static final void method7222() {
- UserComparator5.clock.mark(); // L: 438
-
- int var0;
- for (var0 = 0; var0 < 32; ++var0) { // L: 439
- GameEngine.graphicsTickTimes[var0] = 0L;
+ static final void method7376() {
+ Client.field607 = 0; // L: 5419
+ int var0 = (class101.localPlayer.x >> 7) + class28.baseX; // L: 5420
+ int var1 = (class101.localPlayer.y >> 7) + WorldMapLabelSize.baseY; // L: 5421
+ if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5422
+ Client.field607 = 1;
}
- for (var0 = 0; var0 < 32; ++var0) { // L: 440
- GameEngine.clientTickTimes[var0] = 0L;
+ if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5423
+ Client.field607 = 1;
}
- GameEngine.gameCyclesToDo = 0; // L: 441
- } // L: 442
+ if (Client.field607 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5424
+ Client.field607 = 0;
+ }
+
+ } // L: 5425
+
+ @ObfuscatedName("ha")
+ @ObfuscatedSignature(
+ descriptor = "(IIZI)V",
+ garbageValue = "-976677354"
+ )
+ static final void method7377(int var0, int var1, boolean var2) {
+ if (!var2 || var0 != GrandExchangeOffer.field4070 || ApproximateRouteStrategy.field466 != var1) { // L: 5621
+ GrandExchangeOffer.field4070 = var0; // L: 5624
+ ApproximateRouteStrategy.field466 = var1; // L: 5625
+ HealthBarUpdate.updateGameState(25); // L: 5626
+ SequenceDefinition.drawLoadingMessage("Loading - please wait.", true); // L: 5627
+ int var3 = class28.baseX; // L: 5628
+ int var4 = WorldMapLabelSize.baseY; // L: 5629
+ class28.baseX = (var0 - 6) * 8; // L: 5630
+ WorldMapLabelSize.baseY = (var1 - 6) * 8; // L: 5631
+ int var5 = class28.baseX - var3; // L: 5632
+ int var6 = WorldMapLabelSize.baseY - var4; // L: 5633
+ var3 = class28.baseX; // L: 5634
+ var4 = WorldMapLabelSize.baseY; // L: 5635
+
+ int var7;
+ int var9;
+ int[] var10000;
+ for (var7 = 0; var7 < 32768; ++var7) { // L: 5636
+ NPC var19 = Client.npcs[var7]; // L: 5637
+ if (var19 != null) { // L: 5638
+ for (var9 = 0; var9 < 10; ++var9) { // L: 5639
+ var10000 = var19.pathX; // L: 5640
+ var10000[var9] -= var5;
+ var10000 = var19.pathY; // L: 5641
+ var10000[var9] -= var6;
+ }
+
+ var19.x -= var5 * 128; // L: 5643
+ var19.y -= var6 * 128; // L: 5644
+ }
+ }
+
+ for (var7 = 0; var7 < 2048; ++var7) { // L: 5647
+ Player var22 = Client.players[var7]; // L: 5648
+ if (var22 != null) { // L: 5649
+ for (var9 = 0; var9 < 10; ++var9) { // L: 5650
+ var10000 = var22.pathX; // L: 5651
+ var10000[var9] -= var5;
+ var10000 = var22.pathY; // L: 5652
+ var10000[var9] -= var6;
+ }
+
+ var22.x -= var5 * 128; // L: 5654
+ var22.y -= var6 * 128; // L: 5655
+ }
+ }
+
+ byte var20 = 0; // L: 5658
+ byte var8 = 104; // L: 5659
+ byte var21 = 1; // L: 5660
+ if (var5 < 0) { // L: 5661
+ var20 = 103; // L: 5662
+ var8 = -1; // L: 5663
+ var21 = -1; // L: 5664
+ }
+
+ byte var10 = 0; // L: 5666
+ byte var11 = 104; // L: 5667
+ byte var12 = 1; // L: 5668
+ if (var6 < 0) { // L: 5669
+ var10 = 103; // L: 5670
+ var11 = -1; // L: 5671
+ var12 = -1; // L: 5672
+ }
+
+ int var14;
+ for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5674
+ for (var14 = var10; var11 != var14; var14 += var12) { // L: 5675
+ int var15 = var5 + var13; // L: 5676
+ int var16 = var14 + var6; // L: 5677
+
+ for (int var17 = 0; var17 < 4; ++var17) { // L: 5678
+ if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
+ Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5679
+ } else {
+ Client.groundItems[var17][var13][var14] = null; // L: 5680
+ }
+ }
+ }
+ }
+
+ for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5684 5685 5689
+ var18.x -= var5; // L: 5686
+ var18.y -= var6; // L: 5687
+ if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5688
+ var18.remove();
+ }
+ }
+
+ if (Client.destinationX != 0) { // L: 5691
+ Client.destinationX -= var5; // L: 5692
+ Client.destinationY -= var6; // L: 5693
+ }
+
+ Client.soundEffectCount = 0; // L: 5695
+ Client.isCameraLocked = false; // L: 5696
+ class18.cameraX -= var5 << 7; // L: 5697
+ class228.cameraZ -= var6 << 7; // L: 5698
+ InterfaceParent.oculusOrbFocalPointX -= var5 << 7; // L: 5699
+ class141.oculusOrbFocalPointY -= var6 << 7; // L: 5700
+ Client.field725 = -1; // L: 5701
+ Client.graphicsObjects.clear(); // L: 5702
+ Client.projectiles.clear(); // L: 5703
+
+ for (var14 = 0; var14 < 4; ++var14) { // L: 5704
+ Client.collisionMaps[var14].clear();
+ }
+
+ }
+ } // L: 5622 5705
}
diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java
index 9c5459e5e0..6804b2aa38 100644
--- a/runescape-client/src/main/java/WorldMapArchiveLoader.java
+++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oy")
+@ObfuscatedName("ox")
@Implements("WorldMapArchiveLoader")
public class WorldMapArchiveLoader {
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("cacheName")
String cacheName;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("archive")
AbstractArchive archive;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1691331765
+ intValue = -1239125603
)
@Export("percentLoaded")
int percentLoaded;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("loaded")
boolean loaded;
@ObfuscatedSignature(
- descriptor = "(Llp;)V"
+ descriptor = "(Llh;)V"
)
WorldMapArchiveLoader(AbstractArchive var1) {
this.percentLoaded = 0; // L: 13
@@ -35,10 +35,10 @@ public class WorldMapArchiveLoader {
this.archive = var1; // L: 17
} // L: 18
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-1839353893"
+ garbageValue = "-1356083812"
)
@Export("reset")
void reset(String var1) {
@@ -52,15 +52,15 @@ public class WorldMapArchiveLoader {
}
} // L: 22 25 31
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1569392009"
+ descriptor = "(B)I",
+ garbageValue = "-22"
)
@Export("load")
int load() {
if (this.percentLoaded < 33) { // L: 34
- if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2907.name, this.cacheName)) { // L: 35
+ if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2865.name, this.cacheName)) { // L: 35
return this.percentLoaded; // L: 36
}
@@ -68,7 +68,7 @@ public class WorldMapArchiveLoader {
}
if (this.percentLoaded == 33) { // L: 40
- if (this.archive.isValidFileName(WorldMapCacheName.field2908.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2908.name, this.cacheName)) { // L: 41 42
+ if (this.archive.isValidFileName(WorldMapCacheName.field2866.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2866.name, this.cacheName)) { // L: 41 42
return this.percentLoaded; // L: 43
}
@@ -76,7 +76,7 @@ public class WorldMapArchiveLoader {
}
if (this.percentLoaded == 66) { // L: 48
- if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2911.name)) { // L: 49
+ if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2868.name)) { // L: 49
return this.percentLoaded; // L: 50
}
@@ -87,32 +87,23 @@ public class WorldMapArchiveLoader {
return this.percentLoaded; // L: 55
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-1022349002"
+ garbageValue = "-923588263"
)
@Export("isLoaded")
boolean isLoaded() {
return this.loaded; // L: 59
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-12"
+ descriptor = "(I)I",
+ garbageValue = "1790621398"
)
@Export("getPercentLoaded")
int getPercentLoaded() {
return this.percentLoaded; // L: 63
}
-
- @ObfuscatedName("ah")
- @ObfuscatedSignature(
- descriptor = "([BIS)I",
- garbageValue = "-8446"
- )
- public static int method7020(byte[] var0, int var1) {
- return Clock.method3249(var0, 0, var1); // L: 56
- }
}
diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java
index f98c9824a5..fd9337eaac 100644
--- a/runescape-client/src/main/java/WorldMapArea.java
+++ b/runescape-client/src/main/java/WorldMapArea.java
@@ -6,92 +6,86 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hm")
+@ObfuscatedName("hg")
@Implements("WorldMapArea")
public class WorldMapArea {
- @ObfuscatedName("f")
- @Export("formattedOperatingSystemName")
- public static String formattedOperatingSystemName;
- @ObfuscatedName("ao")
- @Export("hasFocus")
- protected static boolean hasFocus;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1777839071
+ intValue = -1597712321
)
@Export("id")
int id;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("internalName")
String internalName;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@Export("externalName")
String externalName;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -466670555
+ intValue = 1737833383
)
@Export("backGroundColor")
int backGroundColor;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1573986951
+ intValue = 1942406311
)
@Export("zoom")
int zoom;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "Lkd;"
)
@Export("origin")
Coord origin;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 976938007
+ intValue = -2103250031
)
@Export("regionLowX")
int regionLowX;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -281612569
+ intValue = 1341200167
)
@Export("regionHighX")
int regionHighX;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -711482523
+ intValue = 986248981
)
@Export("regionLowY")
int regionLowY;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = 1976100383
+ intValue = -360253211
)
@Export("regionHighY")
int regionHighY;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("isMain")
boolean isMain;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("sections")
LinkedList sections;
public WorldMapArea() {
this.id = -1; // L: 9
- this.backGroundColor = -1; // L: 12
+ this.backGroundColor = -1;
this.zoom = -1; // L: 13
this.origin = null; // L: 14
this.regionLowX = Integer.MAX_VALUE; // L: 15
- this.regionHighX = 0; // L: 16
+ this.regionHighX = 0;
this.regionLowY = Integer.MAX_VALUE; // L: 17
this.regionHighY = 0; // L: 18
this.isMain = false; // L: 19
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "20"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "1424101591"
)
@Export("read")
public void read(Buffer var1, int var2) {
@@ -113,82 +107,81 @@ public class WorldMapArea {
this.setBounds(); // L: 36
} // L: 37
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)Lie;",
- garbageValue = "38"
+ descriptor = "(Lqt;I)Lih;",
+ garbageValue = "2053446291"
)
@Export("readWorldMapSection")
WorldMapSection readWorldMapSection(Buffer var1) {
int var2 = var1.readUnsignedByte(); // L: 40
- WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43
- WorldMapSectionType var4 = (WorldMapSectionType)class291.findEnumerated(var3, var2); // L: 45
- Object var5 = null; // L: 46
- switch(var4.type) { // L: 47
+ WorldMapSectionType var3 = (WorldMapSectionType)Actor.findEnumerated(WorldMapSectionType.method4950(), var2); // L: 41
+ Object var4 = null; // L: 42
+ switch(var3.type) { // L: 43
case 0:
- var5 = new WorldMapSection0(); // L: 49
- break;
+ var4 = new class228(); // L: 48
+ break; // L: 49
case 1:
- var5 = new WorldMapSection2(); // L: 57
- break; // L: 58
+ var4 = new WorldMapSection2(); // L: 53
+ break; // L: 54
case 2:
- var5 = new class229(); // L: 60
+ var4 = new WorldMapSection0(); // L: 56
break;
case 3:
- var5 = new WorldMapSection1(); // L: 54
- break; // L: 55
+ var4 = new WorldMapSection1(); // L: 45
+ break;
default:
- throw new IllegalStateException(""); // L: 52
+ throw new IllegalStateException(""); // L: 51
}
- ((WorldMapSection)var5).read(var1); // L: 63
- return (WorldMapSection)var5; // L: 64
+ ((WorldMapSection)var4).read(var1); // L: 59
+ return (WorldMapSection)var4; // L: 60
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IIIB)Z",
- garbageValue = "48"
+ descriptor = "(IIII)Z",
+ garbageValue = "-876642942"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
- Iterator var4 = this.sections.iterator(); // L: 68
+ Iterator var4 = this.sections.iterator(); // L: 64
WorldMapSection var5;
do {
- if (!var4.hasNext()) {
- return false; // L: 76
+ if (!var4.hasNext()) { // L: 71
+ return false; // L: 72
}
- var5 = (WorldMapSection)var4.next(); // L: 69
- } while(!var5.containsCoord(var1, var2, var3)); // L: 71
+ var5 = (WorldMapSection)var4.next(); // L: 65
+ } while(!var5.containsCoord(var1, var2, var3)); // L: 67
- return true; // L: 72
+ return true; // L: 68
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IIS)Z",
- garbageValue = "16574"
+ descriptor = "(III)Z",
+ garbageValue = "-1025417"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
- int var3 = var1 / 64; // L: 80
- int var4 = var2 / 64; // L: 81
- if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82
- if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83
- Iterator var5 = this.sections.iterator(); // L: 84
+ int var3 = var1 / 64; // L: 76
+ int var4 = var2 / 64; // L: 77
+ if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78
+ if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79
+ Iterator var5 = this.sections.iterator(); // L: 80
WorldMapSection var6;
do {
if (!var5.hasNext()) {
- return false; // L: 92
+ return false; // L: 88
}
- var6 = (WorldMapSection)var5.next(); // L: 85
- } while(!var6.containsPosition(var1, var2)); // L: 87
+ var6 = (WorldMapSection)var5.next(); // L: 81
+ } while(!var6.containsPosition(var1, var2)); // L: 83
- return true; // L: 88
+ return true; // L: 84
} else {
return false;
}
@@ -197,228 +190,218 @@ public class WorldMapArea {
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(IIII)[I",
- garbageValue = "1090356101"
+ garbageValue = "-885448620"
)
@Export("position")
public int[] position(int var1, int var2, int var3) {
- Iterator var4 = this.sections.iterator(); // L: 96
+ Iterator var4 = this.sections.iterator(); // L: 92
WorldMapSection var5;
do {
if (!var4.hasNext()) {
- return null; // L: 104
+ return null; // L: 100
}
- var5 = (WorldMapSection)var4.next(); // L: 97
- } while(!var5.containsCoord(var1, var2, var3)); // L: 99
+ var5 = (WorldMapSection)var4.next(); // L: 93
+ } while(!var5.containsCoord(var1, var2, var3)); // L: 95
- return var5.getBorderTileLengths(var1, var2, var3); // L: 100
+ return var5.getBorderTileLengths(var1, var2, var3); // L: 96
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(III)Lkd;",
- garbageValue = "634567261"
+ garbageValue = "-1315713782"
)
@Export("coord")
public Coord coord(int var1, int var2) {
- Iterator var3 = this.sections.iterator(); // L: 108
+ Iterator var3 = this.sections.iterator(); // L: 104
WorldMapSection var4;
do {
if (!var3.hasNext()) {
- return null; // L: 116
+ return null; // L: 112
}
- var4 = (WorldMapSection)var3.next(); // L: 109
- } while(!var4.containsPosition(var1, var2)); // L: 111
+ var4 = (WorldMapSection)var3.next(); // L: 105
+ } while(!var4.containsPosition(var1, var2)); // L: 107
- return var4.coord(var1, var2); // L: 112
+ return var4.coord(var1, var2); // L: 108
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1149525230"
+ garbageValue = "1353069052"
)
@Export("setBounds")
void setBounds() {
- Iterator var1 = this.sections.iterator(); // L: 120
+ Iterator var1 = this.sections.iterator(); // L: 116
while (var1.hasNext()) {
- WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121
- var2.expandBounds(this); // L: 123
+ WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117
+ var2.expandBounds(this); // L: 119
}
- } // L: 126
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1853977483"
- )
- @Export("getId")
- public int getId() {
- return this.id; // L: 129
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "458064679"
- )
- @Export("getIsMain")
- public boolean getIsMain() {
- return this.isMain; // L: 133
- }
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "16"
- )
- @Export("getInternalName")
- public String getInternalName() {
- return this.internalName; // L: 137
- }
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-2112752839"
- )
- @Export("getExternalName")
- public String getExternalName() {
- return this.externalName; // L: 141
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "80"
- )
- @Export("getBackGroundColor")
- int getBackGroundColor() {
- return this.backGroundColor; // L: 145
- }
+ } // L: 122
@ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "40622917"
+ garbageValue = "-1950741707"
)
- @Export("getZoom")
- public int getZoom() {
- return this.zoom; // L: 149
+ @Export("getId")
+ public int getId() {
+ return this.id; // L: 125
}
- @ObfuscatedName("b")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "160"
+ descriptor = "(B)Z",
+ garbageValue = "15"
)
- @Export("getRegionLowX")
- public int getRegionLowX() {
- return this.regionLowX; // L: 153
+ @Export("getIsMain")
+ public boolean getIsMain() {
+ return this.isMain; // L: 129
+ }
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "1728819039"
+ )
+ @Export("getInternalName")
+ public String getInternalName() {
+ return this.internalName; // L: 133
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "123"
+ )
+ @Export("getExternalName")
+ public String getExternalName() {
+ return this.externalName; // L: 137
}
@ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1655978989"
+ garbageValue = "-410449947"
+ )
+ @Export("getBackGroundColor")
+ int getBackGroundColor() {
+ return this.backGroundColor; // L: 141
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1613337186"
+ )
+ @Export("getZoom")
+ public int getZoom() {
+ return this.zoom; // L: 145
+ }
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-28"
+ )
+ @Export("getRegionLowX")
+ public int getRegionLowX() {
+ return this.regionLowX; // L: 149
+ }
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1776623593"
)
@Export("getRegionHighX")
public int getRegionHighX() {
- return this.regionHighX; // L: 157
+ return this.regionHighX; // L: 153
}
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "-112"
+ garbageValue = "50"
)
@Export("getRegionLowY")
public int getRegionLowY() {
- return this.regionLowY; // L: 161
- }
-
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "2143670007"
- )
- @Export("getRegionHighY")
- public int getRegionHighY() {
- return this.regionHighY; // L: 165
- }
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-108749497"
- )
- @Export("getOriginX")
- public int getOriginX() {
- return this.origin.x; // L: 169
- }
-
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1959056800"
- )
- @Export("getOriginPlane")
- public int getOriginPlane() {
- return this.origin.plane; // L: 173
+ return this.regionLowY; // L: 157
}
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1472370022"
+ garbageValue = "47612520"
+ )
+ @Export("getRegionHighY")
+ public int getRegionHighY() {
+ return this.regionHighY; // L: 161
+ }
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1452541812"
+ )
+ @Export("getOriginX")
+ public int getOriginX() {
+ return this.origin.x; // L: 165
+ }
+
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "709733027"
+ )
+ @Export("getOriginPlane")
+ public int getOriginPlane() {
+ return this.origin.plane; // L: 169
+ }
+
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "43"
)
@Export("getOriginY")
public int getOriginY() {
- return this.origin.y; // L: 177
+ return this.origin.y; // L: 173
}
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
descriptor = "(I)Lkd;",
- garbageValue = "591229615"
+ garbageValue = "-2060886066"
)
@Export("getOrigin")
public Coord getOrigin() {
- return new Coord(this.origin); // L: 181
+ return new Coord(this.origin); // L: 177
}
- @ObfuscatedName("fq")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIB)V",
- garbageValue = "1"
+ descriptor = "([BZB)Ljava/lang/Object;",
+ garbageValue = "-9"
)
- static void method4514(int var0, int var1) {
- int[] var2 = new int[9]; // L: 1504
-
- for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1505
- int var4 = var3 * 32 + 15 + 128; // L: 1506
- int var5 = class10.method94(var4); // L: 1507
- int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1508
- int var8 = var1 - 334; // L: 1511
- if (var8 < 0) { // L: 1512
- var8 = 0;
- } else if (var8 > 100) { // L: 1513
- var8 = 100;
- }
-
- int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 1514
- int var7 = var9 * var5 / 256; // L: 1515
- var2[var3] = var7 * var6 >> 16; // L: 1518
+ public static Object method4621(byte[] var0, boolean var1) {
+ if (var0 == null) { // L: 7
+ return null;
+ } else if (var0.length > 136) { // L: 8
+ DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10
+ var2.set(var0); // L: 11
+ return var2; // L: 12
+ } else {
+ return var0; // L: 16
}
-
- Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1520
- } // L: 1521
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index b3aa181920..6b3e3a3604 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -1,32 +1,37 @@
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Random;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("iq")
+@ObfuscatedName("iu")
@Implements("WorldMapAreaData")
public class WorldMapAreaData extends WorldMapArea {
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("worldMapData0Set")
HashSet worldMapData0Set;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("worldMapData1Set")
HashSet worldMapData1Set;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("iconList")
List iconList;
WorldMapAreaData() {
} // L: 14
- @ObfuscatedName("bu")
+ @ObfuscatedName("bo")
@ObfuscatedSignature(
- descriptor = "(Lpx;Lpx;IZI)V",
- garbageValue = "696765491"
+ descriptor = "(Lqt;Lqt;IZI)V",
+ garbageValue = "-15216320"
)
@Export("init")
void init(Buffer var1, Buffer var2, int var3, boolean var4) {
@@ -54,250 +59,190 @@ public class WorldMapAreaData extends WorldMapArea {
WorldMapData_1 var8 = new WorldMapData_1(); // L: 33
try {
- var8.init(var2); // L: 35
- } catch (IllegalStateException var11) { // L: 37
- continue; // L: 38
+ var8.init(var2);
+ } catch (IllegalStateException var11) {
+ continue;
}
- this.worldMapData1Set.add(var8); // L: 40
+ this.worldMapData1Set.add(var8);
}
- this.initIconsList(var2, var4); // L: 42
- } // L: 43
+ this.initIconsList(var2, var4);
+ }
- @ObfuscatedName("bq")
+ @ObfuscatedName("bx")
@ObfuscatedSignature(
- descriptor = "(Lpx;ZI)V",
- garbageValue = "-838366517"
+ descriptor = "(Lqt;ZI)V",
+ garbageValue = "-681546343"
)
@Export("initIconsList")
void initIconsList(Buffer var1, boolean var2) {
this.iconList = new LinkedList(); // L: 46
- int var3 = var1.readUnsignedShort(); // L: 47
+ int var3 = var1.readUnsignedShort();
- for (int var4 = 0; var4 < var3; ++var4) { // L: 48
- int var5 = var1.method7532(); // L: 49
- Coord var6 = new Coord(var1.readInt()); // L: 50
- boolean var7 = var1.readUnsignedByte() == 1; // L: 51
- if (var2 || !var7) { // L: 52
+ for (int var4 = 0; var4 < var3; ++var4) {
+ int var5 = var1.method7752();
+ Coord var6 = new Coord(var1.readInt());
+ boolean var7 = var1.readUnsignedByte() == 1;
+ if (var2 || !var7) {
this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53
}
}
- } // L: 56
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "676720431"
- )
- public static boolean method4880(int var0) {
- return var0 >= 0 && var0 < 112 ? KeyHandler.field120[var0] : false; // L: 227 228
}
- @ObfuscatedName("m")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "782138310"
+ descriptor = "(JLjava/lang/String;I)I",
+ garbageValue = "-513053480"
)
- static int method4887(int var0, Script var1, boolean var2) {
- int var4 = -1; // L: 612
- Widget var3;
- if (var0 >= 2000) { // L: 613
- var0 -= 1000; // L: 614
- var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 615
- var3 = class92.getWidget(var4); // L: 616
- } else {
- var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 618
+ static final int method5082(long var0, String var2) {
+ Random var3 = new Random(); // L: 35
+ Buffer var4 = new Buffer(128); // L: 36
+ Buffer var5 = new Buffer(128); // L: 37
+ int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42
+ var4.writeByte(10); // L: 43
+
+ int var7;
+ for (var7 = 0; var7 < 4; ++var7) { // L: 44
+ var4.writeInt(var3.nextInt()); // L: 45
}
- if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 619
- class12.Interpreter_intStackSize -= 2; // L: 620
- var3.scrollX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 621
- if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 622
- var3.scrollX = var3.scrollWidth - var3.width;
- }
+ var4.writeInt(var6[0]); // L: 47
+ var4.writeInt(var6[1]); // L: 48
+ var4.writeLong(var0); // L: 49
+ var4.writeLong(0L); // L: 50
- if (var3.scrollX < 0) { // L: 623
- var3.scrollX = 0;
- }
+ for (var7 = 0; var7 < 4; ++var7) { // L: 51
+ var4.writeInt(var3.nextInt()); // L: 52
+ }
- var3.scrollY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 624
- if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 625
- var3.scrollY = var3.scrollHeight - var3.height;
- }
+ var4.encryptRsa(class65.field865, class65.field868); // L: 54
+ var5.writeByte(10); // L: 55
- if (var3.scrollY < 0) { // L: 626
- var3.scrollY = 0;
- }
+ for (var7 = 0; var7 < 3; ++var7) { // L: 56
+ var5.writeInt(var3.nextInt()); // L: 57
+ }
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 627
- return 1; // L: 628
- } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 630
- var3.color = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 631
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 632
- return 1; // L: 633
- } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 635
- var3.fill = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 636
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 637
- return 1; // L: 638
- } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 640
- var3.transparencyTop = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 641
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 642
- return 1; // L: 643
- } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 645
- var3.lineWid = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 646
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 647
- return 1; // L: 648
- } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 650
- var3.spriteId2 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 651
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 652
- return 1; // L: 653
- } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 655
- var3.spriteAngle = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 656
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 657
- return 1; // L: 658
- } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 660
- var3.spriteTiling = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 661
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 662
- return 1; // L: 663
- } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 665
- var3.modelType = 1; // L: 666
- var3.modelId = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 667
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 668
- return 1; // L: 669
- } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 671
- class12.Interpreter_intStackSize -= 6; // L: 672
- var3.modelOffsetX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 673
- var3.modelOffsetY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 674
- var3.modelAngleX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 675
- var3.modelAngleY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 676
- var3.modelAngleZ = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 4]; // L: 677
- var3.modelZoom = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 5]; // L: 678
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 679
- return 1; // L: 680
+ var5.writeLong(var3.nextLong()); // L: 59
+ var5.writeLongMedium(var3.nextLong()); // L: 60
+ if (Client.randomDatData != null) { // L: 62
+ var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 63
} else {
- int var8;
- if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 682
- var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 683
- if (var8 != var3.sequenceId) { // L: 684
- var3.sequenceId = var8; // L: 685
- var3.modelFrame = 0; // L: 686
- var3.modelFrameCycle = 0; // L: 687
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 688
- }
+ byte[] var20 = ModeWhere.method6082(); // L: 66
+ var5.writeBytes(var20, 0, var20.length); // L: 67
+ }
- return 1; // L: 690
- } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 692
- var3.modelOrthog = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 693
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 694
- return 1; // L: 695
- } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 697
- String var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 698
- if (!var7.equals(var3.text)) { // L: 699
- var3.text = var7; // L: 700
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 701
- }
+ var5.writeLong(var3.nextLong()); // L: 69
+ var5.encryptRsa(class65.field865, class65.field868); // L: 70
+ var7 = ScriptEvent.stringCp1252NullTerminatedByteSize(var2); // L: 71
+ if (var7 % 8 != 0) { // L: 72
+ var7 += 8 - var7 % 8;
+ }
- return 1; // L: 703
- } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 705
- var3.fontId = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 706
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 707
- return 1; // L: 708
- } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 710
- class12.Interpreter_intStackSize -= 3; // L: 711
- var3.textXAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 712
- var3.textYAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 713
- var3.textLineHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 714
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 715
- return 1; // L: 716
- } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 718
- var3.textShadowed = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 719
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 720
- return 1; // L: 721
- } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 723
- var3.outline = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 724
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 725
- return 1; // L: 726
- } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 728
- var3.spriteShadow = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 729
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 730
- return 1; // L: 731
- } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 733
- var3.spriteFlipV = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 734
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 735
- return 1; // L: 736
- } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 738
- var3.spriteFlipH = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 739
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 740
- return 1; // L: 741
- } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 743
- class12.Interpreter_intStackSize -= 2; // L: 744
- var3.scrollWidth = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 745
- var3.scrollHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 746
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 747
- if (var4 != -1 && var3.type == 0) { // L: 748
- UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var4 >> 16], var3, false);
- }
+ Buffer var8 = new Buffer(var7); // L: 73
+ var8.writeStringCp1252NullTerminated(var2); // L: 74
+ var8.offset = var7; // L: 75
+ var8.xteaEncryptAll(var6); // L: 76
+ Buffer var9 = new Buffer(var4.offset + var5.offset + var8.offset + 5); // L: 77
+ var9.writeByte(2); // L: 78
+ var9.writeByte(var4.offset); // L: 79
+ var9.writeBytes(var4.array, 0, var4.offset); // L: 80
+ var9.writeByte(var5.offset); // L: 81
+ var9.writeBytes(var5.array, 0, var5.offset); // L: 82
+ var9.writeShort(var8.offset); // L: 83
+ var9.writeBytes(var8.array, 0, var8.offset); // L: 84
+ byte[] var11 = var9.array; // L: 86
+ int var13 = var11.length; // L: 89
+ StringBuilder var14 = new StringBuilder(); // L: 91
- return 1; // L: 749
- } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 751
- Skills.resumePauseWidget(var3.id, var3.childIndex); // L: 752
- Client.meslayerContinueWidget = var3; // L: 753
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 754
- return 1; // L: 755
- } else if (var0 == 1122) { // L: 757
- var3.spriteId = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 758
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 759
- return 1; // L: 760
- } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 762
- var3.color2 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 763
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 764
- return 1; // L: 765
- } else if (var0 == 1124) { // L: 767
- var3.transparencyBot = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 768
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 769
- return 1; // L: 770
- } else if (var0 == 1125) { // L: 772
- var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 773
- FillMode var6 = (FillMode)class291.findEnumerated(WorldMapEvent.FillMode_values(), var8); // L: 774
- if (var6 != null) { // L: 775
- var3.fillMode = var6; // L: 776
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 777
- }
-
- return 1; // L: 779
- } else {
- boolean var5;
- if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 781
- var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 782
- var3.field3428 = var5; // L: 783
- return 1; // L: 784
- } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 786
- var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 787
- var3.modelTransparency = var5; // L: 788
- return 1; // L: 789
- } else if (var0 == 1128) { // L: 791
- class12.Interpreter_intStackSize -= 2; // L: 792
- return 1; // L: 793
- } else if (var0 == 1129) { // L: 795
- var3.field3431 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 796
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 797
- return 1; // L: 798
- } else if (var0 == 1130) { // L: 800
- var3.method5449(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize], UserComparator7.urlRequester, class92.method2374()); // L: 801
- return 1; // L: 802
- } else if (var0 == 1131) { // L: 804
- class12.Interpreter_intStackSize -= 2; // L: 805
- var3.method5451(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 806
- return 1; // L: 807
- } else if (var0 == 1132) { // L: 809
- var3.method5468(Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize], Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 810
- return 1; // L: 811
+ int var17;
+ for (int var15 = 0; var15 < var13 + 0; var15 += 3) { // L: 92
+ int var16 = var11[var15] & 255; // L: 93
+ var14.append(class341.field4146[var16 >>> 2]); // L: 94
+ if (var15 < var13 - 1) { // L: 95
+ var17 = var11[var15 + 1] & 255; // L: 96
+ var14.append(class341.field4146[(var16 & 3) << 4 | var17 >>> 4]); // L: 97
+ if (var15 < var13 - 2) { // L: 98
+ int var18 = var11[var15 + 2] & 255; // L: 99
+ var14.append(class341.field4146[(var17 & 15) << 2 | var18 >>> 6]).append(class341.field4146[var18 & 63]); // L: 100
} else {
- return 2; // L: 813
+ var14.append(class341.field4146[(var17 & 15) << 2]).append("="); // L: 102
}
+ } else {
+ var14.append(class341.field4146[(var16 & 3) << 4]).append("=="); // L: 104
}
}
+
+ String var12 = var14.toString(); // L: 106
+ var12 = var12; // L: 110
+
+ try {
+ URL var21 = new URL(ModeWhere.method6080("services", false) + "m=accountappeal/login.ws"); // L: 112
+ URLConnection var27 = var21.openConnection(); // L: 113
+ var27.setDoInput(true); // L: 114
+ var27.setDoOutput(true); // L: 115
+ var27.setConnectTimeout(5000); // L: 116
+ OutputStreamWriter var22 = new OutputStreamWriter(var27.getOutputStream()); // L: 117
+ var22.write("data2=" + GrandExchangeOfferOwnWorldComparator.method1097(var12) + "&dest=" + GrandExchangeOfferOwnWorldComparator.method1097("passwordchoice.ws")); // L: 118
+ var22.flush(); // L: 119
+ InputStream var23 = var27.getInputStream(); // L: 120
+ var9 = new Buffer(new byte[1000]); // L: 121
+
+ do {
+ var17 = var23.read(var9.array, var9.offset, 1000 - var9.offset); // L: 123
+ if (var17 == -1) { // L: 124
+ var22.close(); // L: 130
+ var23.close(); // L: 131
+ String var24 = new String(var9.array); // L: 132
+ if (var24.startsWith("OFFLINE")) { // L: 133
+ return 4; // L: 134
+ } else if (var24.startsWith("WRONG")) { // L: 136
+ return 7; // L: 137
+ } else if (var24.startsWith("RELOAD")) { // L: 139
+ return 3; // L: 140
+ } else if (var24.startsWith("Not permitted for social network accounts.")) { // L: 142
+ return 6; // L: 143
+ } else {
+ var9.xteaDecryptAll(var6); // L: 145
+
+ while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 146
+ --var9.offset; // L: 147
+ }
+
+ var24 = new String(var9.array, 0, var9.offset); // L: 149
+ boolean var28;
+ if (var24 == null) { // L: 152
+ var28 = false; // L: 153
+ } else {
+ label107: {
+ try {
+ new URL(var24);
+ } catch (MalformedURLException var25) { // L: 159
+ var28 = false; // L: 160
+ break label107; // L: 161
+ }
+
+ var28 = true; // L: 163
+ }
+ }
+
+ if (var28) { // L: 165
+ class258.openURL(var24, true, false); // L: 166
+ return 2; // L: 167
+ } else {
+ return 5; // L: 169
+ }
+ }
+ }
+
+ var9.offset += var17; // L: 125
+ } while(var9.offset < 1000); // L: 126
+
+ return 5; // L: 127
+ } catch (Throwable var26) { // L: 171
+ var26.printStackTrace(); // L: 172
+ return 5; // L: 173
+ }
}
}
diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java
index 2ca24209de..fb642a6bce 100644
--- a/runescape-client/src/main/java/WorldMapCacheName.java
+++ b/runescape-client/src/main/java/WorldMapCacheName.java
@@ -1,67 +1,70 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("id")
+@ObfuscatedName("io")
@Implements("WorldMapCacheName")
public class WorldMapCacheName {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lid;"
+ descriptor = "Lio;"
)
- public static final WorldMapCacheName field2910;
+ public static final WorldMapCacheName field2867;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lio;"
+ )
+ public static final WorldMapCacheName field2865;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lid;"
+ descriptor = "Lio;"
)
- public static final WorldMapCacheName field2907;
- @ObfuscatedName("l")
+ public static final WorldMapCacheName field2866;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lid;"
+ descriptor = "Lio;"
)
- public static final WorldMapCacheName field2908;
- @ObfuscatedName("k")
+ static final WorldMapCacheName field2869;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lid;"
+ descriptor = "Lio;"
)
- static final WorldMapCacheName field2909;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lid;"
- )
- public static final WorldMapCacheName field2911;
- @ObfuscatedName("z")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("Widget_spritesArchive")
- static AbstractArchive Widget_spritesArchive;
- @ObfuscatedName("bm")
- @ObfuscatedGetter(
- intValue = 1965056495
- )
- static int field2912;
- @ObfuscatedName("gf")
- @ObfuscatedSignature(
- descriptor = "Lfl;"
- )
- @Export("socketTask")
- static Task socketTask;
- @ObfuscatedName("m")
+ public static final WorldMapCacheName field2868;
+ @ObfuscatedName("e")
@Export("name")
public final String name;
static {
- field2910 = new WorldMapCacheName("details"); // L: 4
- field2907 = new WorldMapCacheName("compositemap"); // L: 5
- field2908 = new WorldMapCacheName("compositetexture"); // L: 6
- field2909 = new WorldMapCacheName("area"); // L: 7
- field2911 = new WorldMapCacheName("labels"); // L: 8
+ field2867 = new WorldMapCacheName("details"); // L: 4
+ field2865 = new WorldMapCacheName("compositemap"); // L: 5
+ field2866 = new WorldMapCacheName("compositetexture"); // L: 6
+ field2869 = new WorldMapCacheName("area"); // L: 7
+ field2868 = new WorldMapCacheName("labels"); // L: 8
}
WorldMapCacheName(String var1) {
this.name = var1; // L: 12
} // L: 13
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lgx;",
+ garbageValue = "1464975473"
+ )
+ public static VarbitComposition method5054(int var0) {
+ VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28
+ if (var1 != null) { // L: 29
+ return var1;
+ } else {
+ byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 30
+ var1 = new VarbitComposition(); // L: 31
+ if (var2 != null) { // L: 32
+ var1.decode(new Buffer(var2));
+ }
+
+ VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33
+ return var1; // L: 34
+ }
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java
index 774be8dc8a..34fb37f962 100644
--- a/runescape-client/src/main/java/WorldMapData_0.java
+++ b/runescape-client/src/main/java/WorldMapData_0.java
@@ -3,21 +3,21 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hz")
+@ObfuscatedName("hh")
@Implements("WorldMapData_0")
public class WorldMapData_0 extends AbstractWorldMapData {
WorldMapData_0() {
} // L: 6
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-2029115050"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1126557934"
)
@Export("init")
void init(Buffer var1) {
int var2 = var1.readUnsignedByte(); // L: 9
- if (var2 != WorldMapID.field2879.value) { // L: 10
+ if (var2 != WorldMapID.field2843.value) { // L: 10
throw new IllegalStateException(""); // L: 11
} else {
super.minPlane = var1.readUnsignedByte(); // L: 13
@@ -26,26 +26,26 @@ public class WorldMapData_0 extends AbstractWorldMapData {
super.regionYLow = var1.readUnsignedShort(); // L: 16
super.regionX = var1.readUnsignedShort(); // L: 17
super.regionY = var1.readUnsignedShort(); // L: 18
- super.groupId = var1.method7532(); // L: 19
- super.fileId = var1.method7532(); // L: 20
+ super.groupId = var1.method7752(); // L: 19
+ super.fileId = var1.method7752(); // L: 20
}
} // L: 21
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "933342926"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-2593161"
)
@Export("readGeography")
void readGeography(Buffer var1) {
super.planes = Math.min(super.planes, 4); // L: 25
super.floorUnderlayIds = new short[1][64][64]; // L: 26
super.floorOverlayIds = new short[super.planes][64][64]; // L: 27
- super.field2845 = new byte[super.planes][64][64]; // L: 28
- super.field2847 = new byte[super.planes][64][64]; // L: 29
+ super.field2796 = new byte[super.planes][64][64]; // L: 28
+ super.field2795 = new byte[super.planes][64][64]; // L: 29
super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 30
int var2 = var1.readUnsignedByte(); // L: 31
- if (var2 != class239.field2875.value) { // L: 32
+ if (var2 != class238.field2837.value) { // L: 32
throw new IllegalStateException(""); // L: 33
} else {
int var3 = var1.readUnsignedByte(); // L: 35
@@ -75,4 +75,14 @@ public class WorldMapData_0 extends AbstractWorldMapData {
public int hashCode() {
return super.regionX | super.regionY << 8; // L: 58
}
+
+ @ObfuscatedName("ku")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1004471654"
+ )
+ static final void method4563(int var0) {
+ var0 = Math.min(Math.max(var0, 0), 127); // L: 11856
+ class19.clientPreferences.updateSoundEffectVolume(var0); // L: 11857
+ } // L: 11858
}
diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java
index 2f2f9184cd..42e56d7c37 100644
--- a/runescape-client/src/main/java/WorldMapData_1.java
+++ b/runescape-client/src/main/java/WorldMapData_1.java
@@ -1,37 +1,33 @@
-import java.lang.management.GarbageCollectorMXBean;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hj")
+@ObfuscatedName("ho")
@Implements("WorldMapData_1")
public class WorldMapData_1 extends AbstractWorldMapData {
- @ObfuscatedName("av")
- @Export("garbageCollector")
- static GarbageCollectorMXBean garbageCollector;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -490109915
+ intValue = 944761331
)
@Export("chunkXLow")
int chunkXLow;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 963547753
+ intValue = -2108946565
)
@Export("chunkYLow")
int chunkYLow;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1228146275
+ intValue = 1996140337
)
@Export("chunkX")
int chunkX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -2073132681
+ intValue = -427207979
)
@Export("chunkY")
int chunkY;
@@ -39,16 +35,16 @@ public class WorldMapData_1 extends AbstractWorldMapData {
WorldMapData_1() {
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "108"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "122"
)
@Export("init")
void init(Buffer var1) {
int var2 = var1.readUnsignedByte(); // L: 14
- if (var2 != WorldMapID.field2877.value) { // L: 15
- throw new IllegalStateException(""); // L: 16
+ if (var2 != WorldMapID.field2840.value) { // L: 15
+ throw new IllegalStateException("");
} else {
super.minPlane = var1.readUnsignedByte(); // L: 18
super.planes = var1.readUnsignedByte(); // L: 19
@@ -60,26 +56,26 @@ public class WorldMapData_1 extends AbstractWorldMapData {
super.regionY = var1.readUnsignedShort(); // L: 25
this.chunkX = var1.readUnsignedByte(); // L: 26
this.chunkY = var1.readUnsignedByte(); // L: 27
- super.groupId = var1.method7532(); // L: 28
- super.fileId = var1.method7532(); // L: 29
+ super.groupId = var1.method7752(); // L: 28
+ super.fileId = var1.method7752(); // L: 29
}
} // L: 30
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "933342926"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-2593161"
)
@Export("readGeography")
void readGeography(Buffer var1) {
super.planes = Math.min(super.planes, 4); // L: 34
super.floorUnderlayIds = new short[1][64][64]; // L: 35
super.floorOverlayIds = new short[super.planes][64][64]; // L: 36
- super.field2845 = new byte[super.planes][64][64]; // L: 37
- super.field2847 = new byte[super.planes][64][64]; // L: 38
+ super.field2796 = new byte[super.planes][64][64]; // L: 37
+ super.field2795 = new byte[super.planes][64][64]; // L: 38
super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 39
int var2 = var1.readUnsignedByte(); // L: 40
- if (var2 != class239.field2872.value) { // L: 41
+ if (var2 != class238.field2836.value) { // L: 41
throw new IllegalStateException(""); // L: 42
} else {
int var3 = var1.readUnsignedByte(); // L: 44
@@ -99,40 +95,40 @@ public class WorldMapData_1 extends AbstractWorldMapData {
}
} // L: 56
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-8"
+ descriptor = "(I)I",
+ garbageValue = "906993418"
)
@Export("getChunkXLow")
int getChunkXLow() {
return this.chunkXLow; // L: 76
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1782342314"
+ garbageValue = "1946876923"
)
@Export("getChunkYLow")
int getChunkYLow() {
return this.chunkYLow; // L: 80
}
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1449526509"
+ descriptor = "(S)I",
+ garbageValue = "-14250"
)
@Export("getChunkX")
int getChunkX() {
return this.chunkX; // L: 84
}
- @ObfuscatedName("p")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-413234934"
+ descriptor = "(B)I",
+ garbageValue = "-74"
)
@Export("getChunkY")
int getChunkY() {
@@ -144,7 +140,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
return false; // L: 61
} else {
WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63
- if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 64
+ if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 64
return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; // L: 67
} else {
return false; // L: 65
@@ -156,153 +152,67 @@ public class WorldMapData_1 extends AbstractWorldMapData {
return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72
}
- @ObfuscatedName("v")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "-21477697"
+ descriptor = "(I)[Lcc;",
+ garbageValue = "-217216556"
)
- static void method4706(boolean var0) {
- byte var1 = 0; // L: 1074
- if (!class118.method2721()) { // L: 1075
- var1 = 12; // L: 1076
- } else if (class82.client.method1128() || class82.client.method1520()) { // L: 1078
- var1 = 10; // L: 1079
- }
-
- class126.method2799(var1); // L: 1081
- if (var0) { // L: 1082
- Login.Login_username = ""; // L: 1083
- Login.Login_password = ""; // L: 1084
- WorldMapCacheName.field2912 = 0; // L: 1085
- class92.otp = ""; // L: 1086
- }
-
- if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 1089
- if (class12.clientPreferences.method2241() != null) { // L: 1090
- Login.Login_username = class12.clientPreferences.method2241(); // L: 1091
- Client.Login_isUsernameRemembered = true; // L: 1092
- } else {
- Client.Login_isUsernameRemembered = false; // L: 1094
- }
- }
-
- if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1097
- Login.currentLoginField = 1; // L: 1098
- } else {
- Login.currentLoginField = 0; // L: 1101
- }
-
- } // L: 1104
-
- @ObfuscatedName("hj")
- @ObfuscatedSignature(
- descriptor = "(IIIIIIII)V",
- garbageValue = "-1880965646"
- )
- @Export("addPendingSpawnToScene")
- static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
- if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7922
- if (Client.isLowDetail && var0 != class128.Client_plane) { // L: 7923
- return;
- }
-
- long var7 = 0L; // L: 7924
- boolean var9 = true; // L: 7925
- boolean var10 = false; // L: 7926
- boolean var11 = false; // L: 7927
- if (var1 == 0) { // L: 7928
- var7 = class175.scene.getBoundaryObjectTag(var0, var2, var3);
- }
-
- if (var1 == 1) { // L: 7929
- var7 = class175.scene.getWallDecorationTag(var0, var2, var3);
- }
-
- if (var1 == 2) { // L: 7930
- var7 = class175.scene.getGameObjectTag(var0, var2, var3);
- }
-
- if (var1 == 3) { // L: 7931
- var7 = class175.scene.getFloorDecorationTag(var0, var2, var3);
- }
-
- int var12;
- if (var7 != 0L) { // L: 7932
- var12 = class175.scene.getObjectFlags(var0, var2, var3, var7); // L: 7933
- int var14 = NetSocket.Entity_unpackID(var7); // L: 7934
- int var15 = var12 & 31; // L: 7935
- int var16 = var12 >> 6 & 3; // L: 7936
- ObjectComposition var13;
- if (var1 == 0) { // L: 7937
- class175.scene.removeBoundaryObject(var0, var2, var3); // L: 7938
- var13 = class82.getObjectDefinition(var14); // L: 7939
- if (var13.interactType != 0) { // L: 7940
- Client.collisionMaps[var0].method3756(var2, var3, var15, var16, var13.boolean1);
- }
- }
-
- if (var1 == 1) { // L: 7942
- class175.scene.removeWallDecoration(var0, var2, var3);
- }
-
- if (var1 == 2) { // L: 7943
- class175.scene.removeGameObject(var0, var2, var3); // L: 7944
- var13 = class82.getObjectDefinition(var14); // L: 7945
- if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7946
- return;
- }
-
- if (var13.interactType != 0) { // L: 7947
- Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1);
- }
- }
-
- if (var1 == 3) { // L: 7949
- class175.scene.removeFloorDecoration(var0, var2, var3); // L: 7950
- var13 = class82.getObjectDefinition(var14); // L: 7951
- if (var13.interactType == 1) { // L: 7952
- Client.collisionMaps[var0].method3759(var2, var3);
- }
- }
- }
-
- if (var4 >= 0) { // L: 7955
- var12 = var0; // L: 7956
- if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7957
- var12 = var0 + 1;
- }
-
- Fonts.method7226(var0, var12, var2, var3, var4, var5, var6, class175.scene, Client.collisionMaps[var0]); // L: 7958
- }
- }
-
- } // L: 7961
-
- @ObfuscatedName("lw")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;",
- garbageValue = "35"
- )
- static String method4707(String var0, boolean var1) {
- String var2 = var1 ? "https://" : "http://"; // L: 12529
- if (Client.gameBuild == 1) { // L: 12530
- var0 = var0 + "-wtrc";
- } else if (Client.gameBuild == 2) { // L: 12531
- var0 = var0 + "-wtqa";
- } else if (Client.gameBuild == 3) { // L: 12532
- var0 = var0 + "-wtwip";
- } else if (Client.gameBuild == 5) { // L: 12533
- var0 = var0 + "-wti";
- } else if (Client.gameBuild == 4) { // L: 12534
- var0 = "local";
- }
-
- String var3 = ""; // L: 12535
- if (Client.field662 != null) { // L: 12536
- var3 = "/p=" + Client.field662;
- }
-
- String var4 = "runescape.com"; // L: 12537
- return var2 + var0 + "." + var4 + "/l=" + class263.clientLanguage + "/a=" + class230.field2807 + var3 + "/"; // L: 12538
+ static class82[] method4867() {
+ return new class82[]{class82.field1073, class82.field1067, class82.field1069, class82.field1066, class82.field1068}; // L: 16
}
+
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-2054852963"
+ )
+ static void method4872(int var0) {
+ if (var0 != Login.loginIndex) { // L: 1939
+ Login.loginIndex = var0; // L: 1940
+ }
+ } // L: 1941
+
+ @ObfuscatedName("kq")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I)V",
+ garbageValue = "-1987300687"
+ )
+ static final void method4874(Widget var0) {
+ int var1 = var0.contentType; // L: 11943
+ if (var1 == 324) { // L: 11944
+ if (Client.field535 == -1) { // L: 11945
+ Client.field535 = var0.spriteId2; // L: 11946
+ Client.field763 = var0.spriteId; // L: 11947
+ }
+
+ if (Client.playerAppearance.isFemale) { // L: 11949
+ var0.spriteId2 = Client.field535;
+ } else {
+ var0.spriteId2 = Client.field763; // L: 11950
+ }
+
+ } else if (var1 == 325) { // L: 11953
+ if (Client.field535 == -1) { // L: 11954
+ Client.field535 = var0.spriteId2; // L: 11955
+ Client.field763 = var0.spriteId; // L: 11956
+ }
+
+ if (Client.playerAppearance.isFemale) { // L: 11958
+ var0.spriteId2 = Client.field763;
+ } else {
+ var0.spriteId2 = Client.field535; // L: 11959
+ }
+
+ } else if (var1 == 327) { // L: 11962
+ var0.modelAngleX = 150; // L: 11963
+ var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11964
+ var0.modelType = 5; // L: 11965
+ var0.modelId = 0; // L: 11966
+ } else if (var1 == 328) { // L: 11969
+ var0.modelAngleX = 150; // L: 11970
+ var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11971
+ var0.modelType = 5; // L: 11972
+ var0.modelId = 1; // L: 11973
+ }
+ } // L: 11951 11960 11967 11974 11976
}
diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java
index 1899cff375..12dcc48432 100644
--- a/runescape-client/src/main/java/WorldMapDecoration.java
+++ b/runescape-client/src/main/java/WorldMapDecoration.java
@@ -5,24 +5,24 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("iy")
+@ObfuscatedName("ix")
@Implements("WorldMapDecoration")
public class WorldMapDecoration {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -170825093
+ intValue = 1217125903
)
@Export("objectDefinitionId")
final int objectDefinitionId;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -727750889
+ intValue = -1822794685
)
@Export("decoration")
final int decoration;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1798867267
+ intValue = -1636858953
)
@Export("rotation")
final int rotation;
@@ -33,105 +33,64 @@ public class WorldMapDecoration {
this.rotation = var3; // L: 11
} // L: 12
- @ObfuscatedName("k")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "2105271367"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-2049294776"
)
- @Export("loadInterface")
- public static boolean loadInterface(int var0) {
- if (class120.Widget_loadedInterfaces[var0]) { // L: 246
- return true;
- } else if (!class134.Widget_archive.tryLoadGroup(var0)) { // L: 247
- return false;
+ static int method4992(int var0, Script var1, boolean var2) {
+ Widget var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1322
+ if (var0 == ScriptOpcodes.IF_GETX) { // L: 1323
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.x; // L: 1324
+ return 1; // L: 1325
+ } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1327
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.y; // L: 1328
+ return 1; // L: 1329
+ } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1331
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.width; // L: 1332
+ return 1; // L: 1333
+ } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1335
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.height; // L: 1336
+ return 1; // L: 1337
+ } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1339
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1340
+ return 1; // L: 1341
+ } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1343
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.parentId; // L: 1344
+ return 1; // L: 1345
} else {
- int var1 = class134.Widget_archive.getGroupFileCount(var0); // L: 248
- if (var1 == 0) { // L: 249
- class120.Widget_loadedInterfaces[var0] = true; // L: 250
- return true; // L: 251
- } else {
- if (NetSocket.Widget_interfaceComponents[var0] == null) { // L: 253
- NetSocket.Widget_interfaceComponents[var0] = new Widget[var1];
- }
+ return 2; // L: 1347
+ }
+ }
- for (int var2 = 0; var2 < var1; ++var2) { // L: 254
- if (NetSocket.Widget_interfaceComponents[var0][var2] == null) { // L: 255
- byte[] var3 = class134.Widget_archive.takeFile(var0, var2); // L: 256
- if (var3 != null) { // L: 257
- NetSocket.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 258
- NetSocket.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 259
- if (var3[0] == -1) { // L: 260
- NetSocket.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
- } else {
- NetSocket.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 261
- }
- }
- }
- }
-
- class120.Widget_loadedInterfaces[var0] = true; // L: 265
- return true; // L: 266
+ @ObfuscatedName("ig")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-80"
+ )
+ @Export("Widget_runOnTargetLeave")
+ static void Widget_runOnTargetLeave() {
+ if (Client.isSpellSelected) { // L: 9573
+ Widget var0 = ScriptFrame.getWidgetChild(NetCache.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9574
+ if (var0 != null && var0.onTargetLeave != null) { // L: 9575
+ ScriptEvent var1 = new ScriptEvent(); // L: 9576
+ var1.widget = var0; // L: 9577
+ var1.args = var0.onTargetLeave; // L: 9578
+ BoundaryObject.runScriptEvent(var1); // L: 9579
}
- }
- }
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1988799748"
- )
- static int method4804(int var0, Script var1, boolean var2) {
- Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1341
- if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1342
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1343
- return 1; // L: 1344
- } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1346
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1347
- return 1; // L: 1348
- } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1350
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.text; // L: 1351
- return 1; // L: 1352
- } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1354
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1355
- return 1; // L: 1356
- } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1358
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1359
- return 1; // L: 1360
- } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1362
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1363
- return 1; // L: 1364
- } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1366
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1367
- return 1; // L: 1368
- } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1370
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1371
- return 1; // L: 1372
- } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1374
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1375
- return 1; // L: 1376
- } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1378
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1379
- return 1; // L: 1380
- } else if (var0 == 2610) { // L: 1382
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1383
- return 1; // L: 1384
- } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1386
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color; // L: 1387
- return 1; // L: 1388
- } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1390
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color2; // L: 1391
- return 1; // L: 1392
- } else if (var0 == 2613) { // L: 1394
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1395
- return 1; // L: 1396
- } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1398
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1399
- return 1; // L: 1400
- } else if (var0 != 2615 && var0 != 2616) { // L: 1402
- return 2; // L: 1406
- } else {
- ++class12.Interpreter_intStackSize; // L: 1403
- return 1; // L: 1404
+ Client.selectedSpellItemId = -1; // L: 9581
+ Client.isSpellSelected = false; // L: 9582
+ ChatChannel.invalidateWidget(var0); // L: 9583
}
- }
+ } // L: 9584
+
+ @ObfuscatedName("lp")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1243783436"
+ )
+ static void method4991(int var0) {
+ Client.oculusOrbState = var0; // L: 12414
+ } // L: 12415
}
diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java
index b180921f1f..d00c6f9a6e 100644
--- a/runescape-client/src/main/java/WorldMapDecorationType.java
+++ b/runescape-client/src/main/java/WorldMapDecorationType.java
@@ -4,128 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kw")
+@ObfuscatedName("ku")
@Implements("WorldMapDecorationType")
public enum WorldMapDecorationType implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3571(0, 0),
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3570(1, 0),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3558(2, 0),
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3559(3, 0),
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3560(9, 2),
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3556(4, 1),
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3564(5, 1),
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3563(6, 1),
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3572(7, 1),
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3565(8, 1),
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3566(12, 2),
@ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lkw;"
+ descriptor = "Lku;"
)
- field3567(13, 2),
- @ObfuscatedName("w")
+ field3549(0, 0),
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lkw;"
+ descriptor = "Lku;"
)
- field3557(14, 2),
- @ObfuscatedName("b")
+ field3543(1, 0),
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lkw;"
+ descriptor = "Lku;"
)
- field3569(15, 2),
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3576(16, 2),
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3561(17, 2),
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3568(18, 2),
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3573(19, 2),
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3574(20, 2),
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3575(21, 2),
+ field3533(2, 0),
@ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lkw;"
+ descriptor = "Lku;"
)
- field3562(10, 2),
- @ObfuscatedName("d")
- @ObfuscatedSignature(
- descriptor = "Lkw;"
- )
- field3577(11, 2),
+ field3534(3, 0),
@ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lkw;"
+ descriptor = "Lku;"
)
- field3578(22, 3);
-
+ field3535(9, 2),
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3536(4, 1),
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3537(5, 1),
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3538(6, 1),
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3539(7, 1),
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3532(8, 1),
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3541(12, 2),
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3542(13, 2),
@ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3551(14, 2),
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3531(15, 2),
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3545(16, 2),
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3546(17, 2),
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3547(18, 2),
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3548(19, 2),
+ @ObfuscatedName("l")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3540(20, 2),
+ @ObfuscatedName("a")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3550(21, 2),
+ @ObfuscatedName("p")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3553(10, 2),
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3552(11, 2),
+ @ObfuscatedName("n")
+ @ObfuscatedSignature(
+ descriptor = "Lku;"
+ )
+ field3544(22, 3);
+
+ @ObfuscatedName("o")
@ObfuscatedGetter(
- intValue = -1442497389
+ intValue = -1096065009
)
@Export("id")
public final int id;
@@ -138,57 +138,23 @@ public enum WorldMapDecorationType implements MouseWheel {
this.id = var3; // L: 34
} // L: 35
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id; // L: 39
}
- @ObfuscatedName("kw")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(Lki;I)V",
- garbageValue = "1049661564"
+ descriptor = "(CI)Z",
+ garbageValue = "-1746098292"
)
- static final void method5575(Widget var0) {
- int var1 = var0.contentType; // L: 12160
- if (var1 == 324) { // L: 12161
- if (Client.field602 == -1) { // L: 12162
- Client.field602 = var0.spriteId2; // L: 12163
- Client.field763 = var0.spriteId; // L: 12164
- }
-
- if (Client.playerAppearance.isFemale) { // L: 12166
- var0.spriteId2 = Client.field602;
- } else {
- var0.spriteId2 = Client.field763; // L: 12167
- }
-
- } else if (var1 == 325) { // L: 12170
- if (Client.field602 == -1) { // L: 12171
- Client.field602 = var0.spriteId2; // L: 12172
- Client.field763 = var0.spriteId; // L: 12173
- }
-
- if (Client.playerAppearance.isFemale) { // L: 12175
- var0.spriteId2 = Client.field763;
- } else {
- var0.spriteId2 = Client.field602; // L: 12176
- }
-
- } else if (var1 == 327) { // L: 12179
- var0.modelAngleX = 150; // L: 12180
- var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12181
- var0.modelType = 5; // L: 12182
- var0.modelId = 0; // L: 12183
- } else if (var1 == 328) { // L: 12186
- var0.modelAngleX = 150; // L: 12187
- var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12188
- var0.modelType = 5; // L: 12189
- var0.modelId = 1; // L: 12190
- }
- } // L: 12168 12177 12184 12191 12193
+ @Export("isCharAlphabetic")
+ public static boolean isCharAlphabetic(char var0) {
+ return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 155
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index d168e7bf1f..b8642aef17 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -4,104 +4,110 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fx")
+@ObfuscatedName("fa")
@Implements("WorldMapElement")
public class WorldMapElement extends DualNode {
- @ObfuscatedName("l")
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "[Lfa;"
+ )
+ @Export("WorldMapElement_cached")
+ static WorldMapElement[] WorldMapElement_cached;
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1647278563
+ intValue = -547648511
)
@Export("WorldMapElement_count")
public static int WorldMapElement_count;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lir;"
+ descriptor = "Lii;"
)
@Export("WorldMapElement_cachedSprites")
- public static EvictingDualNodeHashTable WorldMapElement_cachedSprites;
- @ObfuscatedName("a")
+ static EvictingDualNodeHashTable WorldMapElement_cachedSprites;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1174190197
+ intValue = -1275448415
)
@Export("objectId")
public final int objectId;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1853548417
+ intValue = -15519353
)
@Export("sprite1")
public int sprite1;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 195753019
+ intValue = -555095945
)
@Export("sprite2")
int sprite2;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@Export("name")
public String name;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 814064351
+ intValue = -1169351291
)
- public int field1871;
- @ObfuscatedName("v")
+ public int field1834;
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -1883868595
+ intValue = 1620342619
)
@Export("textSize")
public int textSize;
- @ObfuscatedName("c")
- public boolean field1876;
- @ObfuscatedName("w")
- public boolean field1874;
- @ObfuscatedName("b")
+ @ObfuscatedName("t")
+ public boolean field1830;
+ @ObfuscatedName("z")
+ public boolean field1837;
+ @ObfuscatedName("r")
@Export("menuActions")
public String[] menuActions;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@Export("menuTargetName")
public String menuTargetName;
- @ObfuscatedName("g")
- int[] field1873;
- @ObfuscatedName("x")
- @ObfuscatedGetter(
- intValue = -945687381
- )
- int field1865;
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = 2079888943
- )
- int field1869;
- @ObfuscatedName("e")
- @ObfuscatedGetter(
- intValue = 1349758673
- )
- int field1885;
+ @ObfuscatedName("k")
+ int[] field1840;
@ObfuscatedName("h")
@ObfuscatedGetter(
- intValue = -817462247
+ intValue = -671925561
)
- int field1881;
- @ObfuscatedName("f")
- @ObfuscatedSignature(
- descriptor = "Lfj;"
+ int field1841;
+ @ObfuscatedName("x")
+ @ObfuscatedGetter(
+ intValue = -2029697455
)
- @Export("horizontalAlignment")
- public HorizontalAlignment horizontalAlignment;
- @ObfuscatedName("d")
+ int field1842;
+ @ObfuscatedName("l")
+ @ObfuscatedGetter(
+ intValue = -512044121
+ )
+ int field1843;
+ @ObfuscatedName("a")
+ @ObfuscatedGetter(
+ intValue = -673813715
+ )
+ int field1827;
+ @ObfuscatedName("p")
@ObfuscatedSignature(
descriptor = "Lfk;"
)
+ @Export("horizontalAlignment")
+ public HorizontalAlignment horizontalAlignment;
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "Lft;"
+ )
@Export("verticalAlignment")
public VerticalAlignment verticalAlignment;
- @ObfuscatedName("j")
- int[] field1884;
- @ObfuscatedName("z")
- byte[] field1877;
- @ObfuscatedName("i")
+ @ObfuscatedName("n")
+ int[] field1833;
+ @ObfuscatedName("o")
+ byte[] field1844;
+ @ObfuscatedName("m")
@ObfuscatedGetter(
- intValue = 1922405763
+ intValue = 1429465133
)
@Export("category")
public int category;
@@ -114,23 +120,23 @@ public class WorldMapElement extends DualNode {
this.sprite1 = -1; // L: 18
this.sprite2 = -1; // L: 19
this.textSize = 0; // L: 22
- this.field1876 = true; // L: 24
- this.field1874 = false; // L: 25
+ this.field1830 = true; // L: 24
+ this.field1837 = false; // L: 25
this.menuActions = new String[5]; // L: 26
- this.field1865 = Integer.MAX_VALUE; // L: 29
- this.field1869 = Integer.MAX_VALUE; // L: 30
- this.field1885 = Integer.MIN_VALUE; // L: 31
- this.field1881 = Integer.MIN_VALUE; // L: 32
+ this.field1841 = Integer.MAX_VALUE; // L: 29
+ this.field1842 = Integer.MAX_VALUE; // L: 30
+ this.field1843 = Integer.MIN_VALUE; // L: 31
+ this.field1827 = Integer.MIN_VALUE; // L: 32
this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33
this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34
this.category = -1; // L: 37
this.objectId = var1; // L: 40
} // L: 41
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "49"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-585264130"
)
@Export("decode")
void decode(Buffer var1) {
@@ -144,68 +150,68 @@ public class WorldMapElement extends DualNode {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;IB)V",
- garbageValue = "6"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-976528863"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
if (var2 == 1) { // L: 77
- this.sprite1 = var1.method7532();
+ this.sprite1 = var1.method7752();
} else if (var2 == 2) { // L: 78
- this.sprite2 = var1.method7532();
+ this.sprite2 = var1.method7752();
} else if (var2 == 3) { // L: 79
this.name = var1.readStringCp1252NullTerminated();
} else if (var2 == 4) { // L: 80
- this.field1871 = var1.readMedium();
+ this.field1834 = var1.readMedium();
} else if (var2 == 5) { // L: 81
var1.readMedium(); // L: 82
} else if (var2 == 6) { // L: 84
this.textSize = var1.readUnsignedByte();
} else {
- int var6;
+ int var3;
if (var2 == 7) { // L: 85
- var6 = var1.readUnsignedByte(); // L: 86
- if ((var6 & 1) == 0) { // L: 87
- this.field1876 = false;
+ var3 = var1.readUnsignedByte(); // L: 86
+ if ((var3 & 1) == 0) { // L: 87
+ this.field1830 = false;
}
- if ((var6 & 2) == 2) { // L: 88
- this.field1874 = true;
+ if ((var3 & 2) == 2) { // L: 88
+ this.field1837 = true;
}
} else if (var2 == 8) { // L: 90
var1.readUnsignedByte(); // L: 91
} else if (var2 >= 10 && var2 <= 14) { // L: 93
this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated();
} else if (var2 == 15) { // L: 94
- var6 = var1.readUnsignedByte(); // L: 95
- this.field1873 = new int[var6 * 2]; // L: 96
+ var3 = var1.readUnsignedByte(); // L: 95
+ this.field1840 = new int[var3 * 2]; // L: 96
int var4;
- for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 97
- this.field1873[var4] = var1.readShort();
+ for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 97
+ this.field1840[var4] = var1.readShort();
}
var1.readInt(); // L: 98
var4 = var1.readUnsignedByte(); // L: 99
- this.field1884 = new int[var4]; // L: 100
+ this.field1833 = new int[var4]; // L: 100
int var5;
- for (var5 = 0; var5 < this.field1884.length; ++var5) { // L: 101
- this.field1884[var5] = var1.readInt();
+ for (var5 = 0; var5 < this.field1833.length; ++var5) { // L: 101
+ this.field1833[var5] = var1.readInt();
}
- this.field1877 = new byte[var6]; // L: 102
+ this.field1844 = new byte[var3]; // L: 102
- for (var5 = 0; var5 < var6; ++var5) { // L: 103
- this.field1877[var5] = var1.readByte();
+ for (var5 = 0; var5 < var3; ++var5) { // L: 103
+ this.field1844[var5] = var1.readByte();
}
} else if (var2 != 16) { // L: 105
if (var2 == 17) { // L: 106
this.menuTargetName = var1.readStringCp1252NullTerminated();
} else if (var2 == 18) { // L: 107
- var1.method7532(); // L: 108
+ var1.method7752(); // L: 108
} else if (var2 == 19) { // L: 110
this.category = var1.readUnsignedShort();
} else if (var2 == 21) { // L: 111
@@ -220,87 +226,85 @@ public class WorldMapElement extends DualNode {
var1.readShort(); // L: 123
var1.readShort(); // L: 124
} else if (var2 == 25) { // L: 126
- var1.method7532(); // L: 127
+ var1.method7752(); // L: 127
} else if (var2 == 28) { // L: 129
var1.readUnsignedByte(); // L: 130
} else if (var2 == 29) { // L: 132
- HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1937, HorizontalAlignment.field1938}; // L: 135
- this.horizontalAlignment = (HorizontalAlignment)class291.findEnumerated(var3, var1.readUnsignedByte()); // L: 137
- } else if (var2 == 30) { // L: 139
- VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.field2001, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1994}; // L: 142
- this.verticalAlignment = (VerticalAlignment)class291.findEnumerated(var7, var1.readUnsignedByte()); // L: 144
+ this.horizontalAlignment = (HorizontalAlignment)Actor.findEnumerated(ModeWhere.method6076(), var1.readUnsignedByte()); // L: 133
+ } else if (var2 == 30) { // L: 135
+ this.verticalAlignment = (VerticalAlignment)Actor.findEnumerated(class124.method2820(), var1.readUnsignedByte()); // L: 136
}
}
}
- } // L: 147
+ } // L: 139
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "14"
+ descriptor = "(I)V",
+ garbageValue = "1501827845"
)
- void method3291() {
- if (this.field1873 != null) { // L: 150
- for (int var1 = 0; var1 < this.field1873.length; var1 += 2) { // L: 151
- if (this.field1873[var1] < this.field1865) { // L: 152
- this.field1865 = this.field1873[var1];
- } else if (this.field1873[var1] > this.field1885) { // L: 153
- this.field1885 = this.field1873[var1];
+ void method3377() {
+ if (this.field1840 != null) { // L: 142
+ for (int var1 = 0; var1 < this.field1840.length; var1 += 2) { // L: 143
+ if (this.field1840[var1] < this.field1841) { // L: 144
+ this.field1841 = this.field1840[var1];
+ } else if (this.field1840[var1] > this.field1843) { // L: 145
+ this.field1843 = this.field1840[var1];
}
- if (this.field1873[var1 + 1] < this.field1869) { // L: 154
- this.field1869 = this.field1873[var1 + 1];
- } else if (this.field1873[var1 + 1] > this.field1881) {
- this.field1881 = this.field1873[var1 + 1]; // L: 155
+ if (this.field1840[var1 + 1] < this.field1842) { // L: 146
+ this.field1842 = this.field1840[var1 + 1];
+ } else if (this.field1840[var1 + 1] > this.field1827) {
+ this.field1827 = this.field1840[var1 + 1]; // L: 147
}
}
}
- } // L: 158
+ } // L: 150
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(ZI)Lqr;",
- garbageValue = "-1312642050"
+ descriptor = "(ZI)Lqe;",
+ garbageValue = "-1796697978"
)
@Export("getSpriteBool")
public SpritePixels getSpriteBool(boolean var1) {
- int var2 = this.sprite1; // L: 161
- return this.getSprite(var2); // L: 162
+ int var2 = this.sprite1; // L: 153
+ return this.getSprite(var2); // L: 154
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(II)Lqr;",
- garbageValue = "1990397357"
+ descriptor = "(IB)Lqe;",
+ garbageValue = "32"
)
@Export("getSprite")
SpritePixels getSprite(int var1) {
- if (var1 < 0) { // L: 166
+ if (var1 < 0) { // L: 158
return null;
} else {
- SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 167
- if (var2 != null) { // L: 168
+ SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 159
+ if (var2 != null) { // L: 160
return var2;
} else {
- var2 = StructComposition.SpriteBuffer_getSprite(GrandExchangeOfferWorldComparator.WorldMapElement_archive, var1, 0); // L: 169
- if (var2 != null) { // L: 170
- WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 171
+ var2 = class7.SpriteBuffer_getSprite(class121.WorldMapElement_archive, var1, 0); // L: 161
+ if (var2 != null) { // L: 162
+ WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 163
}
- return var2; // L: 173
+ return var2; // L: 165
}
}
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "2"
+ descriptor = "(I)I",
+ garbageValue = "835027569"
)
@Export("getObjectId")
public int getObjectId() {
- return this.objectId; // L: 177
+ return this.objectId; // L: 169
}
}
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index 467953d5f8..aaaf0ad27f 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -4,22 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("it")
+@ObfuscatedName("iy")
@Implements("WorldMapEvent")
public class WorldMapEvent {
- @ObfuscatedName("o")
+ @ObfuscatedName("eg")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ static Archive field2882;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1384072805
+ intValue = 285885713
)
@Export("mapElement")
public int mapElement;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "Lkd;"
)
@Export("coord1")
public Coord coord1;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "Lkd;"
)
@@ -30,396 +35,51 @@ public class WorldMapEvent {
descriptor = "(ILkd;Lkd;)V"
)
public WorldMapEvent(int var1, Coord var2, Coord var3) {
- this.mapElement = var1;
- this.coord1 = var2;
+ this.mapElement = var1; // L: 11
+ this.coord1 = var2; // L: 12
this.coord2 = var3; // L: 13
} // L: 14
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V",
- garbageValue = "-2"
+ descriptor = "(DDIB)[D",
+ garbageValue = "-87"
)
- @Export("addGameMessage")
- static void addGameMessage(int var0, String var1, String var2) {
- UserComparator7.addChatMessage(var0, var1, var2, (String)null); // L: 19
- } // L: 20
+ public static double[] method5119(double var0, double var2, int var4) {
+ int var5 = var4 * 2 + 1; // L: 18
+ double[] var6 = new double[var5]; // L: 19
+ int var7 = -var4;
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "([BZI)Ljava/lang/Object;",
- garbageValue = "-2126153906"
- )
- public static Object method4929(byte[] var0, boolean var1) {
- if (var0 == null) { // L: 7
- return null;
- } else if (var0.length > 136) { // L: 8
- DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10
- var2.set(var0); // L: 11
- return var2; // L: 12
- } else {
- return var0; // L: 16
+ for (int var8 = 0; var7 <= var4; ++var8) {
+ var6[var8] = class357.method6530((double)var7, var0, var2); // L: 21
+ ++var7; // L: 20
}
+
+ return var6; // L: 23
}
- @ObfuscatedName("k")
+ @ObfuscatedName("kb")
@ObfuscatedSignature(
- descriptor = "(B)[Lqw;",
- garbageValue = "-27"
+ descriptor = "(II)V",
+ garbageValue = "-2116126418"
)
- @Export("FillMode_values")
- public static FillMode[] FillMode_values() {
- return new FillMode[]{FillMode.field4753, FillMode.field4754, FillMode.SOLID}; // L: 15
- }
+ static final void method5120(int var0) {
+ var0 = Math.max(Math.min(var0, 100), 0); // L: 11823
+ var0 = 100 - var0; // L: 11824
+ float var1 = (float)var0 / 200.0F + 0.5F; // L: 11825
+ Rasterizer3D.Rasterizer3D_setBrightness((double)var1); // L: 11827
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness((double)var1); // L: 11828
+ Projectile.method1959(); // L: 11829
+ class19.clientPreferences.method2255((double)var1); // L: 11830
+ } // L: 11832
- @ObfuscatedName("hg")
+ @ObfuscatedName("kn")
@ObfuscatedSignature(
- descriptor = "(IIIIII)V",
- garbageValue = "-1670571059"
+ descriptor = "(IB)V",
+ garbageValue = "124"
)
- @Export("drawObject")
- static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
- long var5 = class175.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5990
- int var7;
- int var8;
- int var9;
- int var10;
- int var12;
- int var13;
- if (0L != var5) { // L: 5991
- var7 = class175.scene.getObjectFlags(var0, var1, var2, var5); // L: 5992
- var8 = var7 >> 6 & 3; // L: 5993
- var9 = var7 & 31; // L: 5994
- var10 = var3; // L: 5995
- if (LoginPacket.method5022(var5)) { // L: 5996
- var10 = var4;
- }
-
- int[] var11 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5997
- var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5998
- var13 = NetSocket.Entity_unpackID(var5); // L: 5999
- ObjectComposition var14 = class82.getObjectDefinition(var13); // L: 6000
- if (var14.mapSceneId != -1) { // L: 6001
- IndexedSprite var15 = class29.mapSceneSprites[var14.mapSceneId]; // L: 6002
- if (var15 != null) { // L: 6003
- int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 6004
- int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 6005
- var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 6006
- }
- } else {
- if (var9 == 0 || var9 == 2) { // L: 6010
- if (var8 == 0) { // L: 6011
- var11[var12] = var10; // L: 6012
- var11[var12 + 512] = var10; // L: 6013
- var11[var12 + 1024] = var10; // L: 6014
- var11[var12 + 1536] = var10; // L: 6015
- } else if (var8 == 1) { // L: 6017
- var11[var12] = var10; // L: 6018
- var11[var12 + 1] = var10; // L: 6019
- var11[var12 + 2] = var10; // L: 6020
- var11[var12 + 3] = var10; // L: 6021
- } else if (var8 == 2) { // L: 6023
- var11[var12 + 3] = var10; // L: 6024
- var11[var12 + 512 + 3] = var10; // L: 6025
- var11[var12 + 1024 + 3] = var10; // L: 6026
- var11[var12 + 1536 + 3] = var10; // L: 6027
- } else if (var8 == 3) { // L: 6029
- var11[var12 + 1536] = var10; // L: 6030
- var11[var12 + 1536 + 1] = var10; // L: 6031
- var11[var12 + 1536 + 2] = var10; // L: 6032
- var11[var12 + 1536 + 3] = var10; // L: 6033
- }
- }
-
- if (var9 == 3) { // L: 6036
- if (var8 == 0) { // L: 6037
- var11[var12] = var10;
- } else if (var8 == 1) { // L: 6038
- var11[var12 + 3] = var10;
- } else if (var8 == 2) { // L: 6039
- var11[var12 + 1536 + 3] = var10;
- } else if (var8 == 3) { // L: 6040
- var11[var12 + 1536] = var10;
- }
- }
-
- if (var9 == 2) { // L: 6042
- if (var8 == 3) { // L: 6043
- var11[var12] = var10; // L: 6044
- var11[var12 + 512] = var10; // L: 6045
- var11[var12 + 1024] = var10; // L: 6046
- var11[var12 + 1536] = var10; // L: 6047
- } else if (var8 == 0) { // L: 6049
- var11[var12] = var10; // L: 6050
- var11[var12 + 1] = var10; // L: 6051
- var11[var12 + 2] = var10; // L: 6052
- var11[var12 + 3] = var10; // L: 6053
- } else if (var8 == 1) { // L: 6055
- var11[var12 + 3] = var10; // L: 6056
- var11[var12 + 512 + 3] = var10; // L: 6057
- var11[var12 + 1024 + 3] = var10; // L: 6058
- var11[var12 + 1536 + 3] = var10; // L: 6059
- } else if (var8 == 2) { // L: 6061
- var11[var12 + 1536] = var10; // L: 6062
- var11[var12 + 1536 + 1] = var10; // L: 6063
- var11[var12 + 1536 + 2] = var10; // L: 6064
- var11[var12 + 1536 + 3] = var10; // L: 6065
- }
- }
- }
- }
-
- var5 = class175.scene.getGameObjectTag(var0, var1, var2); // L: 6070
- if (var5 != 0L) { // L: 6071
- var7 = class175.scene.getObjectFlags(var0, var1, var2, var5); // L: 6072
- var8 = var7 >> 6 & 3; // L: 6073
- var9 = var7 & 31; // L: 6074
- var10 = NetSocket.Entity_unpackID(var5); // L: 6075
- ObjectComposition var24 = class82.getObjectDefinition(var10); // L: 6076
- int var19;
- if (var24.mapSceneId != -1) { // L: 6077
- IndexedSprite var20 = class29.mapSceneSprites[var24.mapSceneId]; // L: 6078
- if (var20 != null) { // L: 6079
- var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 6080
- var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 6081
- var20.drawAt(var13 + var1 * 4 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 6082
- }
- } else if (var9 == 9) { // L: 6085
- var12 = 15658734; // L: 6086
- if (LoginPacket.method5022(var5)) { // L: 6087
- var12 = 15597568;
- }
-
- int[] var18 = InterfaceParent.sceneMinimapSprite.pixels; // L: 6088
- var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6089
- if (var8 != 0 && var8 != 2) { // L: 6090
- var18[var19] = var12; // L: 6097
- var18[var19 + 1 + 512] = var12; // L: 6098
- var18[var19 + 1024 + 2] = var12; // L: 6099
- var18[var19 + 1536 + 3] = var12; // L: 6100
- } else {
- var18[var19 + 1536] = var12; // L: 6091
- var18[var19 + 1 + 1024] = var12; // L: 6092
- var18[var19 + 512 + 2] = var12; // L: 6093
- var18[var19 + 3] = var12; // L: 6094
- }
- }
- }
-
- var5 = class175.scene.getFloorDecorationTag(var0, var1, var2); // L: 6104
- if (var5 != 0L) { // L: 6105
- var7 = NetSocket.Entity_unpackID(var5); // L: 6106
- ObjectComposition var21 = class82.getObjectDefinition(var7); // L: 6107
- if (var21.mapSceneId != -1) { // L: 6108
- IndexedSprite var22 = class29.mapSceneSprites[var21.mapSceneId]; // L: 6109
- if (var22 != null) { // L: 6110
- var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6111
- int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6112
- var22.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 6113
- }
- }
- }
-
- } // L: 6117
-
- @ObfuscatedName("ic")
- @ObfuscatedSignature(
- descriptor = "(IIIII)V",
- garbageValue = "1650699748"
- )
- @Export("addSceneMenuOptions")
- static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
- if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9925
- Projectile.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9926
- }
-
- long var4 = -1L; // L: 9929
- long var6 = -1L; // L: 9930
-
- int var8;
- for (var8 = 0; var8 < class114.method2637(); ++var8) { // L: 9931
- long var23 = class132.method2833(var8); // L: 9932
- if (var6 != var23) { // L: 9933
- var6 = var23; // L: 9934
- int var11 = class17.method236(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9937
- int var12 = var11; // L: 9939
- int var13 = ClanChannelMember.method2819(var8); // L: 9940
- int var14 = GrandExchangeOfferNameComparator.method5790(var8); // L: 9941
- int var15 = NetSocket.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9944
- int var16 = var15; // L: 9946
- if (var14 == 2 && class175.scene.getObjectFlags(class128.Client_plane, var11, var13, var23) >= 0) { // L: 9947 9948
- ObjectComposition var17 = class82.getObjectDefinition(var15); // L: 9949
- if (var17.transforms != null) { // L: 9950
- var17 = var17.transform();
- }
-
- if (var17 == null) { // L: 9951
- continue;
- }
-
- if (Client.isItemSelected == 1) { // L: 9952
- Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(65535) + var17.name, 1, var15, var11, var13); // L: 9953
- } else if (Client.isSpellSelected) { // L: 9956
- if ((class113.selectedSpellFlags & 4) == 4) { // L: 9957
- Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(65535) + var17.name, 2, var15, var11, var13); // L: 9958
- }
- } else {
- String[] var18 = var17.actions; // L: 9963
- if (var18 != null) { // L: 9964
- for (int var19 = 4; var19 >= 0; --var19) { // L: 9965
- if (var18[var19] != null) { // L: 9966
- short var20 = 0; // L: 9967
- if (var19 == 0) { // L: 9968
- var20 = 3;
- }
-
- if (var19 == 1) { // L: 9969
- var20 = 4;
- }
-
- if (var19 == 2) { // L: 9970
- var20 = 5;
- }
-
- if (var19 == 3) { // L: 9971
- var20 = 6;
- }
-
- if (var19 == 4) { // L: 9972
- var20 = 1001;
- }
-
- Projectile.insertMenuItemNoShift(var18[var19], class166.colorStartTag(65535) + var17.name, var20, var16, var12, var13); // L: 9973
- }
- }
- }
-
- Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(65535) + var17.name, 1002, var17.id, var12, var13); // L: 9978
- }
- }
-
- Player var21;
- int var25;
- NPC var26;
- int var33;
- int[] var34;
- if (var14 == 1) { // L: 9983
- NPC var29 = Client.npcs[var16]; // L: 9984
- if (var29 == null) { // L: 9985
- continue;
- }
-
- if (var29.definition.size == 1 && (var29.x & 127) == 64 && (var29.y & 127) == 64) { // L: 9986
- for (var25 = 0; var25 < Client.npcCount; ++var25) { // L: 9987
- var26 = Client.npcs[Client.npcIndices[var25]]; // L: 9988
- if (var26 != null && var26 != var29 && var26.definition.size == 1 && var26.x == var29.x && var26.y == var29.y) { // L: 9989
- WorldMapLabelSize.addNpcToMenu(var26, Client.npcIndices[var25], var12, var13);
- }
- }
-
- var25 = Players.Players_count; // L: 9991
- var34 = Players.Players_indices; // L: 9992
-
- for (var33 = 0; var33 < var25; ++var33) { // L: 9993
- var21 = Client.players[var34[var33]]; // L: 9994
- if (var21 != null && var29.x == var21.x && var29.y == var21.y) { // L: 9995
- ApproximateRouteStrategy.addPlayerToMenu(var21, var34[var33], var12, var13);
- }
- }
- }
-
- WorldMapLabelSize.addNpcToMenu(var29, var16, var12, var13); // L: 9998
- }
-
- if (var14 == 0) { // L: 10000
- Player var30 = Client.players[var16]; // L: 10001
- if (var30 == null) { // L: 10002
- continue;
- }
-
- if ((var30.x & 127) == 64 && (var30.y & 127) == 64) { // L: 10003
- for (var25 = 0; var25 < Client.npcCount; ++var25) { // L: 10004
- var26 = Client.npcs[Client.npcIndices[var25]]; // L: 10005
- if (var26 != null && var26.definition.size == 1 && var26.x == var30.x && var30.y == var26.y) { // L: 10006
- WorldMapLabelSize.addNpcToMenu(var26, Client.npcIndices[var25], var12, var13);
- }
- }
-
- var25 = Players.Players_count; // L: 10008
- var34 = Players.Players_indices; // L: 10009
-
- for (var33 = 0; var33 < var25; ++var33) { // L: 10010
- var21 = Client.players[var34[var33]]; // L: 10011
- if (var21 != null && var21 != var30 && var21.x == var30.x && var30.y == var21.y) { // L: 10012
- ApproximateRouteStrategy.addPlayerToMenu(var21, var34[var33], var12, var13);
- }
- }
- }
-
- if (var16 != Client.combatTargetPlayerIndex) { // L: 10015
- ApproximateRouteStrategy.addPlayerToMenu(var30, var16, var12, var13);
- } else {
- var4 = var23; // L: 10016
- }
- }
-
- if (var14 == 3) { // L: 10018
- NodeDeque var32 = Client.groundItems[class128.Client_plane][var12][var13]; // L: 10019
- if (var32 != null) { // L: 10020
- for (TileItem var31 = (TileItem)var32.first(); var31 != null; var31 = (TileItem)var32.next()) { // L: 10021 10022 10055
- ItemComposition var35 = FileSystem.ItemDefinition_get(var31.id); // L: 10023
- if (Client.isItemSelected == 1) { // L: 10024
- Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16748608) + var35.name, 16, var31.id, var12, var13); // L: 10025
- } else if (Client.isSpellSelected) { // L: 10028
- if ((class113.selectedSpellFlags & 1) == 1) { // L: 10029
- Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16748608) + var35.name, 17, var31.id, var12, var13); // L: 10030
- }
- } else {
- String[] var27 = var35.groundActions; // L: 10035
-
- for (int var28 = 4; var28 >= 0; --var28) { // L: 10036
- if (var27 != null && var27[var28] != null) { // L: 10037
- byte var22 = 0; // L: 10038
- if (var28 == 0) { // L: 10039
- var22 = 18;
- }
-
- if (var28 == 1) { // L: 10040
- var22 = 19;
- }
-
- if (var28 == 2) { // L: 10041
- var22 = 20;
- }
-
- if (var28 == 3) { // L: 10042
- var22 = 21;
- }
-
- if (var28 == 4) { // L: 10043
- var22 = 22;
- }
-
- Projectile.insertMenuItemNoShift(var27[var28], class166.colorStartTag(16748608) + var35.name, var22, var31.id, var12, var13); // L: 10044
- } else if (var28 == 2) { // L: 10047
- Projectile.insertMenuItemNoShift("Take", class166.colorStartTag(16748608) + var35.name, 20, var31.id, var12, var13); // L: 10048
- }
- }
-
- Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16748608) + var35.name, 1004, var31.id, var12, var13); // L: 10052
- }
- }
- }
- }
- }
- }
-
- if (-1L != var4) { // L: 10060
- var8 = class17.method236(var4); // L: 10061
- int var9 = ScriptEvent.method2085(var4); // L: 10062
- Player var10 = Client.players[Client.combatTargetPlayerIndex]; // L: 10063
- ApproximateRouteStrategy.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); // L: 10064
- }
-
- } // L: 10066
+ static final void method5121(int var0) {
+ var0 = Math.min(Math.max(var0, 0), 127); // L: 11861
+ class19.clientPreferences.method2341(var0); // L: 11862
+ } // L: 11863
}
diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java
index f17d20914b..a111b22f9b 100644
--- a/runescape-client/src/main/java/WorldMapID.java
+++ b/runescape-client/src/main/java/WorldMapID.java
@@ -4,37 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ik")
+@ObfuscatedName("il")
@Implements("WorldMapID")
public class WorldMapID {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lik;"
+ descriptor = "Lil;"
)
- static final WorldMapID field2879;
+ static final WorldMapID field2843;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lil;"
+ )
+ static final WorldMapID field2840;
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "Len;"
+ )
+ static ClanSettings field2842;
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lik;"
- )
- static final WorldMapID field2877;
- @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 923674533
+ intValue = 785745011
)
@Export("value")
final int value;
static {
- field2879 = new WorldMapID(0); // L: 4
- field2877 = new WorldMapID(1); // L: 5
+ field2843 = new WorldMapID(0); // L: 4
+ field2840 = new WorldMapID(1); // L: 5
}
WorldMapID(int var1) {
- this.value = var1;
+ this.value = var1; // L: 9
} // L: 10
- @ObfuscatedName("o")
- public static double method4811(double var0) {
- return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-1614868880"
+ )
+ @Export("Widget_unpackTargetMask")
+ public static int Widget_unpackTargetMask(int var0) {
+ return var0 >> 11 & 63; // L: 13
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IS)Z",
+ garbageValue = "255"
+ )
+ public static boolean method5003(int var0) {
+ return (var0 >> 20 & 1) != 0; // L: 21
}
}
diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java
index ba93d519ae..6103646b4e 100644
--- a/runescape-client/src/main/java/WorldMapIcon_0.java
+++ b/runescape-client/src/main/java/WorldMapIcon_0.java
@@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hs")
+@ObfuscatedName("hz")
@Implements("WorldMapIcon_0")
public class WorldMapIcon_0 extends AbstractWorldMapIcon {
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "Lli;"
- )
- @Export("NetCache_currentResponse")
- public static NetFileRequest NetCache_currentResponse;
- @ObfuscatedName("o")
+ @ObfuscatedName("iz")
@ObfuscatedGetter(
- intValue = -956371221
+ intValue = 2063269649
+ )
+ @Export("selectedItemId")
+ static int selectedItemId;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = -717867737
)
@Export("element")
final int element;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lip;"
+ descriptor = "Liz;"
)
@Export("label")
final WorldMapLabel label;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 2031981367
+ intValue = -466218723
)
@Export("subWidth")
final int subWidth;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1919685021
+ intValue = 1083440853
)
@Export("subHeight")
final int subHeight;
@ObfuscatedSignature(
- descriptor = "(Lkd;Lkd;ILip;)V"
+ descriptor = "(Lkd;Lkd;ILiz;)V"
)
WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) {
super(var1, var2); // L: 14
this.element = var3; // L: 15
this.label = var4; // L: 16
- WorldMapElement var5 = class120.WorldMapElement_get(this.getElement()); // L: 17
+ WorldMapElement var5 = class432.WorldMapElement_get(this.getElement()); // L: 17
SpritePixels var6 = var5.getSpriteBool(false); // L: 18
if (var6 != null) { // L: 19
this.subWidth = var6.subWidth; // L: 20
@@ -57,67 +57,57 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
} // L: 27
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "16"
+ descriptor = "(I)I",
+ garbageValue = "781292504"
)
@Export("getElement")
public int getElement() {
return this.element; // L: 31
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)Lip;",
- garbageValue = "1420245554"
+ descriptor = "(I)Liz;",
+ garbageValue = "1473728"
)
@Export("getLabel")
WorldMapLabel getLabel() {
return this.label; // L: 36
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "102"
+ descriptor = "(I)I",
+ garbageValue = "-1263012412"
)
@Export("getSubWidth")
int getSubWidth() {
return this.subWidth; // L: 41
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1663406998"
+ descriptor = "(B)I",
+ garbageValue = "-34"
)
@Export("getSubHeight")
int getSubHeight() {
return this.subHeight; // L: 46
}
- @ObfuscatedName("gj")
+ @ObfuscatedName("lj")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1424752711"
+ descriptor = "(Lkb;I)Ljava/lang/String;",
+ garbageValue = "-1970746569"
)
- @Export("playSong")
- static void playSong(int var0) {
- if (var0 == -1 && !Client.playingJingle) { // L: 3800
- ApproximateRouteStrategy.method1110(); // L: 3801
- } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class12.clientPreferences.method2248() != 0 && !Client.playingJingle) { // L: 3803
- Archive var1 = AbstractUserComparator.archive6; // L: 3804
- int var2 = class12.clientPreferences.method2248(); // L: 3805
- class273.musicPlayerStatus = 1; // L: 3807
- ClanChannelMember.musicTrackArchive = var1; // L: 3808
- StructComposition.musicTrackGroupId = var0; // L: 3809
- FriendsList.musicTrackFileId = 0; // L: 3810
- Clock.musicTrackVolume = var2; // L: 3811
- VertexNormal.musicTrackBoolean = false; // L: 3812
- GrandExchangeEvent.pcmSampleLength = 2; // L: 3813
+ @Export("Widget_getSpellActionName")
+ static String Widget_getSpellActionName(Widget var0) {
+ if (WorldMapID.Widget_unpackTargetMask(class124.getWidgetFlags(var0)) == 0) { // L: 12322
+ return null;
+ } else {
+ return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12323 12324 12326
}
-
- Client.currentTrackGroupId = var0; // L: 3816
- } // L: 3817
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java
index 192c44fdcf..60afcb0d08 100644
--- a/runescape-client/src/main/java/WorldMapIcon_1.java
+++ b/runescape-client/src/main/java/WorldMapIcon_1.java
@@ -4,114 +4,278 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hb")
+@ObfuscatedName("hp")
@Implements("WorldMapIcon_1")
public class WorldMapIcon_1 extends AbstractWorldMapIcon {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 51181617
+ intValue = 574768679
)
@Export("objectDefId")
final int objectDefId;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lhd;"
+ descriptor = "Lhn;"
)
@Export("region")
final WorldMapRegion region;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -351714887
+ intValue = -312607591
)
@Export("element")
int element;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lip;"
+ descriptor = "Liz;"
)
@Export("label")
WorldMapLabel label;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 1557282329
+ intValue = -2109646665
)
@Export("subWidth")
int subWidth;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1198695651
+ intValue = -2072150361
)
@Export("subHeight")
int subHeight;
@ObfuscatedSignature(
- descriptor = "(Lkd;Lkd;ILhd;)V"
+ descriptor = "(Lkd;Lkd;ILhn;)V"
)
WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) {
super(var1, var2); // L: 17
this.objectDefId = var3; // L: 18
- this.region = var4; // L: 19
- this.init(); // L: 20
- } // L: 21
+ this.region = var4;
+ this.init();
+ }
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-760266737"
+ garbageValue = "-1694427689"
)
@Export("init")
void init() {
- this.element = class82.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24
- this.label = this.region.createMapLabel(class120.WorldMapElement_get(this.element)); // L: 25
- WorldMapElement var1 = class120.WorldMapElement_get(this.getElement()); // L: 26
- SpritePixels var2 = var1.getSpriteBool(false); // L: 27
- if (var2 != null) { // L: 28
- this.subWidth = var2.subWidth; // L: 29
- this.subHeight = var2.subHeight; // L: 30
+ this.element = class162.getObjectDefinition(this.objectDefId).transform().mapIconId;
+ this.label = this.region.createMapLabel(class432.WorldMapElement_get(this.element));
+ WorldMapElement var1 = class432.WorldMapElement_get(this.getElement());
+ SpritePixels var2 = var1.getSpriteBool(false);
+ if (var2 != null) {
+ this.subWidth = var2.subWidth;
+ this.subHeight = var2.subHeight;
} else {
- this.subWidth = 0; // L: 33
- this.subHeight = 0; // L: 34
+ this.subWidth = 0;
+ this.subHeight = 0;
}
- } // L: 36
+ }
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "16"
+ descriptor = "(I)I",
+ garbageValue = "781292504"
)
@Export("getElement")
public int getElement() {
- return this.element; // L: 40
+ return this.element;
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)Lip;",
- garbageValue = "1420245554"
+ descriptor = "(I)Liz;",
+ garbageValue = "1473728"
)
@Export("getLabel")
WorldMapLabel getLabel() {
- return this.label; // L: 45
+ return this.label;
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "102"
+ descriptor = "(I)I",
+ garbageValue = "-1263012412"
)
@Export("getSubWidth")
int getSubWidth() {
- return this.subWidth; // L: 50
+ return this.subWidth;
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1663406998"
+ descriptor = "(B)I",
+ garbageValue = "-34"
)
@Export("getSubHeight")
int getSubHeight() {
return this.subHeight; // L: 55
}
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IILgu;Lgv;I)Z",
+ garbageValue = "312138547"
+ )
+ public static final boolean method4592(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+ int var4 = var0; // L: 19
+ int var5 = var1; // L: 20
+ byte var6 = 64; // L: 21
+ byte var7 = 64; // L: 22
+ int var8 = var0 - var6;
+ int var9 = var1 - var7;
+ class193.directions[var6][var7] = 99;
+ class193.distances[var6][var7] = 0;
+ byte var10 = 0;
+ int var11 = 0;
+ class193.bufferX[var10] = var0;
+ byte var10001 = var10;
+ int var18 = var10 + 1;
+ class193.bufferY[var10001] = var1;
+ int[][] var12 = var3.flags; // L: 31
+
+ while (var11 != var18) { // L: 32
+ var4 = class193.bufferX[var11]; // L: 33
+ var5 = class193.bufferY[var11]; // L: 34
+ var11 = var11 + 1 & 4095; // L: 35
+ int var16 = var4 - var8; // L: 36
+ int var17 = var5 - var9; // L: 37
+ int var13 = var4 - var3.xInset; // L: 38
+ int var14 = var5 - var3.yInset; // L: 39
+ if (var2.hasArrived(2, var4, var5, var3)) { // L: 40
+ class193.field2219 = var4; // L: 41
+ class394.field4429 = var5; // L: 42
+ return true; // L: 43
+ }
+
+ int var15 = class193.distances[var16][var17] + 1; // L: 45
+ if (var16 > 0 && class193.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49
+ class193.bufferX[var18] = var4 - 1; // L: 50
+ class193.bufferY[var18] = var5; // L: 51
+ var18 = var18 + 1 & 4095; // L: 52
+ class193.directions[var16 - 1][var17] = 2; // L: 53
+ class193.distances[var16 - 1][var17] = var15; // L: 54
+ }
+
+ if (var16 < 126 && class193.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 57 58 59
+ class193.bufferX[var18] = var4 + 1; // L: 60
+ class193.bufferY[var18] = var5; // L: 61
+ var18 = var18 + 1 & 4095; // L: 62
+ class193.directions[var16 + 1][var17] = 8; // L: 63
+ class193.distances[var16 + 1][var17] = var15; // L: 64
+ }
+
+ if (var17 > 0 && class193.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69
+ class193.bufferX[var18] = var4; // L: 70
+ class193.bufferY[var18] = var5 - 1; // L: 71
+ var18 = var18 + 1 & 4095; // L: 72
+ class193.directions[var16][var17 - 1] = 1; // L: 73
+ class193.distances[var16][var17 - 1] = var15; // L: 74
+ }
+
+ if (var17 < 126 && class193.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79
+ class193.bufferX[var18] = var4; // L: 80
+ class193.bufferY[var18] = var5 + 1; // L: 81
+ var18 = var18 + 1 & 4095; // L: 82
+ class193.directions[var16][var17 + 1] = 4; // L: 83
+ class193.distances[var16][var17 + 1] = var15; // L: 84
+ }
+
+ if (var16 > 0 && var17 > 0 && class193.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 86 87 88 89 90
+ class193.bufferX[var18] = var4 - 1; // L: 91
+ class193.bufferY[var18] = var5 - 1; // L: 92
+ var18 = var18 + 1 & 4095; // L: 93
+ class193.directions[var16 - 1][var17 - 1] = 3; // L: 94
+ class193.distances[var16 - 1][var17 - 1] = var15; // L: 95
+ }
+
+ if (var16 < 126 && var17 > 0 && class193.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 97 98 99 100 101
+ class193.bufferX[var18] = var4 + 1; // L: 102
+ class193.bufferY[var18] = var5 - 1; // L: 103
+ var18 = var18 + 1 & 4095; // L: 104
+ class193.directions[var16 + 1][var17 - 1] = 9; // L: 105
+ class193.distances[var16 + 1][var17 - 1] = var15; // L: 106
+ }
+
+ if (var16 > 0 && var17 < 126 && class193.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 108 109 110 111 112
+ class193.bufferX[var18] = var4 - 1; // L: 113
+ class193.bufferY[var18] = var5 + 1; // L: 114
+ var18 = var18 + 1 & 4095; // L: 115
+ class193.directions[var16 - 1][var17 + 1] = 6; // L: 116
+ class193.distances[var16 - 1][var17 + 1] = var15; // L: 117
+ }
+
+ if (var16 < 126 && var17 < 126 && class193.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 119 120 121 122 123
+ class193.bufferX[var18] = var4 + 1; // L: 124
+ class193.bufferY[var18] = var5 + 1; // L: 125
+ var18 = var18 + 1 & 4095; // L: 126
+ class193.directions[var16 + 1][var17 + 1] = 12; // L: 127
+ class193.distances[var16 + 1][var17 + 1] = var15; // L: 128
+ }
+ }
+
+ class193.field2219 = var4; // L: 131
+ class394.field4429 = var5; // L: 132
+ return false; // L: 133
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lgi;",
+ garbageValue = "-288193163"
+ )
+ @Export("StructDefinition_getStructDefinition")
+ public static StructComposition StructDefinition_getStructDefinition(int var0) {
+ StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23
+ if (var1 != null) { // L: 24
+ return var1;
+ } else {
+ byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25
+ var1 = new StructComposition(); // L: 26
+ if (var2 != null) { // L: 27
+ var1.decode(new Buffer(var2));
+ }
+
+ var1.postDecode(); // L: 28
+ StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
+ return var1; // L: 30
+ }
+ }
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(IIB)I",
+ garbageValue = "-27"
+ )
+ static final int method4594(int var0, int var1) {
+ int var2 = var1 * 57 + var0; // L: 912
+ var2 ^= var2 << 13; // L: 913
+ int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; // L: 914
+ return var3 >> 19 & 255; // L: 915
+ }
+
+ @ObfuscatedName("lg")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-735422475"
+ )
+ static void method4590(Buffer var0, int var1) {
+ byte[] var2 = var0.array; // L: 12393
+ if (Client.randomDatData == null) { // L: 12395
+ Client.randomDatData = new byte[24];
+ }
+
+ class350.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 12396
+ if (JagexCache.JagexCache_randomDat != null) { // L: 12399
+ try {
+ JagexCache.JagexCache_randomDat.seek(0L); // L: 12401
+ JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12402
+ } catch (Exception var4) { // L: 12404
+ }
+ }
+
+ } // L: 12407
}
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index 8de7d12f32..32ce861327 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -4,33 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ip")
+@ObfuscatedName("iz")
@Implements("WorldMapLabel")
public class WorldMapLabel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("text")
String text;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -233966441
+ intValue = 1772526111
)
@Export("width")
int width;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -606142323
+ intValue = -1037270607
)
@Export("height")
int height;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lhw;"
+ descriptor = "Lhq;"
)
@Export("size")
WorldMapLabelSize size;
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;IILhw;)V"
+ descriptor = "(Ljava/lang/String;IILhq;)V"
)
WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) {
this.text = var1; // L: 10
@@ -38,4 +38,33 @@ public class WorldMapLabel {
this.height = var3; // L: 12
this.size = var4; // L: 13
} // L: 14
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;B)V",
+ garbageValue = "-115"
+ )
+ public static void method5000(AbstractArchive var0) {
+ VarcInt.VarcInt_archive = var0; // L: 15
+ } // L: 16
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1560877857"
+ )
+ public static void method4999() {
+ try {
+ JagexCache.JagexCache_dat2File.close(); // L: 295
+
+ for (int var0 = 0; var0 < class142.idxCount; ++var0) { // L: 296
+ class359.JagexCache_idxFiles[var0].close();
+ }
+
+ JagexCache.JagexCache_idx255File.close(); // L: 297
+ JagexCache.JagexCache_randomDat.close(); // L: 298
+ } catch (Exception var2) { // L: 300
+ }
+
+ } // L: 301
}
diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java
index 8b7f752ff1..8e339a3b3a 100644
--- a/runescape-client/src/main/java/WorldMapLabelSize.java
+++ b/runescape-client/src/main/java/WorldMapLabelSize.java
@@ -4,233 +4,150 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hw")
+@ObfuscatedName("hq")
@Implements("WorldMapLabelSize")
public class WorldMapLabelSize {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lhw;"
+ descriptor = "Lhq;"
)
@Export("WorldMapLabelSize_small")
public static final WorldMapLabelSize WorldMapLabelSize_small;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lhw;"
+ descriptor = "Lhq;"
)
@Export("WorldMapLabelSize_medium")
public static final WorldMapLabelSize WorldMapLabelSize_medium;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lhw;"
+ descriptor = "Lhq;"
)
@Export("WorldMapLabelSize_large")
public static final WorldMapLabelSize WorldMapLabelSize_large;
- @ObfuscatedName("k")
+ @ObfuscatedName("ha")
@ObfuscatedGetter(
- intValue = 553621229
+ intValue = -794445137
)
- final int field2708;
- @ObfuscatedName("a")
+ @Export("baseY")
+ static int baseY;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -2002311863
+ intValue = 1344743675
)
- final int field2712;
- @ObfuscatedName("m")
+ final int field2671;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = 216104665
+ intValue = -1890052329
)
- final int field2714;
+ final int field2672;
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = -241742535
+ )
+ final int field2676;
static {
- WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7
- WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); // L: 8
+ WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); // L: 7
+ WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); // L: 8
WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); // L: 9
}
WorldMapLabelSize(int var1, int var2, int var3) {
- this.field2708 = var1; // L: 15
- this.field2712 = var2; // L: 16
- this.field2714 = var3; // L: 17
- } // L: 18
+ this.field2671 = var1; // L: 19
+ this.field2672 = var2; // L: 20
+ this.field2676 = var3; // L: 21
+ } // L: 22
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(FI)Z",
- garbageValue = "-459015930"
+ garbageValue = "2012056978"
)
- boolean method4409(float var1) {
- return var1 >= (float)this.field2714; // L: 21
+ boolean method4567(float var1) {
+ return var1 >= (float)this.field2676; // L: 25
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;B)V",
- garbageValue = "70"
+ descriptor = "(I)[Lhq;",
+ garbageValue = "2063977691"
)
- public static void method4417(AbstractArchive var0) {
- FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; // L: 24
- } // L: 25
+ static WorldMapLabelSize[] method4568() {
+ return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; // L: 15
+ }
- @ObfuscatedName("l")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1257472711"
+ descriptor = "(II)Z",
+ garbageValue = "-480347083"
)
- public static void method4414() {
- synchronized(MouseHandler.MouseHandler_instance) { // L: 50
- MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 51
- MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 52
- MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 53
- MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 54
- MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 55
- MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 56
- MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 57
- MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 58
- MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 59
- }
- } // L: 61
+ public static boolean method4575(int var0) {
+ return var0 == WorldMapDecorationType.field3544.id; // L: 47
+ }
- @ObfuscatedName("fa")
+ @ObfuscatedName("bp")
@ObfuscatedSignature(
- descriptor = "(IIIB)V",
- garbageValue = "-55"
+ descriptor = "(IB)V",
+ garbageValue = "1"
)
- @Export("queueSoundEffect")
- static void queueSoundEffect(int var0, int var1, int var2) {
- if (class12.clientPreferences.method2244() != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3789
- Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3790
- Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3791
- Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3792
- Client.soundEffects[Client.soundEffectCount] = null; // L: 3793
- Client.soundLocations[Client.soundEffectCount] = 0; // L: 3794
- ++Client.soundEffectCount; // L: 3795
- }
-
- } // L: 3797
-
- @ObfuscatedName("ij")
- @ObfuscatedSignature(
- descriptor = "(Lcd;IIIB)V",
- garbageValue = "46"
- )
- @Export("addNpcToMenu")
- static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) {
- NPCComposition var4 = var0.definition; // L: 10069
- if (Client.menuOptionsCount < 400) { // L: 10070
- if (var4.transforms != null) { // L: 10071
- var4 = var4.transform();
- }
-
- if (var4 != null) { // L: 10072
- if (var4.isInteractable) { // L: 10073
- if (!var4.isFollower || Client.followerIndex == var1) { // L: 10074
- String var5 = var0.method2342(); // L: 10075
- int var6;
- if (var4.combatLevel != 0 && var0.field1210 != 0) { // L: 10076
- var6 = var0.field1210 != -1 ? var0.field1210 * 731891927 * -1765430553 : var4.combatLevel * 580256741 * -200769043; // L: 10077
- var5 = var5 + IgnoreList.method6430(var6, ModelData0.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; // L: 10078
- }
-
- if (var4.isFollower && Client.followerOpsLowPriority) { // L: 10080
- Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10081
- }
-
- if (Client.isItemSelected == 1) { // L: 10084
- Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 10085
- } else if (Client.isSpellSelected) { // L: 10088
- if ((class113.selectedSpellFlags & 2) == 2) { // L: 10089
- Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 10090
- }
- } else {
- var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 10095
- String[] var7 = var4.actions; // L: 10096
- int var8;
- int var9;
- if (var7 != null) { // L: 10097
- for (var8 = 4; var8 >= 0; --var8) { // L: 10098
- if (var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { // L: 10099
- var9 = 0; // L: 10100
- if (var8 == 0) { // L: 10101
- var9 = var6 + 9;
- }
-
- if (var8 == 1) { // L: 10102
- var9 = var6 + 10;
- }
-
- if (var8 == 2) { // L: 10103
- var9 = var6 + 11;
- }
-
- if (var8 == 3) { // L: 10104
- var9 = var6 + 12;
- }
-
- if (var8 == 4) { // L: 10105
- var9 = var6 + 13;
- }
-
- Projectile.insertMenuItemNoShift(var7[var8], class166.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10106
- }
- }
- }
-
- if (var7 != null) { // L: 10111
- for (var8 = 4; var8 >= 0; --var8) { // L: 10112
- if (var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { // L: 10113
- short var10 = 0; // L: 10114
- if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 10115
- if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var4.combatLevel > ModelData0.localPlayer.combatLevel) { // L: 10116
- var10 = 2000; // L: 10117
- }
-
- var9 = 0; // L: 10119
- if (var8 == 0) { // L: 10120
- var9 = var10 + 9;
- }
-
- if (var8 == 1) {
- var9 = var10 + 10; // L: 10121
- }
-
- if (var8 == 2) { // L: 10122
- var9 = var10 + 11;
- }
-
- if (var8 == 3) { // L: 10123
- var9 = var10 + 12;
- }
-
- if (var8 == 4) { // L: 10124
- var9 = var10 + 13;
- }
-
- Projectile.insertMenuItemNoShift(var7[var8], class166.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10125
- }
- }
- }
- }
-
- if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 10130
- Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10131
- }
- }
+ @Export("runWidgetOnLoadListener")
+ static void runWidgetOnLoadListener(int var0) {
+ if (var0 != -1) { // L: 4972
+ if (WorldMapSection2.loadInterface(var0)) { // L: 4973
+ Widget[] var1 = SoundCache.Widget_interfaceComponents[var0]; // L: 4974
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4975
+ Widget var3 = var1[var2]; // L: 4976
+ if (var3.onLoad != null) { // L: 4977
+ ScriptEvent var4 = new ScriptEvent(); // L: 4978
+ var4.widget = var3; // L: 4979
+ var4.args = var3.onLoad; // L: 4980
+ class135.runScript(var4, 5000000, 0); // L: 4981
}
}
+
}
}
- } // L: 10135
+ } // L: 4984
- @ObfuscatedName("jx")
+ @ObfuscatedName("gd")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "397937565"
+ descriptor = "(IS)V",
+ garbageValue = "-23388"
)
- @Export("runIntfCloseListeners")
- static final void runIntfCloseListeners(int var0, int var1) {
- if (WorldMapDecoration.loadInterface(var0)) { // L: 11741
- MusicPatchPcmStream.runComponentCloseListeners(NetSocket.Widget_interfaceComponents[var0], var1); // L: 11742
+ @Export("setWindowedMode")
+ static void setWindowedMode(int var0) {
+ Client.field711 = 0L; // L: 4371
+ if (var0 >= 2) { // L: 4372
+ Client.isResizable = true;
+ } else {
+ Client.isResizable = false; // L: 4373
}
- } // L: 11743
+
+ if (class9.getWindowedMode() == 1) { // L: 4374
+ class353.client.setMaxCanvasSize(765, 503); // L: 4375
+ } else {
+ class353.client.setMaxCanvasSize(7680, 2160); // L: 4378
+ }
+
+ if (Client.gameState >= 25) { // L: 4380
+ SpriteMask.method5522();
+ }
+
+ } // L: 4381
+
+ @ObfuscatedName("kr")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "-1407297152"
+ )
+ static void method4566(int var0) {
+ class20.tempMenuAction = new MenuAction(); // L: 11719
+ class20.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11720
+ class20.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11721
+ class20.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11722
+ class20.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11723
+ class20.tempMenuAction.action = Client.menuActions[var0]; // L: 11724
+ } // L: 11725
}
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index cacc4a150b..3a488a39d4 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -9,93 +9,98 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hp")
+@ObfuscatedName("hm")
@Implements("WorldMapManager")
public final class WorldMapManager {
- @ObfuscatedName("o")
+ @ObfuscatedName("tn")
+ @ObfuscatedGetter(
+ intValue = -1432180747
+ )
+ static int field2743;
+ @ObfuscatedName("c")
@Export("loaded")
boolean loaded;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("loadStarted")
boolean loadStarted;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Liq;"
+ descriptor = "Liu;"
)
@Export("mapAreaData")
WorldMapAreaData mapAreaData;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lqr;"
+ descriptor = "Lqe;"
)
@Export("compositeTextureSprite")
SpritePixels compositeTextureSprite;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@Export("icons")
HashMap icons;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "[[Lhd;"
+ descriptor = "[[Lhn;"
)
@Export("regions")
WorldMapRegion[][] regions;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@Export("scaleHandlers")
HashMap scaleHandlers;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "[Lqd;"
+ descriptor = "[Lqu;"
)
@Export("mapSceneSprites")
IndexedSprite[] mapSceneSprites;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("geographyArchive")
final AbstractArchive geographyArchive;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llh;"
)
@Export("groundArchive")
final AbstractArchive groundArchive;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@Export("fonts")
final HashMap fonts;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = 1992474543
+ intValue = -2096721995
)
@Export("tileX")
int tileX;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = 1099755425
+ intValue = -1553712937
)
@Export("tileY")
int tileY;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = 670998135
+ intValue = -2035001383
)
@Export("tileWidth")
int tileWidth;
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedGetter(
- intValue = -2098187555
+ intValue = 909480201
)
@Export("tileHeight")
int tileHeight;
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = 1501443401
+ intValue = 1585461089
)
@Export("pixelsPerTile")
public int pixelsPerTile;
@ObfuscatedSignature(
- descriptor = "([Lqd;Ljava/util/HashMap;Llp;Llp;)V"
+ descriptor = "([Lqu;Ljava/util/HashMap;Llh;Llh;)V"
)
public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
this.loaded = false; // L: 16
@@ -108,10 +113,10 @@ public final class WorldMapManager {
this.groundArchive = var4; // L: 37
} // L: 38
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;Ljava/lang/String;ZI)V",
- garbageValue = "1061155576"
+ descriptor = "(Llh;Ljava/lang/String;ZI)V",
+ garbageValue = "-945278394"
)
@Export("load")
public void load(AbstractArchive var1, String var2, boolean var3) {
@@ -119,10 +124,10 @@ public final class WorldMapManager {
this.loaded = false; // L: 44
this.loadStarted = true; // L: 45
System.nanoTime(); // L: 46
- int var4 = var1.getGroupId(WorldMapCacheName.field2910.name); // L: 47
+ int var4 = var1.getGroupId(WorldMapCacheName.field2867.name); // L: 47
int var5 = var1.getFileId(var4, var2); // L: 48
- Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2910.name, var2)); // L: 49
- Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2907.name, var2)); // L: 50
+ Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2867.name, var2)); // L: 49
+ Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2865.name, var2)); // L: 50
System.nanoTime(); // L: 51
System.nanoTime(); // L: 52
this.mapAreaData = new WorldMapAreaData(); // L: 53
@@ -169,9 +174,9 @@ public final class WorldMapManager {
System.nanoTime(); // L: 94
System.nanoTime(); // L: 95
- if (var1.isValidFileName(WorldMapCacheName.field2908.name, var2)) { // L: 96
- byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2908.name, var2); // L: 97
- this.compositeTextureSprite = Frames.method4217(var20); // L: 98
+ if (var1.isValidFileName(WorldMapCacheName.field2866.name, var2)) { // L: 96
+ byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2866.name, var2); // L: 97
+ this.compositeTextureSprite = ItemLayer.method3920(var20); // L: 98
}
System.nanoTime(); // L: 100
@@ -181,20 +186,20 @@ public final class WorldMapManager {
}
} // L: 42 104
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-39"
+ descriptor = "(I)V",
+ garbageValue = "-71448186"
)
@Export("clearIcons")
public final void clearIcons() {
this.icons = null; // L: 107
} // L: 108
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IIIIIIIII)V",
- garbageValue = "-1519819198"
+ garbageValue = "-415772889"
)
@Export("drawTiles")
public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
@@ -213,8 +218,8 @@ public final class WorldMapManager {
this.scaleHandlers.put(var15, var16); // L: 123
}
- int var23 = var13.x + var13.width - 1; // L: 125
- int var17 = var13.y + var13.height - 1; // L: 126
+ int var23 = var13.width + var13.x - 1; // L: 125
+ int var17 = var13.height + var13.y - 1; // L: 126
int var18;
int var19;
@@ -226,22 +231,22 @@ public final class WorldMapManager {
Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 132
Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 133
- var18 = (int)(64.0F * var14); // L: 134
+ var18 = (int)(var14 * 64.0F); // L: 134
var19 = this.tileX + var1; // L: 135
int var20 = var2 + this.tileY; // L: 136
for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 137
for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 138
- this.regions[var21][var22].method4516(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139
+ this.regions[var21][var22].method4694(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139
}
}
} // L: 142
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V",
- garbageValue = "-561586744"
+ descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
+ garbageValue = "-12"
)
@Export("drawElements")
public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
@@ -253,41 +258,41 @@ public final class WorldMapManager {
int var19;
int var20;
- for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 150
+ for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 150
for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151
if (var13) { // L: 152
this.regions[var19][var20].initWorldMapIcon1s(); // L: 153
}
- this.regions[var19][var20].method4526(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155
+ this.regions[var19][var20].method4738(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155
}
}
- if (var10 != null && var11 > 0) {
- for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) {
- for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) {
- this.regions[var19][var20].flashElements(var10, var11, var12);
+ if (var10 != null && var11 > 0) { // L: 158
+ for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 159
+ for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160
+ this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161
}
}
}
} // L: 165
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(IIIILjava/util/HashSet;IIB)V",
- garbageValue = "-8"
+ descriptor = "(IIIILjava/util/HashSet;III)V",
+ garbageValue = "647582053"
)
@Export("drawOverview")
public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
- if (this.compositeTextureSprite != null) {
- this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4);
+ if (this.compositeTextureSprite != null) { // L: 168
+ this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 171
if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 172
- if (this.icons == null) {
- this.buildIcons0();
+ if (this.icons == null) { // L: 175
+ this.buildIcons0(); // L: 176
}
- Iterator var8 = var5.iterator();
+ Iterator var8 = var5.iterator(); // L: 178
while (true) {
List var10;
@@ -297,7 +302,7 @@ public final class WorldMapManager {
}
int var9 = (Integer)var8.next(); // L: 179
- var10 = (List)this.icons.get(var9);
+ var10 = (List)this.icons.get(var9); // L: 181
} while(var10 == null); // L: 182
Iterator var11 = var10.iterator();
@@ -311,27 +316,27 @@ public final class WorldMapManager {
}
}
}
- } // L: 169
+ } // L: 169 173
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(IIIIIIIIIII)Ljava/util/List;",
- garbageValue = "598797638"
+ garbageValue = "1063140476"
)
- public List method4645(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
+ public List method4819(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
LinkedList var11 = new LinkedList(); // L: 198
if (!this.loaded) { // L: 199
return var11; // L: 200
} else {
WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202
float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203
- int var14 = (int)(var13 * 64.0F); // L: 204
+ int var14 = (int)(64.0F * var13); // L: 204
int var15 = this.tileX + var1; // L: 205
int var16 = var2 + this.tileY; // L: 206
for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 207
- for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 208
- List var19 = this.regions[var17][var18].method4547(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209
+ for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 208
+ List var19 = this.regions[var17][var18].method4802(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209
if (!var19.isEmpty()) { // L: 210
var11.addAll(var19); // L: 211
}
@@ -342,10 +347,10 @@ public final class WorldMapManager {
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(IIIIB)Lig;",
- garbageValue = "24"
+ descriptor = "(IIIII)Lij;",
+ garbageValue = "376056062"
)
@Export("createWorldMapRectangle")
WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) {
@@ -385,20 +390,20 @@ public final class WorldMapManager {
return var5; // L: 248
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "1915795539"
+ garbageValue = "-43937891"
)
@Export("isLoaded")
public boolean isLoaded() {
return this.loaded; // L: 252
}
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/util/HashMap;",
- garbageValue = "94"
+ descriptor = "(I)Ljava/util/HashMap;",
+ garbageValue = "-1914441394"
)
@Export("buildIcons")
public HashMap buildIcons() {
@@ -406,10 +411,10 @@ public final class WorldMapManager {
return this.icons; // L: 257
}
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1311394013"
+ garbageValue = "-2076094078"
)
@Export("buildIcons0")
void buildIcons0() {
@@ -443,10 +448,10 @@ public final class WorldMapManager {
} // L: 286
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(III)F",
- garbageValue = "1633980675"
+ garbageValue = "-251921137"
)
@Export("getPixelsPerTile")
float getPixelsPerTile(int var1, int var2) {
@@ -460,49 +465,4 @@ public final class WorldMapManager {
return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 293 294
}
}
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
- garbageValue = "1507362286"
- )
- public static String method4679(String var0) {
- int var1 = var0.length(); // L: 158
- char[] var2 = new char[var1]; // L: 159
- byte var3 = 2; // L: 160
-
- for (int var4 = 0; var4 < var1; ++var4) { // L: 161
- char var5 = var0.charAt(var4); // L: 162
- if (var3 == 0) { // L: 163
- var5 = Character.toLowerCase(var5);
- } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 164
- char var6;
- if (var5 != 181 && var5 != 402) { // L: 167
- var6 = Character.toTitleCase(var5); // L: 171
- } else {
- var6 = var5; // L: 168
- }
-
- var5 = var6; // L: 173
- }
-
- if (Character.isLetter(var5)) {
- var3 = 0; // L: 175
- } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 176
- if (Character.isSpaceChar(var5)) { // L: 177
- if (var3 != 2) { // L: 178
- var3 = 1;
- }
- } else {
- var3 = 1; // L: 180
- }
- } else {
- var3 = 2;
- }
-
- var2[var4] = var5; // L: 181
- }
-
- return new String(var2); // L: 183
- }
}
diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java
index eb988950c1..600fe85b44 100644
--- a/runescape-client/src/main/java/WorldMapRectangle.java
+++ b/runescape-client/src/main/java/WorldMapRectangle.java
@@ -3,44 +3,87 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
-@ObfuscatedName("ig")
+@ObfuscatedName("ij")
@Implements("WorldMapRectangle")
public final class WorldMapRectangle {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 10914297
+ intValue = -1451061377
)
@Export("width")
int width;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 1439555673
+ intValue = -216115115
)
@Export("height")
int height;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -959506253
+ intValue = -90003499
)
@Export("x")
int x;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1518441747
+ intValue = -1498862133
)
@Export("y")
int y;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lhp;"
+ descriptor = "Lhm;"
)
final WorldMapManager this$0;
@ObfuscatedSignature(
- descriptor = "(Lhp;)V"
+ descriptor = "(Lhm;)V"
)
WorldMapRectangle(WorldMapManager var1) {
this.this$0 = var1; // L: 305
}
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;",
+ garbageValue = "-2108490134"
+ )
+ @Export("loadClassFromDescriptor")
+ static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
+ if (var0.equals("B")) { // L: 222
+ return Byte.TYPE;
+ } else if (var0.equals("I")) { // L: 223
+ return Integer.TYPE;
+ } else if (var0.equals("S")) { // L: 224
+ return Short.TYPE;
+ } else if (var0.equals("J")) { // L: 225
+ return Long.TYPE;
+ } else if (var0.equals("Z")) { // L: 226
+ return Boolean.TYPE;
+ } else if (var0.equals("F")) { // L: 227
+ return Float.TYPE;
+ } else if (var0.equals("D")) { // L: 228
+ return Double.TYPE;
+ } else if (var0.equals("C")) { // L: 229
+ return Character.TYPE;
+ } else {
+ return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231
+ }
+ }
+
+ @ObfuscatedName("li")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lps;",
+ garbageValue = "46"
+ )
+ static class436 method4988(int var0) {
+ class436 var1 = (class436)Client.Widget_cachedFonts.get((long)var0); // L: 12486
+ if (var1 == null) { // L: 12487
+ var1 = new class436(class132.field1588, var0); // L: 12488
+ }
+
+ return var1; // L: 12490
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index 604f17a57d..d03c1fde18 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -10,61 +10,64 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("hd")
+@ObfuscatedName("hn")
@Implements("WorldMapRegion")
public class WorldMapRegion {
- @ObfuscatedName("a")
+ @ObfuscatedName("sa")
+ @ObfuscatedSignature(
+ descriptor = "Lbe;"
+ )
+ @Export("decimator")
+ static Decimator decimator;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Lic;"
)
@Export("WorldMapRegion_cachedSprites")
- static DemotingHashTable WorldMapRegion_cachedSprites;
- @ObfuscatedName("fz")
+ public static DemotingHashTable WorldMapRegion_cachedSprites;
+ @ObfuscatedName("hc")
+ @Export("xteaKeys")
+ static int[][] xteaKeys;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -832880865
- )
- @Export("currentPort")
- static int currentPort;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 1022747117
+ intValue = 1546454377
)
@Export("regionX")
int regionX;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 295918545
+ intValue = 800960001
)
@Export("regionY")
int regionY;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Lhz;"
+ descriptor = "Lhh;"
)
@Export("worldMapData_0")
WorldMapData_0 worldMapData_0;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@Export("worldMapData1List")
LinkedList worldMapData1List;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -2124547861
+ intValue = -2806249
)
@Export("backgroundColor")
int backgroundColor;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -1151544367
+ intValue = 1260783779
)
@Export("pixelsPerTile")
int pixelsPerTile;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@Export("icon0List")
List icon0List;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@Export("iconMap")
HashMap iconMap;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@Export("fonts")
final HashMap fonts;
@@ -73,107 +76,107 @@ public class WorldMapRegion {
}
WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
- this.regionX = var1; // L: 51
- this.regionY = var2; // L: 52
- this.worldMapData1List = new LinkedList(); // L: 53
- this.icon0List = new LinkedList(); // L: 54
- this.iconMap = new HashMap(); // L: 55
- this.backgroundColor = var3 | -16777216; // L: 56
- this.fonts = var4; // L: 57
- } // L: 58
+ this.regionX = var1; // L: 57
+ this.regionY = var2; // L: 58
+ this.worldMapData1List = new LinkedList(); // L: 59
+ this.icon0List = new LinkedList(); // L: 60
+ this.iconMap = new HashMap(); // L: 61
+ this.backgroundColor = var3 | -16777216; // L: 62
+ this.fonts = var4; // L: 63
+ } // L: 64
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(IIII)V",
- garbageValue = "1328537818"
+ garbageValue = "-1988867113"
)
- void method4516(int var1, int var2, int var3) {
- SpritePixels var4 = SoundSystem.method774(this.regionX, this.regionY, this.pixelsPerTile); // L: 61
- if (var4 != null) { // L: 62
- if (var3 == this.pixelsPerTile * 64) { // L: 63
- var4.drawAt(var1, var2); // L: 64
+ void method4694(int var1, int var2, int var3) {
+ SpritePixels var4 = class432.method7578(this.regionX, this.regionY, this.pixelsPerTile); // L: 67
+ if (var4 != null) { // L: 68
+ if (var3 == this.pixelsPerTile * 64) { // L: 69
+ var4.drawAt(var1, var2); // L: 70
} else {
- var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 67
+ var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 73
}
}
- } // L: 69
+ } // L: 75
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lhz;Ljava/util/List;I)V",
- garbageValue = "-544065510"
+ descriptor = "(Lhh;Ljava/util/List;S)V",
+ garbageValue = "128"
)
@Export("initWorldMapData0")
void initWorldMapData0(WorldMapData_0 var1, List var2) {
- this.iconMap.clear(); // L: 72
- this.worldMapData_0 = var1; // L: 73
- this.addAllToIconList(var2); // L: 74
- } // L: 75
+ this.iconMap.clear(); // L: 78
+ this.worldMapData_0 = var1; // L: 79
+ this.addAllToIconList(var2); // L: 80
+ } // L: 81
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V",
- garbageValue = "1544276205"
+ garbageValue = "1764533382"
)
@Export("initWorldMapData1")
void initWorldMapData1(HashSet var1, List var2) {
- this.iconMap.clear(); // L: 78
- Iterator var3 = var1.iterator(); // L: 79
+ this.iconMap.clear(); // L: 84
+ Iterator var3 = var1.iterator(); // L: 85
- while (var3.hasNext()) {
- WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 80
- if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 82
- this.worldMapData1List.add(var4); // L: 83
+ while (var3.hasNext()) { // L: 92
+ WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 86
+ if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 88
+ this.worldMapData1List.add(var4); // L: 89
}
}
- this.addAllToIconList(var2); // L: 87
- } // L: 88
+ this.addAllToIconList(var2); // L: 93
+ } // L: 94
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(IIIILib;I)V",
- garbageValue = "1261476375"
+ descriptor = "(IIIILhd;I)V",
+ garbageValue = "165512816"
)
@Export("getIconsForTiles")
void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
- for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 91
- label74:
- for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 92
- for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 93
- WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 94
- if (var9 != null && var9.length != 0) { // L: 95
- WorldMapDecoration[] var10 = var9; // L: 99
+ for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 97
+ label76:
+ for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 98
+ for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 99
+ WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 100
+ if (var9 != null && var9.length != 0) { // L: 101
+ WorldMapDecoration[] var10 = var9; // L: 105
- for (int var11 = 0; var11 < var10.length; ++var11) { // L: 100
+ for (int var11 = 0; var11 < var10.length; ++var11) { // L: 106
ObjectComposition var13;
boolean var14;
- label65: {
- WorldMapDecoration var12 = var10[var11]; // L: 101
- var13 = class82.getObjectDefinition(var12.objectDefinitionId); // L: 103
- if (var13.transforms != null) { // L: 106
- int[] var15 = var13.transforms; // L: 108
+ label67: {
+ WorldMapDecoration var12 = var10[var11]; // L: 107
+ var13 = class162.getObjectDefinition(var12.objectDefinitionId); // L: 109
+ if (var13.transforms != null) { // L: 112
+ int[] var15 = var13.transforms; // L: 114
- for (int var16 = 0; var16 < var15.length; ++var16) { // L: 109
- int var17 = var15[var16]; // L: 110
- ObjectComposition var18 = class82.getObjectDefinition(var17); // L: 112
- if (var18.mapIconId != -1) { // L: 113
- var14 = true; // L: 114
- break label65;
+ for (int var16 = 0; var16 < var15.length; ++var16) { // L: 115
+ int var17 = var15[var16]; // L: 116
+ ObjectComposition var18 = class162.getObjectDefinition(var17); // L: 118
+ if (var18.mapIconId != -1) { // L: 119
+ var14 = true; // L: 120
+ break label67;
}
}
- } else if (var13.mapIconId != -1) { // L: 121
- var14 = true; // L: 122
- break label65; // L: 123
+ } else if (var13.mapIconId != -1) { // L: 127
+ var14 = true; // L: 128
+ break label67; // L: 129
}
- var14 = false; // L: 125
+ var14 = false; // L: 131
}
- if (var14) { // L: 127
- this.getIcon(var13, var8, var6, var7, var5); // L: 130
- continue label74; // L: 131
+ if (var14) { // L: 133
+ this.getIcon(var13, var8, var6, var7, var5); // L: 136
+ continue label76; // L: 137
}
}
}
@@ -181,440 +184,437 @@ public class WorldMapRegion {
}
}
- } // L: 138
+ } // L: 144
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Lgy;IIILib;I)V",
- garbageValue = "-956469356"
+ descriptor = "(Lgk;IIILhd;B)V",
+ garbageValue = "127"
)
@Export("getIcon")
void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
- Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 141
- Coord var7 = null; // L: 142
- if (this.worldMapData_0 != null) { // L: 143
- var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 144
+ Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 147
+ Coord var7 = null; // L: 148
+ if (this.worldMapData_0 != null) { // L: 149
+ var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 150
} else {
- WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 147
- var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 148
+ WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 153
+ var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 154
}
WorldMapElement var9;
Object var10;
- if (var1.transforms != null) { // L: 151
- var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 152
+ if (var1.transforms != null) { // L: 157
+ var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 158
} else {
- var9 = class120.WorldMapElement_get(var1.mapIconId); // L: 155
- var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 156
+ var9 = class432.WorldMapElement_get(var1.mapIconId); // L: 161
+ var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 162
}
- var9 = class120.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 158
- if (var9.field1876) { // L: 159
- this.iconMap.put(new Coord(0, var3, var4), var10); // L: 160
+ var9 = class432.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 164
+ if (var9.field1830) { // L: 165
+ this.iconMap.put(new Coord(0, var3, var4), var10); // L: 166
}
- } // L: 162
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "9"
- )
- @Export("initWorldMapIcon1s")
- void initWorldMapIcon1s() {
- Iterator var1 = this.iconMap.values().iterator(); // L: 165
-
- while (var1.hasNext()) {
- AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 166
- if (var2 instanceof WorldMapIcon_1) { // L: 168
- ((WorldMapIcon_1)var2).init(); // L: 169
- }
- }
-
- } // L: 173
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(Ljava/util/List;B)V",
- garbageValue = "-78"
- )
- @Export("addAllToIconList")
- void addAllToIconList(List var1) {
- Iterator var2 = var1.iterator(); // L: 176
-
- while (var2.hasNext()) {
- WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 177
- if (class120.WorldMapElement_get(var3.element).field1876 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 179 182
- WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4545(var3.element)); // L: 183
- this.icon0List.add(var4); // L: 184
- }
- }
-
- } // L: 188
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "0"
- )
- void method4523() {
- if (this.worldMapData_0 != null) { // L: 191
- this.worldMapData_0.reset(); // L: 192
- } else {
- Iterator var1 = this.worldMapData1List.iterator(); // L: 195
-
- while (var1.hasNext()) {
- WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 196
- var2.reset(); // L: 198
- }
- }
-
- } // L: 202
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(Llp;S)Z",
- garbageValue = "11541"
- )
- @Export("loadGeography")
- boolean loadGeography(AbstractArchive var1) {
- this.iconMap.clear(); // L: 205
- if (this.worldMapData_0 != null) { // L: 206
- this.worldMapData_0.loadGeography(var1); // L: 207
- if (this.worldMapData_0.isFullyLoaded()) { // L: 208
- this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 209
- return true; // L: 210
- } else {
- return false; // L: 212
- }
- } else {
- boolean var2 = true; // L: 215
-
- Iterator var3;
- WorldMapData_1 var4;
- for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 216 220
- var4 = (WorldMapData_1)var3.next(); // L: 217
- var4.loadGeography(var1); // L: 219
- }
-
- if (var2) { // L: 223
- var3 = this.worldMapData1List.iterator(); // L: 224
-
- while (var3.hasNext()) {
- var4 = (WorldMapData_1)var3.next(); // L: 225
- this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 227
- }
- }
-
- return var2; // L: 231
- }
- }
-
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(ILii;[Lqd;Llp;Llp;S)V",
- garbageValue = "-10084"
- )
- @Export("drawTile")
- void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
- this.pixelsPerTile = var1; // L: 236
- if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 237
- if (SoundSystem.method774(this.regionX, this.regionY, var1) == null) { // L: 240
- boolean var6 = true; // L: 243
- var6 &= this.loadGeography(var4); // L: 244
- int var8;
- if (this.worldMapData_0 != null) { // L: 247
- var8 = this.worldMapData_0.groupId; // L: 248
- } else {
- var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 251
- }
-
- var6 &= var5.tryLoadGroup(var8); // L: 253
- if (var6) { // L: 254
- byte[] var7 = var5.takeFileFlat(var8); // L: 255
- WorldMapSprite var9;
- if (var7 == null) { // L: 258
- var9 = new WorldMapSprite(); // L: 259
- } else {
- var9 = new WorldMapSprite(Frames.method4217(var7).pixels); // L: 262
- }
-
- SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 265
- var11.setRaster(); // L: 266
- if (this.worldMapData_0 != null) { // L: 267
- this.method4528(var2, var3, var9); // L: 268
- } else {
- this.method4620(var2, var3, var9); // L: 271
- }
-
- int var12 = this.regionX; // L: 273
- int var13 = this.regionY; // L: 274
- int var14 = this.pixelsPerTile; // L: 275
- DemotingHashTable var15 = WorldMapRegion_cachedSprites; // L: 277
- long var17 = (long)(var14 << 16 | var12 << 8 | var13); // L: 281
- var15.put(var11, var17, var11.pixels.length * 4); // L: 283
- this.method4523(); // L: 285
- }
- }
- }
- } // L: 238 241 286
+ } // L: 168
@ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(IIILjava/util/HashSet;I)V",
- garbageValue = "1592995873"
+ descriptor = "(B)V",
+ garbageValue = "-78"
)
- void method4526(int var1, int var2, int var3, HashSet var4) {
- if (var4 == null) { // L: 289
- var4 = new HashSet(); // L: 290
+ @Export("initWorldMapIcon1s")
+ void initWorldMapIcon1s() {
+ Iterator var1 = this.iconMap.values().iterator(); // L: 171
+
+ while (var1.hasNext()) { // L: 178
+ AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 172
+ if (var2 instanceof WorldMapIcon_1) { // L: 174
+ ((WorldMapIcon_1)var2).init(); // L: 175
+ }
}
- this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 292
- this.drawMapLinks(var1, var2, var4, var3); // L: 293
- } // L: 294
+ } // L: 179
- @ObfuscatedName("b")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Ljava/util/HashSet;IIB)V",
- garbageValue = "-53"
+ descriptor = "(Ljava/util/List;B)V",
+ garbageValue = "32"
+ )
+ @Export("addAllToIconList")
+ void addAllToIconList(List var1) {
+ Iterator var2 = var1.iterator(); // L: 182
+
+ while (var2.hasNext()) {
+ WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 183
+ if (class432.WorldMapElement_get(var3.element).field1830 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 185 188
+ WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4808(var3.element)); // L: 189
+ this.icon0List.add(var4); // L: 190
+ }
+ }
+
+ } // L: 194
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-727804061"
+ )
+ void method4701() {
+ if (this.worldMapData_0 != null) { // L: 197
+ this.worldMapData_0.reset(); // L: 198
+ } else {
+ Iterator var1 = this.worldMapData1List.iterator(); // L: 201
+
+ while (var1.hasNext()) {
+ WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 202
+ var2.reset(); // L: 204
+ }
+ }
+
+ } // L: 208
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;I)Z",
+ garbageValue = "-2071549269"
+ )
+ @Export("loadGeography")
+ boolean loadGeography(AbstractArchive var1) {
+ this.iconMap.clear(); // L: 211
+ if (this.worldMapData_0 != null) { // L: 212
+ this.worldMapData_0.loadGeography(var1); // L: 213
+ if (this.worldMapData_0.isFullyLoaded()) { // L: 214
+ this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 215
+ return true; // L: 216
+ } else {
+ return false; // L: 218
+ }
+ } else {
+ boolean var2 = true; // L: 221
+
+ Iterator var3;
+ WorldMapData_1 var4;
+ for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 222 226
+ var4 = (WorldMapData_1)var3.next(); // L: 223
+ var4.loadGeography(var1); // L: 225
+ }
+
+ if (var2) { // L: 229
+ var3 = this.worldMapData1List.iterator(); // L: 230
+
+ while (var3.hasNext()) {
+ var4 = (WorldMapData_1)var3.next(); // L: 231
+ this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 233
+ }
+ }
+
+ return var2; // L: 237
+ }
+ }
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(ILif;[Lqu;Llh;Llh;B)V",
+ garbageValue = "94"
+ )
+ @Export("drawTile")
+ void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
+ this.pixelsPerTile = var1; // L: 242
+ if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 243
+ if (class432.method7578(this.regionX, this.regionY, var1) == null) { // L: 246
+ boolean var6 = true; // L: 249
+ var6 &= this.loadGeography(var4); // L: 250
+ int var8;
+ if (this.worldMapData_0 != null) { // L: 253
+ var8 = this.worldMapData_0.groupId; // L: 254
+ } else {
+ var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 257
+ }
+
+ var6 &= var5.tryLoadGroup(var8); // L: 259
+ if (var6) { // L: 260
+ byte[] var7 = var5.takeFileFlat(var8); // L: 261
+ WorldMapSprite var9;
+ if (var7 == null) { // L: 264
+ var9 = new WorldMapSprite(); // L: 265
+ } else {
+ var9 = new WorldMapSprite(ItemLayer.method3920(var7).pixels); // L: 268
+ }
+
+ SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 271
+ var11.setRaster(); // L: 272
+ if (this.worldMapData_0 != null) { // L: 273
+ this.method4784(var2, var3, var9); // L: 274
+ } else {
+ this.method4788(var2, var3, var9); // L: 277
+ }
+
+ class116.method2699(var11, this.regionX, this.regionY, this.pixelsPerTile); // L: 279
+ this.method4701(); // L: 280
+ }
+ }
+ }
+ } // L: 244 247 281
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(IIILjava/util/HashSet;I)V",
+ garbageValue = "1460089775"
+ )
+ void method4738(int var1, int var2, int var3, HashSet var4) {
+ if (var4 == null) { // L: 284
+ var4 = new HashSet(); // L: 285
+ }
+
+ this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 287
+ this.drawMapLinks(var1, var2, var4, var3); // L: 288
+ } // L: 289
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/util/HashSet;III)V",
+ garbageValue = "396083089"
)
@Export("flashElements")
void flashElements(HashSet var1, int var2, int var3) {
- Iterator var4 = this.iconMap.values().iterator(); // L: 297
+ Iterator var4 = this.iconMap.values().iterator(); // L: 292
while (var4.hasNext()) {
- AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 298
- if (var5.hasValidElement()) { // L: 300
- int var6 = var5.getElement(); // L: 301
- if (var1.contains(var6)) { // L: 302
- WorldMapElement var7 = class120.WorldMapElement_get(var6); // L: 303
- this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 304
+ AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 293
+ if (var5.hasValidElement()) { // L: 295
+ int var6 = var5.getElement(); // L: 296
+ if (var1.contains(var6)) { // L: 297
+ WorldMapElement var7 = class432.WorldMapElement_get(var6); // L: 298
+ this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 299
}
}
}
- this.method4537(var1, var2, var3); // L: 308
- } // L: 309
+ this.method4715(var1, var2, var3); // L: 303
+ } // L: 304
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(Lii;[Lqd;Lix;S)V",
- garbageValue = "8250"
+ descriptor = "(Lif;[Lqu;Lis;B)V",
+ garbageValue = "36"
)
- void method4528(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
+ void method4784(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
int var4;
int var5;
- for (var4 = 0; var4 < 64; ++var4) { // L: 312
- for (var5 = 0; var5 < 64; ++var5) { // L: 313
- this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 314
- this.method4515(var4, var5, this.worldMapData_0, var1); // L: 315
+ for (var4 = 0; var4 < 64; ++var4) { // L: 307
+ for (var5 = 0; var5 < 64; ++var5) { // L: 308
+ this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 309
+ this.method4782(var4, var5, this.worldMapData_0, var1); // L: 310
}
}
- for (var4 = 0; var4 < 64; ++var4) { // L: 318
- for (var5 = 0; var5 < 64; ++var5) { // L: 319
- this.method4530(var4, var5, this.worldMapData_0, var1, var2); // L: 320
+ for (var4 = 0; var4 < 64; ++var4) { // L: 313
+ for (var5 = 0; var5 < 64; ++var5) { // L: 314
+ this.method4708(var4, var5, this.worldMapData_0, var1, var2); // L: 315
}
}
- } // L: 323
+ } // L: 318
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(Lii;[Lqd;Lix;I)V",
- garbageValue = "1922312294"
+ descriptor = "(Lif;[Lqu;Lis;I)V",
+ garbageValue = "-389074070"
)
- void method4620(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
- Iterator var4 = this.worldMapData1List.iterator(); // L: 326
+ void method4788(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
+ Iterator var4 = this.worldMapData1List.iterator(); // L: 321
WorldMapData_1 var5;
int var6;
int var7;
while (var4.hasNext()) {
- var5 = (WorldMapData_1)var4.next(); // L: 327
+ var5 = (WorldMapData_1)var4.next(); // L: 322
- for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 329
- for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 330
- this.drawTileGround(var6, var7, var5, var1, var3); // L: 331
- this.method4515(var6, var7, var5, var1); // L: 332
+ for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 324
+ for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 325
+ this.drawTileGround(var6, var7, var5, var1, var3); // L: 326
+ this.method4782(var6, var7, var5, var1); // L: 327
}
}
}
- var4 = this.worldMapData1List.iterator(); // L: 337
+ var4 = this.worldMapData1List.iterator(); // L: 332
while (var4.hasNext()) {
- var5 = (WorldMapData_1)var4.next(); // L: 338
+ var5 = (WorldMapData_1)var4.next(); // L: 333
- for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 340
- for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 341
- this.method4530(var6, var7, var5, var1, var2); // L: 342
+ for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 335
+ for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 336
+ this.method4708(var6, var7, var5, var1, var2); // L: 337
}
}
}
+ } // L: 342
+
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(IILhd;Lif;[Lqu;B)V",
+ garbageValue = "28"
+ )
+ void method4708(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) {
+ this.method4713(var1, var2, var3); // L: 345
+ this.method4706(var1, var2, var3, var5); // L: 346
} // L: 347
@ObfuscatedName("x")
@ObfuscatedSignature(
- descriptor = "(IILib;Lii;[Lqd;I)V",
- garbageValue = "-893644673"
- )
- void method4530(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) {
- this.method4535(var1, var2, var3); // L: 350
- this.method4534(var1, var2, var3, var5); // L: 351
- } // L: 352
-
- @ObfuscatedName("n")
- @ObfuscatedSignature(
- descriptor = "(IILib;Lii;Lix;I)V",
- garbageValue = "337766862"
+ descriptor = "(IILhd;Lif;Lis;I)V",
+ garbageValue = "1839695565"
)
@Export("drawTileGround")
void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) {
- int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 355
- int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 356
- if (var6 == -1 && var7 == -1) { // L: 357
- Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 358
+ int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 350
+ int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 351
+ if (var6 == -1 && var7 == -1) { // L: 352
+ Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 353
}
- int var8 = 16711935; // L: 360
+ int var8 = 16711935; // L: 355
int var9;
- if (var7 != -1) { // L: 361
- int var10 = this.backgroundColor; // L: 363
- FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); // L: 367
- FloorOverlayDefinition var11;
- if (var12 != null) { // L: 368
- var11 = var12; // L: 369
+ if (var7 != -1) { // L: 356
+ int var10 = this.backgroundColor; // L: 358
+ FloorOverlayDefinition var11 = class124.method2814(var7); // L: 360
+ if (var11 == null) { // L: 361
+ var9 = var10; // L: 362
+ } else if (var11.secondaryRgb >= 0) { // L: 365
+ var9 = var11.secondaryRgb | -16777216; // L: 366
+ } else if (var11.texture >= 0) { // L: 368
+ int var12 = class154.method3170(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 369
+ var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 370
+ } else if (var11.primaryRgb == 16711935) { // L: 372
+ var9 = var10; // L: 373
} else {
- byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); // L: 372
- var12 = new FloorOverlayDefinition(); // L: 373
- if (var13 != null) { // L: 374
- var12.decode(new Buffer(var13), var7);
+ int var13 = var11.hue; // L: 377
+ int var14 = var11.saturation; // L: 378
+ int var15 = var11.lightness; // L: 379
+ if (var15 > 179) { // L: 381
+ var14 /= 2;
}
- var12.postDecode(); // L: 375
- FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); // L: 376
- var11 = var12; // L: 377
- }
-
- if (var11 == null) { // L: 380
- var9 = var10; // L: 381
- } else if (var11.secondaryRgb >= 0) { // L: 384
- var9 = var11.secondaryRgb | -16777216; // L: 385
- } else {
- int var15;
- if (var11.texture >= 0) { // L: 387
- var15 = class18.method243(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 388
- var9 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 389
- } else if (var11.primaryRgb == 16711935) { // L: 391
- var9 = var10; // L: 392
- } else {
- var15 = class345.method6156(var11.hue, var11.saturation, var11.lightness); // L: 395
- int var14 = class18.method243(var15, 96); // L: 396
- var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216; // L: 397
+ if (var15 > 192) { // L: 382
+ var14 /= 2;
}
+
+ if (var15 > 217) { // L: 383
+ var14 /= 2;
+ }
+
+ if (var15 > 243) { // L: 384
+ var14 /= 2;
+ }
+
+ int var16 = (var14 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 385
+ int var17 = class154.method3170(var16, 96); // L: 389
+ var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 390
}
- var8 = var9; // L: 400
+ var8 = var9; // L: 393
}
- if (var7 > -1 && var3.field2845[0][var1][var2] == 0) { // L: 402
- Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 403
+ if (var7 > -1 && var3.field2796[0][var1][var2] == 0) { // L: 395
+ Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 396
} else {
- var9 = this.method4533(var1, var2, var3, var5); // L: 406
- if (var7 == -1) { // L: 407
- Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 408
+ var9 = this.method4711(var1, var2, var3, var5); // L: 399
+ if (var7 == -1) { // L: 400
+ Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 401
} else {
- var4.method4889(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2845[0][var1][var2], var3.field2847[0][var1][var2]); // L: 411
+ var4.method5108(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2796[0][var1][var2], var3.field2795[0][var1][var2]); // L: 404
}
}
- } // L: 404 409 412
+ } // L: 397 402 405
- @ObfuscatedName("e")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "(IILib;Lii;B)V",
- garbageValue = "121"
+ descriptor = "(IILhd;Lif;I)V",
+ garbageValue = "-1128004844"
)
- void method4515(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) {
- for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 415
- int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 416
- if (var6 > -1) { // L: 417
- int var8 = this.backgroundColor; // L: 419
- FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); // L: 423
- FloorOverlayDefinition var9;
- if (var10 != null) { // L: 424
- var9 = var10; // L: 425
- } else {
- byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); // L: 428
- var10 = new FloorOverlayDefinition(); // L: 429
- if (var11 != null) { // L: 430
- var10.decode(new Buffer(var11), var6);
- }
-
- var10.postDecode(); // L: 431
- FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); // L: 432
- var9 = var10; // L: 433
- }
-
+ void method4782(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) {
+ for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 408
+ int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 409
+ if (var6 > -1) { // L: 410
+ int var8 = this.backgroundColor; // L: 412
+ FloorOverlayDefinition var9 = class124.method2814(var6); // L: 414
int var7;
- if (var9 == null) { // L: 436
- var7 = var8; // L: 437
- } else if (var9.secondaryRgb >= 0) { // L: 440
- var7 = var9.secondaryRgb | -16777216; // L: 441
+ if (var9 == null) { // L: 415
+ var7 = var8; // L: 416
+ } else if (var9.secondaryRgb >= 0) { // L: 419
+ var7 = var9.secondaryRgb | -16777216; // L: 420
+ } else if (var9.texture >= 0) { // L: 422
+ int var10 = class154.method3170(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 423
+ var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 424
+ } else if (var9.primaryRgb == 16711935) { // L: 426
+ var7 = var8; // L: 427
} else {
- int var13;
- if (var9.texture >= 0) { // L: 443
- var13 = class18.method243(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 444
- var7 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; // L: 445
- } else if (var9.primaryRgb == 16711935) { // L: 447
- var7 = var8; // L: 448
- } else {
- var13 = class345.method6156(var9.hue, var9.saturation, var9.lightness); // L: 451
- int var12 = class18.method243(var13, 96); // L: 452
- var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 453
+ int var11 = var9.hue; // L: 431
+ int var12 = var9.saturation; // L: 432
+ int var13 = var9.lightness; // L: 433
+ if (var13 > 179) { // L: 435
+ var12 /= 2;
}
+
+ if (var13 > 192) { // L: 436
+ var12 /= 2;
+ }
+
+ if (var13 > 217) { // L: 437
+ var12 /= 2;
+ }
+
+ if (var13 > 243) { // L: 438
+ var12 /= 2;
+ }
+
+ int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 439
+ int var15 = class154.method3170(var14, 96); // L: 443
+ var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 444
}
- if (var3.field2845[var5][var1][var2] == 0) { // L: 457
- Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 458
+ if (var3.field2796[var5][var1][var2] == 0) { // L: 448
+ Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 449
} else {
- var4.method4889(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2845[var5][var1][var2], var3.field2847[var5][var1][var2]); // L: 461
+ var4.method5108(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2796[var5][var1][var2], var3.field2795[var5][var1][var2]); // L: 452
}
}
}
- } // L: 465
+ } // L: 456
- @ObfuscatedName("h")
+ @ObfuscatedName("a")
@ObfuscatedSignature(
- descriptor = "(IILib;Lix;B)I",
- garbageValue = "127"
+ descriptor = "(IILhd;Lis;I)I",
+ garbageValue = "2000160992"
)
- int method4533(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) {
- return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 468 469 471
+ int method4711(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) {
+ return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 459 460 462
}
- @ObfuscatedName("f")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "(IILib;[Lqd;B)V",
- garbageValue = "20"
+ descriptor = "(IILhd;[Lqu;I)V",
+ garbageValue = "114482222"
)
- void method4534(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) {
- for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 475
- WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 476
- if (var6 != null && var6.length != 0) { // L: 477
- WorldMapDecoration[] var7 = var6; // L: 481
+ void method4706(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) {
+ for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 466
+ WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 467
+ if (var6 != null && var6.length != 0) { // L: 468
+ WorldMapDecoration[] var7 = var6; // L: 472
- for (int var8 = 0; var8 < var7.length; ++var8) { // L: 482
- WorldMapDecoration var9 = var7[var8]; // L: 483
- if (ChatChannel.method1968(var9.decoration) || GraphicsObject.method1868(var9.decoration)) { // L: 485
- ObjectComposition var10 = class82.getObjectDefinition(var9.objectDefinitionId); // L: 486
- if (var10.mapSceneId != -1) { // L: 487
- if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 488
- var4[var10.mapSceneId].method7927(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 492
+ for (int var8 = 0; var8 < var7.length; ++var8) { // L: 473
+ WorldMapDecoration var9 = var7[var8]; // L: 474
+ if (Clock.method3331(var9.decoration) || WorldMapLabelSize.method4575(var9.decoration)) { // L: 476
+ ObjectComposition var10 = class162.getObjectDefinition(var9.objectDefinitionId); // L: 477
+ if (var10.mapSceneId != -1) { // L: 478
+ if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 479
+ var4[var10.mapSceneId].method8135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 483
} else {
- var4[var10.mapSceneId].method7927(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 489
+ var4[var10.mapSceneId].method8135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 480
}
}
}
@@ -622,61 +622,63 @@ public class WorldMapRegion {
}
}
- } // L: 500
+ } // L: 491
- @ObfuscatedName("d")
+ @ObfuscatedName("b")
@ObfuscatedSignature(
- descriptor = "(IILib;I)V",
- garbageValue = "1254694573"
+ descriptor = "(IILhd;B)V",
+ garbageValue = "16"
)
- void method4535(int var1, int var2, AbstractWorldMapData var3) {
- for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 503
- WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 504
- if (var5 != null && var5.length != 0) { // L: 505
- WorldMapDecoration[] var6 = var5; // L: 509
+ void method4713(int var1, int var2, AbstractWorldMapData var3) {
+ for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 494
+ WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 495
+ if (var5 != null && var5.length != 0) { // L: 496
+ WorldMapDecoration[] var6 = var5; // L: 500
- for (int var7 = 0; var7 < var6.length; ++var7) { // L: 510
- WorldMapDecoration var8 = var6[var7]; // L: 511
- if (PendingSpawn.method2164(var8.decoration)) { // L: 513
- ObjectComposition var9 = class82.getObjectDefinition(var8.objectDefinitionId); // L: 514
- int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 515
- if (var8.decoration == WorldMapDecorationType.field3571.id) { // L: 516
- this.method4571(var1, var2, var8.rotation, var10); // L: 517
+ for (int var7 = 0; var7 < var6.length; ++var7) { // L: 501
+ WorldMapDecoration var8 = var6[var7]; // L: 502
+ int var10 = var8.decoration; // L: 505
+ boolean var9 = var10 >= WorldMapDecorationType.field3549.id && var10 <= WorldMapDecorationType.field3534.id || var10 == WorldMapDecorationType.field3535.id; // L: 507
+ if (var9) { // L: 509
+ ObjectComposition var11 = class162.getObjectDefinition(var8.objectDefinitionId); // L: 510
+ int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 511
+ if (var8.decoration == WorldMapDecorationType.field3549.id) { // L: 512
+ this.method4723(var1, var2, var8.rotation, var12); // L: 513
}
- if (var8.decoration == WorldMapDecorationType.field3558.id) { // L: 519
- this.method4571(var1, var2, var8.rotation, -3355444); // L: 520
- this.method4571(var1, var2, var8.rotation + 1, var10); // L: 521
+ if (var8.decoration == WorldMapDecorationType.field3533.id) { // L: 515
+ this.method4723(var1, var2, var8.rotation, -3355444); // L: 516
+ this.method4723(var1, var2, var8.rotation + 1, var12); // L: 517
}
- if (var8.decoration == WorldMapDecorationType.field3559.id) { // L: 523
- if (var8.rotation == 0) { // L: 524
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
+ if (var8.decoration == WorldMapDecorationType.field3534.id) { // L: 519
+ if (var8.rotation == 0) { // L: 520
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12);
}
- if (var8.rotation == 1) {
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 525
+ if (var8.rotation == 1) { // L: 521
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var12);
}
- if (var8.rotation == 2) { // L: 526
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
+ if (var8.rotation == 2) { // L: 522
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
}
- if (var8.rotation == 3) { // L: 527
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
+ if (var8.rotation == 3) { // L: 523
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
}
}
- if (var8.decoration == WorldMapDecorationType.field3560.id) { // L: 529
- int var11 = var8.rotation % 2; // L: 530
- int var12;
- if (var11 == 0) { // L: 531
- for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 532
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 533
+ if (var8.decoration == WorldMapDecorationType.field3535.id) { // L: 525
+ int var13 = var8.rotation % 2; // L: 526
+ int var14;
+ if (var13 == 0) { // L: 527
+ for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 528
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 529
}
} else {
- for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 537
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 538
+ for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 533
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 534
}
}
}
@@ -685,955 +687,313 @@ public class WorldMapRegion {
}
}
- } // L: 547
+ } // L: 543
- @ObfuscatedName("j")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "(IILjava/util/HashSet;IS)V",
- garbageValue = "153"
+ descriptor = "(IILjava/util/HashSet;IB)V",
+ garbageValue = "8"
)
@Export("drawNonLinkMapIcons")
void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) {
- float var5 = (float)var4 / 64.0F; // L: 550
- float var6 = var5 / 2.0F; // L: 551
- Iterator var7 = this.iconMap.entrySet().iterator(); // L: 552
+ float var5 = (float)var4 / 64.0F; // L: 546
+ float var6 = var5 / 2.0F; // L: 547
+ Iterator var7 = this.iconMap.entrySet().iterator(); // L: 548
while (var7.hasNext()) {
- Entry var8 = (Entry)var7.next(); // L: 553
- Coord var9 = (Coord)var8.getKey(); // L: 555
- int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); // L: 556
- int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 557
- AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 558
- if (var12 != null && var12.hasValidElement()) { // L: 559
- var12.screenX = var10; // L: 560
- var12.screenY = var11; // L: 561
- WorldMapElement var13 = class120.WorldMapElement_get(var12.getElement()); // L: 562
- if (!var3.contains(var13.getObjectId())) { // L: 563
- this.method4575(var12, var10, var11, var5); // L: 564
+ Entry var8 = (Entry)var7.next(); // L: 549
+ Coord var9 = (Coord)var8.getKey(); // L: 551
+ int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 552
+ int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 553
+ AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 554
+ if (var12 != null && var12.hasValidElement()) { // L: 555
+ var12.screenX = var10; // L: 556
+ var12.screenY = var11; // L: 557
+ WorldMapElement var13 = class432.WorldMapElement_get(var12.getElement()); // L: 558
+ if (!var3.contains(var13.getObjectId())) { // L: 559
+ this.method4771(var12, var10, var11, var5); // L: 560
}
}
}
- } // L: 569
+ } // L: 565
- @ObfuscatedName("z")
+ @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "(Ljava/util/HashSet;IIS)V",
- garbageValue = "256"
+ descriptor = "(Ljava/util/HashSet;III)V",
+ garbageValue = "1790127090"
)
- void method4537(HashSet var1, int var2, int var3) {
- Iterator var4 = this.icon0List.iterator(); // L: 572
+ void method4715(HashSet var1, int var2, int var3) {
+ Iterator var4 = this.icon0List.iterator(); // L: 568
while (var4.hasNext()) {
- AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 573
- if (var5.hasValidElement()) { // L: 575
- WorldMapElement var6 = class120.WorldMapElement_get(var5.getElement()); // L: 576
- if (var6 != null && var1.contains(var6.getObjectId())) { // L: 577
- this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 578
+ AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 569
+ if (var5.hasValidElement()) { // L: 571
+ WorldMapElement var6 = class432.WorldMapElement_get(var5.getElement()); // L: 572
+ if (var6 != null && var1.contains(var6.getObjectId())) { // L: 573
+ this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 574
}
}
}
- } // L: 582
+ } // L: 578
- @ObfuscatedName("i")
+ @ObfuscatedName("m")
@ObfuscatedSignature(
- descriptor = "(Lfx;IIIII)V",
- garbageValue = "-1051315032"
+ descriptor = "(Lfa;IIIII)V",
+ garbageValue = "797623326"
)
@Export("drawBackgroundCircle")
void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) {
- SpritePixels var6 = var1.getSpriteBool(false); // L: 585
- if (var6 != null) { // L: 586
- var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 589
- if (var4 % var5 < var5 / 2) { // L: 590
- Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 591
- Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 592
+ SpritePixels var6 = var1.getSpriteBool(false); // L: 581
+ if (var6 != null) { // L: 582
+ var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 585
+ if (var4 % var5 < var5 / 2) { // L: 586
+ Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 587
+ Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 588
}
}
- } // L: 587 594
+ } // L: 583 590
- @ObfuscatedName("u")
+ @ObfuscatedName("d")
@ObfuscatedSignature(
- descriptor = "(Liw;IIFI)V",
- garbageValue = "1241063243"
+ descriptor = "(Lim;IIFB)V",
+ garbageValue = "-8"
)
- void method4575(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
- WorldMapElement var5 = class120.WorldMapElement_get(var1.getElement()); // L: 597
- this.method4540(var5, var2, var3); // L: 598
- this.method4541(var1, var5, var2, var3, var4); // L: 599
- } // L: 600
+ void method4771(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
+ WorldMapElement var5 = class432.WorldMapElement_get(var1.getElement()); // L: 593
+ this.method4718(var5, var2, var3); // L: 594
+ this.method4719(var1, var5, var2, var3, var4); // L: 595
+ } // L: 596
- @ObfuscatedName("ag")
+ @ObfuscatedName("ad")
@ObfuscatedSignature(
- descriptor = "(Lfx;III)V",
- garbageValue = "2127201520"
+ descriptor = "(Lfa;III)V",
+ garbageValue = "-1556950864"
)
- void method4540(WorldMapElement var1, int var2, int var3) {
- SpritePixels var4 = var1.getSpriteBool(false); // L: 603
- if (var4 != null) { // L: 604
- int var5 = this.method4543(var4, var1.horizontalAlignment); // L: 605
- int var6 = this.method4619(var4, var1.verticalAlignment); // L: 606
- var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 607
+ void method4718(WorldMapElement var1, int var2, int var3) {
+ SpritePixels var4 = var1.getSpriteBool(false); // L: 599
+ if (var4 != null) { // L: 600
+ int var5 = this.method4721(var4, var1.horizontalAlignment); // L: 601
+ int var6 = this.method4722(var4, var1.verticalAlignment); // L: 602
+ var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 603
}
- } // L: 609
+ } // L: 605
- @ObfuscatedName("ar")
+ @ObfuscatedName("ak")
@ObfuscatedSignature(
- descriptor = "(Liw;Lfx;IIFI)V",
- garbageValue = "1327912976"
+ descriptor = "(Lim;Lfa;IIFI)V",
+ garbageValue = "1703862225"
)
- void method4541(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
- WorldMapLabel var6 = var1.getLabel(); // L: 612
- if (var6 != null) { // L: 613
- if (var6.size.method4409(var5)) { // L: 616
- Font var7 = (Font)this.fonts.get(var6.size); // L: 619
- var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1871, 0, 1, 0, var7.ascent / 2); // L: 620
+ void method4719(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
+ WorldMapLabel var6 = var1.getLabel(); // L: 608
+ if (var6 != null) { // L: 609
+ if (var6.size.method4567(var5)) { // L: 612
+ Font var7 = (Font)this.fonts.get(var6.size); // L: 615
+ var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1834, 0, 1, 0, var7.ascent / 2); // L: 616
}
}
- } // L: 614 617 621
+ } // L: 610 613 617
- @ObfuscatedName("am")
+ @ObfuscatedName("al")
@ObfuscatedSignature(
descriptor = "(IILjava/util/HashSet;II)V",
- garbageValue = "-1591705047"
+ garbageValue = "612177592"
)
@Export("drawMapLinks")
void drawMapLinks(int var1, int var2, HashSet var3, int var4) {
- float var5 = (float)var4 / 64.0F; // L: 624
- Iterator var6 = this.icon0List.iterator(); // L: 625
+ float var5 = (float)var4 / 64.0F; // L: 620
+ Iterator var6 = this.icon0List.iterator(); // L: 621
while (var6.hasNext()) {
- AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 626
- if (var7.hasValidElement()) { // L: 628
- int var8 = var7.coord2.x % 64; // L: 629
- int var9 = var7.coord2.y % 64; // L: 630
- var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 631
- var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); // L: 632
- if (!var3.contains(var7.getElement())) { // L: 633
- this.method4575(var7, var7.screenX, var7.screenY, var5); // L: 636
+ AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 622
+ if (var7.hasValidElement()) { // L: 624
+ int var8 = var7.coord2.x % 64; // L: 625
+ int var9 = var7.coord2.y % 64; // L: 626
+ var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 627
+ var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); // L: 628
+ if (!var3.contains(var7.getElement())) { // L: 629
+ this.method4771(var7, var7.screenX, var7.screenY, var5); // L: 632
}
}
}
- } // L: 639
+ } // L: 635
- @ObfuscatedName("ac")
+ @ObfuscatedName("ao")
@ObfuscatedSignature(
- descriptor = "(Lqr;Lfj;I)I",
- garbageValue = "1784906213"
+ descriptor = "(Lqe;Lfk;I)I",
+ garbageValue = "-1396908726"
)
- int method4543(SpritePixels var1, HorizontalAlignment var2) {
- switch(var2.value) { // L: 642
- case 0:
- return -var1.subWidth / 2; // L: 645
- case 2:
+ int method4721(SpritePixels var1, HorizontalAlignment var2) {
+ switch(var2.value) { // L: 638
+ case 1:
return 0; // L: 649
+ case 2:
+ return -var1.subWidth / 2; // L: 641
default:
- return -var1.subWidth; // L: 653
+ return -var1.subWidth; // L: 645
}
}
@ObfuscatedName("ab")
@ObfuscatedSignature(
- descriptor = "(Lqr;Lfk;B)I",
- garbageValue = "11"
+ descriptor = "(Lqe;Lft;I)I",
+ garbageValue = "1287844359"
)
- int method4619(SpritePixels var1, VerticalAlignment var2) {
- switch(var2.value) { // L: 659
+ int method4722(SpritePixels var1, VerticalAlignment var2) {
+ switch(var2.value) { // L: 655
case 0:
return 0; // L: 662
- case 1:
+ case 2:
return -var1.subHeight / 2; // L: 666
default:
- return -var1.subHeight; // L: 670
+ return -var1.subHeight; // L: 658
}
}
- @ObfuscatedName("aj")
+ @ObfuscatedName("ap")
@ObfuscatedSignature(
- descriptor = "(II)Lip;",
- garbageValue = "1955466429"
+ descriptor = "(IB)Liz;",
+ garbageValue = "-66"
)
- WorldMapLabel method4545(int var1) {
- WorldMapElement var2 = class120.WorldMapElement_get(var1); // L: 676
- return this.createMapLabel(var2); // L: 677
+ WorldMapLabel method4808(int var1) {
+ WorldMapElement var2 = class432.WorldMapElement_get(var1); // L: 672
+ return this.createMapLabel(var2); // L: 673
+ }
+
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "(Lfa;I)Liz;",
+ garbageValue = "-927951776"
+ )
+ @Export("createMapLabel")
+ WorldMapLabel createMapLabel(WorldMapElement var1) {
+ if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 677
+ int var3 = var1.textSize; // L: 681
+ WorldMapLabelSize[] var4 = WorldMapLabelSize.method4568(); // L: 684
+ int var5 = 0;
+
+ WorldMapLabelSize var2;
+ while (true) {
+ if (var5 >= var4.length) {
+ var2 = null; // L: 695
+ break;
+ }
+
+ WorldMapLabelSize var6 = var4[var5]; // L: 686
+ if (var3 == var6.field2672) { // L: 688
+ var2 = var6; // L: 689
+ break;
+ }
+
+ ++var5; // L: 685
+ }
+
+ if (var2 == null) { // L: 698
+ return null; // L: 699
+ } else {
+ Font var14 = (Font)this.fonts.get(var2); // L: 701
+ if (var14 == null) { // L: 702
+ return null; // L: 703
+ } else {
+ int var15 = var14.lineCount(var1.name, 1000000); // L: 705
+ String[] var7 = new String[var15]; // L: 706
+ var14.breakLines(var1.name, (int[])null, var7); // L: 707
+ int var8 = var7.length * var14.ascent / 2; // L: 708
+ int var9 = 0; // L: 709
+ String[] var10 = var7; // L: 711
+
+ for (int var11 = 0; var11 < var10.length; ++var11) { // L: 712
+ String var12 = var10[var11]; // L: 713
+ int var13 = var14.stringWidth(var12); // L: 715
+ if (var13 > var9) { // L: 716
+ var9 = var13; // L: 717
+ }
+ }
+
+ return new WorldMapLabel(var1.name, var9, var8, var2); // L: 722
+ }
+ }
+ } else {
+ return null; // L: 678
+ }
}
@ObfuscatedName("ae")
@ObfuscatedSignature(
- descriptor = "(Lfx;B)Lip;",
- garbageValue = "-43"
+ descriptor = "(IIIIIB)Ljava/util/List;",
+ garbageValue = "78"
)
- @Export("createMapLabel")
- WorldMapLabel createMapLabel(WorldMapElement var1) {
- if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 681
- int var3 = var1.textSize; // L: 685
- WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_large, WorldMapLabelSize.WorldMapLabelSize_small}; // L: 690
- WorldMapLabelSize[] var5 = var4; // L: 692
- int var6 = 0;
-
- WorldMapLabelSize var2;
- while (true) {
- if (var6 >= var5.length) {
- var2 = null; // L: 703
- break;
- }
-
- WorldMapLabelSize var7 = var5[var6]; // L: 694
- if (var3 == var7.field2712) { // L: 696
- var2 = var7; // L: 697
- break;
- }
-
- ++var6; // L: 693
- }
-
- if (var2 == null) { // L: 706
- return null; // L: 707
- } else {
- Font var14 = (Font)this.fonts.get(var2); // L: 709
- if (var14 == null) { // L: 710
- return null; // L: 711
- } else {
- var6 = var14.lineCount(var1.name, 1000000); // L: 713
- String[] var15 = new String[var6]; // L: 714
- var14.breakLines(var1.name, (int[])null, var15); // L: 715
- int var8 = var15.length * var14.ascent / 2; // L: 716
- int var9 = 0; // L: 717
- String[] var10 = var15; // L: 719
-
- for (int var11 = 0; var11 < var10.length; ++var11) { // L: 720
- String var12 = var10[var11]; // L: 721
- int var13 = var14.stringWidth(var12); // L: 723
- if (var13 > var9) { // L: 724
- var9 = var13; // L: 725
- }
- }
-
- return new WorldMapLabel(var1.name, var9, var8, var2); // L: 730
- }
- }
- } else {
- return null; // L: 682
- }
- }
-
- @ObfuscatedName("az")
- @ObfuscatedSignature(
- descriptor = "(IIIIII)Ljava/util/List;",
- garbageValue = "1348030891"
- )
- List method4547(int var1, int var2, int var3, int var4, int var5) {
- LinkedList var6 = new LinkedList(); // L: 734
- if (var4 >= var1 && var5 >= var2) { // L: 735
- if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 736
+ List method4802(int var1, int var2, int var3, int var4, int var5) {
+ LinkedList var6 = new LinkedList(); // L: 726
+ if (var4 >= var1 && var5 >= var2) { // L: 727
+ if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 728
Iterator var7 = this.iconMap.values().iterator();
AbstractWorldMapIcon var8;
- while (var7.hasNext()) { // L: 737
+ while (var7.hasNext()) { // L: 729
+ var8 = (AbstractWorldMapIcon)var7.next(); // L: 730
+ if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 732
+ var6.add(var8); // L: 733
+ }
+ }
+
+ var7 = this.icon0List.iterator(); // L: 737
+
+ while (var7.hasNext()) {
var8 = (AbstractWorldMapIcon)var7.next(); // L: 738
if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 740
var6.add(var8); // L: 741
}
}
- var7 = this.icon0List.iterator(); // L: 745
-
- while (var7.hasNext()) {
- var8 = (AbstractWorldMapIcon)var7.next(); // L: 746
- if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 748
- var6.add(var8); // L: 749
- }
- }
-
- return var6; // L: 753
+ return var6; // L: 745
} else {
- return var6; // L: 744
+ return var6; // L: 736
}
} else {
return var6;
}
}
- @ObfuscatedName("ap")
+ @ObfuscatedName("aj")
@ObfuscatedSignature(
descriptor = "(I)Ljava/util/List;",
- garbageValue = "621020876"
+ garbageValue = "-74215594"
)
@Export("icons")
List icons() {
- LinkedList var1 = new LinkedList(); // L: 757
- var1.addAll(this.icon0List); // L: 758
- var1.addAll(this.iconMap.values()); // L: 759
- return var1; // L: 760
+ LinkedList var1 = new LinkedList(); // L: 749
+ var1.addAll(this.icon0List); // L: 750
+ var1.addAll(this.iconMap.values()); // L: 751
+ return var1; // L: 752
}
- @ObfuscatedName("as")
+ @ObfuscatedName("am")
@ObfuscatedSignature(
descriptor = "(IIIII)V",
- garbageValue = "1095602630"
+ garbageValue = "1662314817"
)
- void method4571(int var1, int var2, int var3, int var4) {
- var3 %= 4; // L: 764
- if (var3 == 0) { // L: 765
+ void method4723(int var1, int var2, int var3, int var4) {
+ var3 %= 4; // L: 756
+ if (var3 == 0) { // L: 757
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
- if (var3 == 1) { // L: 766
+ if (var3 == 1) { // L: 758
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
- if (var3 == 2) { // L: 767
+ if (var3 == 2) { // L: 759
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
if (var3 == 3) {
- Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 768
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 760
}
- } // L: 769
-
- @ObfuscatedName("fn")
- @ObfuscatedSignature(
- descriptor = "(IZZZI)Lle;",
- garbageValue = "-1474520480"
- )
- @Export("newArchive")
- static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
- ArchiveDisk var4 = null; // L: 2071
- if (JagexCache.JagexCache_dat2File != null) { // L: 2072
- var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000);
- }
-
- return new Archive(var4, class135.masterDisk, var0, var1, var2, var3); // L: 2073
- }
-
- @ObfuscatedName("ji")
- @ObfuscatedSignature(
- descriptor = "([Lki;IIIIIIIB)V",
- garbageValue = "72"
- )
- @Export("updateInterface")
- static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
- for (int var8 = 0; var8 < var0.length; ++var8) { // L: 11210
- Widget var9 = var0[var8]; // L: 11211
- if (var9 != null && var9.parentId == var1 && (var9.method5448() || UrlRequester.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 11212 11213 11214
- if (var9.isIf3) { // L: 11215
- if (class434.isComponentHidden(var9)) { // L: 11216
- continue;
- }
- } else if (var9.type == 0 && var9 != class144.mousedOverWidgetIf1 && class434.isComponentHidden(var9)) { // L: 11219
- continue;
- }
-
- if (var9.type == 11 && var9.method5517(UserComparator7.urlRequester)) { // L: 11221 11222
- if (var9.method5498()) { // L: 11223
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var9); // L: 11224
- UserComparator8.revalidateWidgetScroll(var9.children, var9, true); // L: 11225
- }
-
- if (var9.field3460 != null) { // L: 11227
- ScriptEvent var10 = new ScriptEvent(); // L: 11228
- var10.widget = var9; // L: 11229
- var10.args = var9.field3460; // L: 11230
- Client.scriptEvents.addFirst(var10); // L: 11231
- }
- }
-
- int var26 = var9.x + var6; // L: 11235
- int var11 = var7 + var9.y; // L: 11236
- int var12;
- int var13;
- int var14;
- int var15;
- int var17;
- int var18;
- if (var9.type == 2) { // L: 11241
- var12 = var2; // L: 11242
- var13 = var3; // L: 11243
- var14 = var4; // L: 11244
- var15 = var5; // L: 11245
- } else {
- int var16;
- if (var9.type == 9) { // L: 11247
- var16 = var26; // L: 11248
- var17 = var11; // L: 11249
- var18 = var26 + var9.width; // L: 11250
- int var19 = var11 + var9.height; // L: 11251
- if (var18 < var26) { // L: 11252
- var16 = var18; // L: 11254
- var18 = var26; // L: 11255
- }
-
- if (var19 < var11) { // L: 11257
- var17 = var19; // L: 11259
- var19 = var11; // L: 11260
- }
-
- ++var18; // L: 11262
- ++var19; // L: 11263
- var12 = var16 > var2 ? var16 : var2; // L: 11264
- var13 = var17 > var3 ? var17 : var3; // L: 11265
- var14 = var18 < var4 ? var18 : var4; // L: 11266
- var15 = var19 < var5 ? var19 : var5; // L: 11267
- } else {
- var16 = var26 + var9.width; // L: 11270
- var17 = var11 + var9.height; // L: 11271
- var12 = var26 > var2 ? var26 : var2; // L: 11272
- var13 = var11 > var3 ? var11 : var3; // L: 11273
- var14 = var16 < var4 ? var16 : var4; // L: 11274
- var15 = var17 < var5 ? var17 : var5; // L: 11275
- }
- }
-
- if (var9 == Client.clickedWidget) { // L: 11277
- Client.field675 = true; // L: 11278
- Client.field653 = var26; // L: 11279
- Client.field612 = var11; // L: 11280
- }
-
- boolean var34 = false; // L: 11282
- if (var9.field3473) { // L: 11283
- switch(Client.field487) { // L: 11284
- case 0:
- var34 = true; // L: 11296
- case 1:
- default:
- break;
- case 2:
- if (Client.field657 == var9.id >>> 16) { // L: 11286
- var34 = true; // L: 11287
- }
- break;
- case 3:
- if (var9.id == Client.field657) { // L: 11291
- var34 = true; // L: 11292
- }
- }
- }
-
- if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11300
- if (var9.isIf3) { // L: 11301
- ScriptEvent var27;
- if (var9.noClickThrough) { // L: 11302
- if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11303
- for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11304
- if (var27.isMouseInputEvent) { // L: 11305
- var27.remove(); // L: 11306
- var27.widget.containsMouse = false; // L: 11307
- }
- }
-
- if (SoundSystem.widgetDragDuration == 0) { // L: 11310
- Client.clickedWidget = null; // L: 11311
- Client.clickedWidgetParent = null; // L: 11312
- }
-
- if (!Client.isMenuOpen) { // L: 11314
- class20.addCancelMenuEntry(); // L: 11315
- }
- }
- } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11319 11320
- for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11321
- if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 11322
- var27.remove(); // L: 11323
- }
- }
- }
- }
-
- var17 = MouseHandler.MouseHandler_x; // L: 11329
- var18 = MouseHandler.MouseHandler_y; // L: 11330
- if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11331
- var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11332
- var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11333
- }
-
- boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11335
- if (var9.contentType == 1337) { // L: 11336
- if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 11337
- WorldMapEvent.addSceneMenuOptions(var17, var18, var12, var13);
- }
- } else if (var9.contentType == 1338) { // L: 11340
- class129.checkIfMinimapClicked(var9, var26, var11); // L: 11341
- } else {
- if (var9.contentType == 1400) { // L: 11344
- ServerPacket.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 11345
- }
-
- if (!Client.isMenuOpen && var35) { // L: 11347
- if (var9.contentType == 1400) { // L: 11348
- ServerPacket.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 11349
- } else {
- class160.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 11352
- }
- }
-
- boolean var21;
- int var29;
- if (var34) { // L: 11355
- for (int var20 = 0; var20 < var9.field3474.length; ++var20) { // L: 11356
- var21 = false; // L: 11357
- boolean var28 = false; // L: 11358
- if (!var21 && var9.field3474[var20] != null) { // L: 11359
- for (var29 = 0; var29 < var9.field3474[var20].length; ++var29) { // L: 11360
- boolean var24 = false; // L: 11361
- if (var9.field3527 != null) { // L: 11362
- var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3474[var20][var29]]; // L: 11363
- }
-
- if (class145.method2991(var9.field3474[var20][var29]) || var24) { // L: 11365
- var21 = true; // L: 11366
- if (var9.field3527 != null && var9.field3527[var20] > Client.cycle) { // L: 11367
- break;
- }
-
- byte var33 = var9.field3419[var20][var29]; // L: 11368
- if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11369 11370 11371 11372 11373
- var28 = true; // L: 11375
- break; // L: 11376
- }
- }
- }
- }
-
- if (var28) { // L: 11381
- if (var20 < 10) { // L: 11382
- TaskHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
- } else if (var20 == 10) { // L: 11383
- MusicPatchNode2.Widget_runOnTargetLeave(); // L: 11384
- class93.selectSpell(var9.id, var9.childIndex, WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var9)), var9.itemId); // L: 11385
- Client.selectedSpellActionName = TriBool.Widget_getSpellActionName(var9); // L: 11386
- if (Client.selectedSpellActionName == null) { // L: 11387
- Client.selectedSpellActionName = "null";
- }
-
- Client.selectedSpellName = var9.dataText + class166.colorStartTag(16777215); // L: 11388
- }
-
- var29 = var9.field3476[var20]; // L: 11390
- if (var9.field3527 == null) { // L: 11391
- var9.field3527 = new int[var9.field3474.length];
- }
-
- if (var9.field3481 == null) { // L: 11392
- var9.field3481 = new int[var9.field3474.length];
- }
-
- if (var29 != 0) { // L: 11393
- if (var9.field3527[var20] == 0) { // L: 11394
- var9.field3527[var20] = var29 + Client.cycle + var9.field3481[var20];
- } else {
- var9.field3527[var20] = var29 + Client.cycle; // L: 11395
- }
- } else {
- var9.field3527[var20] = Integer.MAX_VALUE; // L: 11397
- }
- }
-
- if (!var21 && var9.field3527 != null) { // L: 11399 11400
- var9.field3527[var20] = 0;
- }
- }
- }
-
- if (var9.isIf3) { // L: 11404
- if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11405
- var35 = true;
- } else {
- var35 = false; // L: 11406
- }
-
- boolean var36 = false; // L: 11407
- if ((MouseHandler.MouseHandler_currentButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 11408
- var36 = true;
- }
-
- var21 = false; // L: 11409
- if ((MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11410
- var21 = true;
- }
-
- int[] var22;
- if (var21) { // L: 11411
- class10.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 11412
- if (var9.type == 11 && var9.method5474(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY, var6, var7)) { // L: 11413
- switch(var9.method5457()) { // L: 11414
- case 0:
- ScriptEvent.openURL(var9.method5480(), true, false); // L: 11416
- break;
- case 1:
- if (class152.method3039(UrlRequester.getWidgetFlags(var9))) { // L: 11419
- var22 = var9.method5460(); // L: 11420
- if (var22 != null) { // L: 11421
- PacketBufferNode var23 = WallDecoration.getPacketBufferNode(ClientPacket.field3000, Client.packetWriter.isaacCipher); // L: 11422
- var23.packetBuffer.writeInt(var22[2]); // L: 11423
- var23.packetBuffer.writeIntME(var9.id); // L: 11424
- var23.packetBuffer.method7550(var9.childIndex); // L: 11425
- var23.packetBuffer.writeIntME(var22[1]); // L: 11426
- var23.packetBuffer.writeIntME(var22[0]); // L: 11427
- var23.packetBuffer.writeInt(var9.method5458()); // L: 11428
- Client.packetWriter.addNode(var23); // L: 11429
- }
- }
- }
- }
- }
-
- if (var9.contentType == 1400) { // L: 11436
- ServerPacket.worldMap.method7025(var17, var18, var35 & var36, var35 & var21); // L: 11437
- }
-
- if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && class229.method4727(UrlRequester.getWidgetFlags(var9))) { // L: 11439
- Client.draggedOnWidget = var9;
- }
-
- if (var9 == Client.clickedWidgetParent) { // L: 11440
- Client.field574 = true; // L: 11441
- Client.field747 = var26; // L: 11442
- Client.field674 = var11; // L: 11443
- }
-
- if (var9.hasListener) { // L: 11445
- ScriptEvent var37;
- if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11446
- var37 = new ScriptEvent(); // L: 11447
- var37.isMouseInputEvent = true; // L: 11448
- var37.widget = var9; // L: 11449
- var37.mouseY = Client.mouseWheelRotation; // L: 11450
- var37.args = var9.onScroll; // L: 11451
- Client.scriptEvents.addFirst(var37); // L: 11452
- }
-
- if (Client.clickedWidget != null || Canvas.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11454
- var21 = false; // L: 11455
- var36 = false; // L: 11456
- var35 = false; // L: 11457
- }
-
- if (!var9.isClicked && var21) { // L: 11459
- var9.isClicked = true; // L: 11460
- if (var9.onClick != null) { // L: 11461
- var37 = new ScriptEvent(); // L: 11462
- var37.isMouseInputEvent = true; // L: 11463
- var37.widget = var9; // L: 11464
- var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 11465
- var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11466
- var37.args = var9.onClick; // L: 11467
- Client.scriptEvents.addFirst(var37); // L: 11468
- }
- }
-
- if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 11471 11472
- var37 = new ScriptEvent(); // L: 11473
- var37.isMouseInputEvent = true; // L: 11474
- var37.widget = var9; // L: 11475
- var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11476
- var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11477
- var37.args = var9.onClickRepeat; // L: 11478
- Client.scriptEvents.addFirst(var37); // L: 11479
- }
-
- if (var9.isClicked && !var36) { // L: 11482
- var9.isClicked = false; // L: 11483
- if (var9.onRelease != null) { // L: 11484
- var37 = new ScriptEvent(); // L: 11485
- var37.isMouseInputEvent = true; // L: 11486
- var37.widget = var9; // L: 11487
- var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11488
- var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11489
- var37.args = var9.onRelease; // L: 11490
- Client.field701.addFirst(var37); // L: 11491
- }
- }
-
- if (var36 && var9.onHold != null) { // L: 11494 11495
- var37 = new ScriptEvent(); // L: 11496
- var37.isMouseInputEvent = true; // L: 11497
- var37.widget = var9; // L: 11498
- var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11499
- var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11500
- var37.args = var9.onHold; // L: 11501
- Client.scriptEvents.addFirst(var37); // L: 11502
- }
-
- if (!var9.containsMouse && var35) { // L: 11505
- var9.containsMouse = true; // L: 11506
- if (var9.onMouseOver != null) { // L: 11507
- var37 = new ScriptEvent(); // L: 11508
- var37.isMouseInputEvent = true; // L: 11509
- var37.widget = var9; // L: 11510
- var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11511
- var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11512
- var37.args = var9.onMouseOver; // L: 11513
- Client.scriptEvents.addFirst(var37); // L: 11514
- }
- }
-
- if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 11517 11518
- var37 = new ScriptEvent(); // L: 11519
- var37.isMouseInputEvent = true; // L: 11520
- var37.widget = var9; // L: 11521
- var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11522
- var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11523
- var37.args = var9.onMouseRepeat; // L: 11524
- Client.scriptEvents.addFirst(var37); // L: 11525
- }
-
- if (var9.containsMouse && !var35) { // L: 11528
- var9.containsMouse = false; // L: 11529
- if (var9.onMouseLeave != null) { // L: 11530
- var37 = new ScriptEvent(); // L: 11531
- var37.isMouseInputEvent = true; // L: 11532
- var37.widget = var9; // L: 11533
- var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11534
- var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11535
- var37.args = var9.onMouseLeave; // L: 11536
- Client.field701.addFirst(var37); // L: 11537
- }
- }
-
- if (var9.onTimer != null) { // L: 11540
- var37 = new ScriptEvent(); // L: 11541
- var37.widget = var9; // L: 11542
- var37.args = var9.onTimer; // L: 11543
- Client.field698.addFirst(var37); // L: 11544
- }
-
- ScriptEvent var25;
- int var39;
- int var40;
- if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3538) { // L: 11546
- if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3538 <= 32) { // L: 11547
- label825:
- for (var40 = var9.field3538; var40 < Client.changedVarpCount; ++var40) { // L: 11554
- var29 = Client.changedVarps[var40 & 31]; // L: 11555
-
- for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 11556
- if (var29 == var9.varTransmitTriggers[var39]) { // L: 11557
- var25 = new ScriptEvent(); // L: 11558
- var25.widget = var9; // L: 11559
- var25.args = var9.onVarTransmit; // L: 11560
- Client.scriptEvents.addFirst(var25); // L: 11561
- break label825; // L: 11562
- }
- }
- }
- } else {
- var37 = new ScriptEvent(); // L: 11548
- var37.widget = var9; // L: 11549
- var37.args = var9.onVarTransmit; // L: 11550
- Client.scriptEvents.addFirst(var37); // L: 11551
- }
-
- var9.field3538 = Client.changedVarpCount; // L: 11567
- }
-
- if (var9.onInvTransmit != null && Client.field683 > var9.field3539) { // L: 11569
- if (var9.invTransmitTriggers != null && Client.field683 - var9.field3539 <= 32) { // L: 11570
- label801:
- for (var40 = var9.field3539; var40 < Client.field683; ++var40) { // L: 11577
- var29 = Client.changedItemContainers[var40 & 31]; // L: 11578
-
- for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 11579
- if (var29 == var9.invTransmitTriggers[var39]) { // L: 11580
- var25 = new ScriptEvent(); // L: 11581
- var25.widget = var9; // L: 11582
- var25.args = var9.onInvTransmit; // L: 11583
- Client.scriptEvents.addFirst(var25); // L: 11584
- break label801; // L: 11585
- }
- }
- }
- } else {
- var37 = new ScriptEvent(); // L: 11571
- var37.widget = var9; // L: 11572
- var37.args = var9.onInvTransmit; // L: 11573
- Client.scriptEvents.addFirst(var37); // L: 11574
- }
-
- var9.field3539 = Client.field683; // L: 11590
- }
-
- if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3540) { // L: 11592
- if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3540 <= 32) { // L: 11593
- label777:
- for (var40 = var9.field3540; var40 < Client.changedSkillsCount; ++var40) { // L: 11600
- var29 = Client.changedSkills[var40 & 31]; // L: 11601
-
- for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 11602
- if (var29 == var9.statTransmitTriggers[var39]) { // L: 11603
- var25 = new ScriptEvent(); // L: 11604
- var25.widget = var9; // L: 11605
- var25.args = var9.onStatTransmit; // L: 11606
- Client.scriptEvents.addFirst(var25); // L: 11607
- break label777; // L: 11608
- }
- }
- }
- } else {
- var37 = new ScriptEvent(); // L: 11594
- var37.widget = var9; // L: 11595
- var37.args = var9.onStatTransmit; // L: 11596
- Client.scriptEvents.addFirst(var37); // L: 11597
- }
-
- var9.field3540 = Client.changedSkillsCount; // L: 11613
- }
-
- if (Client.chatCycle > var9.field3524 && var9.onChatTransmit != null) { // L: 11615
- var37 = new ScriptEvent(); // L: 11616
- var37.widget = var9; // L: 11617
- var37.args = var9.onChatTransmit; // L: 11618
- Client.scriptEvents.addFirst(var37); // L: 11619
- }
-
- if (Client.field689 > var9.field3524 && var9.onFriendTransmit != null) { // L: 11621
- var37 = new ScriptEvent(); // L: 11622
- var37.widget = var9; // L: 11623
- var37.args = var9.onFriendTransmit; // L: 11624
- Client.scriptEvents.addFirst(var37); // L: 11625
- }
-
- if (Client.field690 > var9.field3524 && var9.onClanTransmit != null) { // L: 11627
- var37 = new ScriptEvent(); // L: 11628
- var37.widget = var9; // L: 11629
- var37.args = var9.onClanTransmit; // L: 11630
- Client.scriptEvents.addFirst(var37); // L: 11631
- }
-
- if (Client.field691 > var9.field3524 && var9.field3513 != null) { // L: 11633
- var37 = new ScriptEvent(); // L: 11634
- var37.widget = var9; // L: 11635
- var37.args = var9.field3513; // L: 11636
- Client.scriptEvents.addFirst(var37); // L: 11637
- }
-
- if (Client.field692 > var9.field3524 && var9.field3456 != null) { // L: 11639
- var37 = new ScriptEvent(); // L: 11640
- var37.widget = var9; // L: 11641
- var37.args = var9.field3456; // L: 11642
- Client.scriptEvents.addFirst(var37); // L: 11643
- }
-
- if (Client.field762 > var9.field3524 && var9.onStockTransmit != null) { // L: 11645
- var37 = new ScriptEvent(); // L: 11646
- var37.widget = var9; // L: 11647
- var37.args = var9.onStockTransmit; // L: 11648
- Client.scriptEvents.addFirst(var37); // L: 11649
- }
-
- if (Client.field512 > var9.field3524 && var9.field3520 != null) { // L: 11651
- var37 = new ScriptEvent(); // L: 11652
- var37.widget = var9; // L: 11653
- var37.args = var9.field3520; // L: 11654
- Client.scriptEvents.addFirst(var37); // L: 11655
- }
-
- if (Client.field695 > var9.field3524 && var9.onMiscTransmit != null) { // L: 11657
- var37 = new ScriptEvent(); // L: 11658
- var37.widget = var9; // L: 11659
- var37.args = var9.onMiscTransmit; // L: 11660
- Client.scriptEvents.addFirst(var37); // L: 11661
- }
-
- var9.field3524 = Client.cycleCntr; // L: 11663
- if (var9.onKey != null) { // L: 11664
- for (var40 = 0; var40 < Client.field719; ++var40) { // L: 11665
- ScriptEvent var38 = new ScriptEvent(); // L: 11666
- var38.widget = var9; // L: 11667
- var38.keyTyped = Client.field721[var40]; // L: 11668
- var38.keyPressed = Client.field720[var40]; // L: 11669
- var38.args = var9.onKey; // L: 11670
- Client.scriptEvents.addFirst(var38); // L: 11671
- }
- }
-
- ScriptEvent var32;
- if (var9.field3443 != null) { // L: 11674
- var22 = InterfaceParent.method2071(); // L: 11675
-
- for (var29 = 0; var29 < var22.length; ++var29) { // L: 11676
- var32 = new ScriptEvent(); // L: 11677
- var32.widget = var9; // L: 11678
- var32.keyTyped = var22[var29]; // L: 11679
- var32.args = var9.field3443; // L: 11680
- Client.scriptEvents.addFirst(var32); // L: 11681
- }
- }
-
- if (var9.field3510 != null) { // L: 11684
- var22 = ServerPacket.method5020(); // L: 11685
-
- for (var29 = 0; var29 < var22.length; ++var29) { // L: 11686
- var32 = new ScriptEvent(); // L: 11687
- var32.widget = var9; // L: 11688
- var32.keyTyped = var22[var29]; // L: 11689
- var32.args = var9.field3510; // L: 11690
- Client.scriptEvents.addFirst(var32); // L: 11691
- }
- }
- }
- }
-
- if (!var9.isIf3) { // L: 11696
- if (Client.clickedWidget != null || Canvas.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11697
- continue;
- }
-
- if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11698
- if (var9.mouseOverRedirect >= 0) { // L: 11699
- class144.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
- } else {
- class144.mousedOverWidgetIf1 = var9; // L: 11700
- }
- }
-
- if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11702
- class113.field1422 = var9; // L: 11703
- }
-
- if (var9.scrollHeight > var9.height) { // L: 11705
- FileSystem.method3168(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
- }
- }
-
- if (var9.type == 0) { // L: 11707
- updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11708
- if (var9.children != null) { // L: 11709
- updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY);
- }
-
- InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11710
- if (var30 != null) { // L: 11711
- if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11712
- for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11713
- if (var31.isMouseInputEvent) { // L: 11714
- var31.remove(); // L: 11715
- var31.widget.containsMouse = false; // L: 11716
- }
- }
-
- if (SoundSystem.widgetDragDuration == 0) { // L: 11719
- Client.clickedWidget = null; // L: 11720
- Client.clickedWidgetParent = null; // L: 11721
- }
-
- if (!Client.isMenuOpen) { // L: 11723
- class20.addCancelMenuEntry(); // L: 11724
- }
- }
-
- class4.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11727
- }
- }
- }
- }
- }
- }
-
- } // L: 11731
+ } // L: 761
}
diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java
index 5a4972185d..2bd0ec7ef9 100644
--- a/runescape-client/src/main/java/WorldMapScaleHandler.java
+++ b/runescape-client/src/main/java/WorldMapScaleHandler.java
@@ -4,16 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ii")
+@ObfuscatedName("if")
@Implements("WorldMapScaleHandler")
public class WorldMapScaleHandler {
- @ObfuscatedName("o")
+ @ObfuscatedName("r")
+ static int[] field2877;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1483330645
+ intValue = 654014719
)
@Export("pixelsPerTile")
int pixelsPerTile;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("tileTemplates")
byte[][][] tileTemplates;
@@ -21,25 +23,25 @@ public class WorldMapScaleHandler {
this.pixelsPerTile = var1; // L: 10
} // L: 11
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIIIIIIII)V",
- garbageValue = "-1818081190"
+ descriptor = "(IIIIIIIIB)V",
+ garbageValue = "41"
)
- void method4889(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+ void method5108(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { // L: 14
- var8 = this.method4890(var8, var7); // L: 15
- var7 = this.method4891(var7); // L: 16
+ var8 = this.method5085(var8, var7); // L: 15
+ var7 = this.method5086(var7); // L: 16
Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17
}
} // L: 18
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IIB)I",
- garbageValue = "96"
+ descriptor = "(III)I",
+ garbageValue = "-1221075512"
)
- int method4890(int var1, int var2) {
+ int method5085(int var1, int var2) {
if (var2 == 9) { // L: 21
var1 = var1 + 1 & 3;
}
@@ -55,12 +57,12 @@ public class WorldMapScaleHandler {
return var1; // L: 24
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IS)I",
- garbageValue = "-17656"
+ descriptor = "(II)I",
+ garbageValue = "126339973"
)
- int method4891(int var1) {
+ int method5086(int var1) {
if (var1 != 9 && var1 != 10) { // L: 28
return var1 == 11 ? 8 : var1; // L: 29
} else {
@@ -68,10 +70,10 @@ public class WorldMapScaleHandler {
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1137561741"
+ garbageValue = "-2085097863"
)
@Export("init")
void init() {
@@ -88,10 +90,10 @@ public class WorldMapScaleHandler {
}
} // L: 35 46
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1927655821"
+ garbageValue = "-1778590915"
)
@Export("init0")
void init0() {
@@ -155,10 +157,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[0][3] = var1; // L: 84
} // L: 85
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "1464832295"
+ garbageValue = "-102724724"
)
@Export("init1")
void init1() {
@@ -226,10 +228,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[1][3] = var1; // L: 127
} // L: 128
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-374640342"
+ descriptor = "(S)V",
+ garbageValue = "9580"
)
@Export("init2")
void init2() {
@@ -254,8 +256,8 @@ public class WorldMapScaleHandler {
for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142
for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143
- if (var4 >= var3 << 1) {
- var1[var2] = -1; // L: 144
+ if (var4 >= var3 << 1) { // L: 144
+ var1[var2] = -1;
}
++var2; // L: 145
@@ -293,10 +295,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[2][3] = var1; // L: 166
} // L: 167
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1850363637"
+ descriptor = "(B)V",
+ garbageValue = "55"
)
@Export("init3")
void init3() {
@@ -360,10 +362,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[3][3] = var1; // L: 205
} // L: 206
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1633438908"
+ garbageValue = "1845608815"
)
@Export("init4")
void init4() {
@@ -388,8 +390,8 @@ public class WorldMapScaleHandler {
for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220
for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221
- if (var4 <= var3 << 1) { // L: 222
- var1[var2] = -1;
+ if (var4 <= var3 << 1) {
+ var1[var2] = -1; // L: 222
}
++var2; // L: 223
@@ -427,10 +429,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[4][3] = var1; // L: 244
} // L: 245
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "2103912678"
+ garbageValue = "-978388257"
)
@Export("init5")
void init5() {
@@ -496,10 +498,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[5][3] = var1; // L: 285
} // L: 286
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "70400689"
+ descriptor = "(B)V",
+ garbageValue = "70"
)
@Export("init6")
void init6() {
@@ -565,10 +567,10 @@ public class WorldMapScaleHandler {
this.tileTemplates[6][3] = var1; // L: 326
} // L: 327
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1644297836"
+ descriptor = "(B)V",
+ garbageValue = "97"
)
@Export("init7")
void init7() {
@@ -633,16 +635,4 @@ public class WorldMapScaleHandler {
this.tileTemplates[7][3] = var1; // L: 367
} // L: 368
-
- @ObfuscatedName("e")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1410661486"
- )
- static void method4927() {
- Login.worldSelectOpen = false; // L: 1957
- UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1958
- SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1959
- Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 1960
- } // L: 1961
}
diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java
index 97cdd0ec32..d1cb7f0f53 100644
--- a/runescape-client/src/main/java/WorldMapSection.java
+++ b/runescape-client/src/main/java/WorldMapSection.java
@@ -3,53 +3,53 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ie")
+@ObfuscatedName("ih")
@Implements("WorldMapSection")
public interface WorldMapSection {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-1792723155"
+ descriptor = "(Lhg;I)V",
+ garbageValue = "1585435431"
)
@Export("expandBounds")
void expandBounds(WorldMapArea var1);
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IIIB)Z",
- garbageValue = "1"
+ descriptor = "(IIII)Z",
+ garbageValue = "-929111713"
)
@Export("containsCoord")
boolean containsCoord(int var1, int var2, int var3);
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "2"
+ descriptor = "(III)Z",
+ garbageValue = "-47549823"
)
@Export("containsPosition")
boolean containsPosition(int var1, int var2);
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(IIII)[I",
- garbageValue = "-41287528"
+ garbageValue = "-561571792"
)
@Export("getBorderTileLengths")
int[] getBorderTileLengths(int var1, int var2, int var3);
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(III)Lkd;",
- garbageValue = "289851355"
+ garbageValue = "531454030"
)
@Export("coord")
Coord coord(int var1, int var2);
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-113194936"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-27"
)
@Export("read")
void read(Buffer var1);
diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java
index 8f8600315b..2b6e805ebc 100644
--- a/runescape-client/src/main/java/WorldMapSection0.java
+++ b/runescape-client/src/main/java/WorldMapSection0.java
@@ -4,207 +4,485 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ha")
+@ObfuscatedName("hc")
@Implements("WorldMapSection0")
public class WorldMapSection0 implements WorldMapSection {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1921370827
+ intValue = 890498367
)
@Export("oldZ")
int oldZ;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = -1948863841
+ intValue = 766699141
)
@Export("newZ")
int newZ;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1923971
+ intValue = 563175329
)
@Export("oldX")
int oldX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -834083351
+ intValue = -1550449975
)
@Export("oldY")
int oldY;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -151067067
+ intValue = 1600318395
)
@Export("newX")
int newX;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -993548849
+ intValue = -25921137
)
@Export("newY")
int newY;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -1130243685
+ intValue = -1796176271
)
@Export("oldChunkXLow")
int oldChunkXLow;
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -1666808285
+ intValue = -1276314401
)
@Export("oldChunkYLow")
int oldChunkYLow;
- @ObfuscatedName("r")
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -912507685
+ intValue = 1500474937
)
@Export("oldChunkXHigh")
int oldChunkXHigh;
- @ObfuscatedName("v")
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -1336425609
+ intValue = -693533351
)
@Export("oldChunkYHigh")
int oldChunkYHigh;
- @ObfuscatedName("y")
+ @ObfuscatedName("s")
@ObfuscatedGetter(
- intValue = -834426157
+ intValue = -817896745
)
@Export("newChunkXLow")
int newChunkXLow;
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -1730040283
+ intValue = -1687649259
)
@Export("newChunkYLow")
int newChunkYLow;
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = -1327937655
+ intValue = 731785347
)
@Export("newChunkXHigh")
int newChunkXHigh;
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedGetter(
- intValue = -1666490665
+ intValue = 1623079757
)
@Export("newChunkYHigh")
int newChunkYHigh;
WorldMapSection0() {
- } // L: 22
+ }
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-1792723155"
+ descriptor = "(Lhg;I)V",
+ garbageValue = "1585435431"
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
- if (var1.regionLowX > this.newX) { // L: 26
+ if (var1.regionLowX > this.newX) {
var1.regionLowX = this.newX;
}
if (var1.regionHighX < this.newX) {
- var1.regionHighX = this.newX; // L: 27
+ var1.regionHighX = this.newX;
}
- if (var1.regionLowY > this.newY) { // L: 28
+ if (var1.regionLowY > this.newY) {
var1.regionLowY = this.newY;
}
- if (var1.regionHighY < this.newY) { // L: 29
+ if (var1.regionHighY < this.newY) {
var1.regionHighY = this.newY;
}
- } // L: 30
+ }
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IIIB)Z",
- garbageValue = "1"
+ descriptor = "(IIII)Z",
+ garbageValue = "-929111713"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
- if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 34
- return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 37
+ if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) {
+ return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7;
} else {
- return false; // L: 35
+ return false;
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "2"
+ descriptor = "(III)Z",
+ garbageValue = "-47549823"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 42
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(IIII)[I",
- garbageValue = "-41287528"
+ garbageValue = "-561571792"
)
@Export("getBorderTileLengths")
public int[] getBorderTileLengths(int var1, int var2, int var3) {
- if (!this.containsCoord(var1, var2, var3)) { // L: 47
- return null; // L: 48
+ if (!this.containsCoord(var1, var2, var3)) {
+ return null;
} else {
- int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 50 51 52
- return var4; // L: 53
+ int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)};
+ return var4;
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(III)Lkd;",
- garbageValue = "289851355"
+ garbageValue = "531454030"
)
@Export("coord")
public Coord coord(int var1, int var2) {
- if (!this.containsPosition(var1, var2)) { // L: 58
- return null; // L: 59
+ if (!this.containsPosition(var1, var2)) {
+ return null;
} else {
- int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 61
- int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 62
- return new Coord(this.oldZ, var3, var4); // L: 63
+ int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1;
+ int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8);
+ return new Coord(this.oldZ, var3, var4);
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-113194936"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-27"
)
@Export("read")
public void read(Buffer var1) {
- this.oldZ = var1.readUnsignedByte(); // L: 68
- this.newZ = var1.readUnsignedByte(); // L: 69
- this.oldX = var1.readUnsignedShort(); // L: 70
- this.oldChunkXLow = var1.readUnsignedByte(); // L: 71
- this.oldChunkXHigh = var1.readUnsignedByte(); // L: 72
- this.oldY = var1.readUnsignedShort(); // L: 73
- this.oldChunkYLow = var1.readUnsignedByte(); // L: 74
- this.oldChunkYHigh = var1.readUnsignedByte(); // L: 75
- this.newX = var1.readUnsignedShort(); // L: 76
- this.newChunkXLow = var1.readUnsignedByte(); // L: 77
+ this.oldZ = var1.readUnsignedByte();
+ this.newZ = var1.readUnsignedByte();
+ this.oldX = var1.readUnsignedShort();
+ this.oldChunkXLow = var1.readUnsignedByte();
+ this.oldChunkXHigh = var1.readUnsignedByte();
+ this.oldY = var1.readUnsignedShort();
+ this.oldChunkYLow = var1.readUnsignedByte();
+ this.oldChunkYHigh = var1.readUnsignedByte();
+ this.newX = var1.readUnsignedShort();
+ this.newChunkXLow = var1.readUnsignedByte();
this.newChunkXHigh = var1.readUnsignedByte(); // L: 78
this.newY = var1.readUnsignedShort(); // L: 79
- this.newChunkYLow = var1.readUnsignedByte(); // L: 80
- this.newChunkYHigh = var1.readUnsignedByte(); // L: 81
- this.postRead(); // L: 82
- } // L: 83
+ this.newChunkYLow = var1.readUnsignedByte();
+ this.newChunkYHigh = var1.readUnsignedByte();
+ this.postRead();
+ }
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "-6373"
+ descriptor = "(I)V",
+ garbageValue = "1114054632"
)
@Export("postRead")
void postRead() {
- } // L: 85
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Ldo;FB)F",
+ garbageValue = "-14"
+ )
+ static float method4918(class117 var0, float var1) {
+ if (var0 != null && var0.method2709() != 0) {
+ if (var1 < (float)var0.field1462[0].field1420) { // L: 21
+ return var0.field1468 == class116.field1455 ? var0.field1462[0].field1423 : InvDefinition.method3349(var0, var1, true); // L: 22
+ } else if (var1 > (float)var0.field1462[var0.method2709() - 1].field1420) {
+ return var0.field1461 == class116.field1455 ? var0.field1462[var0.method2709() - 1].field1423 : InvDefinition.method3349(var0, var1, false); // L: 31
+ } else if (var0.field1459) {
+ return var0.field1462[0].field1423;
+ } else {
+ class113 var2 = var0.method2717(var1);
+ boolean var3 = false;
+ boolean var4 = false;
+ if (var2 == null) {
+ return 0.0F; // L: 183
+ } else {
+ float var7;
+ if (0.0D == (double)var2.field1419 && (double)var2.field1425 == 0.0D) {
+ var3 = true; // L: 41
+ } else if (Float.MAX_VALUE == var2.field1419 && Float.MAX_VALUE == var2.field1425) {
+ var4 = true;
+ } else if (var2.field1426 != null) {
+ if (var0.field1472) {
+ float[] var5 = new float[4]; // L: 48
+ float[] var6 = new float[4];
+ var5[0] = (float)var2.field1420;
+ var6[0] = var2.field1423;
+ var5[1] = var5[0] + var2.field1419 * 0.33333334F;
+ var6[1] = 0.33333334F * var2.field1425 + var6[0];
+ var5[3] = (float)var2.field1426.field1420;
+ var6[3] = var2.field1426.field1423;
+ var5[2] = var5[3] - 0.33333334F * var2.field1426.field1421; // L: 56
+ var6[2] = var6[3] - var2.field1426.field1422 * 0.33333334F; // L: 57
+ if (var0.field1463) {
+ if (var0 != null) {
+ var7 = var5[3] - var5[0];
+ if (0.0D != (double)var7) { // L: 64
+ float var8 = var5[1] - var5[0]; // L: 67
+ float var9 = var5[2] - var5[0]; // L: 68
+ Float var10 = var8 / var7; // L: 69
+ Float var11 = var9 / var7; // L: 70
+ var0.field1470 = var10 == 0.33333334F && var11 == 0.6666667F; // L: 71
+ float var12 = var10; // L: 72
+ float var13 = var11; // L: 73
+ if ((double)var10 < 0.0D) { // L: 74
+ var10 = 0.0F;
+ }
+
+ if ((double)var11 > 1.0D) { // L: 75
+ var11 = 1.0F;
+ }
+
+ if ((double)var10 > 1.0D || var11 < -1.0F) { // L: 76
+ Float var14 = var10; // L: 77
+ Float var15 = 1.0F - var11; // L: 80
+ if (var10 < 0.0F) { // L: 81
+ var14 = 0.0F;
+ }
+
+ if (var15 < 0.0F) { // L: 82
+ var15 = 0.0F;
+ }
+
+ if (var14 > 1.0F || var15 > 1.0F) { // L: 83
+ float var16 = (float)((double)(var14 * (var14 - 2.0F + var15)) + (double)var15 * ((double)var15 - 2.0D) + 1.0D); // L: 84
+ if (class114.field1429 + var16 > 0.0F) { // L: 85
+ ObjectComposition.method3690(var14, var15); // L: 86
+ }
+ }
+
+ var15 = 1.0F - var15; // L: 89
+ }
+
+ if (var10 != var12) { // L: 92
+ var5[1] = var5[0] + var10 * var7; // L: 93
+ if ((double)var12 != 0.0D) { // L: 94
+ var6[1] = var6[0] + (var6[1] - var6[0]) * var10 / var12; // L: 95
+ }
+ }
+
+ if (var11 != var13) { // L: 98
+ var5[2] = var5[0] + var11 * var7; // L: 99
+ if (1.0D != (double)var13) { // L: 100
+ var6[2] = (float)((double)var6[3] - (double)(var6[3] - var6[2]) * (1.0D - (double)var11) / (1.0D - (double)var13)); // L: 101
+ }
+ }
+
+ var0.field1464 = var5[0]; // L: 104
+ var0.field1458 = var5[3]; // L: 105
+ class388.method7040(0.0F, var10, var11, 1.0F, var0.field1465); // L: 106
+ class388.method7040(var6[0], var6[1], var6[2], var6[3], var0.field1467); // L: 107
+ }
+ }
+ } else {
+ HealthBar.method2355(var0, var5, var6); // L: 111
+ }
+
+ var0.field1472 = false; // L: 113
+ }
+ } else {
+ var3 = true; // L: 117
+ }
+
+ if (var3) { // L: 119
+ return var2.field1423; // L: 120
+ } else if (var4) { // L: 122
+ return (float)var2.field1420 != var1 && var2.field1426 != null ? var2.field1426.field1423 : var2.field1423; // L: 123 124 127
+ } else {
+ float var17;
+ float var18;
+ if (var0.field1463) { // L: 130
+ if (var0 == null) { // L: 133
+ var18 = 0.0F; // L: 134
+ } else {
+ if (var1 == var0.field1464) { // L: 138
+ var17 = 0.0F; // L: 139
+ } else if (var0.field1458 == var1) { // L: 141
+ var17 = 1.0F; // L: 142
+ } else {
+ var17 = (var1 - var0.field1464) / (var0.field1458 - var0.field1464); // L: 145
+ }
+
+ if (var0.field1470) { // L: 148
+ var7 = var17; // L: 149
+ } else {
+ float[] var19 = new float[]{var0.field1465[0] - var17, var0.field1465[1], var0.field1465[2], var0.field1465[3]}; // L: 152 153 154 155 156
+ float[] var20 = new float[5]; // L: 157
+ int var21 = VerticalAlignment.method3534(var19, 3, 0.0F, true, 1.0F, true, var20); // L: 158
+ if (var21 == 1) { // L: 159
+ var7 = var20[0]; // L: 160
+ } else {
+ var7 = 0.0F; // L: 163
+ }
+ }
+
+ var18 = var0.field1467[0] + var7 * (var0.field1467[1] + (var0.field1467[2] + var7 * var0.field1467[3]) * var7); // L: 166
+ }
+
+ return var18; // L: 168
+ } else {
+ if (var0 == null) { // L: 173
+ var18 = 0.0F; // L: 174
+ } else {
+ var17 = var1 - var0.field1464; // L: 177
+ var18 = var17 * ((var17 * var0.field1465[0] + var0.field1465[1]) * var17 + var0.field1465[2]) + var0.field1465[3]; // L: 178
+ }
+
+ return var18; // L: 180
+ }
+ }
+ }
+ }
+ } else {
+ return 0.0F;
+ }
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;B)V",
+ garbageValue = "0"
+ )
+ public static void method4936(AbstractArchive var0) {
+ EnumComposition.EnumDefinition_archive = var0;
+ } // L: 26
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llb;I)I",
+ garbageValue = "-675208875"
+ )
+ @Export("compareStrings")
+ public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
+ int var3 = var0.length(); // L: 11
+ int var4 = var1.length(); // L: 12
+ int var5 = 0; // L: 13
+ int var6 = 0; // L: 14
+ char var7 = 0; // L: 15
+ char var8 = 0; // L: 16
+
+ while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18
+ if (var5 - var7 >= var3) { // L: 19
+ return -1;
+ }
+
+ if (var6 - var8 >= var4) { // L: 20
+ return 1;
+ }
+
+ char var9;
+ if (var7 != 0) { // L: 23
+ var9 = var7; // L: 24
+ boolean var14 = false; // L: 25
+ } else {
+ var9 = var0.charAt(var5++); // L: 27
+ }
+
+ char var10;
+ if (var8 != 0) { // L: 28
+ var10 = var8; // L: 29
+ boolean var15 = false; // L: 30
+ } else {
+ var10 = var1.charAt(var6++); // L: 32
+ }
+
+ var7 = class127.method2848(var9); // L: 33
+ var8 = class127.method2848(var10); // L: 34
+ var9 = FileSystem.standardizeChar(var9, var2); // L: 35
+ var10 = FileSystem.standardizeChar(var10, var2); // L: 36
+ if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37
+ var9 = Character.toLowerCase(var9); // L: 38
+ var10 = Character.toLowerCase(var10); // L: 39
+ if (var10 != var9) { // L: 40
+ return class137.lowercaseChar(var9, var2) - class137.lowercaseChar(var10, var2);
+ }
+ }
+ }
+
+ int var16 = Math.min(var3, var4); // L: 43
+
+ char var12;
+ int var17;
+ for (var17 = 0; var17 < var16; ++var17) { // L: 44
+ if (var2 == Language.Language_FR) { // L: 45
+ var5 = var3 - 1 - var17; // L: 46
+ var6 = var4 - 1 - var17; // L: 47
+ } else {
+ var6 = var17; // L: 49
+ var5 = var17;
+ }
+
+ char var11 = var0.charAt(var5); // L: 50
+ var12 = var1.charAt(var6); // L: 51
+ if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52
+ var11 = Character.toLowerCase(var11); // L: 53
+ var12 = Character.toLowerCase(var12); // L: 54
+ if (var11 != var12) {
+ return class137.lowercaseChar(var11, var2) - class137.lowercaseChar(var12, var2); // L: 55
+ }
+ }
+ }
+
+ var17 = var3 - var4; // L: 58
+ if (var17 != 0) { // L: 59
+ return var17;
+ } else {
+ for (int var18 = 0; var18 < var16; ++var18) { // L: 60
+ var12 = var0.charAt(var18); // L: 61
+ char var13 = var1.charAt(var18); // L: 62
+ if (var12 != var13) { // L: 63
+ return class137.lowercaseChar(var12, var2) - class137.lowercaseChar(var13, var2);
+ }
+ }
+
+ return 0; // L: 65
+ }
+ }
+
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I)I",
+ garbageValue = "1003329413"
+ )
+ static int method4947(Widget var0) {
+ if (var0.type != 11) { // L: 1248
+ Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1249
+ return 1; // L: 1250
+ } else {
+ String var1 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1252
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var0.method5626(var1); // L: 1253
+ return 1; // L: 1254
+ }
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java
index 1d817f6932..c4ce5c51ad 100644
--- a/runescape-client/src/main/java/WorldMapSection1.java
+++ b/runescape-client/src/main/java/WorldMapSection1.java
@@ -3,49 +3,43 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
-@ObfuscatedName("in")
+@ObfuscatedName("ir")
@Implements("WorldMapSection1")
public class WorldMapSection1 implements WorldMapSection {
- @ObfuscatedName("sj")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1030373785
- )
- static int field2898;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -1054024445
+ intValue = -2036174811
)
@Export("minPlane")
int minPlane;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 268591679
+ intValue = 1537995989
)
@Export("planes")
int planes;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1612610403
+ intValue = -300775863
)
@Export("regionStartX")
int regionStartX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -462292543
+ intValue = 1381396249
)
@Export("regionStartY")
int regionStartY;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1693287799
+ intValue = -1589676553
)
@Export("regionEndX")
int regionEndX;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1403534241
+ intValue = 1377237821
)
@Export("regionEndY")
int regionEndY;
@@ -53,10 +47,10 @@ public class WorldMapSection1 implements WorldMapSection {
WorldMapSection1() {
} // L: 14
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-1792723155"
+ descriptor = "(Lhg;I)V",
+ garbageValue = "1585435431"
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
@@ -78,34 +72,34 @@ public class WorldMapSection1 implements WorldMapSection {
} // L: 22
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IIIB)Z",
- garbageValue = "1"
+ descriptor = "(IIII)Z",
+ garbageValue = "-929111713"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
- if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 26
+ if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 26
return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 29
} else {
return false; // L: 27
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "2"
+ descriptor = "(III)Z",
+ garbageValue = "-47549823"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(IIII)[I",
- garbageValue = "-41287528"
+ garbageValue = "-561571792"
)
@Export("getBorderTileLengths")
public int[] getBorderTileLengths(int var1, int var2, int var3) {
@@ -117,10 +111,10 @@ public class WorldMapSection1 implements WorldMapSection {
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(III)Lkd;",
- garbageValue = "289851355"
+ garbageValue = "531454030"
)
@Export("coord")
public Coord coord(int var1, int var2) {
@@ -133,10 +127,10 @@ public class WorldMapSection1 implements WorldMapSection {
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-113194936"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-27"
)
@Export("read")
public void read(Buffer var1) {
@@ -149,71 +143,12 @@ public class WorldMapSection1 implements WorldMapSection {
this.postRead(); // L: 66
} // L: 67
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "38"
+ descriptor = "(I)V",
+ garbageValue = "-1018712398"
)
@Export("postRead")
void postRead() {
} // L: 69
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "1032077651"
- )
- @Export("Widget_unpackTargetMask")
- public static int Widget_unpackTargetMask(int var0) {
- return var0 >> 11 & 63; // L: 13
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;",
- garbageValue = "53"
- )
- @Export("loadClassFromDescriptor")
- static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
- if (var0.equals("B")) { // L: 212
- return Byte.TYPE;
- } else if (var0.equals("I")) { // L: 213
- return Integer.TYPE;
- } else if (var0.equals("S")) { // L: 214
- return Short.TYPE;
- } else if (var0.equals("J")) { // L: 215
- return Long.TYPE;
- } else if (var0.equals("Z")) { // L: 216
- return Boolean.TYPE;
- } else if (var0.equals("F")) { // L: 217
- return Float.TYPE;
- } else if (var0.equals("D")) { // L: 218
- return Double.TYPE;
- } else if (var0.equals("C")) { // L: 219
- return Character.TYPE;
- } else {
- return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 220 221
- }
- }
-
- @ObfuscatedName("gv")
- @ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "20733"
- )
- static final void method4839() {
- if (Decimator.ClanChat_inClanChat) { // L: 3827
- if (PcmPlayer.friendsChat != null) { // L: 3828
- PcmPlayer.friendsChat.sort(); // L: 3829
- }
-
- for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3832
- Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3833
- var1.clearIsInFriendsChat(); // L: 3834
- }
-
- Decimator.ClanChat_inClanChat = false; // L: 3837
- }
-
- } // L: 3839
}
diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java
index 7e9996b0b4..064fae8411 100644
--- a/runescape-client/src/main/java/WorldMapSection2.java
+++ b/runescape-client/src/main/java/WorldMapSection2.java
@@ -4,153 +4,153 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ho")
+@ObfuscatedName("ht")
@Implements("WorldMapSection2")
public class WorldMapSection2 implements WorldMapSection {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1506776431
+ intValue = 1337709959
)
@Export("minPlane")
int minPlane;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- intValue = 424127313
+ intValue = -2041431669
)
@Export("planes")
int planes;
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 1432871815
+ intValue = 313441815
)
@Export("regionStartX")
int regionStartX;
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1348644299
+ intValue = 1342474779
)
@Export("regionStartY")
int regionStartY;
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1690940403
+ intValue = -1683492737
)
@Export("regionEndX")
int regionEndX;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 1797936433
+ intValue = -966327777
)
@Export("regionEndY")
int regionEndY;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 868620289
+ intValue = -578189287
)
- int field2723;
- @ObfuscatedName("s")
+ int field2693;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = -979796665
+ intValue = 306558807
)
- int field2730;
- @ObfuscatedName("r")
+ int field2689;
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = 1754400747
+ intValue = 2143624865
)
- int field2732;
- @ObfuscatedName("v")
+ int field2695;
+ @ObfuscatedName("i")
@ObfuscatedGetter(
- intValue = -1520058109
+ intValue = 1064831407
)
- int field2729;
+ int field2687;
WorldMapSection2() {
} // L: 18
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-1792723155"
+ descriptor = "(Lhg;I)V",
+ garbageValue = "1585435431"
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
- if (var1.regionLowX > this.field2723) { // L: 22
- var1.regionLowX = this.field2723;
+ if (var1.regionLowX > this.field2693) { // L: 22
+ var1.regionLowX = this.field2693;
}
- if (var1.regionHighX < this.field2732) {
- var1.regionHighX = this.field2732; // L: 23
+ if (var1.regionHighX < this.field2695) {
+ var1.regionHighX = this.field2695; // L: 23
}
- if (var1.regionLowY > this.field2730) { // L: 24
- var1.regionLowY = this.field2730;
+ if (var1.regionLowY > this.field2689) { // L: 24
+ var1.regionLowY = this.field2689;
}
- if (var1.regionHighY < this.field2729) { // L: 25
- var1.regionHighY = this.field2729;
+ if (var1.regionHighY < this.field2687) { // L: 25
+ var1.regionHighY = this.field2687;
}
} // L: 26
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IIIB)Z",
- garbageValue = "1"
+ descriptor = "(IIII)Z",
+ garbageValue = "-929111713"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
- if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 30
+ if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 30
return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 33
} else {
return false; // L: 31
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "2"
+ descriptor = "(III)Z",
+ garbageValue = "-47549823"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
- return var1 >> 6 >= this.field2723 && var1 >> 6 <= this.field2732 && var2 >> 6 >= this.field2730 && var2 >> 6 <= this.field2729; // L: 38
+ return var1 >> 6 >= this.field2693 && var1 >> 6 <= this.field2695 && var2 >> 6 >= this.field2689 && var2 >> 6 <= this.field2687; // L: 38
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(IIII)[I",
- garbageValue = "-41287528"
+ garbageValue = "-561571792"
)
@Export("getBorderTileLengths")
public int[] getBorderTileLengths(int var1, int var2, int var3) {
if (!this.containsCoord(var1, var2, var3)) { // L: 43
return null; // L: 44
} else {
- int[] var4 = new int[]{var2 + (this.field2723 * 64 - this.regionStartX * 64), var3 + (this.field2730 * 64 - this.regionStartY * 64)}; // L: 46 47 48
+ int[] var4 = new int[]{var2 + (this.field2693 * 64 - this.regionStartX * 64), var3 + (this.field2689 * 64 - this.regionStartY * 64)}; // L: 46 47 48
return var4; // L: 49
}
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(III)Lkd;",
- garbageValue = "289851355"
+ garbageValue = "531454030"
)
@Export("coord")
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) { // L: 54
return null; // L: 55
} else {
- int var3 = this.regionStartX * 64 - this.field2723 * 64 + var1; // L: 57
- int var4 = var2 + (this.regionStartY * 64 - this.field2730 * 64); // L: 58
+ int var3 = this.regionStartX * 64 - this.field2693 * 64 + var1; // L: 57
+ int var4 = var2 + (this.regionStartY * 64 - this.field2689 * 64); // L: 58
return new Coord(this.minPlane, var3, var4); // L: 59
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-113194936"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-27"
)
@Export("read")
public void read(Buffer var1) {
@@ -160,19 +160,61 @@ public class WorldMapSection2 implements WorldMapSection {
this.regionStartY = var1.readUnsignedShort(); // L: 67
this.regionEndX = var1.readUnsignedShort(); // L: 68
this.regionEndY = var1.readUnsignedShort(); // L: 69
- this.field2723 = var1.readUnsignedShort(); // L: 70
- this.field2730 = var1.readUnsignedShort(); // L: 71
- this.field2732 = var1.readUnsignedShort(); // L: 72
- this.field2729 = var1.readUnsignedShort(); // L: 73
+ this.field2693 = var1.readUnsignedShort(); // L: 70
+ this.field2689 = var1.readUnsignedShort(); // L: 71
+ this.field2695 = var1.readUnsignedShort(); // L: 72
+ this.field2687 = var1.readUnsignedShort(); // L: 73
this.postRead(); // L: 74
} // L: 75
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(B)V",
- garbageValue = "-80"
+ garbageValue = "20"
)
@Export("postRead")
void postRead() {
} // L: 77
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(II)Z",
+ garbageValue = "692019623"
+ )
+ @Export("loadInterface")
+ public static boolean loadInterface(int var0) {
+ if (class228.Widget_loadedInterfaces[var0]) { // L: 237
+ return true;
+ } else if (!MusicPatchPcmStream.Widget_archive.tryLoadGroup(var0)) { // L: 238
+ return false;
+ } else {
+ int var1 = MusicPatchPcmStream.Widget_archive.getGroupFileCount(var0); // L: 239
+ if (var1 == 0) { // L: 240
+ class228.Widget_loadedInterfaces[var0] = true; // L: 241
+ return true; // L: 242
+ } else {
+ if (SoundCache.Widget_interfaceComponents[var0] == null) { // L: 244
+ SoundCache.Widget_interfaceComponents[var0] = new Widget[var1];
+ }
+
+ for (int var2 = 0; var2 < var1; ++var2) { // L: 245
+ if (SoundCache.Widget_interfaceComponents[var0][var2] == null) { // L: 246
+ byte[] var3 = MusicPatchPcmStream.Widget_archive.takeFile(var0, var2); // L: 247
+ if (var3 != null) { // L: 248
+ SoundCache.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 249
+ SoundCache.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 250
+ if (var3[0] == -1) { // L: 251
+ SoundCache.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
+ } else {
+ SoundCache.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 252
+ }
+ }
+ }
+ }
+
+ class228.Widget_loadedInterfaces[var0] = true; // L: 256
+ return true; // L: 257
+ }
+ }
+ }
}
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index 3e02435494..695fc2e6b1 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -3,86 +3,253 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("hn")
+@ObfuscatedName("hv")
@Implements("WorldMapSectionType")
public enum WorldMapSectionType implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lhn;"
+ descriptor = "Lhv;"
)
@Export("WORLDMAPSECTIONTYPE0")
WORLDMAPSECTIONTYPE0(1, (byte)0),
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lhn;"
+ descriptor = "Lhv;"
)
@Export("WORLDMAPSECTIONTYPE1")
WORLDMAPSECTIONTYPE1(3, (byte)1),
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lhn;"
+ descriptor = "Lhv;"
)
@Export("WORLDMAPSECTIONTYPE2")
- WORLDMAPSECTIONTYPE2(0, (byte)2),
- @ObfuscatedName("k")
+ WORLDMAPSECTIONTYPE2(2, (byte)2),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lhn;"
+ descriptor = "Lhv;"
)
@Export("WORLDMAPSECTIONTYPE3")
- WORLDMAPSECTIONTYPE3(2, (byte)3);
+ WORLDMAPSECTIONTYPE3(0, (byte)3);
- @ObfuscatedName("hg")
- @ObfuscatedGetter(
- intValue = -156777687
+ @ObfuscatedName("s")
+ public static short[] field2793;
+ @ObfuscatedName("eq")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
)
- static int field2828;
- @ObfuscatedName("a")
+ @Export("archive9")
+ static Archive archive9;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1514256887
+ intValue = -2074450081
)
@Export("type")
final int type;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@Export("id")
final byte id;
WorldMapSectionType(int var3, byte var4) {
- this.type = var3; // L: 17
- this.id = var4; // L: 18
- } // L: 19
+ this.type = var3; // L: 21
+ this.id = var4; // L: 22
+ } // L: 23
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.id; // L: 23
+ return this.id; // L: 27
}
- @ObfuscatedName("o")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(II)Lfm;",
- garbageValue = "-1177052487"
+ descriptor = "(B)[Lhv;",
+ garbageValue = "0"
)
- @Export("getNpcDefinition")
- public static NPCComposition getNpcDefinition(int var0) {
- NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 65
- if (var1 != null) { // L: 66
- return var1;
- } else {
- byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 67
- var1 = new NPCComposition(); // L: 68
- var1.id = var0; // L: 69
- if (var2 != null) { // L: 70
- var1.decode(new Buffer(var2));
- }
+ static WorldMapSectionType[] method4950() {
+ return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0}; // L: 17
+ }
- var1.postDecode(); // L: 71
- NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 72
- return var1; // L: 73
+ @ObfuscatedName("ap")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-803910111"
+ )
+ static int method4953(int var0, Script var1, boolean var2) {
+ int var3;
+ if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2902
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2903
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2904
+ return 1; // L: 2905
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2907
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2908
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2909
+ return 1; // L: 2910
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2912
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2913
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2914
+ return 1; // L: 2915
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2917
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2918
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2919
+ return 1; // L: 2920
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2922
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2923
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2924
+ return 1; // L: 2925
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2927
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2928
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2929
+ return 1; // L: 2930
+ } else {
+ int var13;
+ if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2932
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2933
+ var13 = Client.grandExchangeOffers[var3].status(); // L: 2934
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2935
+ return 1; // L: 2936
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2938
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2939
+ var13 = Client.grandExchangeOffers[var3].status(); // L: 2940
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2941
+ return 1; // L: 2942
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2944
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2945
+ var13 = Client.grandExchangeOffers[var3].status(); // L: 2946
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2947
+ return 1; // L: 2948
+ } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2950
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2951
+ var13 = Client.grandExchangeOffers[var3].status(); // L: 2952
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2953
+ return 1; // L: 2954
+ } else {
+ boolean var12;
+ if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2956
+ var12 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2957
+ if (class143.grandExchangeEvents != null) { // L: 2958
+ class143.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2959
+ }
+
+ return 1; // L: 2961
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2963
+ var12 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2964
+ if (class143.grandExchangeEvents != null) { // L: 2965
+ class143.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2966
+ }
+
+ return 1; // L: 2968
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2970
+ class446.Interpreter_intStackSize -= 2; // L: 2971
+ var12 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] == 1; // L: 2972
+ boolean var11 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1] == 1; // L: 2973
+ if (class143.grandExchangeEvents != null) { // L: 2974
+ Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2975
+ class143.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2976
+ }
+
+ return 1; // L: 2978
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2980
+ var12 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2981
+ if (class143.grandExchangeEvents != null) { // L: 2982
+ class143.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2983
+ }
+
+ return 1; // L: 2985
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2987
+ var12 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 2988
+ if (class143.grandExchangeEvents != null) { // L: 2989
+ class143.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2990
+ }
+
+ return 1; // L: 2992
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2994
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class143.grandExchangeEvents == null ? 0 : class143.grandExchangeEvents.events.size(); // L: 2995
+ return 1; // L: 2996
+ } else {
+ GrandExchangeEvent var4;
+ if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2998
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2999
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3000
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.world; // L: 3001
+ return 1; // L: 3002
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 3004
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3005
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3006
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 3007
+ return 1; // L: 3008
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 3010
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3011
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3012
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 3013
+ return 1; // L: 3014
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 3016
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3017
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3018
+ long var5 = class115.method2692() - class270.field3177 - var4.age; // L: 3019
+ int var7 = (int)(var5 / 3600000L); // L: 3020
+ int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 3021
+ int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 3022
+ String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 3023
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; // L: 3024
+ return 1; // L: 3025
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 3027
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3028
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3029
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 3030
+ return 1; // L: 3031
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 3033
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3034
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3035
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 3036
+ return 1; // L: 3037
+ } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 3039
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3040
+ var4 = (GrandExchangeEvent)class143.grandExchangeEvents.events.get(var3); // L: 3041
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 3042
+ return 1; // L: 3043
+ } else {
+ return 2; // L: 3045
+ }
+ }
+ }
+ }
+ }
+
+ @ObfuscatedName("ay")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1351074150"
+ )
+ static int method4948(int var0, Script var1, boolean var2) {
+ if (var0 >= 7200 && var0 < 7204) { // L: 4649
+ class446.Interpreter_intStackSize -= 5; // L: 4650
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4651
+ return 1; // L: 4652
+ } else if (var0 == 7204) { // L: 4654
+ class446.Interpreter_intStackSize -= 6; // L: 4655
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4656
+ return 1; // L: 4657
+ } else if (var0 >= 7205 && var0 < 7209) { // L: 4659
+ Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize - 1] = -1; // L: 4660
+ return 1; // L: 4661
+ } else if (var0 == 7209) { // L: 4663
+ class446.Interpreter_intStackSize -= 2; // L: 4664
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4665
+ return 1; // L: 4666
+ } else if (var0 >= 7210 && var0 < 7214) { // L: 4668
+ --class446.Interpreter_intStackSize; // L: 4669
+ return 1; // L: 4670
+ } else if (var0 == 7214) { // L: 4672
+ class446.Interpreter_intStackSize -= 2; // L: 4673
+ return 1; // L: 4674
+ } else {
+ return 2; // L: 4676
}
}
}
diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java
index 4fdb02b9ea..10e1f2b7ed 100644
--- a/runescape-client/src/main/java/WorldMapSprite.java
+++ b/runescape-client/src/main/java/WorldMapSprite.java
@@ -3,10 +3,16 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ix")
+@ObfuscatedName("is")
@Implements("WorldMapSprite")
public final class WorldMapSprite {
- @ObfuscatedName("q")
+ @ObfuscatedName("em")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive14")
+ static Archive archive14;
+ @ObfuscatedName("v")
@Export("tileColors")
final int[] tileColors;
@@ -18,28 +24,350 @@ public final class WorldMapSprite {
this.tileColors = var1; // L: 15
} // L: 16
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(IIB)I",
- garbageValue = "28"
+ garbageValue = "14"
)
@Export("getTileColor")
final int getTileColor(int var1, int var2) {
- return this.tileColors[var1 + var2 * 64]; // L: 19
+ return this.tileColors[var2 * 64 + var1]; // L: 19
}
- @ObfuscatedName("d")
+ @ObfuscatedName("ho")
@ObfuscatedSignature(
- descriptor = "(IZII)V",
- garbageValue = "-952596159"
+ descriptor = "(Ljw;I)V",
+ garbageValue = "-419484906"
)
- public static final void method4809(int var0, boolean var1, int var2) {
- if (var0 >= 8000 && var0 <= 48000) { // L: 45
- PcmPlayer.field300 = var0; // L: 46
- ArchiveDiskAction.PcmPlayer_stereo = var1; // L: 47
- class29.field172 = var2; // L: 48
+ static final void method4998(class262 var0) {
+ PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7489
+ int var2;
+ int var3;
+ int var4;
+ int var5;
+ int var6;
+ int var7;
+ if (class262.field3022 == var0) { // L: 7490
+ var2 = var1.readUnsignedShort(); // L: 7491
+ var3 = var1.method7767(); // L: 7492
+ var4 = (var3 >> 4 & 7) + class10.field53; // L: 7493
+ var5 = (var3 & 7) + class298.field3558; // L: 7494
+ var6 = var1.method7767(); // L: 7495
+ var7 = var1.readUnsignedShort(); // L: 7496
+ if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7497
+ var4 = var4 * 128 + 64; // L: 7498
+ var5 = var5 * 128 + 64; // L: 7499
+ GraphicsObject var45 = new GraphicsObject(var2, PacketWriter.Client_plane, var4, var5, SceneTilePaint.getTileHeight(var4, var5, PacketWriter.Client_plane) - var6, var7, Client.cycle); // L: 7500
+ Client.graphicsObjects.addFirst(var45); // L: 7501
+ }
+
} else {
- throw new IllegalArgumentException();
+ int var8;
+ if (class262.field3023 == var0) { // L: 7505
+ var2 = var1.method7765(); // L: 7506
+ var3 = var2 >> 2; // L: 7507
+ var4 = var2 & 3; // L: 7508
+ var5 = Client.field582[var3]; // L: 7509
+ var6 = var1.method7765(); // L: 7510
+ var7 = (var6 >> 4 & 7) + class10.field53; // L: 7511
+ var8 = (var6 & 7) + class298.field3558; // L: 7512
+ if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7513
+ Canvas.updatePendingSpawn(PacketWriter.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 7514
+ }
+
+ } else {
+ int var9;
+ int var10;
+ int var11;
+ int var12;
+ int var13;
+ byte var14;
+ if (class262.field3021 == var0) { // L: 7518
+ var2 = var1.readUnsignedByte() * 4; // L: 7519
+ var3 = var1.readUnsignedShort(); // L: 7520
+ var4 = var1.readUnsignedShort(); // L: 7521
+ var5 = var1.readUnsignedByte(); // L: 7522
+ var6 = var1.method7813(); // L: 7523
+ var7 = var1.method7767(); // L: 7524
+ var8 = var1.method7765(); // L: 7525
+ var9 = (var8 >> 4 & 7) + class10.field53; // L: 7526
+ var10 = (var8 & 7) + class298.field3558; // L: 7527
+ var11 = var1.method7765() * 4; // L: 7528
+ byte var40 = var1.method7952(); // L: 7529
+ var13 = var1.method7776(); // L: 7530
+ var14 = var1.readByte(); // L: 7531
+ int var41 = var14 + var9; // L: 7532
+ var12 = var40 + var10; // L: 7533
+ if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var41 >= 0 && var12 >= 0 && var41 < 104 && var12 < 104 && var4 != 65535) { // L: 7534
+ var9 = var9 * 128 + 64; // L: 7535
+ var10 = var10 * 128 + 64; // L: 7536
+ var41 = var41 * 128 + 64; // L: 7537
+ var12 = var12 * 128 + 64; // L: 7538
+ Projectile var36 = new Projectile(var4, PacketWriter.Client_plane, var9, var10, SceneTilePaint.getTileHeight(var9, var10, PacketWriter.Client_plane) - var11, var13 + Client.cycle, var3 + Client.cycle, var7, var5, var6, var2); // L: 7539
+ var36.setDestination(var41, var12, SceneTilePaint.getTileHeight(var41, var12, PacketWriter.Client_plane) - var2, var13 + Client.cycle); // L: 7540
+ Client.projectiles.addFirst(var36); // L: 7541
+ }
+
+ } else {
+ if (class262.field3020 == var0) { // L: 7545
+ var2 = var1.method7765(); // L: 7546
+ var3 = var2 >> 4 & 15; // L: 7547
+ var4 = var2 & 7; // L: 7548
+ var5 = var1.method7767(); // L: 7549
+ var6 = var1.readUnsignedShort(); // L: 7550
+ var7 = var1.readUnsignedByte(); // L: 7551
+ var8 = (var7 >> 4 & 7) + class10.field53; // L: 7552
+ var9 = (var7 & 7) + class298.field3558; // L: 7553
+ if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 7554
+ var10 = var3 + 1; // L: 7555
+ if (class101.localPlayer.pathX[0] >= var8 - var10 && class101.localPlayer.pathX[0] <= var8 + var10 && class101.localPlayer.pathY[0] >= var9 - var10 && class101.localPlayer.pathY[0] <= var9 + var10 && class19.clientPreferences.method2262() != 0 && var4 > 0 && Client.soundEffectCount < 50) { // L: 7556 7557
+ Client.soundEffectIds[Client.soundEffectCount] = var6; // L: 7558
+ Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 7559
+ Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; // L: 7560
+ Client.soundEffects[Client.soundEffectCount] = null; // L: 7561
+ Client.soundLocations[Client.soundEffectCount] = var3 + (var9 << 8) + (var8 << 16); // L: 7562
+ ++Client.soundEffectCount; // L: 7563
+ }
+ }
+ }
+
+ if (class262.field3017 == var0) { // L: 7568
+ var2 = var1.readUnsignedByte(); // L: 7569
+ var3 = (var2 >> 4 & 7) + class10.field53; // L: 7570
+ var4 = (var2 & 7) + class298.field3558; // L: 7571
+ var5 = var1.method7774(); // L: 7572
+ var6 = var1.method7774(); // L: 7573
+ var7 = var1.readUnsignedShort(); // L: 7574
+ if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7575
+ NodeDeque var34 = Client.groundItems[PacketWriter.Client_plane][var3][var4]; // L: 7576
+ if (var34 != null) { // L: 7577
+ for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { // L: 7578 7579 7584
+ if ((var6 & 32767) == var35.id && var5 == var35.quantity) { // L: 7580
+ var35.quantity = var7; // L: 7581
+ break;
+ }
+ }
+
+ class133.updateItemPile(var3, var4); // L: 7586
+ }
+ }
+
+ } else {
+ TileItem var32;
+ if (class262.field3019 == var0) { // L: 7591
+ var2 = var1.readUnsignedShort(); // L: 7592
+ var3 = var1.method7767(); // L: 7593
+ var4 = (var3 >> 4 & 7) + class10.field53; // L: 7594
+ var5 = (var3 & 7) + class298.field3558; // L: 7595
+ var6 = var1.method7775(); // L: 7596
+ if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7597
+ var32 = new TileItem(); // L: 7598
+ var32.id = var2; // L: 7599
+ var32.quantity = var6; // L: 7600
+ if (Client.groundItems[PacketWriter.Client_plane][var4][var5] == null) { // L: 7601
+ Client.groundItems[PacketWriter.Client_plane][var4][var5] = new NodeDeque();
+ }
+
+ Client.groundItems[PacketWriter.Client_plane][var4][var5].addFirst(var32); // L: 7602
+ class133.updateItemPile(var4, var5); // L: 7603
+ }
+
+ } else {
+ if (class262.field3024 == var0) { // L: 7607
+ var2 = var1.method7765(); // L: 7608
+ var3 = (var2 >> 4 & 7) + class10.field53; // L: 7609
+ var4 = (var2 & 7) + class298.field3558; // L: 7610
+ byte var37 = var1.method7952(); // L: 7611
+ var6 = var1.method7775(); // L: 7612
+ byte var38 = var1.method7952(); // L: 7613
+ byte var39 = var1.method7768(); // L: 7614
+ var9 = var1.method7767(); // L: 7615
+ var10 = var9 >> 2; // L: 7616
+ var11 = var9 & 3; // L: 7617
+ var12 = Client.field582[var10]; // L: 7618
+ var13 = var1.method7776(); // L: 7619
+ var14 = var1.method7769(); // L: 7620
+ int var15 = var1.method7775(); // L: 7621
+ int var16 = var1.readUnsignedShort(); // L: 7622
+ Player var17;
+ if (var15 == Client.localPlayerIndex) { // L: 7624
+ var17 = class101.localPlayer;
+ } else {
+ var17 = Client.players[var15]; // L: 7625
+ }
+
+ if (var17 != null) { // L: 7626
+ ObjectComposition var18 = class162.getObjectDefinition(var6); // L: 7627
+ int var19;
+ int var20;
+ if (var11 != 1 && var11 != 3) { // L: 7630
+ var19 = var18.sizeX; // L: 7635
+ var20 = var18.sizeY; // L: 7636
+ } else {
+ var19 = var18.sizeY; // L: 7631
+ var20 = var18.sizeX; // L: 7632
+ }
+
+ int var21 = var3 + (var19 >> 1); // L: 7638
+ int var22 = var3 + (var19 + 1 >> 1); // L: 7639
+ int var23 = var4 + (var20 >> 1); // L: 7640
+ int var24 = var4 + (var20 + 1 >> 1); // L: 7641
+ int[][] var25 = Tiles.Tiles_heights[PacketWriter.Client_plane]; // L: 7642
+ int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 7643
+ int var27 = (var3 << 7) + (var19 << 6); // L: 7644
+ int var28 = (var4 << 7) + (var20 << 6); // L: 7645
+ Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7646
+ if (var29 != null) { // L: 7647
+ Canvas.updatePendingSpawn(PacketWriter.Client_plane, var3, var4, var12, -1, 0, 0, var13 + 1, var16 + 1); // L: 7648
+ var17.animationCycleStart = var13 + Client.cycle; // L: 7649
+ var17.animationCycleEnd = var16 + Client.cycle; // L: 7650
+ var17.model0 = var29; // L: 7651
+ var17.field1095 = var19 * 64 + var3 * 128; // L: 7652
+ var17.field1108 = var20 * 64 + var4 * 128; // L: 7653
+ var17.tileHeight2 = var26; // L: 7654
+ byte var30;
+ if (var37 > var39) { // L: 7655
+ var30 = var37; // L: 7656
+ var37 = var39; // L: 7657
+ var39 = var30; // L: 7658
+ }
+
+ if (var38 > var14) { // L: 7660
+ var30 = var38; // L: 7661
+ var38 = var14; // L: 7662
+ var14 = var30; // L: 7663
+ }
+
+ var17.minX = var37 + var3; // L: 7665
+ var17.maxX = var39 + var3; // L: 7666
+ var17.minY = var4 + var38; // L: 7667
+ var17.maxY = var4 + var14; // L: 7668
+ }
+ }
+ }
+
+ if (class262.field3015 == var0) { // L: 7672
+ var2 = var1.method7765(); // L: 7673
+ var3 = var2 >> 2; // L: 7674
+ var4 = var2 & 3; // L: 7675
+ var5 = Client.field582[var3]; // L: 7676
+ var6 = var1.method7774(); // L: 7677
+ var7 = var1.readUnsignedByte(); // L: 7678
+ var8 = (var7 >> 4 & 7) + class10.field53; // L: 7679
+ var9 = (var7 & 7) + class298.field3558; // L: 7680
+ if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7681
+ if (var5 == 0) { // L: 7682
+ BoundaryObject var33 = class356.scene.method4333(PacketWriter.Client_plane, var8, var9); // L: 7683
+ if (var33 != null) { // L: 7684
+ var11 = Decimator.Entity_unpackID(var33.tag); // L: 7685
+ if (var3 == 2) { // L: 7686
+ var33.renderable1 = new DynamicObject(var11, 2, var4 + 4, PacketWriter.Client_plane, var8, var9, var6, false, var33.renderable1); // L: 7687
+ var33.renderable2 = new DynamicObject(var11, 2, var4 + 1 & 3, PacketWriter.Client_plane, var8, var9, var6, false, var33.renderable2); // L: 7688
+ } else {
+ var33.renderable1 = new DynamicObject(var11, var3, var4, PacketWriter.Client_plane, var8, var9, var6, false, var33.renderable1); // L: 7690
+ }
+ }
+ }
+
+ if (var5 == 1) { // L: 7693
+ WallDecoration var42 = class356.scene.method4178(PacketWriter.Client_plane, var8, var9); // L: 7694
+ if (var42 != null) { // L: 7695
+ var11 = Decimator.Entity_unpackID(var42.tag); // L: 7696
+ if (var3 != 4 && var3 != 5) { // L: 7697
+ if (var3 == 6) { // L: 7698
+ var42.renderable1 = new DynamicObject(var11, 4, var4 + 4, PacketWriter.Client_plane, var8, var9, var6, false, var42.renderable1);
+ } else if (var3 == 7) { // L: 7699
+ var42.renderable1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, PacketWriter.Client_plane, var8, var9, var6, false, var42.renderable1);
+ } else if (var3 == 8) { // L: 7700
+ var42.renderable1 = new DynamicObject(var11, 4, var4 + 4, PacketWriter.Client_plane, var8, var9, var6, false, var42.renderable1); // L: 7701
+ var42.renderable2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, PacketWriter.Client_plane, var8, var9, var6, false, var42.renderable2); // L: 7702
+ }
+ } else {
+ var42.renderable1 = new DynamicObject(var11, 4, var4, PacketWriter.Client_plane, var8, var9, var6, false, var42.renderable1);
+ }
+ }
+ }
+
+ if (var5 == 2) { // L: 7706
+ GameObject var43 = class356.scene.getGameObject(PacketWriter.Client_plane, var8, var9); // L: 7707
+ if (var3 == 11) { // L: 7708
+ var3 = 10;
+ }
+
+ if (var43 != null) { // L: 7709
+ var43.renderable = new DynamicObject(Decimator.Entity_unpackID(var43.tag), var3, var4, PacketWriter.Client_plane, var8, var9, var6, false, var43.renderable);
+ }
+ }
+
+ if (var5 == 3) { // L: 7711
+ FloorDecoration var44 = class356.scene.getFloorDecoration(PacketWriter.Client_plane, var8, var9); // L: 7712
+ if (var44 != null) { // L: 7713
+ var44.renderable = new DynamicObject(Decimator.Entity_unpackID(var44.tag), 22, var4, PacketWriter.Client_plane, var8, var9, var6, false, var44.renderable);
+ }
+ }
+ }
+
+ } else if (class262.field3018 == var0) { // L: 7718
+ var2 = var1.method7766(); // L: 7719
+ var3 = var2 >> 2; // L: 7720
+ var4 = var2 & 3; // L: 7721
+ var5 = Client.field582[var3]; // L: 7722
+ var6 = var1.method7765(); // L: 7723
+ var7 = (var6 >> 4 & 7) + class10.field53; // L: 7724
+ var8 = (var6 & 7) + class298.field3558; // L: 7725
+ var9 = var1.method7774(); // L: 7726
+ if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7727
+ Canvas.updatePendingSpawn(PacketWriter.Client_plane, var7, var8, var5, var9, var3, var4, 0, -1); // L: 7728
+ }
+
+ } else if (class262.field3016 == var0) { // L: 7732
+ var2 = var1.readUnsignedShort(); // L: 7733
+ var3 = var1.method7766(); // L: 7734
+ var4 = (var3 >> 4 & 7) + class10.field53; // L: 7735
+ var5 = (var3 & 7) + class298.field3558; // L: 7736
+ if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7737
+ NodeDeque var31 = Client.groundItems[PacketWriter.Client_plane][var4][var5]; // L: 7738
+ if (var31 != null) { // L: 7739
+ for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7740 7741 7746
+ if ((var2 & 32767) == var32.id) { // L: 7742
+ var32.remove(); // L: 7743
+ break;
+ }
+ }
+
+ if (var31.last() == null) { // L: 7748
+ Client.groundItems[PacketWriter.Client_plane][var4][var5] = null;
+ }
+
+ class133.updateItemPile(var4, var5); // L: 7749
+ }
+ }
+
+ }
+ }
+ }
+ }
+ }
}
- } // L: 49
+ } // L: 7503 7516 7543 7589 7605 7716 7730 7752 7754
+
+ @ObfuscatedName("jx")
+ @ObfuscatedSignature(
+ descriptor = "(II)Ljava/lang/String;",
+ garbageValue = "-1162269812"
+ )
+ @Export("formatItemStacks")
+ static final String formatItemStacks(int var0) {
+ String var1 = Integer.toString(var0); // L: 10617
+
+ for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10618
+ var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10619
+ }
+
+ if (var1.length() > 9) { // L: 10621
+ return " " + class122.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "";
+ } else {
+ return var1.length() > 6 ? " " + class122.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class122.colorStartTag(16776960) + var1 + ""; // L: 10622 10623
+ }
+ }
}
diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java
index 03b758aed7..d2c5031c72 100644
--- a/runescape-client/src/main/java/Wrapper.java
+++ b/runescape-client/src/main/java/Wrapper.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("im")
+@ObfuscatedName("ip")
@Implements("Wrapper")
public abstract class Wrapper extends DualNode {
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("size")
final int size;
@@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode {
this.size = var1; // L: 9
} // L: 10
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@Export("get")
abstract Object get();
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@Export("isSoft")
abstract boolean isSoft();
}
diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java
index 3c234e377f..39811c5cc1 100644
--- a/runescape-client/src/main/java/class0.java
+++ b/runescape-client/src/main/java/class0.java
@@ -1,28 +1,28 @@
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("o")
+@ObfuscatedName("c")
public class class0 implements class3 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;)Lpx;"
+ descriptor = "(Lqt;)Lqt;"
)
- public Buffer vmethod19(Buffer var1) {
+ public Buffer vmethod10(Buffer var1) {
Buffer var2 = new Buffer(100); // L: 10
- this.method2(var1, var2); // L: 11
+ this.method1(var1, var2); // L: 11
return var2; // L: 12
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;Lpx;)V"
+ descriptor = "(Lqt;Lqt;)V"
)
- void method2(Buffer var1, Buffer var2) {
+ void method1(Buffer var1, Buffer var2) {
class8 var3 = new class8(var1); // L: 16
class5 var4 = new class5(var3); // L: 17
long var5;
- for (var5 = 0L; !var4.method36(var3.method58(), var3.method60(), var5); ++var5) { // L: 18 19 20
+ for (var5 = 0L; !var4.method20(var3.method55(), var3.method57(), var5); ++var5) { // L: 18 19 20
}
var2.writeLong(var5); // L: 22
diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java
index 2f60b2de20..68dda09958 100644
--- a/runescape-client/src/main/java/class1.java
+++ b/runescape-client/src/main/java/class1.java
@@ -1,39 +1,35 @@
import java.util.concurrent.Callable;
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("q")
+@ObfuscatedName("v")
public class class1 implements Callable {
- @ObfuscatedName("l")
+ @ObfuscatedName("u")
+ static int[][][] field2;
+ @ObfuscatedName("ky")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Lkb;"
)
- @Export("HitSplatDefinition_fontsArchive")
- static AbstractArchive HitSplatDefinition_fontsArchive;
- @ObfuscatedName("x")
+ static Widget field4;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Let;"
- )
- static ClanChannel field2;
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "Lqt;"
)
final Buffer field1;
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lk;"
+ descriptor = "Lf;"
)
final class3 field3;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Ls;"
+ descriptor = "Lw;"
)
final class7 this$0;
@ObfuscatedSignature(
- descriptor = "(Ls;Lpx;Lk;)V"
+ descriptor = "(Lw;Lqt;Lf;)V"
)
class1(class7 var1, Buffer var2, class3 var3) {
this.this$0 = var1; // L: 47
@@ -42,213 +38,66 @@ public class class1 implements Callable {
} // L: 50
public Object call() {
- return this.field3.vmethod19(this.field1); // L: 54
+ return this.field3.vmethod10(this.field1); // L: 54
}
- @ObfuscatedName("o")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(II)Lge;",
- garbageValue = "1539440730"
+ descriptor = "(ILbi;ZS)I",
+ garbageValue = "-15642"
)
- public static VarbitComposition method9(int var0) {
- VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28
- if (var1 != null) {
- return var1;
+ static int method7(int var0, Script var1, boolean var2) {
+ Widget var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1140
+ if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1141
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1142
+ return 1; // L: 1143
+ } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1145
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1146
+ return 1; // L: 1147
+ } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1149
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1150
+ return 1; // L: 1151
+ } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1153
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1154
+ return 1; // L: 1155
+ } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1157
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1158
+ return 1; // L: 1159
+ } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1161
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1162
+ return 1; // L: 1163
+ } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1165
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1166
+ return 1; // L: 1167
+ } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1169
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1170
+ return 1; // L: 1171
+ } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1173
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1174
+ return 1; // L: 1175
+ } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1177
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1178
+ return 1; // L: 1179
+ } else if (var0 == 1610) { // L: 1181
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1182
+ return 1; // L: 1183
+ } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1185
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.color; // L: 1186
+ return 1; // L: 1187
+ } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1189
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.color2; // L: 1190
+ return 1; // L: 1191
+ } else if (var0 == 1613) { // L: 1193
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1194
+ return 1; // L: 1195
+ } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1197
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1198
+ return 1; // L: 1199
+ } else if (var0 != 1615 && var0 != 1616) { // L: 1201
+ return 2; // L: 1205
} else {
- byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 30
- var1 = new VarbitComposition(); // L: 31
- if (var2 != null) { // L: 32
- var1.decode(new Buffer(var2));
- }
-
- VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33
- return var1; // L: 34
+ ++class446.Interpreter_intStackSize; // L: 1202
+ return 1; // L: 1203
}
}
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lpc;II)V",
- garbageValue = "-285491852"
- )
- @Export("updatePlayers")
- static final void updatePlayers(PacketBuffer var0, int var1) {
- int var2 = var0.offset; // L: 71
- Players.Players_pendingUpdateCount = 0; // L: 72
- int var3 = 0; // L: 74
- var0.importIndex(); // L: 75
-
- byte[] var10000;
- int var4;
- int var6;
- int var7;
- for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76
- var7 = Players.Players_indices[var4]; // L: 77
- if ((Players.field1301[var7] & 1) == 0) { // L: 78
- if (var3 > 0) { // L: 79
- --var3; // L: 80
- var10000 = Players.field1301; // L: 81
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else {
- var6 = var0.readBits(1); // L: 84
- if (var6 == 0) { // L: 85
- var3 = class18.method249(var0); // L: 86
- var10000 = Players.field1301; // L: 87
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else {
- class230.readPlayerUpdate(var0, var7); // L: 90
- }
- }
- }
- }
-
- var0.exportIndex(); // L: 93
- if (var3 != 0) { // L: 94
- throw new RuntimeException(); // L: 95
- } else {
- var0.importIndex(); // L: 97
-
- for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98
- var7 = Players.Players_indices[var4]; // L: 99
- if ((Players.field1301[var7] & 1) != 0) { // L: 100
- if (var3 > 0) { // L: 101
- --var3; // L: 102
- var10000 = Players.field1301; // L: 103
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else {
- var6 = var0.readBits(1); // L: 106
- if (var6 == 0) { // L: 107
- var3 = class18.method249(var0); // L: 108
- var10000 = Players.field1301; // L: 109
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else {
- class230.readPlayerUpdate(var0, var7); // L: 112
- }
- }
- }
- }
-
- var0.exportIndex(); // L: 115
- if (var3 != 0) { // L: 116
- throw new RuntimeException(); // L: 117
- } else {
- var0.importIndex(); // L: 119
-
- for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120
- var7 = Players.Players_emptyIndices[var4]; // L: 121
- if ((Players.field1301[var7] & 1) != 0) { // L: 122
- if (var3 > 0) { // L: 123
- --var3; // L: 124
- var10000 = Players.field1301; // L: 125
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else {
- var6 = var0.readBits(1); // L: 128
- if (var6 == 0) { // L: 129
- var3 = class18.method249(var0); // L: 130
- var10000 = Players.field1301; // L: 131
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else if (FloorUnderlayDefinition.updateExternalPlayer(var0, var7)) {
- var10000 = Players.field1301; // L: 134
- var10000[var7] = (byte)(var10000[var7] | 2);
- }
- }
- }
- }
-
- var0.exportIndex(); // L: 137
- if (var3 != 0) { // L: 138
- throw new RuntimeException(); // L: 139
- } else {
- var0.importIndex(); // L: 141
-
- for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142
- var7 = Players.Players_emptyIndices[var4]; // L: 143
- if ((Players.field1301[var7] & 1) == 0) { // L: 144
- if (var3 > 0) { // L: 145
- --var3; // L: 146
- var10000 = Players.field1301; // L: 147
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else {
- var6 = var0.readBits(1); // L: 150
- if (var6 == 0) { // L: 151
- var3 = class18.method249(var0); // L: 152
- var10000 = Players.field1301; // L: 153
- var10000[var7] = (byte)(var10000[var7] | 2);
- } else if (FloorUnderlayDefinition.updateExternalPlayer(var0, var7)) { // L: 156
- var10000 = Players.field1301;
- var10000[var7] = (byte)(var10000[var7] | 2);
- }
- }
- }
- }
-
- var0.exportIndex(); // L: 159
- if (var3 != 0) { // L: 160
- throw new RuntimeException(); // L: 161
- } else {
- Players.Players_count = 0; // L: 163
- Players.Players_emptyIdxCount = 0; // L: 164
-
- Player var5;
- for (var4 = 1; var4 < 2048; ++var4) { // L: 165
- var10000 = Players.field1301; // L: 166
- var10000[var4] = (byte)(var10000[var4] >> 1);
- var5 = Client.players[var4]; // L: 167
- if (var5 != null) { // L: 168
- Players.Players_indices[++Players.Players_count - 1] = var4;
- } else {
- Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169
- }
- }
-
- for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173
- var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174
- var5 = Client.players[var4]; // L: 175
- var6 = var0.readUnsignedByte(); // L: 176
- if ((var6 & 2) != 0) { // L: 177
- var6 += var0.readUnsignedByte() << 8;
- }
-
- GrandExchangeOfferNameComparator.method5786(var0, var4, var5, var6); // L: 178
- }
-
- if (var0.offset - var2 != var1) { // L: 181
- throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 182
- }
- }
- }
- }
- }
- } // L: 184
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(IIB)I",
- garbageValue = "0"
- )
- public static int method12(int var0, int var1) {
- return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29
- }
-
- @ObfuscatedName("gq")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1026103514"
- )
- static final void method11() {
- int var0 = Players.field1317 * 128 + 64; // L: 3977
- int var1 = TileItem.field1292 * 128 + 64; // L: 3978
- int var2 = class202.getTileHeight(var0, var1, class128.Client_plane) - WorldMapSection1.field2898; // L: 3979
- class422.method7303(var0, var2, var1); // L: 3980
- var0 = class267.field3206 * 128 + 64; // L: 3981
- var1 = AbstractWorldMapData.field2851 * 128 + 64; // L: 3982
- var2 = class202.getTileHeight(var0, var1, class128.Client_plane) - ScriptFrame.field457; // L: 3983
- int var3 = var0 - class343.cameraX; // L: 3984
- int var4 = var2 - class295.cameraY; // L: 3985
- int var5 = var1 - FaceNormal.cameraZ; // L: 3986
- int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 3987
- int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3988
- int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3989
- class241.method4813(var7, var8); // L: 3990
- } // L: 3991
}
diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java
index 2c6c1a189f..9977de1655 100644
--- a/runescape-client/src/main/java/class10.java
+++ b/runescape-client/src/main/java/class10.java
@@ -15,632 +15,239 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("y")
+@ObfuscatedName("s")
public class class10 {
- @ObfuscatedName("o")
- HttpsURLConnection field48;
- @ObfuscatedName("q")
- final Map field47;
- @ObfuscatedName("l")
+ @ObfuscatedName("uu")
+ @Export("foundItemIds")
+ static short[] foundItemIds;
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "Lot;"
+ descriptor = "Lfv;"
)
- class399 field54;
- @ObfuscatedName("k")
- Map field50;
- @ObfuscatedName("a")
+ @Export("clock")
+ static Clock clock;
+ @ObfuscatedName("ei")
@ObfuscatedSignature(
- descriptor = "Lv;"
+ descriptor = "Llc;"
)
- final class9 field51;
- @ObfuscatedName("m")
- boolean field52;
- @ObfuscatedName("p")
- boolean field53;
- @ObfuscatedName("s")
+ @Export("archive11")
+ static Archive archive11;
+ @ObfuscatedName("iv")
@ObfuscatedGetter(
- intValue = -387471539
+ intValue = 2013387747
)
- int field49;
+ static int field53;
+ @ObfuscatedName("c")
+ HttpsURLConnection field55;
+ @ObfuscatedName("v")
+ final Map field43;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Loi;"
+ )
+ class398 field45;
+ @ObfuscatedName("f")
+ Map field44;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Li;"
+ )
+ final class9 field46;
+ @ObfuscatedName("e")
+ boolean field41;
+ @ObfuscatedName("g")
+ boolean field47;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = 1112676483
+ )
+ int field48;
@ObfuscatedSignature(
- descriptor = "(Ljava/net/URL;Lv;)V"
+ descriptor = "(Ljava/net/URL;Li;Z)V"
)
- public class10(URL var1, class9 var2) throws IOException {
- this.field52 = false; // L: 20
- this.field53 = false; // L: 21
- this.field49 = 300000;
- if (!var2.method76()) {
- throw new UnsupportedEncodingException("Unsupported request method used " + var2.method67());
+ public class10(URL var1, class9 var2, boolean var3) throws IOException {
+ this.field41 = false; // L: 20
+ this.field47 = false; // L: 21
+ this.field48 = 300000; // L: 22
+ if (!var2.method61()) { // L: 25
+ throw new UnsupportedEncodingException("Unsupported request method used " + var2.method64());
} else {
- this.field48 = (HttpsURLConnection)var1.openConnection(); // L: 26
- this.field48.setSSLSocketFactory(new class15()); // L: 27
- this.field51 = var2; // L: 28
- this.field47 = new HashMap(); // L: 29
- this.field50 = new HashMap(); // L: 30
- }
- } // L: 31
+ this.field55 = (HttpsURLConnection)var1.openConnection(); // L: 26
+ if (!var3) { // L: 27
+ HttpsURLConnection var4 = this.field55; // L: 28
+ if (class15.field85 == null) { // L: 31
+ class15.field85 = new class15(); // L: 32
+ }
- @ObfuscatedName("o")
+ class15 var5 = class15.field85; // L: 34
+ var4.setSSLSocketFactory(var5); // L: 36
+ }
+
+ this.field46 = var2; // L: 38
+ this.field43 = new HashMap(); // L: 39
+ this.field44 = new HashMap(); // L: 40
+ }
+ } // L: 41
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;Ljava/lang/String;B)V",
- garbageValue = "94"
+ garbageValue = "34"
)
- public void method78(String var1, String var2) {
- if (!this.field52) { // L: 34
- this.field47.put(var1, var2); // L: 35
+ public void method79(String var1, String var2) {
+ if (!this.field41) { // L: 44
+ this.field43.put(var1, var2); // L: 45
}
- } // L: 36
+ } // L: 46
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(B)Ljava/lang/String;",
- garbageValue = "1"
+ garbageValue = "-66"
)
- String method96() {
- ArrayList var1 = new ArrayList(this.field50.entrySet()); // L: 39
- Collections.sort(var1, new class18(this)); // L: 40
- StringBuilder var2 = new StringBuilder(); // L: 53
- Iterator var3 = var1.iterator(); // L: 54
+ String method76() {
+ ArrayList var1 = new ArrayList(this.field44.entrySet()); // L: 49
+ Collections.sort(var1, new class18(this)); // L: 50
+ StringBuilder var2 = new StringBuilder(); // L: 63
+ Iterator var3 = var1.iterator(); // L: 64
while (var3.hasNext()) {
- Entry var4 = (Entry)var3.next(); // L: 55
- if (var2.length() > 0) { // L: 57
+ Entry var4 = (Entry)var3.next(); // L: 65
+ if (var2.length() > 0) { // L: 67
var2.append(",");
}
- var2.append(((class398)var4.getKey()).method6940()); // L: 58
- float var5 = (Float)var4.getValue(); // L: 59
- if (var5 < 1.0F) { // L: 60
- String var6 = Float.toString(var5).substring(0, 4); // L: 61
- var2.append(";q=" + var6); // L: 62
+ var2.append(((class397)var4.getKey()).method7086()); // L: 68
+ float var5 = (Float)var4.getValue(); // L: 69
+ if (var5 < 1.0F) { // L: 70
+ String var6 = Float.toString(var5).substring(0, 4); // L: 71
+ var2.append(";q=" + var6); // L: 72
}
}
- return var2.toString(); // L: 66
+ return var2.toString(); // L: 76
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-82433388"
+ garbageValue = "-1821819060"
)
- void method80() throws ProtocolException {
- if (!this.field52) { // L: 70
- this.field48.setRequestMethod(this.field51.method67()); // L: 71
- if (!this.field50.isEmpty()) { // L: 72
- this.field47.put("Accept", this.method96());
+ void method77() throws ProtocolException {
+ if (!this.field41) { // L: 80
+ this.field55.setRequestMethod(this.field46.method64()); // L: 81
+ if (!this.field44.isEmpty()) { // L: 82
+ this.field43.put("Accept", this.method76());
}
- Iterator var1 = this.field47.entrySet().iterator(); // L: 73
+ Iterator var1 = this.field43.entrySet().iterator(); // L: 83
while (var1.hasNext()) {
- Entry var2 = (Entry)var1.next(); // L: 74
- this.field48.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76
+ Entry var2 = (Entry)var1.next(); // L: 84
+ this.field55.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 86
}
- if (this.field51.method68() && this.field54 != null) { // L: 79
- this.field48.setDoOutput(true); // L: 80
- ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81
+ if (this.field46.method62() && this.field45 != null) { // L: 89
+ this.field55.setDoOutput(true); // L: 90
+ ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 91
try {
- var13.write(this.field54.vmethod6962()); // L: 83
- var13.writeTo(this.field48.getOutputStream()); // L: 84
- } catch (IOException var11) { // L: 86
- var11.printStackTrace(); // L: 87
+ var13.write(this.field45.vmethod7114()); // L: 93
+ var13.writeTo(this.field55.getOutputStream()); // L: 94
+ } catch (IOException var11) { // L: 96
+ var11.printStackTrace(); // L: 97
} finally {
- if (var13 != null) { // L: 90
+ if (var13 != null) { // L: 100
try {
- var13.close(); // L: 92
- } catch (IOException var10) { // L: 94
- var10.printStackTrace(); // L: 95
+ var13.close(); // L: 102
+ } catch (IOException var10) { // L: 104
+ var10.printStackTrace(); // L: 105
}
}
}
}
- this.field48.setConnectTimeout(this.field49); // L: 100
- this.field48.setInstanceFollowRedirects(this.field53); // L: 101
- this.field52 = true; // L: 102
+ this.field55.setConnectTimeout(this.field48); // L: 110
+ this.field55.setInstanceFollowRedirects(this.field47); // L: 111
+ this.field41 = true; // L: 112
}
- } // L: 103
+ } // L: 113
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-1448695521"
+ garbageValue = "1746167507"
)
- boolean method79() throws IOException, SocketTimeoutException {
- if (!this.field52) { // L: 106
- this.method80();
+ boolean method78() throws IOException, SocketTimeoutException {
+ if (!this.field41) { // L: 116
+ this.method77();
}
- this.field48.connect(); // L: 107
- return this.field48.getResponseCode() == -1; // L: 108
+ this.field55.connect(); // L: 117
+ return this.field55.getResponseCode() == -1; // L: 118
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(B)Ld;",
- garbageValue = "-1"
+ descriptor = "(I)Lb;",
+ garbageValue = "2065804848"
)
- class21 method82() {
+ class21 method90() {
try {
- if (!this.field52 || this.field48.getResponseCode() == -1) {
+ if (!this.field41 || this.field55.getResponseCode() == -1) { // L: 124
return new class21("No REST response has been received yet.");
}
- } catch (IOException var10) {
- this.field48.disconnect();
- return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118
+ } catch (IOException var10) { // L: 126
+ this.field55.disconnect(); // L: 127
+ return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 128
}
- class21 var1 = null;
+ class21 var1 = null; // L: 130
class21 var3;
try {
- var1 = new class21(this.field48); // L: 122
- return var1;
- } catch (IOException var8) {
- var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125
+ var1 = new class21(this.field55); // L: 132
+ return var1; // L: 140
+ } catch (IOException var8) { // L: 134
+ var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 135
} finally {
- this.field48.disconnect();
+ this.field55.disconnect(); // L: 138
}
return var3;
}
- @ObfuscatedName("o")
+ @ObfuscatedName("jn")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1726838595"
+ descriptor = "(Ljava/lang/String;Lkb;B)Ljava/lang/String;",
+ garbageValue = "34"
)
- static void method87(int var0) {
- GrandExchangeOfferAgeComparator.field4072 = var0; // L: 22
- class387.field4395 = new class387[var0]; // L: 23
- Frames.field2492 = 0; // L: 24
- } // L: 25
+ static String method74(String var0, Widget var1) {
+ if (var0.indexOf("%") != -1) { // L: 10594
+ for (int var2 = 1; var2 <= 5; ++var2) { // L: 10595
+ while (true) {
+ int var3 = var0.indexOf("%" + var2); // L: 10597
+ if (var3 == -1) { // L: 10598
+ break;
+ }
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lcr;IIB)V",
- garbageValue = "-15"
- )
- @Export("runScript")
- static void runScript(ScriptEvent var0, int var1, int var2) {
- Object[] var3 = var0.args; // L: 112
- Script var4;
- int var20;
- if (class137.isWorldMapEvent(var0.type)) { // L: 114
- class9.worldMapEvent = (WorldMapEvent)var3[0]; // L: 115
- WorldMapElement var5 = class120.WorldMapElement_get(class9.worldMapEvent.mapElement); // L: 116
- var4 = GameObject.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 117
- } else {
- var20 = (Integer)var3[0]; // L: 120
- var4 = class301.getScript(var20); // L: 121
+ String var4 = var0.substring(0, var3); // L: 10599
+ int var6 = Canvas.method319(var1, var2 - 1); // L: 10601
+ String var5;
+ if (var6 < 999999999) { // L: 10603
+ var5 = Integer.toString(var6); // L: 10604
+ } else {
+ var5 = "*"; // L: 10607
+ }
+
+ var0 = var4 + var5 + var0.substring(var3 + 2); // L: 10609
+ }
+ }
}
- if (var4 != null) { // L: 123
- class12.Interpreter_intStackSize = 0; // L: 126
- class9.Interpreter_stringStackSize = 0; // L: 127
- var20 = -1; // L: 128
- int[] var6 = var4.opcodes; // L: 129
- int[] var7 = var4.intOperands; // L: 130
- byte var8 = -1; // L: 131
- Interpreter.Interpreter_frameDepth = 0; // L: 132
- Interpreter.field835 = false; // L: 133
- boolean var9 = false; // L: 134
- int var10 = 0; // L: 135
- boolean var30 = false;
-
- label955: {
- label956: {
- try {
- int var13;
- try {
- var30 = true; // L: 137
- class21.Interpreter_intLocals = new int[var4.localIntCount]; // L: 138
- int var11 = 0; // L: 139
- class268.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 140
- int var12 = 0;
-
- int var14;
- String var21;
- for (var13 = 1; var13 < var3.length; ++var13) { // L: 141
- if (var3[var13] instanceof Integer) { // L: 142
- var14 = (Integer)var3[var13]; // L: 143
- if (var14 == -2147483647) { // L: 144
- var14 = var0.mouseX;
- }
-
- if (var14 == -2147483646) { // L: 145
- var14 = var0.mouseY;
- }
-
- if (var14 == -2147483645) { // L: 146
- var14 = var0.widget != null ? var0.widget.id * 1115174973 * -203153643 : -1;
- }
-
- if (var14 == -2147483644) { // L: 147
- var14 = var0.opIndex;
- }
-
- if (var14 == -2147483643) { // L: 148
- var14 = var0.widget != null ? var0.widget.childIndex * -776270713 * -224921289 : -1;
- }
-
- if (var14 == -2147483642) { // L: 149
- var14 = var0.dragTarget != null ? var0.dragTarget.id * 1115174973 * -203153643 : -1;
- }
-
- if (var14 == -2147483641) { // L: 150
- var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -776270713 * -224921289 : -1;
- }
-
- if (var14 == -2147483640) { // L: 151
- var14 = var0.keyTyped;
- }
-
- if (var14 == -2147483639) { // L: 152
- var14 = var0.keyPressed;
- }
-
- class21.Interpreter_intLocals[var11++] = var14; // L: 153
- } else if (var3[var13] instanceof String) { // L: 155
- var21 = (String)var3[var13]; // L: 156
- if (var21.equals("event_opbase")) { // L: 157
- var21 = var0.targetName;
- }
-
- class268.Interpreter_stringLocals[var12++] = var21; // L: 158
- }
- }
-
- Interpreter.field823 = var0.field1054; // L: 162
-
- while (true) {
- ++var10; // L: 164
- if (var10 > var1) { // L: 165
- throw new RuntimeException();
- }
-
- ++var20; // L: 166
- int var33 = var6[var20];
- if (var33 >= 100) { // L: 167
- boolean var35;
- if (var4.intOperands[var20] == 1) { // L: 385
- var35 = true;
- } else {
- var35 = false; // L: 386
- }
-
- var14 = KeyHandler.method329(var33, var4, var35); // L: 387
- switch(var14) { // L: 388
- case 0:
- var30 = false;
- break label955;
- case 1:
- default:
- break;
- case 2:
- throw new IllegalStateException(); // L: 395
- }
- } else if (var33 == ScriptOpcodes.ICONST) { // L: 168
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7[var20]; // L: 169
- } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 172
- var13 = var7[var20]; // L: 173
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 174
- } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 177
- var13 = var7[var20]; // L: 178
- Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 179
- class321.changeGameOptions(var13); // L: 180
- } else if (var33 == ScriptOpcodes.SCONST) { // L: 183
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 184
- } else if (var33 == ScriptOpcodes.JUMP) { // L: 187
- var20 += var7[var20]; // L: 188
- } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 191
- class12.Interpreter_intStackSize -= 2; // L: 192
- if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 193
- var20 += var7[var20];
- }
- } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 196
- class12.Interpreter_intStackSize -= 2; // L: 197
- if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 198
- var20 += var7[var20];
- }
- } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 201
- class12.Interpreter_intStackSize -= 2; // L: 202
- if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 203
- var20 += var7[var20];
- }
- } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 206
- class12.Interpreter_intStackSize -= 2; // L: 207
- if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 208
- var20 += var7[var20];
- }
- } else if (var33 == ScriptOpcodes.RETURN) { // L: 211
- if (Interpreter.Interpreter_frameDepth == 0) {
- var30 = false;
- break label956;
- }
-
- ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 213
- var4 = var40.script; // L: 214
- var6 = var4.opcodes; // L: 215
- var7 = var4.intOperands; // L: 216
- var20 = var40.pc; // L: 217
- class21.Interpreter_intLocals = var40.intLocals; // L: 218
- class268.Interpreter_stringLocals = var40.stringLocals; // L: 219
- } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 222
- var13 = var7[var20]; // L: 223
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class18.getVarbit(var13); // L: 224
- } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 227
- var13 = var7[var20]; // L: 228
- class92.method2372(var13, Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 229
- } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 232
- class12.Interpreter_intStackSize -= 2; // L: 233
- if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 234
- var20 += var7[var20];
- }
- } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 237
- class12.Interpreter_intStackSize -= 2; // L: 238
- if (Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]) { // L: 239
- var20 += var7[var20];
- }
- } else if (var33 == ScriptOpcodes.ILOAD) { // L: 242
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.Interpreter_intLocals[var7[var20]]; // L: 243
- } else if (var33 == ScriptOpcodes.ISTORE) { // L: 246
- class21.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 247
- } else if (var33 == ScriptOpcodes.SLOAD) { // L: 250
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class268.Interpreter_stringLocals[var7[var20]]; // L: 251
- } else if (var33 == ScriptOpcodes.SSTORE) { // L: 254
- class268.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 255
- } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 258
- var13 = var7[var20]; // L: 259
- class9.Interpreter_stringStackSize -= var13; // L: 260
- var21 = StructComposition.method3524(Interpreter.Interpreter_stringStack, class9.Interpreter_stringStackSize, var13); // L: 261
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var21; // L: 262
- } else if (var33 == ScriptOpcodes.POP_INT) { // L: 265
- --class12.Interpreter_intStackSize; // L: 266
- } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 269
- --class9.Interpreter_stringStackSize; // L: 270
- } else {
- int var17;
- if (var33 != ScriptOpcodes.INVOKE) { // L: 273
- if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 296
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class125.varcs.getInt(var7[var20]); // L: 297
- } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 300
- class125.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 301
- } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 304
- var13 = var7[var20] >> 16; // L: 305
- var14 = var7[var20] & 65535; // L: 306
- int var24 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 307
- if (var24 < 0 || var24 > 5000) { // L: 308
- throw new RuntimeException(); // L: 309
- }
-
- Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 311
- byte var25 = -1; // L: 312
- if (var14 == 105) { // L: 313
- var25 = 0;
- }
-
- for (var17 = 0; var17 < var24; ++var17) { // L: 314
- Interpreter.Interpreter_arrays[var13][var17] = var25;
- }
- } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 317
- var13 = var7[var20]; // L: 318
- var14 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 319
- if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 320
- throw new RuntimeException(); // L: 321
- }
-
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 323
- } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 326
- var13 = var7[var20]; // L: 327
- class12.Interpreter_intStackSize -= 2; // L: 328
- var14 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 329
- if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 330
- throw new RuntimeException(); // L: 331
- }
-
- Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 333
- } else {
- String var22;
- if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 336
- var22 = class125.varcs.getStringOld(var7[var20]); // L: 337
- if (var22 == null) { // L: 338
- var22 = "null";
- }
-
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var22; // L: 339
- } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 342
- class125.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 343
- } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 346
- var22 = class125.varcs.getString(var7[var20]); // L: 347
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var22; // L: 348
- } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 351
- class125.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 352
- } else if (var33 == ScriptOpcodes.SWITCH) { // L: 355
- IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 356
- IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 357
- if (var37 != null) { // L: 358
- var20 += var37.integer;
- }
- } else {
- Integer var39;
- if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 361
- var39 = FontName.field4583.getTitleGroupValue(var7[var20]); // L: 362
- if (var39 == null) { // L: 363
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 364
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var39; // L: 367
- }
- } else {
- if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 371
- throw new IllegalStateException(); // L: 381
- }
-
- var39 = UserComparator8.field1378.method6905(var7[var20]); // L: 372
- if (var39 == null) { // L: 373
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 374
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var39; // L: 377
- }
- }
- }
- }
- } else {
- var13 = var7[var20]; // L: 274
- Script var36 = class301.getScript(var13); // L: 275
- int[] var15 = new int[var36.localIntCount]; // L: 276
- String[] var16 = new String[var36.localStringCount]; // L: 277
-
- for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 278
- var15[var17] = Interpreter.Interpreter_intStack[var17 + (class12.Interpreter_intStackSize - var36.intArgumentCount)];
- }
-
- for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 279
- var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class9.Interpreter_stringStackSize - var36.stringArgumentCount)];
- }
-
- class12.Interpreter_intStackSize -= var36.intArgumentCount; // L: 280
- class9.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 281
- ScriptFrame var23 = new ScriptFrame(); // L: 282
- var23.script = var4; // L: 283
- var23.pc = var20; // L: 284
- var23.intLocals = class21.Interpreter_intLocals; // L: 285
- var23.stringLocals = class268.Interpreter_stringLocals; // L: 286
- Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 287
- var4 = var36; // L: 288
- var6 = var36.opcodes; // L: 289
- var7 = var36.intOperands; // L: 290
- var20 = -1; // L: 291
- class21.Interpreter_intLocals = var15; // L: 292
- class268.Interpreter_stringLocals = var16; // L: 293
- }
- }
- }
- } catch (Exception var31) { // L: 401
- var9 = true; // L: 402
- StringBuilder var27 = new StringBuilder(30); // L: 404
- var27.append("").append(var4.key).append(" "); // L: 405
- var13 = Interpreter.Interpreter_frameDepth - 1; // L: 406
-
- while (true) {
- if (var13 < 0) {
- var27.append("").append(var8); // L: 407
- ArchiveDiskActionHandler.RunException_sendStackTrace(var27.toString(), var31); // L: 408
- var30 = false;
- break;
- }
-
- var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" ");
- --var13;
- }
- }
- } finally {
- if (var30) {
- while (Interpreter.field821.size() > 0) {
- class93 var19 = (class93)Interpreter.field821.remove(0); // L: 413
- TaskHandler.widgetDefaultMenuAction(var19.method2379(), var19.method2380(), var19.method2389(), var19.method2382(), "");
- }
-
- if (Interpreter.field835) { // L: 416
- Interpreter.field835 = false; // L: 417
- Varps.method5366(); // L: 418
- }
-
- if (!var9 && var2 > 0 && var10 >= var2) {
- ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
- }
-
- }
- }
-
- while (Interpreter.field821.size() > 0) { // L: 412
- class93 var26 = (class93)Interpreter.field821.remove(0);
- TaskHandler.widgetDefaultMenuAction(var26.method2379(), var26.method2380(), var26.method2389(), var26.method2382(), "");
- }
-
- if (Interpreter.field835) {
- Interpreter.field835 = false;
- Varps.method5366();
- }
-
- if (!var9 && var2 > 0 && var10 >= var2) {
- ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
- }
-
- return; // L: 424
- }
-
- while (Interpreter.field821.size() > 0) {
- class93 var41 = (class93)Interpreter.field821.remove(0);
- TaskHandler.widgetDefaultMenuAction(var41.method2379(), var41.method2380(), var41.method2389(), var41.method2382(), "");
- }
-
- if (Interpreter.field835) {
- Interpreter.field835 = false;
- Varps.method5366();
- }
-
- if (!var9 && var2 > 0 && var10 >= var2) {
- ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
- }
-
- return; // L: 212
- }
-
- while (Interpreter.field821.size() > 0) {
- class93 var34 = (class93)Interpreter.field821.remove(0);
- TaskHandler.widgetDefaultMenuAction(var34.method2379(), var34.method2380(), var34.method2389(), var34.method2382(), ""); // L: 414
- }
-
- if (Interpreter.field835) {
- Interpreter.field835 = false;
- Varps.method5366();
- }
-
- if (!var9 && var2 > 0 && var10 >= var2) { // L: 420
- ArchiveDiskActionHandler.RunException_sendStackTrace("Warning: Script " + var4.field949 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 421
- }
-
- }
- } // L: 124 390
-
- @ObfuscatedName("fl")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "-1044379624"
- )
- static int method94(int var0) {
- return var0 * 3 + 600; // L: 1500
+ return var0; // L: 10613
}
-
- @ObfuscatedName("jc")
- @ObfuscatedSignature(
- descriptor = "(Lki;IIS)V",
- garbageValue = "138"
- )
- @Export("clickWidget")
- static final void clickWidget(Widget var0, int var1, int var2) {
- if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11776
- if (var0 != null && class146.method2992(var0) != null) { // L: 11777
- Client.clickedWidget = var0; // L: 11778
- Client.clickedWidgetParent = class146.method2992(var0); // L: 11779
- Client.widgetClickX = var1; // L: 11780
- Client.widgetClickY = var2; // L: 11781
- SoundSystem.widgetDragDuration = 0; // L: 11782
- Client.isDraggingWidget = false; // L: 11783
- int var3 = Client.menuOptionsCount - 1; // L: 11786
- if (var3 != -1) { // L: 11789
- Players.method2426(var3);
- }
-
- }
- }
- } // L: 11790
}
diff --git a/runescape-client/src/main/java/class101.java b/runescape-client/src/main/java/class101.java
index 102e3de80c..acf2f52865 100644
--- a/runescape-client/src/main/java/class101.java
+++ b/runescape-client/src/main/java/class101.java
@@ -6,130 +6,152 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cj")
+@ObfuscatedName("cl")
public class class101 extends UrlRequester {
- @ObfuscatedName("t")
+ @ObfuscatedName("df")
+ static boolean field1366;
+ @ObfuscatedName("lb")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Lci;"
)
- @Export("options_buttons_2Sprite")
- static IndexedSprite options_buttons_2Sprite;
- @ObfuscatedName("eg")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive14")
- static Archive archive14;
+ @Export("localPlayer")
+ static Player localPlayer;
+ @ObfuscatedName("j")
+ final boolean field1364;
- @ObfuscatedName("o")
+ public class101(boolean var1, int var2) {
+ super(var2); // L: 13
+ this.field1364 = var1; // L: 14
+ } // L: 15
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lcb;I)V",
- garbageValue = "717056983"
+ descriptor = "(Lct;I)V",
+ garbageValue = "1538294108"
)
- void vmethod2544(UrlRequest var1) throws IOException {
- URLConnection var2 = null; // L: 12
+ void vmethod2537(UrlRequest var1) throws IOException {
+ URLConnection var2 = null; // L: 19
try {
- try {
- String var3 = var1.url.getProtocol(); // L: 14
- if (var3.equals("http")) { // L: 15
- var2 = this.method2542(var1); // L: 16
- } else {
- if (!var3.equals("https")) { // L: 18
- var1.isDone0 = true; // L: 22
- return; // L: 23
- }
-
- var2 = this.method2545(var1); // L: 19
+ String var3 = var1.url.getProtocol(); // L: 21
+ if (var3.equals("http")) { // L: 22
+ var2 = this.method2548(var1); // L: 23
+ } else {
+ if (!var3.equals("https")) { // L: 25
+ var1.isDone0 = true; // L: 29
+ return; // L: 30
}
- this.method2518(var2, var1); // L: 25
- } catch (IOException var7) {
+ var2 = this.method2540(var1); // L: 26
}
+ this.method2522(var2, var1); // L: 32
+ } catch (IOException var7) {
} finally {
- var1.isDone0 = true; // L: 29
- if (var2 != null) { // L: 30
- if (var2 instanceof HttpURLConnection) { // L: 31
- ((HttpURLConnection)var2).disconnect(); // L: 32
- } else if (var2 instanceof HttpsURLConnection) { // L: 34
- ((HttpsURLConnection)var2).disconnect(); // L: 35
+ var1.isDone0 = true; // L: 36
+ if (var2 != null) { // L: 37
+ if (var2 instanceof HttpURLConnection) { // L: 38
+ ((HttpURLConnection)var2).disconnect(); // L: 39
+ } else if (var2 instanceof HttpsURLConnection) { // L: 41
+ ((HttpsURLConnection)var2).disconnect(); // L: 42
}
}
}
- } // L: 39
- @ObfuscatedName("n")
+ } // L: 46
+
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(Lcb;B)Ljava/net/URLConnection;",
- garbageValue = "18"
+ descriptor = "(Lct;S)Ljava/net/URLConnection;",
+ garbageValue = "6416"
)
- URLConnection method2542(UrlRequest var1) throws IOException {
- URLConnection var2 = var1.url.openConnection(); // L: 42
- this.method2517(var2); // L: 43
- return var2; // L: 44
+ URLConnection method2548(UrlRequest var1) throws IOException {
+ URLConnection var2 = var1.url.openConnection(); // L: 49
+ this.method2520(var2); // L: 50
+ return var2; // L: 51
}
- @ObfuscatedName("e")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(Lcb;I)Ljava/net/URLConnection;",
- garbageValue = "2078171719"
+ descriptor = "(Lct;I)Ljava/net/URLConnection;",
+ garbageValue = "2028242666"
)
- URLConnection method2545(UrlRequest var1) throws IOException {
- HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 48
- var2.setSSLSocketFactory(new class15()); // L: 49
- this.method2517(var2); // L: 50
- return var2; // L: 51
+ URLConnection method2540(UrlRequest var1) throws IOException {
+ HttpsURLConnection var2 = (HttpsURLConnection)var1.url.openConnection(); // L: 55
+ if (!this.field1364) { // L: 56
+ if (class15.field85 == null) { // L: 60
+ class15.field85 = new class15(); // L: 61
+ }
+
+ class15 var4 = class15.field85; // L: 63
+ var2.setSSLSocketFactory(var4); // L: 65
+ }
+
+ this.method2520(var2); // L: 67
+ return var2; // L: 68
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIIII)Z",
+ garbageValue = "-585632517"
+ )
+ static final boolean method2549(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 107
+ if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 108
+ return false;
+ } else {
+ var7 = ViewportMouse.ViewportMouse_y - var6; // L: 109
+ if (var7 > var0 && var7 > var1 && var7 > var2) {
+ return false; // L: 110
+ } else {
+ var7 = ViewportMouse.ViewportMouse_x + var6; // L: 111
+ if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 112
+ return false;
+ } else {
+ var7 = ViewportMouse.ViewportMouse_x - var6; // L: 113
+ return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 114
+ }
+ }
+ }
}
@ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;B)I",
- garbageValue = "64"
+ descriptor = "(ZB)V",
+ garbageValue = "1"
)
- @Export("hashString")
- public static int hashString(CharSequence var0) {
- int var1 = var0.length(); // L: 132
- int var2 = 0; // L: 133
-
- for (int var3 = 0; var3 < var1; ++var3) { // L: 134
- var2 = (var2 << 5) - var2 + UserComparator5.charToByteCp1252(var0.charAt(var3));
+ static void method2547(boolean var0) {
+ byte var1 = 0; // L: 1178
+ boolean var2 = class19.clientPreferences.method2266() >= Client.field482; // L: 1181
+ if (!var2) { // L: 1183
+ var1 = 12; // L: 1184
+ } else if (class353.client.method1102() || class353.client.method1103()) { // L: 1186
+ var1 = 10; // L: 1187
}
- return var2; // L: 135
- }
+ WorldMapData_1.method4872(var1); // L: 1189
+ if (var0) { // L: 1190
+ Login.Login_username = ""; // L: 1191
+ Login.Login_password = ""; // L: 1192
+ class240.field2846 = 0; // L: 1193
+ World.otp = ""; // L: 1194
+ }
- @ObfuscatedName("gx")
+ KeyHandler.method286(); // L: 1196
+ class29.method357(); // L: 1197
+ } // L: 1198
+
+ @ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "13"
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V",
+ garbageValue = "0"
)
- static final int method2551() {
- if (class12.clientPreferences.method2222()) { // L: 5001
- return class128.Client_plane;
- } else {
- int var0 = class202.getTileHeight(class343.cameraX, FaceNormal.cameraZ, class128.Client_plane); // L: 5002
- return var0 - class295.cameraY < 800 && (Tiles.Tiles_renderFlags[class128.Client_plane][class343.cameraX >> 7][FaceNormal.cameraZ >> 7] & 4) != 0 ? class128.Client_plane : 3; // L: 5003 5004
- }
- }
-
- @ObfuscatedName("lz")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "85689367"
- )
- static void method2552() {
- if (class127.field1570 != null) { // L: 12698
- Client.field767 = Client.cycle; // L: 12699
- class127.field1570.method5851(); // L: 12700
-
- for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12701
- if (Client.players[var0] != null) { // L: 12702
- class127.field1570.method5848((Client.players[var0].x >> 7) + SecureRandomCallable.baseX, (Client.players[var0].y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY); // L: 12703
- }
- }
- }
-
- } // L: 12707
+ @Export("setLoginResponseString")
+ static void setLoginResponseString(String var0, String var1, String var2) {
+ Login.Login_response1 = var0; // L: 1829
+ Login.Login_response2 = var1; // L: 1830
+ Login.Login_response3 = var2; // L: 1831
+ } // L: 1832
}
diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java
index 79ce792ace..68a7e503c8 100644
--- a/runescape-client/src/main/java/class11.java
+++ b/runescape-client/src/main/java/class11.java
@@ -1,10 +1,10 @@
+import java.awt.FontMetrics;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.util.LinkedList;
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import org.bouncycastle.crypto.tls.Certificate;
@@ -12,45 +12,144 @@ import org.bouncycastle.crypto.tls.CertificateRequest;
import org.bouncycastle.crypto.tls.TlsAuthentication;
import org.bouncycastle.crypto.tls.TlsCredentials;
-@ObfuscatedName("c")
+@ObfuscatedName("t")
class class11 implements TlsAuthentication {
- @ObfuscatedName("g")
- @ObfuscatedGetter(
- intValue = 824355601
- )
- @Export("cacheGamebuild")
- static int cacheGamebuild;
+ @ObfuscatedName("s")
+ @Export("musicTrackBoolean")
+ public static boolean musicTrackBoolean;
+ @ObfuscatedName("ab")
+ @Export("loginScreenFontMetrics")
+ static FontMetrics loginScreenFontMetrics;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lb;"
+ descriptor = "Lr;"
)
final class13 this$2;
@ObfuscatedSignature(
- descriptor = "(Lb;)V"
+ descriptor = "(Lr;)V"
)
class11(class13 var1) {
- this.this$2 = var1; // L: 303
+ this.this$2 = var1; // L: 306
}
public void notifyServerCertificate(Certificate var1) throws IOException {
try {
- CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 307
- LinkedList var3 = new LinkedList(); // L: 308
- org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 310
+ CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 310
+ LinkedList var3 = new LinkedList(); // L: 311
+ org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 313
- for (int var5 = 0; var5 < var4.length; ++var5) { // L: 311
- org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 312
- var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 314
+ for (int var5 = 0; var5 < var4.length; ++var5) { // L: 314
+ org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 315
+ var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 317
}
- this.this$2.this$1.field63 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 318
- } catch (CertificateException var7) { // L: 320
- throw new IOException(var7); // L: 321
+ this.this$2.this$1.field63 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 321
+ } catch (CertificateException var7) { // L: 323
+ throw new IOException(var7); // L: 324
}
- } // L: 323
+ } // L: 326
public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException {
- return null; // L: 327
+ return null; // L: 330
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(IIIII)V",
+ garbageValue = "1603427189"
+ )
+ static final void method98(int var0, int var1, int var2, int var3) {
+ for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79
+ for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80
+ if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81
+ UserComparator6.field1415[0][var5][var4] = 127; // L: 82
+ if (var0 == var5 && var5 > 0) { // L: 83
+ Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
+ }
+
+ if (var0 + var2 == var5 && var5 < 103) { // L: 84
+ Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
+ }
+
+ if (var4 == var1 && var4 > 0) { // L: 85
+ Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
+ }
+
+ if (var3 + var1 == var4 && var4 < 103) { // L: 86
+ Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
+ }
+ }
+ }
+ }
+
+ } // L: 90
+
+ @ObfuscatedName("ac")
+ @ObfuscatedSignature(
+ descriptor = "(ILkb;IIIII[FI)Lkb;",
+ garbageValue = "1978245093"
+ )
+ static Widget method97(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) {
+ Widget var8 = new Widget(); // L: 920
+ var8.type = var0; // L: 921
+ var8.parentId = var1.id; // L: 922
+ var8.childIndex = var2; // L: 923
+ var8.isIf3 = true; // L: 924
+ var8.xAlignment = var3; // L: 925
+ var8.yAlignment = var4; // L: 926
+ var8.widthAlignment = var5; // L: 927
+ var8.heightAlignment = var6; // L: 928
+ var8.rawX = (int)(var7[0] * (float)var1.width); // L: 929
+ var8.rawY = (int)((float)var1.height * var7[1]); // L: 930
+ var8.rawWidth = (int)((float)var1.width * var7[2]); // L: 931
+ var8.rawHeight = (int)(var7[3] * (float)var1.height); // L: 932
+ return var8; // L: 933
+ }
+
+ @ObfuscatedName("au")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-27"
+ )
+ static int method96(int var0, Script var1, boolean var2) {
+ if (var0 == 7100) { // L: 4602
+ ++class446.Interpreter_intStackSize; // L: 4603
+ return 1; // L: 4604
+ } else if (var0 == 7101) { // L: 4606
+ Interpreter.Interpreter_stringStackSize += 2; // L: 4607
+ return 1; // L: 4608
+ } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4610
+ if (var0 == 7106) { // L: 4614
+ ++class446.Interpreter_intStackSize; // L: 4615
+ return 1; // L: 4616
+ } else if (var0 == 7107) { // L: 4618
+ ++class446.Interpreter_intStackSize; // L: 4619
+ return 1; // L: 4620
+ } else if (var0 == 7108) { // L: 4622
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class18.method234() ? 1 : 0; // L: 4623
+ return 1; // L: 4624
+ } else if (var0 == 7110) { // L: 4626
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4627
+ return 1; // L: 4628
+ } else if (var0 == 7120) { // L: 4630
+ --class446.Interpreter_intStackSize; // L: 4631
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4632
+ return 1; // L: 4633
+ } else if (var0 == 7121) { // L: 4635
+ class446.Interpreter_intStackSize -= 2; // L: 4636
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4637
+ return 1; // L: 4638
+ } else if (var0 == 7122) { // L: 4640
+ class446.Interpreter_intStackSize -= 2; // L: 4641
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4642
+ return 1; // L: 4643
+ } else {
+ return 2; // L: 4645
+ }
+ } else {
+ ++class446.Interpreter_intStackSize; // L: 4611
+ return 1; // L: 4612
+ }
}
}
diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java
index 75af493975..e33139fc93 100644
--- a/runescape-client/src/main/java/class112.java
+++ b/runescape-client/src/main/java/class112.java
@@ -1,5 +1,5 @@
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("do")
+@ObfuscatedName("dp")
public interface class112 {
}
diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java
index e88ca527e1..015af073b0 100644
--- a/runescape-client/src/main/java/class113.java
+++ b/runescape-client/src/main/java/class113.java
@@ -1,121 +1,65 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("di")
+@ObfuscatedName("dx")
public class class113 {
- @ObfuscatedName("y")
- @ObfuscatedGetter(
- intValue = -1838363621
- )
- static int field1421;
- @ObfuscatedName("ns")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "Lki;"
+ descriptor = "Lqu;"
)
- static Widget field1422;
- @ObfuscatedName("ne")
+ static IndexedSprite field1427;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1983455525
+ intValue = 244154869
)
- @Export("selectedSpellFlags")
- static int selectedSpellFlags;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -272617605
- )
- int field1430;
- @ObfuscatedName("q")
- float field1428;
- @ObfuscatedName("l")
+ int field1420;
+ @ObfuscatedName("v")
float field1423;
- @ObfuscatedName("k")
- float field1424;
- @ObfuscatedName("a")
+ @ObfuscatedName("q")
+ float field1421;
+ @ObfuscatedName("f")
+ float field1422;
+ @ObfuscatedName("j")
+ float field1419;
+ @ObfuscatedName("e")
float field1425;
- @ObfuscatedName("m")
- float field1426;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Ldi;"
+ descriptor = "Ldx;"
)
- class113 field1427;
+ class113 field1426;
class113() {
- this.field1423 = Float.MAX_VALUE; // L: 8
- this.field1424 = Float.MAX_VALUE; // L: 9
- this.field1425 = Float.MAX_VALUE; // L: 10
- this.field1426 = Float.MAX_VALUE; // L: 11
- }
+ this.field1421 = Float.MAX_VALUE; // L: 8
+ this.field1422 = Float.MAX_VALUE; // L: 9
+ this.field1419 = Float.MAX_VALUE; // L: 10
+ this.field1425 = Float.MAX_VALUE; // L: 11
+ } // L: 14
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1602426305"
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "-65"
)
- void method2621(Buffer var1, int var2) {
- this.field1430 = var1.readShort(); // L: 17
- this.field1428 = var1.method7570();
- this.field1423 = var1.method7570();
- this.field1424 = var1.method7570(); // L: 20
- this.field1425 = var1.method7570(); // L: 21
- this.field1426 = var1.method7570(); // L: 22
+ void method2630(Buffer var1, int var2) {
+ this.field1420 = var1.readShort(); // L: 17
+ this.field1423 = var1.method7740(); // L: 18
+ this.field1421 = var1.method7740(); // L: 19
+ this.field1422 = var1.method7740(); // L: 20
+ this.field1419 = var1.method7740(); // L: 21
+ this.field1425 = var1.method7740(); // L: 22
} // L: 23
- @ObfuscatedName("o")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(I)J",
- garbageValue = "1202809250"
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "1059822722"
)
- public static final synchronized long method2624() {
- long var0 = System.currentTimeMillis(); // L: 14
- if (var0 < class269.field3215) { // L: 15
- class269.field3217 += class269.field3215 - var0; // L: 16
- }
-
- class269.field3215 = var0; // L: 18
- return class269.field3217 + var0; // L: 19
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "([Ljava/lang/String;[II)V",
- garbageValue = "-530991411"
- )
- public static void method2625(String[] var0, int[] var1) {
- InterfaceParent.method2072(var0, var1, 0, var0.length - 1); // L: 39
- } // L: 40
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Ldz;[F[FB)V",
- garbageValue = "-37"
- )
- static void method2623(class117 var0, float[] var1, float[] var2) {
- if (var0 != null) { // L: 295
- var0.field1478 = var1[0]; // L: 298
- float var3 = var1[3] - var1[0]; // L: 299
- float var4 = var2[3] - var2[0]; // L: 300
- float var5 = var1[1] - var1[0]; // L: 301
- float var6 = 0.0F; // L: 302
- float var7 = 0.0F; // L: 303
- if (0.0D != (double)var5) { // L: 304
- var6 = (var2[1] - var2[0]) / var5; // L: 305
- }
-
- var5 = var1[3] - var1[2]; // L: 307
- if ((double)var5 != 0.0D) { // L: 308
- var7 = (var2[3] - var2[2]) / var5; // L: 309
- }
-
- float var8 = 1.0F / (var3 * var3); // L: 311
- float var9 = var6 * var3; // L: 312
- float var10 = var3 * var7; // L: 313
- var0.field1473[0] = (var9 + var10 - var4 - var4) * var8 / var3; // L: 314
- var0.field1473[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; // L: 315
- var0.field1473[2] = var6; // L: 316
- var0.field1473[3] = var2[0]; // L: 317
- }
- } // L: 296 318
+ static final void method2632(String var0) {
+ PacketBufferNode var1 = EnumComposition.getPacketBufferNode(ClientPacket.field2944, Client.packetWriter.isaacCipher); // L: 195
+ var1.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var0)); // L: 196
+ var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 197
+ Client.packetWriter.addNode(var1); // L: 198
+ } // L: 199
}
diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java
index 97d31a09db..72b31dbacc 100644
--- a/runescape-client/src/main/java/class114.java
+++ b/runescape-client/src/main/java/class114.java
@@ -2,91 +2,100 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("de")
+@ObfuscatedName("dl")
public class class114 {
- @ObfuscatedName("k")
- public static final float field1435;
- @ObfuscatedName("a")
- public static final float field1436;
- @ObfuscatedName("cs")
- @ObfuscatedSignature(
- descriptor = "[Lqd;"
- )
- @Export("worldSelectArrows")
- static IndexedSprite[] worldSelectArrows;
- @ObfuscatedName("ep")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive17")
- static Archive archive17;
+ @ObfuscatedName("f")
+ public static final float field1429;
+ @ObfuscatedName("j")
+ public static final float field1432;
static {
- field1435 = Math.ulp(1.0F); // L: 10
- field1436 = 2.0F * field1435; // L: 11
+ field1429 = Math.ulp(1.0F); // L: 10
+ field1432 = 2.0F * field1429; // L: 11
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;I)J",
- garbageValue = "-1342157785"
+ descriptor = "(Llh;Llh;ZLmt;I)V",
+ garbageValue = "1005410507"
)
- public static long method2626(CharSequence var0) {
- long var1 = 0L; // L: 16
- int var3 = var0.length(); // L: 17
+ public static void method2636(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) {
+ UserComparator4.ItemDefinition_archive = var0; // L: 84
+ ItemComposition.ItemDefinition_modelArchive = var1; // L: 85
+ DevicePcmPlayerProvider.ItemDefinition_inMembersWorld = var2; // L: 86
+ PacketBufferNode.ItemDefinition_fileCount = UserComparator4.ItemDefinition_archive.getGroupFileCount(10); // L: 87
+ ItemComposition.ItemDefinition_fontPlain11 = var3; // L: 88
+ } // L: 89
- for (int var4 = 0; var4 < var3; ++var4) { // L: 18
- var1 *= 37L; // L: 19
- char var5 = var0.charAt(var4); // L: 20
- if (var5 >= 'A' && var5 <= 'Z') { // L: 21
- var1 += (long)(var5 + 1 - 65);
- } else if (var5 >= 'a' && var5 <= 'z') { // L: 22
- var1 += (long)(var5 + 1 - 97);
- } else if (var5 >= '0' && var5 <= '9') {
- var1 += (long)(var5 + 27 - 48); // L: 23
- }
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;B)Z",
+ garbageValue = "-111"
+ )
+ @Export("isNumber")
+ public static boolean isNumber(CharSequence var0) {
+ boolean var2 = false; // L: 38
+ boolean var3 = false; // L: 39
+ int var4 = 0; // L: 40
+ int var5 = var0.length(); // L: 41
+ int var6 = 0;
- if (var1 >= 177917621779460413L) { // L: 24
+ boolean var1;
+ while (true) {
+ if (var6 >= var5) {
+ var1 = var3; // L: 71
break;
}
- }
- while (0L == var1 % 37L && var1 != 0L) { // L: 26
- var1 /= 37L;
- }
+ label84: {
+ char var7 = var0.charAt(var6); // L: 43
+ if (var6 == 0) { // L: 44
+ if (var7 == '-') { // L: 45
+ var2 = true; // L: 46
+ break label84;
+ }
- return var1; // L: 27
- }
+ if (var7 == '+') { // L: 49
+ break label84;
+ }
+ }
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(II)Lgq;",
- garbageValue = "111011513"
- )
- @Export("SequenceDefinition_get")
- public static SequenceDefinition SequenceDefinition_get(int var0) {
- SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 46
- if (var1 != null) { // L: 47
- return var1;
- } else {
- byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 48
- var1 = new SequenceDefinition(); // L: 49
- if (var2 != null) { // L: 50
- var1.decode(new Buffer(var2));
+ int var9;
+ if (var7 >= '0' && var7 <= '9') { // L: 51
+ var9 = var7 - '0';
+ } else if (var7 >= 'A' && var7 <= 'Z') { // L: 52
+ var9 = var7 - '7';
+ } else {
+ if (var7 < 'a' || var7 > 'z') { // L: 53
+ var1 = false; // L: 55
+ break;
+ }
+
+ var9 = var7 - 'W';
+ }
+
+ if (var9 >= 10) { // L: 58
+ var1 = false; // L: 59
+ break; // L: 60
+ }
+
+ if (var2) { // L: 62
+ var9 = -var9;
+ }
+
+ int var8 = var4 * 10 + var9; // L: 63
+ if (var4 != var8 / 10) { // L: 64
+ var1 = false; // L: 65
+ break; // L: 66
+ }
+
+ var4 = var8; // L: 68
+ var3 = true; // L: 69
}
- var1.postDecode(); // L: 51
- SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 52
- return var1; // L: 53
+ ++var6; // L: 42
}
- }
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "809732836"
- )
- public static int method2637() {
- return ViewportMouse.ViewportMouse_entityCount; // L: 44
+ return var1; // L: 73
}
}
diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java
index 1ef876d753..be6b49adc4 100644
--- a/runescape-client/src/main/java/class115.java
+++ b/runescape-client/src/main/java/class115.java
@@ -1,448 +1,732 @@
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
+import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("db")
+@ObfuscatedName("dc")
public class class115 {
- @ObfuscatedName("ee")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive12")
- static Archive archive12;
- @ObfuscatedName("o")
+ @ObfuscatedName("b")
+ @Export("operatingSystemName")
+ static String operatingSystemName;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1981912443
+ intValue = -119583879
)
- public final int field1455;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Ldb;"
- )
- public class115 field1447;
- @ObfuscatedName("l")
- float[][] field1446;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "[Lnw;"
- )
- final class388[] field1449;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "[Lnw;"
- )
- class388[] field1452;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "[Lnw;"
- )
- class388[] field1451;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Lnw;"
- )
- class388 field1459;
- @ObfuscatedName("s")
- boolean field1450;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Lnw;"
- )
- class388 field1453;
+ public final int field1448;
@ObfuscatedName("v")
- boolean field1454;
+ @ObfuscatedSignature(
+ descriptor = "Ldc;"
+ )
+ public class115 field1440;
+ @ObfuscatedName("q")
+ float[][] field1435;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "[Lny;"
+ )
+ final class387[] field1433;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "[Lny;"
+ )
+ class387[] field1437;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "[Lny;"
+ )
+ class387[] field1438;
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Lny;"
+ )
+ class387 field1449;
+ @ObfuscatedName("w")
+ boolean field1441;
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Lnw;"
+ descriptor = "Lny;"
)
- class388 field1456;
- @ObfuscatedName("c")
- float[][] field1457;
- @ObfuscatedName("w")
- float[][] field1458;
- @ObfuscatedName("b")
- float[][] field1448;
+ class387 field1434;
+ @ObfuscatedName("i")
+ boolean field1442;
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "Lny;"
+ )
+ class387 field1443;
+ @ObfuscatedName("t")
+ float[][] field1444;
+ @ObfuscatedName("z")
+ float[][] field1439;
+ @ObfuscatedName("r")
+ float[][] field1446;
@ObfuscatedSignature(
- descriptor = "(ILpx;Z)V"
+ descriptor = "(ILqt;Z)V"
)
public class115(int var1, Buffer var2, boolean var3) {
- this.field1459 = new class388(); // L: 13
- this.field1450 = true; // L: 14
- this.field1453 = new class388(); // L: 15
- this.field1454 = true; // L: 16
- this.field1456 = new class388(); // L: 17
- this.field1455 = var2.readShort(); // L: 23
- this.field1449 = new class388[var1]; // L: 24
- this.field1452 = new class388[this.field1449.length]; // L: 25
- this.field1451 = new class388[this.field1449.length]; // L: 26
- this.field1446 = new float[this.field1449.length][3]; // L: 27
+ this.field1449 = new class387(); // L: 13
+ this.field1441 = true;
+ this.field1434 = new class387();
+ this.field1442 = true;
+ this.field1443 = new class387(); // L: 17
+ this.field1448 = var2.readShort(); // L: 23
+ this.field1433 = new class387[var1]; // L: 24
+ this.field1437 = new class387[this.field1433.length]; // L: 25
+ this.field1438 = new class387[this.field1433.length]; // L: 26
+ this.field1435 = new float[this.field1433.length][3]; // L: 27
- for (int var4 = 0; var4 < this.field1449.length; ++var4) { // L: 28
- this.field1449[var4] = new class388(var2, var3); // L: 29
- this.field1446[var4][0] = var2.method7570(); // L: 30
- this.field1446[var4][1] = var2.method7570(); // L: 31
- this.field1446[var4][2] = var2.method7570(); // L: 32
+ for (int var4 = 0; var4 < this.field1433.length; ++var4) { // L: 28
+ this.field1433[var4] = new class387(var2, var3); // L: 29
+ this.field1435[var4][0] = var2.method7740(); // L: 30
+ this.field1435[var4][1] = var2.method7740(); // L: 31
+ this.field1435[var4][2] = var2.method7740(); // L: 32
}
- this.method2677(); // L: 34
+ this.method2652(); // L: 34
} // L: 35
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "54"
+ descriptor = "(I)V",
+ garbageValue = "654014719"
)
- void method2677() {
- this.field1457 = new float[this.field1449.length][3]; // L: 38
- this.field1458 = new float[this.field1449.length][3]; // L: 39
- this.field1448 = new float[this.field1449.length][3]; // L: 40
- class388 var1 = Tile.method3904(); // L: 41
+ void method2652() {
+ this.field1444 = new float[this.field1433.length][3]; // L: 38
+ this.field1439 = new float[this.field1433.length][3]; // L: 39
+ this.field1446 = new float[this.field1433.length][3]; // L: 40
+ class387 var1 = MenuAction.method1884(); // L: 41
- for (int var2 = 0; var2 < this.field1449.length; ++var2) { // L: 42
- class388 var3 = this.method2640(var2); // L: 43
- var1.method6868(var3); // L: 44
- var1.method6820(); // L: 45
- this.field1457[var2] = var1.method6810(); // L: 46
- this.field1458[var2][0] = var3.field4400[12]; // L: 47
- this.field1458[var2][1] = var3.field4400[13]; // L: 48
- this.field1458[var2][2] = var3.field4400[14]; // L: 49
- this.field1448[var2] = var3.method6821(); // L: 50
+ for (int var2 = 0; var2 < this.field1433.length; ++var2) { // L: 42
+ class387 var3 = this.method2653(var2); // L: 43
+ var1.method6973(var3);
+ var1.method6970();
+ this.field1444[var2] = var1.method6959();
+ this.field1439[var2][0] = var3.field4394[12];
+ this.field1439[var2][1] = var3.field4394[13];
+ this.field1439[var2][2] = var3.field4394[14];
+ this.field1446[var2] = var3.method6992();
}
- var1.method6865(); // L: 52
- } // L: 53
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)Lnw;",
- garbageValue = "2055144288"
- )
- class388 method2640(int var1) {
- return this.field1449[var1]; // L: 56
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(IB)Lnw;",
- garbageValue = "-82"
- )
- class388 method2641(int var1) {
- if (this.field1452[var1] == null) { // L: 60
- this.field1452[var1] = new class388(this.method2640(var1)); // L: 61
- if (this.field1447 != null) { // L: 62
- this.field1452[var1].method6816(this.field1447.method2641(var1)); // L: 63
- } else {
- this.field1452[var1].method6816(class388.field4403); // L: 66
- }
- }
-
- return this.field1452[var1]; // L: 69
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Lnw;",
- garbageValue = "543774546"
- )
- class388 method2642(int var1) {
- if (this.field1451[var1] == null) { // L: 73
- this.field1451[var1] = new class388(this.method2641(var1)); // L: 74
- this.field1451[var1].method6820(); // L: 75
- }
-
- return this.field1451[var1]; // L: 77
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(Lnw;I)V",
- garbageValue = "1597711527"
- )
- void method2645(class388 var1) {
- this.field1459.method6868(var1); // L: 81
- this.field1450 = true; // L: 82
- this.field1454 = true; // L: 83
- } // L: 84
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(I)Lnw;",
- garbageValue = "-1889892168"
- )
- class388 method2672() {
- return this.field1459; // L: 87
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(I)Lnw;",
- garbageValue = "-1532476889"
- )
- class388 method2652() {
- if (this.field1450) { // L: 91
- this.field1453.method6868(this.method2672()); // L: 92
- if (this.field1447 != null) { // L: 93
- this.field1453.method6816(this.field1447.method2652()); // L: 94
- }
-
- this.field1450 = false; // L: 96
- }
-
- return this.field1453; // L: 98
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(II)Lnw;",
- garbageValue = "1098148128"
- )
- public class388 method2666(int var1) {
- if (this.field1454) { // L: 102
- this.field1456.method6868(this.method2642(var1)); // L: 103
- this.field1456.method6816(this.method2652()); // L: 104
- this.field1454 = false; // L: 105
- }
-
- return this.field1456; // L: 107
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(IS)[F",
- garbageValue = "15889"
- )
- float[] method2647(int var1) {
- return this.field1457[var1]; // L: 111
+ var1.method6968();
}
@ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(II)[F",
- garbageValue = "-2138262360"
+ descriptor = "(II)Lny;",
+ garbageValue = "1273342901"
)
- float[] method2655(int var1) {
- return this.field1458[var1]; // L: 115
+ class387 method2653(int var1) {
+ return this.field1433[var1];
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lny;",
+ garbageValue = "437863053"
+ )
+ class387 method2658(int var1) {
+ if (this.field1437[var1] == null) { // L: 60
+ this.field1437[var1] = new class387(this.method2653(var1)); // L: 61
+ if (this.field1440 != null) { // L: 62
+ this.field1437[var1].method6962(this.field1440.method2658(var1)); // L: 63
+ } else {
+ this.field1437[var1].method6962(class387.field4397); // L: 66
+ }
+ }
+
+ return this.field1437[var1]; // L: 69
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IS)Lny;",
+ garbageValue = "-31759"
+ )
+ class387 method2655(int var1) {
+ if (this.field1438[var1] == null) { // L: 73
+ this.field1438[var1] = new class387(this.method2658(var1)); // L: 74
+ this.field1438[var1].method6970(); // L: 75
+ }
+
+ return this.field1438[var1]; // L: 77
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Lny;I)V",
+ garbageValue = "1315349364"
+ )
+ void method2656(class387 var1) {
+ this.field1449.method6973(var1); // L: 81
+ this.field1441 = true; // L: 82
+ this.field1442 = true; // L: 83
+ } // L: 84
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lny;",
+ garbageValue = "-1989832149"
+ )
+ class387 method2657() {
+ return this.field1449; // L: 87
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lny;",
+ garbageValue = "240378906"
+ )
+ class387 method2681() {
+ if (this.field1441) { // L: 91
+ this.field1434.method6973(this.method2657()); // L: 92
+ if (this.field1440 != null) { // L: 93
+ this.field1434.method6962(this.field1440.method2681()); // L: 94
+ }
+
+ this.field1441 = false; // L: 96
+ }
+
+ return this.field1434; // L: 98
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lny;",
+ garbageValue = "65631141"
+ )
+ public class387 method2651(int var1) {
+ if (this.field1442) { // L: 102
+ this.field1443.method6973(this.method2655(var1)); // L: 103
+ this.field1443.method6962(this.method2681()); // L: 104
+ this.field1442 = false; // L: 105
+ }
+
+ return this.field1443; // L: 107
}
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(IB)[F",
- garbageValue = "0"
+ descriptor = "(IS)[F",
+ garbageValue = "180"
)
- float[] method2649(int var1) {
- return this.field1448[var1]; // L: 119
+ float[] method2660(int var1) {
+ return this.field1444[var1]; // L: 111
}
- @ObfuscatedName("p")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/util/Date;",
- garbageValue = "12"
+ descriptor = "(II)[F",
+ garbageValue = "379318512"
)
- static Date method2679() throws ParseException {
- SimpleDateFormat var0 = new SimpleDateFormat("ddMMyyyyHH", Locale.ENGLISH); // L: 1011
- var0.setLenient(false); // L: 1012
- StringBuilder var1 = new StringBuilder(); // L: 1013
- String[] var2 = Login.field876; // L: 1015
+ float[] method2661(int var1) {
+ return this.field1439[var1]; // L: 115
+ }
- for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1016
- String var4 = var2[var3]; // L: 1017
- if (var4 == null) { // L: 1019
- class126.method2799(7); // L: 1021
- class345.setLoginResponseString("Date not valid.", "Please ensure all characters are populated.", ""); // L: 1022
- return null; // L: 1024
- }
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(II)[F",
+ garbageValue = "1659744707"
+ )
+ float[] method2679(int var1) {
+ return this.field1446[var1]; // L: 119
+ }
- var1.append(var4); // L: 1026
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)J",
+ garbageValue = "-27"
+ )
+ public static final synchronized long method2692() {
+ long var0 = System.currentTimeMillis(); // L: 14
+ if (var0 < class268.field3170) { // L: 15
+ class393.field4425 += class268.field3170 - var0; // L: 16
}
- var1.append("12"); // L: 1030
- return var0.parse(var1.toString()); // L: 1031
+ class268.field3170 = var0; // L: 18
+ return class393.field4425 + var0; // L: 19
}
- @ObfuscatedName("gw")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lcx;I)V",
- garbageValue = "641789779"
+ descriptor = "(ZB)V",
+ garbageValue = "-71"
)
- static final void method2680(Actor var0) {
- var0.movementSequence = var0.idleSequence; // L: 4211
- if (var0.pathLength == 0) { // L: 4212
- var0.field1194 = 0; // L: 4213
+ public static void method2693(boolean var0) {
+ if (NetCache.NetCache_socket != null) {
+ try {
+ Buffer var1 = new Buffer(4);
+ var1.writeByte(var0 ? 2 : 3); // L: 47
+ var1.writeMedium(0);
+ NetCache.NetCache_socket.write(var1.array, 0, 4);
+ } catch (IOException var4) {
+ try {
+ NetCache.NetCache_socket.close();
+ } catch (Exception var3) {
+ }
+
+ ++NetCache.NetCache_ioExceptions; // L: 56
+ NetCache.NetCache_socket = null; // L: 57
+ }
+
+ }
+ } // L: 59
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;Llh;I)Z",
+ garbageValue = "609480846"
+ )
+ public static boolean method2691(AbstractArchive var0, AbstractArchive var1) {
+ class121.WorldMapElement_archive = var1; // L: 44
+ if (!var0.isFullyLoaded()) { // L: 45
+ return false; // L: 46
} else {
- if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4216
- SequenceDefinition var1 = class114.SequenceDefinition_get(var0.sequence); // L: 4217
- if (var0.field1200 > 0 && var1.field2224 == 0) { // L: 4218
- ++var0.field1194; // L: 4219
- return; // L: 4220
- }
+ WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48
+ WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 49
- if (var0.field1200 <= 0 && var1.field2206 == 0) { // L: 4222
- ++var0.field1194; // L: 4223
- return; // L: 4224
+ for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 50
+ byte[] var3 = var0.takeFile(35, var2); // L: 51
+ WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52
+ if (var3 != null) { // L: 53
+ WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54
+ WorldMapElement.WorldMapElement_cached[var2].method3377(); // L: 55
}
}
- int var10 = var0.x; // L: 4227
- int var2 = var0.y; // L: 4228
- int var3 = var0.field1167 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4229
- int var4 = var0.field1167 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4230
- if (var10 < var3) { // L: 4231
- if (var2 < var4) { // L: 4232
- var0.orientation = 1280;
- } else if (var2 > var4) { // L: 4233
- var0.orientation = 1792;
- } else {
- var0.orientation = 1536; // L: 4234
- }
- } else if (var10 > var3) { // L: 4236
- if (var2 < var4) { // L: 4237
- var0.orientation = 768;
- } else if (var2 > var4) { // L: 4238
- var0.orientation = 256;
- } else {
- var0.orientation = 512; // L: 4239
- }
- } else if (var2 < var4) { // L: 4241
- var0.orientation = 1024;
- } else if (var2 > var4) { // L: 4242
- var0.orientation = 0;
+ return true; // L: 58
+ }
+ }
+
+ @ObfuscatedName("o")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-298256181"
+ )
+ static int method2682(int var0, Script var1, boolean var2) {
+ String var7;
+ if (var0 == ScriptOpcodes.MES) { // L: 1480
+ var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1481
+ class290.addGameMessage(0, "", var7); // L: 1482
+ return 1; // L: 1483
+ } else if (var0 == ScriptOpcodes.ANIM) {
+ class446.Interpreter_intStackSize -= 2; // L: 1486
+ class65.performPlayerAnimation(class101.localPlayer, Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 1487
+ return 1; // L: 1488
+ } else if (var0 == ScriptOpcodes.IF_CLOSE) {
+ if (!Interpreter.field842) { // L: 1491
+ Interpreter.field829 = true; // L: 1492
}
- class193 var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4243
- if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4244
- int var6 = var0.orientation - var0.rotation & 2047; // L: 4251
- if (var6 > 1024) { // L: 4252
- var6 -= 2048;
- }
-
- int var7 = var0.walkBackSequence; // L: 4253
- if (var6 >= -256 && var6 <= 256) { // L: 4254
- var7 = var0.walkSequence;
- } else if (var6 >= 256 && var6 < 768) { // L: 4255
- var7 = var0.walkRightSequence;
- } else if (var6 >= -768 && var6 <= -256) { // L: 4256
- var7 = var0.walkLeftSequence;
- }
-
- if (var7 == -1) { // L: 4257
- var7 = var0.walkSequence;
- }
-
- var0.movementSequence = var7; // L: 4258
- int var8 = 4; // L: 4259
- boolean var9 = true; // L: 4260
- if (var0 instanceof NPC) { // L: 4261
- var9 = ((NPC)var0).definition.isClickable;
- }
-
- if (var9) { // L: 4262
- if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1204 != 0) { // L: 4263
- var8 = 2;
- }
-
- if (var0.pathLength > 2) { // L: 4264
- var8 = 6;
- }
-
- if (var0.pathLength > 3) { // L: 4265
- var8 = 8;
- }
-
- if (var0.field1194 > 0 && var0.pathLength > 1) { // L: 4266
- var8 = 8; // L: 4267
- --var0.field1194; // L: 4268
- }
- } else {
- if (var0.pathLength > 1) { // L: 4272
- var8 = 6;
- }
-
- if (var0.pathLength > 2) { // L: 4273
- var8 = 8;
- }
-
- if (var0.field1194 > 0 && var0.pathLength > 1) { // L: 4274
- var8 = 8; // L: 4275
- --var0.field1194; // L: 4276
- }
- }
-
- if (var5 == class193.field2248) { // L: 4279
- var8 <<= 1;
- } else if (var5 == class193.field2249) { // L: 4280
- var8 >>= 1;
- }
-
- if (var8 >= 8) { // L: 4281
- if (var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4282
- var0.movementSequence = var0.runSequence;
- } else if (var0.movementSequence == var0.walkBackSequence && var0.field1150 != -1) { // L: 4283
- var0.movementSequence = var0.field1150;
- } else if (var0.walkLeftSequence == var0.movementSequence && var0.field1183 != -1) { // L: 4284
- var0.movementSequence = var0.field1183;
- } else if (var0.walkRightSequence == var0.movementSequence && var0.field1152 != -1) { // L: 4285
- var0.movementSequence = var0.field1152;
- }
- } else if (var8 <= 1) { // L: 4287
- if (var0.walkSequence == var0.movementSequence && var0.field1160 != -1) { // L: 4288
- var0.movementSequence = var0.field1160;
- } else if (var0.movementSequence == var0.walkBackSequence && var0.field1154 != -1) { // L: 4289
- var0.movementSequence = var0.field1154;
- } else if (var0.movementSequence == var0.walkLeftSequence && var0.field1155 != -1) { // L: 4290
- var0.movementSequence = var0.field1155;
- } else if (var0.walkRightSequence == var0.movementSequence && var0.field1156 != -1) { // L: 4291
- var0.movementSequence = var0.field1156;
- }
- }
-
- if (var10 != var3 || var2 != var4) { // L: 4293
- if (var10 < var3) { // L: 4294
- var0.x += var8; // L: 4295
- if (var0.x > var3) { // L: 4296
- var0.x = var3;
- }
- } else if (var10 > var3) { // L: 4298
- var0.x -= var8; // L: 4299
- if (var0.x < var3) { // L: 4300
- var0.x = var3;
- }
- }
-
- if (var2 < var4) { // L: 4302
- var0.y += var8; // L: 4303
- if (var0.y > var4) { // L: 4304
- var0.y = var4;
- }
- } else if (var2 > var4) { // L: 4306
- var0.y -= var8; // L: 4307
- if (var0.y < var4) { // L: 4308
- var0.y = var4;
- }
- }
- }
-
- if (var3 == var0.x && var4 == var0.y) { // L: 4311
- --var0.pathLength; // L: 4312
- if (var0.field1200 > 0) { // L: 4313
- --var0.field1200;
- }
+ return 1; // L: 1494
+ } else {
+ int var15;
+ if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
+ var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1497
+ var15 = 0; // L: 1498
+ if (class114.isNumber(var7)) { // L: 1499
+ var15 = FaceNormal.method4344(var7);
}
+ PacketBufferNode var13 = EnumComposition.getPacketBufferNode(ClientPacket.field2946, Client.packetWriter.isaacCipher); // L: 1501
+ var13.packetBuffer.writeInt(var15); // L: 1502
+ Client.packetWriter.addNode(var13); // L: 1503
+ return 1; // L: 1504
} else {
- var0.x = var3; // L: 4245
- var0.y = var4; // L: 4246
- --var0.pathLength; // L: 4247
- if (var0.field1200 > 0) { // L: 4248
- --var0.field1200;
- }
+ PacketBufferNode var11;
+ if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
+ var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1507
+ var11 = EnumComposition.getPacketBufferNode(ClientPacket.field2928, Client.packetWriter.isaacCipher); // L: 1509
+ var11.packetBuffer.writeByte(var7.length() + 1); // L: 1510
+ var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1511
+ Client.packetWriter.addNode(var11); // L: 1512
+ return 1; // L: 1513
+ } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
+ var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1516
+ var11 = EnumComposition.getPacketBufferNode(ClientPacket.field2985, Client.packetWriter.isaacCipher); // L: 1518
+ var11.packetBuffer.writeByte(var7.length() + 1); // L: 1519
+ var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1520
+ Client.packetWriter.addNode(var11); // L: 1521
+ return 1; // L: 1522
+ } else {
+ String var4;
+ int var10;
+ if (var0 == ScriptOpcodes.OPPLAYER) {
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1525
+ var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1526
+ Coord.method5549(var10, var4); // L: 1527
+ return 1; // L: 1528
+ } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
+ class446.Interpreter_intStackSize -= 3; // L: 1531
+ var10 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 1532
+ var15 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 1533
+ int var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 1534
+ Widget var14 = class140.getWidget(var9); // L: 1535
+ class161.clickWidget(var14, var10, var15); // L: 1536
+ return 1; // L: 1537
+ } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
+ class446.Interpreter_intStackSize -= 2; // L: 1540
+ var10 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 1541
+ var15 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 1542
+ Widget var12 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1543
+ class161.clickWidget(var12, var10, var15); // L: 1544
+ return 1; // L: 1545
+ } else if (var0 == ScriptOpcodes.MOUSECAM) {
+ class122.mouseCam = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1548
+ return 1; // L: 1549
+ } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class19.clientPreferences.method2245() ? 1 : 0; // L: 1552
+ return 1; // L: 1553
+ } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
+ class19.clientPreferences.method2339(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1); // L: 1556
+ return 1; // L: 1557
+ } else if (var0 == ScriptOpcodes.OPENURL) {
+ var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1560
+ boolean var8 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1561
+ class258.openURL(var7, var8, false); // L: 1562
+ return 1; // L: 1563
+ } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1566
+ var11 = EnumComposition.getPacketBufferNode(ClientPacket.field2927, Client.packetWriter.isaacCipher); // L: 1568
+ var11.packetBuffer.writeShort(var10); // L: 1569
+ Client.packetWriter.addNode(var11); // L: 1570
+ return 1; // L: 1571
+ } else if (var0 == ScriptOpcodes.BUG_REPORT) {
+ var10 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1574
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 1575
+ var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 1576
+ String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 1577
+ if (var4.length() > 500) { // L: 1578
+ return 1;
+ } else if (var5.length() > 500) { // L: 1579
+ return 1;
+ } else {
+ PacketBufferNode var6 = EnumComposition.getPacketBufferNode(ClientPacket.field2951, Client.packetWriter.isaacCipher); // L: 1580
+ var6.packetBuffer.writeShort(1 + ScriptEvent.stringCp1252NullTerminatedByteSize(var4) + ScriptEvent.stringCp1252NullTerminatedByteSize(var5)); // L: 1581
+ var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1582
+ var6.packetBuffer.method7762(var10); // L: 1583
+ var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1584
+ Client.packetWriter.addNode(var6); // L: 1585
+ return 1; // L: 1586
+ }
+ } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
+ Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1589
+ return 1; // L: 1590
+ } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
+ Client.showMouseOverText = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1593
+ return 1; // L: 1594
+ } else if (var0 == ScriptOpcodes.RENDERSELF) {
+ Client.renderSelf = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1597
+ return 1; // L: 1598
+ } else if (var0 == 3120) {
+ if (Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1) { // L: 1601
+ Client.drawPlayerNames |= 1;
+ } else {
+ Client.drawPlayerNames &= -2; // L: 1602
+ }
+ return 1; // L: 1603
+ } else if (var0 == 3121) {
+ if (Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1) { // L: 1606
+ Client.drawPlayerNames |= 2;
+ } else {
+ Client.drawPlayerNames &= -3; // L: 1607
+ }
+
+ return 1; // L: 1608
+ } else if (var0 == 3122) {
+ if (Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1) { // L: 1611
+ Client.drawPlayerNames |= 4;
+ } else {
+ Client.drawPlayerNames &= -5; // L: 1612
+ }
+
+ return 1; // L: 1613
+ } else if (var0 == 3123) {
+ if (Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1) { // L: 1616
+ Client.drawPlayerNames |= 8;
+ } else {
+ Client.drawPlayerNames &= -9; // L: 1617
+ }
+
+ return 1; // L: 1618
+ } else if (var0 == 3124) {
+ Client.drawPlayerNames = 0; // L: 1621
+ return 1; // L: 1622
+ } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
+ Client.showMouseCross = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1625
+ return 1; // L: 1626
+ } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
+ Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1629
+ return 1; // L: 1630
+ } else if (var0 == ScriptOpcodes.SETTAPTODROP) {
+ class9.setTapToDrop(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1); // L: 1633
+ return 1; // L: 1634
+ } else if (var0 == ScriptOpcodes.GETTAPTODROP) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = HorizontalAlignment.getTapToDrop() ? 1 : 0; // L: 1637
+ return 1; // L: 1638
+ } else if (var0 == 3129) {
+ class446.Interpreter_intStackSize -= 2; // L: 1641
+ Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 1642
+ Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 1643
+ return 1; // L: 1644
+ } else if (var0 == 3130) {
+ class446.Interpreter_intStackSize -= 2; // L: 1647
+ return 1; // L: 1648
+ } else if (var0 == 3131) {
+ --class446.Interpreter_intStackSize; // L: 1651
+ return 1; // L: 1652
+ } else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Script.canvasWidth; // L: 1655
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class78.canvasHeight; // L: 1656
+ return 1; // L: 1657
+ } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
+ --class446.Interpreter_intStackSize; // L: 1660
+ return 1; // L: 1661
+ } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
+ return 1; // L: 1664
+ } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
+ class446.Interpreter_intStackSize -= 2; // L: 1667
+ return 1; // L: 1668
+ } else if (var0 == 3136) {
+ Client.field656 = 3; // L: 1671
+ Client.field657 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1672
+ return 1; // L: 1673
+ } else if (var0 == 3137) {
+ Client.field656 = 2; // L: 1676
+ Client.field657 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1677
+ return 1; // L: 1678
+ } else if (var0 == 3138) {
+ Client.field656 = 0; // L: 1681
+ return 1; // L: 1682
+ } else if (var0 == 3139) {
+ Client.field656 = 1; // L: 1685
+ return 1; // L: 1686
+ } else if (var0 == 3140) {
+ Client.field656 = 3; // L: 1689
+ Client.field657 = var2 ? class124.scriptDotWidget.id * -1598663557 * -1038587213 : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget.id * -1598663557 * -1038587213; // L: 1690
+ return 1; // L: 1691
+ } else {
+ boolean var3;
+ if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1694
+ class19.clientPreferences.method2246(var3); // L: 1695
+ return 1; // L: 1696
+ } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class19.clientPreferences.method2247() ? 1 : 0; // L: 1699
+ return 1; // L: 1700
+ } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1703
+ Client.Login_isUsernameRemembered = var3; // L: 1704
+ if (!var3) { // L: 1705
+ class19.clientPreferences.method2260(""); // L: 1706
+ }
+
+ return 1; // L: 1708
+ } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1711
+ return 1; // L: 1712
+ } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
+ return 1; // L: 1715
+ } else if (var0 == 3146) {
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize] == 1; // L: 1718
+ class19.clientPreferences.method2248(!var3); // L: 1719
+ return 1; // L: 1720
+ } else if (var0 == 3147) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class19.clientPreferences.method2317() ? 0 : 1; // L: 1723
+ return 1; // L: 1724
+ } else if (var0 == 3148) {
+ return 1; // L: 1727
+ } else if (var0 == 3149) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1730
+ return 1; // L: 1731
+ } else if (var0 == 3150) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1734
+ return 1; // L: 1735
+ } else if (var0 == 3151) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1738
+ return 1; // L: 1739
+ } else if (var0 == 3152) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1742
+ return 1; // L: 1743
+ } else if (var0 == 3153) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1746
+ return 1; // L: 1747
+ } else if (var0 == 3154) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class117.method2719(); // L: 1750
+ return 1; // L: 1751
+ } else if (var0 == 3155) {
+ --Interpreter.Interpreter_stringStackSize; // L: 1754
+ return 1; // L: 1755
+ } else if (var0 == 3156) {
+ return 1; // L: 1758
+ } else if (var0 == 3157) {
+ class446.Interpreter_intStackSize -= 2; // L: 1761
+ return 1; // L: 1762
+ } else if (var0 == 3158) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1765
+ return 1; // L: 1766
+ } else if (var0 == 3159) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1769
+ return 1; // L: 1770
+ } else if (var0 == 3160) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1773
+ return 1; // L: 1774
+ } else if (var0 == 3161) {
+ --class446.Interpreter_intStackSize; // L: 1777
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1778
+ return 1; // L: 1779
+ } else if (var0 == 3162) {
+ --class446.Interpreter_intStackSize; // L: 1782
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1783
+ return 1; // L: 1784
+ } else if (var0 == 3163) {
+ --Interpreter.Interpreter_stringStackSize; // L: 1787
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1788
+ return 1; // L: 1789
+ } else if (var0 == 3164) {
+ --class446.Interpreter_intStackSize; // L: 1792
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1793
+ return 1; // L: 1794
+ } else if (var0 == 3165) {
+ --class446.Interpreter_intStackSize; // L: 1797
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1798
+ return 1; // L: 1799
+ } else if (var0 == 3166) {
+ class446.Interpreter_intStackSize -= 2; // L: 1802
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1803
+ return 1; // L: 1804
+ } else if (var0 == 3167) {
+ class446.Interpreter_intStackSize -= 2; // L: 1807
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1808
+ return 1; // L: 1809
+ } else if (var0 == 3168) {
+ class446.Interpreter_intStackSize -= 2; // L: 1812
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1813
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1814
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1815
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1816
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1817
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1818
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1819
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1820
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1821
+ return 1; // L: 1822
+ } else if (var0 == 3169) {
+ return 1; // L: 1825
+ } else if (var0 == 3170) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1828
+ return 1; // L: 1829
+ } else if (var0 == 3171) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1832
+ return 1; // L: 1833
+ } else if (var0 == 3172) {
+ --class446.Interpreter_intStackSize; // L: 1836
+ return 1; // L: 1837
+ } else if (var0 == 3173) {
+ --class446.Interpreter_intStackSize; // L: 1840
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1841
+ return 1; // L: 1842
+ } else if (var0 == 3174) {
+ --class446.Interpreter_intStackSize; // L: 1845
+ return 1; // L: 1846
+ } else if (var0 == 3175) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1849
+ return 1; // L: 1850
+ } else if (var0 == 3176) {
+ return 1; // L: 1853
+ } else if (var0 == 3177) {
+ return 1; // L: 1856
+ } else if (var0 == 3178) {
+ --Interpreter.Interpreter_stringStackSize; // L: 1859
+ return 1; // L: 1860
+ } else if (var0 == 3179) {
+ return 1; // L: 1863
+ } else if (var0 == 3180) {
+ --Interpreter.Interpreter_stringStackSize; // L: 1866
+ return 1; // L: 1867
+ } else if (var0 == 3181) {
+ WorldMapEvent.method5120(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1870
+ return 1; // L: 1871
+ } else if (var0 == 3182) {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class193.method3919(); // L: 1874
+ return 1; // L: 1875
+ } else if (var0 != 3183 && var0 != 3184) {
+ if (var0 == 3187) {
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 1882
+ return 1; // L: 1883
+ } else {
+ return var0 == 3188 ? 1 : 2; // L: 1886 1888
+ }
+ } else {
+ --class446.Interpreter_intStackSize; // L: 1878
+ return 1; // L: 1879
+ }
+ }
+ }
}
}
- } // L: 4214 4249 4315
+ }
+
+ @ObfuscatedName("gk")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "990148531"
+ )
+ @Export("doCheat")
+ static final void doCheat(String var0) {
+ if (var0.equalsIgnoreCase("toggleroof")) { // L: 3915
+ class19.clientPreferences.method2339(!class19.clientPreferences.method2245()); // L: 3916
+ if (class19.clientPreferences.method2245()) { // L: 3917
+ class290.addGameMessage(99, "", "Roofs are now all hidden"); // L: 3918
+ } else {
+ class290.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3921
+ }
+ }
+
+ if (var0.equalsIgnoreCase("displayfps")) { // L: 3924
+ class19.clientPreferences.method2251();
+ }
+
+ if (var0.equalsIgnoreCase("renderself")) { // L: 3925
+ Client.renderSelf = !Client.renderSelf;
+ }
+
+ if (var0.equalsIgnoreCase("mouseovertext")) {
+ Client.showMouseOverText = !Client.showMouseOverText; // L: 3926
+ }
+
+ if (Client.staffModLevel >= 2) { // L: 3927
+ if (var0.equalsIgnoreCase("errortest")) { // L: 3928
+ throw new RuntimeException();
+ }
+
+ if (var0.equalsIgnoreCase("showcoord")) { // L: 3929
+ class121.worldMap.showCoord = !class121.worldMap.showCoord;
+ }
+
+ if (var0.equalsIgnoreCase("fpson")) { // L: 3930
+ class19.clientPreferences.method2250(true);
+ }
+
+ if (var0.equalsIgnoreCase("fpsoff")) { // L: 3931
+ class19.clientPreferences.method2250(false);
+ }
+
+ if (var0.equalsIgnoreCase("gc")) { // L: 3932
+ System.gc();
+ }
+
+ if (var0.equalsIgnoreCase("clientdrop")) { // L: 3933
+ class131.method2877();
+ }
+ }
+
+ PacketBufferNode var1 = EnumComposition.getPacketBufferNode(ClientPacket.field3013, Client.packetWriter.isaacCipher); // L: 3936
+ var1.packetBuffer.writeByte(var0.length() + 1); // L: 3937
+ var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3938
+ Client.packetWriter.addNode(var1); // L: 3939
+ } // L: 3940
}
diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java
index 952553dd16..7fb9588142 100644
--- a/runescape-client/src/main/java/class116.java
+++ b/runescape-client/src/main/java/class116.java
@@ -5,99 +5,75 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("dn")
public enum class116 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "Ldn;"
)
- field1470(0, 0),
+ field1455(0, 0),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Ldn;"
+ )
+ field1451(1, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "Ldn;"
)
- field1465(1, 1),
- @ObfuscatedName("l")
+ field1450(2, 2),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "Ldn;"
)
- field1464(2, 2),
- @ObfuscatedName("k")
+ field1453(3, 3),
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Ldn;"
)
- field1466(3, 3),
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Ldn;"
- )
- field1468(4, 4);
+ field1454(4, 4);
- @ObfuscatedName("nl")
- @ObfuscatedSignature(
- descriptor = "Lbv;"
- )
- @Export("tempMenuAction")
- static MenuAction tempMenuAction;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -611288391
+ intValue = -121286099
)
- final int field1469;
- @ObfuscatedName("p")
+ final int field1452;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 79441713
+ intValue = -1382484373
)
- final int field1467;
+ final int field1457;
class116(int var3, int var4) {
- this.field1469 = var3; // L: 137
- this.field1467 = var4; // L: 138
- } // L: 139
+ this.field1452 = var3; // L: 143
+ this.field1457 = var4; // L: 144
+ } // L: 145
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field1467; // L: 142
+ return this.field1457; // L: 148
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Lqb;",
- garbageValue = "650575371"
+ descriptor = "(Llh;S)V",
+ garbageValue = "22259"
)
- public static PrivateChatMode method2686(int var0) {
- PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4794, PrivateChatMode.field4793, PrivateChatMode.field4795}; // L: 18
- PrivateChatMode[] var2 = var1; // L: 20
+ public static void method2700(AbstractArchive var0) {
+ class437.field4675 = var0; // L: 20
+ } // L: 21
- for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21
- PrivateChatMode var4 = var2[var3]; // L: 22
- if (var0 == var4.field4796) { // L: 24
- return var4;
- }
- }
-
- return null; // L: 28
- }
-
- @ObfuscatedName("k")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(IB)[B",
- garbageValue = "20"
+ descriptor = "(Lqe;IIII)V",
+ garbageValue = "1518396143"
)
- @Export("ByteArrayPool_getArray")
- public static synchronized byte[] ByteArrayPool_getArray(int var0) {
- return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112
- }
-
- @ObfuscatedName("gt")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1727484940"
- )
- static boolean method2685() {
- return (Client.drawPlayerNames & 2) != 0; // L: 5012
- }
+ static void method2699(SpritePixels var0, int var1, int var2, int var3) {
+ DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 47
+ long var6 = (long)(var3 << 16 | var1 << 8 | var2); // L: 51
+ var4.put(var0, var6, var0.pixels.length * 4); // L: 53
+ } // L: 54
}
diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java
index dd67696d0a..a3779e56dc 100644
--- a/runescape-client/src/main/java/class117.java
+++ b/runescape-client/src/main/java/class117.java
@@ -1,193 +1,196 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dz")
+@ObfuscatedName("do")
public class class117 {
- @ObfuscatedName("o")
- boolean field1477;
- @ObfuscatedName("q")
- boolean field1487;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Ldn;"
- )
- class116 field1472;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Ldn;"
- )
- class116 field1475;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "[Ldi;"
- )
- class113[] field1476;
- @ObfuscatedName("m")
- boolean field1480;
- @ObfuscatedName("p")
- float field1478;
- @ObfuscatedName("s")
- float field1479;
- @ObfuscatedName("r")
- float[] field1473;
- @ObfuscatedName("v")
- float[] field1481;
- @ObfuscatedName("y")
- boolean field1482;
@ObfuscatedName("c")
- @ObfuscatedGetter(
- intValue = 2107172617
+ boolean field1463;
+ @ObfuscatedName("v")
+ boolean field1459;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Ldn;"
)
- int field1483;
+ class116 field1468;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Ldn;"
+ )
+ class116 field1461;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "[Ldx;"
+ )
+ class113[] field1462;
+ @ObfuscatedName("e")
+ boolean field1470;
+ @ObfuscatedName("g")
+ float field1464;
@ObfuscatedName("w")
- float[] field1484;
- @ObfuscatedName("b")
- @ObfuscatedGetter(
- intValue = -1297196187
- )
- int field1474;
+ float field1458;
+ @ObfuscatedName("y")
+ float[] field1465;
+ @ObfuscatedName("i")
+ float[] field1467;
+ @ObfuscatedName("s")
+ boolean field1472;
@ObfuscatedName("t")
@ObfuscatedGetter(
- intValue = -1886403005
+ intValue = 1656446909
)
- int field1486;
- @ObfuscatedName("g")
- float field1485;
- @ObfuscatedName("x")
- float field1488;
+ int field1469;
+ @ObfuscatedName("z")
+ float[] field1460;
+ @ObfuscatedName("r")
+ @ObfuscatedGetter(
+ intValue = -1725270903
+ )
+ int field1471;
+ @ObfuscatedName("u")
+ @ObfuscatedGetter(
+ intValue = -1480629139
+ )
+ int field1466;
+ @ObfuscatedName("k")
+ float field1473;
+ @ObfuscatedName("h")
+ float field1474;
class117() {
- this.field1473 = new float[4]; // L: 16
- this.field1481 = new float[4];
- this.field1482 = true;
- this.field1483 = 0;
+ this.field1465 = new float[4]; // L: 16
+ this.field1467 = new float[4]; // L: 17
+ this.field1472 = true; // L: 18
+ this.field1469 = 0; // L: 19
} // L: 26
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;II)I",
- garbageValue = "548491592"
+ descriptor = "(Lqt;II)I",
+ garbageValue = "1937348414"
)
- int method2688(Buffer var1, int var2) {
+ int method2702(Buffer var1, int var2) {
int var3 = var1.readUnsignedShort(); // L: 29
- class295.method5560(var1.readUnsignedByte()); // L: 30
+ ScriptFrame.method1052(var1.readUnsignedByte()); // L: 30
int var5 = var1.readUnsignedByte(); // L: 32
- class116[] var6 = new class116[]{class116.field1470, class116.field1465, class116.field1464, class116.field1466, class116.field1468}; // L: 36
- class116 var7 = (class116)class291.findEnumerated(var6, var5); // L: 38
+ class116[] var6 = new class116[]{class116.field1455, class116.field1451, class116.field1450, class116.field1453, class116.field1454}; // L: 36
+ class116 var7 = (class116)Actor.findEnumerated(var6, var5); // L: 38
if (var7 == null) { // L: 39
- var7 = class116.field1470;
+ var7 = class116.field1455;
}
- this.field1472 = var7; // L: 42
+ this.field1468 = var7; // L: 42
int var11 = var1.readUnsignedByte(); // L: 44
- class116[] var8 = new class116[]{class116.field1470, class116.field1465, class116.field1464, class116.field1466, class116.field1468}; // L: 48
- class116 var9 = (class116)class291.findEnumerated(var8, var11); // L: 50
- if (var9 == null) { // L: 51
- var9 = class116.field1470;
+ class116[] var8 = new class116[]{class116.field1455, class116.field1451, class116.field1450, class116.field1453, class116.field1454};
+ class116 var9 = (class116)Actor.findEnumerated(var8, var11);
+ if (var9 == null) {
+ var9 = class116.field1455;
}
- this.field1475 = var9; // L: 54
- this.field1477 = var1.readUnsignedByte() != 0; // L: 55
- this.field1476 = new class113[var3]; // L: 56
+ this.field1461 = var9; // L: 54
+ this.field1463 = var1.readUnsignedByte() != 0;
+ this.field1462 = new class113[var3];
class113 var13 = null; // L: 57
int var12;
for (var12 = 0; var12 < var3; ++var12) { // L: 58
- class113 var10 = new class113(); // L: 59
- var10.method2621(var1, var2); // L: 60
- this.field1476[var12] = var10; // L: 61
+ class113 var10 = new class113();
+ var10.method2630(var1, var2); // L: 60
+ this.field1462[var12] = var10;
if (var13 != null) { // L: 62
- var13.field1427 = var10; // L: 63
+ var13.field1426 = var10;
}
- var13 = var10; // L: 65
+ var13 = var10;
}
- this.field1474 = this.field1476[0].field1430; // L: 67
- this.field1486 = this.field1476[this.method2695() - 1].field1430; // L: 68
- this.field1484 = new float[this.method2692() + 1]; // L: 70
+ this.field1471 = this.field1462[0].field1420;
+ this.field1466 = this.field1462[this.method2709() - 1].field1420;
+ this.field1460 = new float[this.method2706() + 1];
- for (var12 = this.method2690(); var12 <= this.method2691(); ++var12) { // L: 71
- this.field1484[var12 - this.method2690()] = MusicPatchNode.method5315(this, (float)var12); // L: 72
+ for (var12 = this.method2704(); var12 <= this.method2703(); ++var12) {
+ this.field1460[var12 - this.method2704()] = WorldMapSection0.method4918(this, (float)var12); // L: 72
}
- this.field1476 = null; // L: 74
- this.field1485 = MusicPatchNode.method5315(this, (float)(this.method2690() - 1)); // L: 76
- this.field1488 = MusicPatchNode.method5315(this, (float)(this.method2691() + 1)); // L: 77
+ this.field1462 = null;
+ this.field1473 = WorldMapSection0.method4918(this, (float)(this.method2704() - 1)); // L: 76
+ this.field1474 = WorldMapSection0.method4918(this, (float)(this.method2703() + 1));
return var3; // L: 78
}
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)F",
+ garbageValue = "1796106515"
+ )
+ public float method2701(int var1) {
+ if (var1 < this.method2704()) { // L: 83
+ return this.field1473;
+ } else {
+ return var1 > this.method2703() ? this.field1474 : this.field1460[var1 - this.method2704()]; // L: 86
+ }
+ }
+
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)F",
- garbageValue = "1078920947"
+ descriptor = "(I)I",
+ garbageValue = "176047889"
)
- public float method2689(int var1) {
- if (var1 < this.method2690()) { // L: 83
- return this.field1485; // L: 84
- } else {
- return var1 > this.method2691() ? this.field1488 : this.field1484[var1 - this.method2690()]; // L: 86 87 89
- }
+ int method2704() {
+ return this.field1471;
}
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "56"
- )
- int method2690() {
- return this.field1474; // L: 94
- }
-
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-529211546"
+ garbageValue = "-1241672779"
)
- int method2691() {
- return this.field1486; // L: 98
+ int method2703() {
+ return this.field1466; // L: 98
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "-2"
+ garbageValue = "5"
)
- int method2692() {
- return this.method2691() - this.method2690(); // L: 102
+ int method2706() {
+ return this.method2703() - this.method2704();
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(FS)I",
- garbageValue = "-12024"
+ descriptor = "(FI)I",
+ garbageValue = "-938650750"
)
- int method2712(float var1) {
- if (this.field1483 < 0 || (float)this.field1476[this.field1483].field1430 > var1 || this.field1476[this.field1483].field1427 != null && (float)this.field1476[this.field1483].field1427.field1430 <= var1) { // L: 106
- if (var1 >= (float)this.method2690() && var1 <= (float)this.method2691()) { // L: 109
- int var2 = this.method2695(); // L: 112
- int var3 = this.field1483; // L: 113
- if (var2 > 0) { // L: 114
- int var4 = 0; // L: 115
- int var5 = var2 - 1; // L: 116
+ int method2705(float var1) {
+ if (this.field1469 < 0 || (float)this.field1462[this.field1469].field1420 > var1 || this.field1462[this.field1469].field1426 != null && (float)this.field1462[this.field1469].field1426.field1420 <= var1) {
+ if (var1 >= (float)this.method2704() && var1 <= (float)this.method2703()) {
+ int var2 = this.method2709();
+ int var3 = this.field1469; // L: 113
+ if (var2 > 0) {
+ int var4 = 0;
+ int var5 = var2 - 1;
do {
- int var6 = var5 + var4 >> 1; // L: 118
- if (var1 < (float)this.field1476[var6].field1430) { // L: 119
- if (var1 > (float)this.field1476[var6 - 1].field1430) { // L: 120
+ int var6 = var4 + var5 >> 1;
+ if (var1 < (float)this.field1462[var6].field1420) { // L: 119
+ if (var1 > (float)this.field1462[var6 - 1].field1420) {
var3 = var6 - 1; // L: 121
break;
}
var5 = var6 - 1; // L: 125
} else {
- if (var1 <= (float)this.field1476[var6].field1430) { // L: 128
+ if (var1 <= (float)this.field1462[var6].field1420) { // L: 128
var3 = var6; // L: 138
break; // L: 139
}
- if (var1 < (float)this.field1476[var6 + 1].field1430) { // L: 129
+ if (var1 < (float)this.field1462[var6 + 1].field1420) { // L: 129
var3 = var6; // L: 130
break; // L: 131
}
@@ -197,58 +200,175 @@ public class class117 {
} while(var4 <= var5); // L: 141
}
- if (var3 != this.field1483) { // L: 143
- this.field1483 = var3; // L: 144
- this.field1482 = true; // L: 145
+ if (var3 != this.field1469) { // L: 143
+ this.field1469 = var3; // L: 144
+ this.field1472 = true; // L: 145
}
- return this.field1483; // L: 147
+ return this.field1469; // L: 147
} else {
return -1; // L: 110
}
} else {
- return this.field1483; // L: 107
+ return this.field1469;
}
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(FI)Ldi;",
- garbageValue = "-5315501"
+ descriptor = "(FI)Ldx;",
+ garbageValue = "-1377164530"
)
- class113 method2707(float var1) {
- int var2 = this.method2712(var1); // L: 151
- return var2 >= 0 && var2 < this.field1476.length ? this.field1476[var2] : null; // L: 152 153 156
+ class113 method2717(float var1) {
+ int var2 = this.method2705(var1); // L: 151
+ return var2 >= 0 && var2 < this.field1462.length ? this.field1462[var2] : null; // L: 152 153 156
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(S)I",
- garbageValue = "6186"
+ descriptor = "(I)I",
+ garbageValue = "273043499"
)
- int method2695() {
- return this.field1476 == null ? 0 : this.field1476.length; // L: 161 162
+ int method2709() {
+ return this.field1462 == null ? 0 : this.field1462.length; // L: 161 162
}
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(IIIIIII)I",
- garbageValue = "1632957867"
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V",
+ garbageValue = "-1404648911"
)
- public static int method2717(int var0, int var1, int var2, int var3, int var4, int var5) {
- if ((var5 & 1) == 1) { // L: 17
- int var6 = var3; // L: 18
- var3 = var4; // L: 19
- var4 = var6; // L: 20
+ public static void method2727(String var0, String var1, int var2, int var3) throws IOException {
+ class142.idxCount = var3; // L: 40
+ class93.cacheGamebuild = var2; // L: 41
+
+ try {
+ class115.operatingSystemName = System.getProperty("os.name"); // L: 43
+ } catch (Exception var15) { // L: 45
+ class115.operatingSystemName = "Unknown"; // L: 46
}
- var2 &= 3; // L: 22
- if (var2 == 0) { // L: 23
- return var1;
- } else if (var2 == 1) { // L: 24
- return 7 - var0 - (var3 - 1);
+ NetFileRequest.formattedOperatingSystemName = class115.operatingSystemName.toLowerCase(); // L: 48
+
+ try {
+ class123.userHomeDirectory = System.getProperty("user.home"); // L: 50
+ if (class123.userHomeDirectory != null) { // L: 51
+ class123.userHomeDirectory = class123.userHomeDirectory + "/";
+ }
+ } catch (Exception var14) { // L: 53
+ }
+
+ try {
+ if (NetFileRequest.formattedOperatingSystemName.startsWith("win")) { // L: 55
+ if (class123.userHomeDirectory == null) { // L: 56
+ class123.userHomeDirectory = System.getenv("USERPROFILE");
+ }
+ } else if (class123.userHomeDirectory == null) { // L: 59
+ class123.userHomeDirectory = System.getenv("HOME");
+ }
+
+ if (class123.userHomeDirectory != null) { // L: 61
+ class123.userHomeDirectory = class123.userHomeDirectory + "/";
+ }
+ } catch (Exception var13) { // L: 63
+ }
+
+ if (class123.userHomeDirectory == null) { // L: 64
+ class123.userHomeDirectory = "~/";
+ }
+
+ Fonts.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class123.userHomeDirectory, "/tmp/", ""}; // L: 65
+ JagexCache.cacheSubPaths = new String[]{".jagex_cache_" + class93.cacheGamebuild, ".file_store_" + class93.cacheGamebuild}; // L: 66
+ int var9 = 0;
+
+ label129:
+ while (var9 < 4) {
+ JagexCache.cacheDir = Friend.method6630(var0, var1, var9); // L: 68
+ if (!JagexCache.cacheDir.exists()) { // L: 69
+ JagexCache.cacheDir.mkdirs();
+ }
+
+ File[] var5 = JagexCache.cacheDir.listFiles(); // L: 70
+ if (var5 == null) { // L: 71
+ break;
+ }
+
+ File[] var6 = var5; // L: 73
+ int var7 = 0;
+
+ while (true) {
+ if (var7 >= var6.length) {
+ break label129;
+ }
+
+ File var8 = var6[var7]; // L: 75
+ if (!Varcs.method2474(var8, false)) { // L: 77
+ ++var9; // L: 67
+ break;
+ }
+
+ ++var7; // L: 74
+ }
+ }
+
+ MilliClock.method3309(JagexCache.cacheDir); // L: 84
+
+ try {
+ File var4 = new File(class123.userHomeDirectory, "random.dat"); // L: 87
+ int var11;
+ if (var4.exists()) { // L: 88
+ JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 89
+ } else {
+ label111:
+ for (int var10 = 0; var10 < JagexCache.cacheSubPaths.length; ++var10) { // L: 92
+ for (var11 = 0; var11 < Fonts.cacheParentPaths.length; ++var11) { // L: 93
+ File var12 = new File(Fonts.cacheParentPaths[var11] + JagexCache.cacheSubPaths[var10] + File.separatorChar + "random.dat"); // L: 94
+ if (var12.exists()) { // L: 95
+ JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var12, "rw", 25L), 24, 0); // L: 96
+ break label111; // L: 97
+ }
+ }
+ }
+ }
+
+ if (JagexCache.JagexCache_randomDat == null) { // L: 102
+ RandomAccessFile var17 = new RandomAccessFile(var4, "rw"); // L: 103
+ var11 = var17.read(); // L: 104
+ var17.seek(0L); // L: 105
+ var17.write(var11); // L: 106
+ var17.seek(0L); // L: 107
+ var17.close(); // L: 108
+ JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 109
+ }
+ } catch (IOException var16) { // L: 112
+ }
+
+ JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 114
+ JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 115
+ class359.JagexCache_idxFiles = new BufferedFile[class142.idxCount]; // L: 116
+
+ for (var9 = 0; var9 < class142.idxCount; ++var9) { // L: 117
+ class359.JagexCache_idxFiles[var9] = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx" + var9), "rw", 1048576L), 6000, 0); // L: 118
+ }
+
+ } // L: 120
+
+ @ObfuscatedName("fb")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-625330098"
+ )
+ static int method2719() {
+ if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1644
+ int var0 = 0; // L: 1645
+
+ for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1646
+ var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1647
+ }
+
+ return var0 * 10000 / Client.field626; // L: 1649
} else {
- return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25
+ return 10000;
}
}
}
diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java
index 43cd17a2aa..b1c5c27df0 100644
--- a/runescape-client/src/main/java/class118.java
+++ b/runescape-client/src/main/java/class118.java
@@ -2,132 +2,405 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("dl")
+@ObfuscatedName("dq")
public class class118 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ldl;"
+ descriptor = "Ldq;"
)
- static final class118 field1498;
+ static final class118 field1481;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Ldq;"
+ )
+ static final class118 field1477;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Ldl;"
+ descriptor = "Ldq;"
)
- static final class118 field1491;
- @ObfuscatedName("l")
+ static final class118 field1478;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ldl;"
+ descriptor = "Ldq;"
)
- static final class118 field1492;
- @ObfuscatedName("k")
+ static final class118 field1479;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Ldl;"
+ descriptor = "Ldq;"
)
- static final class118 field1499;
- @ObfuscatedName("a")
+ static final class118 field1480;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Ldl;"
+ descriptor = "Ldq;"
)
- static final class118 field1490;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Ldl;"
- )
- static final class118 field1495;
- @ObfuscatedName("p")
+ static final class118 field1484;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = -733991275
+ intValue = -451186485
)
- final int field1496;
- @ObfuscatedName("s")
+ final int field1482;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 1625780091
+ intValue = -1492168119
)
- final int field1497;
- @ObfuscatedName("r")
+ final int field1483;
+ @ObfuscatedName("y")
@ObfuscatedGetter(
- intValue = -808605415
+ intValue = 1225507013
)
- final int field1493;
+ final int field1486;
static {
- field1498 = new class118(0, 0, (String)null, 0); // L: 14
- field1491 = new class118(1, 1, (String)null, 9); // L: 15
- field1492 = new class118(2, 2, (String)null, 3); // L: 16
- field1499 = new class118(3, 3, (String)null, 6); // L: 17
- field1490 = new class118(4, 4, (String)null, 1); // L: 18
- field1495 = new class118(5, 5, (String)null, 3); // L: 19
+ field1481 = new class118(0, 0, (String)null, 0); // L: 14
+ field1477 = new class118(1, 1, (String)null, 9); // L: 15
+ field1478 = new class118(2, 2, (String)null, 3); // L: 16
+ field1479 = new class118(3, 3, (String)null, 6); // L: 17
+ field1480 = new class118(4, 4, (String)null, 1); // L: 18
+ field1484 = new class118(5, 5, (String)null, 3); // L: 19
}
class118(int var1, int var2, String var3, int var4) {
- this.field1496 = var1;
- this.field1497 = var2; // L: 30
- this.field1493 = var4; // L: 31
- } // L: 32
+ this.field1482 = var1; // L: 25
+ this.field1483 = var2; // L: 26
+ this.field1486 = var4; // L: 27
+ } // L: 28
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field1497; // L: 46
+ return this.field1483; // L: 46
}
- @ObfuscatedName("m")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "-1599057614"
+ garbageValue = "-2129901712"
)
- int method2732() {
- return this.field1493; // L: 41
+ int method2736() {
+ return this.field1486; // L: 41
}
- @ObfuscatedName("o")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;IZI)V",
- garbageValue = "-898838791"
+ descriptor = "(I)V",
+ garbageValue = "-533774728"
)
- public static void method2733(AbstractArchive var0, String var1, String var2, int var3, boolean var4) {
- int var5 = var0.getGroupId(var1); // L: 26
- int var6 = var0.getFileId(var5, var2); // L: 27
- UserComparator8.method2574(var0, var5, var6, var3, var4); // L: 28
- } // L: 29
+ static void method2738() {
+ if (class136.loadWorlds()) { // L: 1924
+ Login.worldSelectOpen = true; // L: 1925
+ Login.worldSelectPage = 0; // L: 1926
+ Login.worldSelectPagesCount = 0; // L: 1927
+ }
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)[Lkg;",
- garbageValue = "-495384223"
- )
- @Export("PlayerType_values")
- public static PlayerType[] PlayerType_values() {
- return new PlayerType[]{PlayerType.field3989, PlayerType.PlayerType_ironman, PlayerType.field3984, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.field3990}; // L: 22
- }
+ } // L: 1929
- @ObfuscatedName("ht")
+ @ObfuscatedName("am")
@ObfuscatedSignature(
- descriptor = "(Lca;I)Z",
- garbageValue = "1081302246"
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-81"
)
- static boolean method2720(Player var0) {
- if (Client.drawPlayerNames == 0) { // L: 5020
- return false;
- } else if (ModelData0.localPlayer != var0) { // L: 5021
- boolean var1 = (Client.drawPlayerNames & 4) != 0; // L: 5024
- return var1 || SoundSystem.method779() && var0.isFriend() || class116.method2685() && var0.isFriendsChatMember(); // L: 5026
+ static int method2742(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3535
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3536
+ return 1; // L: 3537
+ } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3539
+ class446.Interpreter_intStackSize -= 3; // L: 3540
+ Client.publicChatMode = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3541
+ class339.privateChatMode = Ignored.method6780(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 3542
+ if (class339.privateChatMode == null) { // L: 3543
+ class339.privateChatMode = PrivateChatMode.field4817;
+ }
+
+ Client.tradeChatMode = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3544
+ PacketBufferNode var13 = EnumComposition.getPacketBufferNode(ClientPacket.field2916, Client.packetWriter.isaacCipher); // L: 3546
+ var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3547
+ var13.packetBuffer.writeByte(class339.privateChatMode.field4820); // L: 3548
+ var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3549
+ Client.packetWriter.addNode(var13); // L: 3550
+ return 1; // L: 3551
} else {
- return class21.method274(); // L: 5028
+ PacketBufferNode var6;
+ int var7;
+ String var8;
+ int var9;
+ if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3553
+ var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3554
+ class446.Interpreter_intStackSize -= 2; // L: 3555
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3556
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3557
+ var6 = EnumComposition.getPacketBufferNode(ClientPacket.field2949, Client.packetWriter.isaacCipher); // L: 3559
+ var6.packetBuffer.writeByte(ScriptEvent.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3560
+ var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3561
+ var6.packetBuffer.writeByte(var7 - 1); // L: 3562
+ var6.packetBuffer.writeByte(var9); // L: 3563
+ Client.packetWriter.addNode(var6); // L: 3564
+ return 1; // L: 3565
+ } else {
+ int var3;
+ Message var5;
+ if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3567
+ class446.Interpreter_intStackSize -= 2; // L: 3568
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3569
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3570
+ var5 = class18.Messages_getByChannelAndID(var3, var7); // L: 3571
+ if (var5 != null) { // L: 3572
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.count; // L: 3573
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.cycle; // L: 3574
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3575
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3576
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3577
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3578
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3581
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3582
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3583
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3584
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3585
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3586
+ }
+
+ return 1; // L: 3588
+ } else {
+ Message var4;
+ if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3590
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3591
+ var4 = UserComparator7.Messages_getMessage(var3); // L: 3592
+ if (var4 != null) { // L: 3593
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.type; // L: 3594
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.cycle; // L: 3595
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3596
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3597
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3598
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3599
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3602
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3603
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3604
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3605
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3606
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3607
+ }
+
+ return 1; // L: 3609
+ } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3611
+ if (class339.privateChatMode == null) { // L: 3612
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class339.privateChatMode.field4820; // L: 3613
+ }
+
+ return 1; // L: 3614
+ } else {
+ PacketBufferNode var12;
+ if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3616
+ var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3617
+ var7 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3618
+ var12 = PlayerComposition.method5600(var7, var8, class134.clientLanguage, -1); // L: 3619
+ Client.packetWriter.addNode(var12); // L: 3620
+ return 1; // L: 3621
+ } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3623
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3624
+ var8 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3625
+ String var11 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3626
+ var12 = EnumComposition.getPacketBufferNode(ClientPacket.field2932, Client.packetWriter.isaacCipher); // L: 3628
+ var12.packetBuffer.writeShort(0); // L: 3629
+ int var10 = var12.packetBuffer.offset; // L: 3630
+ var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3631
+ PcmPlayer.method720(var12.packetBuffer, var11); // L: 3632
+ var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3633
+ Client.packetWriter.addNode(var12); // L: 3634
+ return 1; // L: 3635
+ } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3637
+ var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3638
+ class446.Interpreter_intStackSize -= 2; // L: 3639
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3640
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3641
+ var6 = PlayerComposition.method5600(var7, var8, class134.clientLanguage, var9); // L: 3642
+ Client.packetWriter.addNode(var6); // L: 3643
+ return 1; // L: 3644
+ } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3646
+ if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3653
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3654
+ return 1; // L: 3655
+ } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3657
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3658
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = ClanChannelMember.Messages_getHistorySize(var3); // L: 3659
+ return 1; // L: 3660
+ } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3662
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3663
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = DirectByteArrayCopier.Messages_getLastChatID(var3); // L: 3664
+ return 1; // L: 3665
+ } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3667
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3668
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.method305(var3); // L: 3669
+ return 1; // L: 3670
+ } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3672
+ var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3673
+ class115.doCheat(var8); // L: 3674
+ return 1; // L: 3675
+ } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3677
+ Client.field716 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3678
+ return 1; // L: 3679
+ } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3681
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field716; // L: 3682
+ return 1; // L: 3683
+ } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3685
+ var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3686
+ System.out.println(var8); // L: 3687
+ return 1; // L: 3688
+ } else if (var0 == 5024) { // L: 3690
+ --class446.Interpreter_intStackSize; // L: 3691
+ return 1; // L: 3692
+ } else if (var0 == 5025) { // L: 3694
+ ++class446.Interpreter_intStackSize; // L: 3695
+ return 1; // L: 3696
+ } else if (var0 == 5030) { // L: 3698
+ class446.Interpreter_intStackSize -= 2; // L: 3699
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3700
+ var7 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3701
+ var5 = class18.Messages_getByChannelAndID(var3, var7); // L: 3702
+ if (var5 != null) { // L: 3703
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.count; // L: 3704
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.cycle; // L: 3705
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3706
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3707
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3708
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3709
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3710
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3711
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3714
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3715
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3716
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3717
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3718
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3719
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3720
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3721
+ }
+
+ return 1; // L: 3723
+ } else if (var0 == 5031) { // L: 3725
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3726
+ var4 = UserComparator7.Messages_getMessage(var3); // L: 3727
+ if (var4 != null) { // L: 3728
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.type; // L: 3729
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.cycle; // L: 3730
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3731
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3732
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3733
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3734
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3735
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3736
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3739
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3740
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3741
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3742
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3743
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3744
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3745
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3746
+ }
+
+ return 1; // L: 3748
+ } else {
+ return 2; // L: 3750
+ }
+ } else {
+ if (class101.localPlayer != null && class101.localPlayer.username != null) { // L: 3648
+ var8 = class101.localPlayer.username.getName();
+ } else {
+ var8 = ""; // L: 3649
+ }
+
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8; // L: 3650
+ return 1; // L: 3651
+ }
+ }
+ }
+ }
}
}
- @ObfuscatedName("lx")
+ @ObfuscatedName("af")
@ObfuscatedSignature(
- descriptor = "(S)Z",
- garbageValue = "5517"
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-58"
)
- static boolean method2721() {
- return class12.clientPreferences.method2243() >= Client.field484; // L: 12710
+ static int method2744(int var0, Script var1, boolean var2) {
+ int var3;
+ if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3799
+ class446.Interpreter_intStackSize -= 2; // L: 3800
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3801
+ int var4 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3802
+ if (!Client.isCameraLocked) { // L: 3803
+ Client.camAngleX = var3; // L: 3804
+ Client.camAngleY = var4; // L: 3805
+ }
+
+ return 1; // L: 3807
+ } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3809
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3810
+ return 1; // L: 3811
+ } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3813
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3814
+ return 1; // L: 3815
+ } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3817
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 3818
+ if (var3 < 0) { // L: 3819
+ var3 = 0;
+ }
+
+ Client.camFollowHeight = var3; // L: 3820
+ return 1; // L: 3821
+ } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3823
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3824
+ return 1; // L: 3825
+ } else {
+ return 2; // L: 3827
+ }
}
+
+ @ObfuscatedName("jz")
+ @ObfuscatedSignature(
+ descriptor = "([Lkb;IIIZB)V",
+ garbageValue = "84"
+ )
+ @Export("resizeInterface")
+ static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+ for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10669
+ Widget var6 = var0[var5]; // L: 10670
+ if (var6 != null && var6.parentId == var1) { // L: 10671 10672
+ Decimator.alignWidgetSize(var6, var2, var3, var4); // L: 10673
+ class240.alignWidgetPosition(var6, var2, var3); // L: 10674
+ if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10675
+ var6.scrollX = var6.scrollWidth - var6.width;
+ }
+
+ if (var6.scrollX < 0) { // L: 10676
+ var6.scrollX = 0;
+ }
+
+ if (var6.scrollY > var6.scrollHeight - var6.height) {
+ var6.scrollY = var6.scrollHeight - var6.height; // L: 10677
+ }
+
+ if (var6.scrollY < 0) { // L: 10678
+ var6.scrollY = 0;
+ }
+
+ if (var6.type == 0) { // L: 10679
+ BufferedNetSocket.revalidateWidgetScroll(var0, var6, var4);
+ }
+ }
+ }
+
+ } // L: 10681
}
diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java
index a32e70d43e..873eed45a4 100644
--- a/runescape-client/src/main/java/class119.java
+++ b/runescape-client/src/main/java/class119.java
@@ -3,130 +3,127 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("da")
+@ObfuscatedName("dt")
public class class119 implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1508;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1512;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1502;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1516;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1518;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1521;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1506;
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1507;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1500;
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1509;
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1510;
@ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lda;"
+ descriptor = "Ldt;"
)
- static final class119 field1511;
- @ObfuscatedName("w")
+ static final class119 field1497;
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1503;
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1513;
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1514;
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "Lda;"
- )
- static final class119 field1515;
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "Lda;"
+ descriptor = "Ldt;"
)
static final class119 field1504;
- @ObfuscatedName("ac")
- @Export("fontHelvetica13")
- static java.awt.Font fontHelvetica13;
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = 1636917821
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
)
- final int field1517;
+ static final class119 field1505;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1501;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1492;
@ObfuscatedName("e")
- @ObfuscatedGetter(
- intValue = -1474083167
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
)
- final int field1505;
+ static final class119 field1493;
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1494;
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1495;
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1496;
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1489;
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1498;
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1499;
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1500;
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1502;
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1488;
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
+ )
+ static final class119 field1503;
@ObfuscatedName("h")
- @ObfuscatedGetter(
- intValue = 1038102121
+ @ObfuscatedSignature(
+ descriptor = "Ldt;"
)
- final int field1519;
+ static final class119 field1491;
+ @ObfuscatedName("x")
+ @ObfuscatedGetter(
+ intValue = -1597541925
+ )
+ final int field1490;
+ @ObfuscatedName("l")
+ @ObfuscatedGetter(
+ intValue = -954105411
+ )
+ final int field1506;
+ @ObfuscatedName("a")
+ @ObfuscatedGetter(
+ intValue = -1728542525
+ )
+ final int field1507;
static {
- field1508 = new class119(0, 0, (String)null, -1, -1); // L: 52
- field1512 = new class119(1, 1, (String)null, 0, 2); // L: 53
- field1502 = new class119(2, 2, (String)null, 1, 2); // L: 54
- field1516 = new class119(3, 3, (String)null, 2, 2); // L: 55
- field1518 = new class119(4, 4, (String)null, 3, 1); // L: 56
- field1521 = new class119(5, 5, (String)null, 4, 1); // L: 57
- field1506 = new class119(6, 6, (String)null, 5, 1); // L: 58
- field1507 = new class119(7, 7, (String)null, 6, 3);
- field1500 = new class119(8, 8, (String)null, 7, 3); // L: 60
- field1509 = new class119(9, 9, (String)null, 8, 3);
- field1510 = new class119(10, 10, (String)null, 0, 7);
- field1511 = new class119(11, 11, (String)null, 1, 7);
- field1503 = new class119(12, 12, (String)null, 2, 7);
- field1513 = new class119(13, 13, (String)null, 3, 7);
- field1514 = new class119(14, 14, (String)null, 4, 7);
- field1515 = new class119(15, 15, (String)null, 5, 7);
- field1504 = new class119(16, 16, (String)null, 0, 5);
+ field1497 = new class119(0, 0, (String)null, -1, -1); // L: 52
+ field1504 = new class119(1, 1, (String)null, 0, 2); // L: 53
+ field1505 = new class119(2, 2, (String)null, 1, 2); // L: 54
+ field1501 = new class119(3, 3, (String)null, 2, 2); // L: 55
+ field1492 = new class119(4, 4, (String)null, 3, 1); // L: 56
+ field1493 = new class119(5, 5, (String)null, 4, 1); // L: 57
+ field1494 = new class119(6, 6, (String)null, 5, 1); // L: 58
+ field1495 = new class119(7, 7, (String)null, 6, 3); // L: 59
+ field1496 = new class119(8, 8, (String)null, 7, 3); // L: 60
+ field1489 = new class119(9, 9, (String)null, 8, 3); // L: 61
+ field1498 = new class119(10, 10, (String)null, 0, 7); // L: 62
+ field1499 = new class119(11, 11, (String)null, 1, 7); // L: 63
+ field1500 = new class119(12, 12, (String)null, 2, 7); // L: 64
+ field1502 = new class119(13, 13, (String)null, 3, 7); // L: 65
+ field1488 = new class119(14, 14, (String)null, 4, 7); // L: 66
+ field1503 = new class119(15, 15, (String)null, 5, 7); // L: 67
+ field1491 = new class119(16, 16, (String)null, 0, 5); // L: 68
}
@ObfuscatedSignature(
@@ -134,141 +131,45 @@ public class class119 implements MouseWheel {
garbageValue = "-1"
)
class119(int var1, int var2, String var3, int var4, int var5) {
- this.field1517 = var1;
- this.field1505 = var2; // L: 79
- this.field1519 = var4; // L: 80
+ this.field1490 = var1; // L: 78
+ this.field1506 = var2; // L: 79
+ this.field1507 = var4; // L: 80
} // L: 81
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field1505; // L: 84
+ return this.field1506; // L: 84
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "1"
+ garbageValue = "14"
)
- int method2738() {
- return this.field1519; // L: 88
+ int method2747() {
+ return this.field1507; // L: 88
}
- @ObfuscatedName("o")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "([BB)Ljava/lang/String;",
- garbageValue = "-27"
+ descriptor = "(III)I",
+ garbageValue = "-1713795762"
)
- public static String method2745(byte[] var0) {
- int var2 = var0.length; // L: 59
- StringBuilder var3 = new StringBuilder(); // L: 61
-
- for (int var4 = 0; var4 < var2 + 0; var4 += 3) { // L: 62
- int var5 = var0[var4] & 255; // L: 63
- var3.append(class342.field4158[var5 >>> 2]); // L: 64
- if (var4 < var2 - 1) { // L: 65
- int var6 = var0[var4 + 1] & 255; // L: 66
- var3.append(class342.field4158[(var5 & 3) << 4 | var6 >>> 4]); // L: 67
- if (var4 < var2 - 2) { // L: 68
- int var7 = var0[var4 + 2] & 255; // L: 69
- var3.append(class342.field4158[(var6 & 15) << 2 | var7 >>> 6]).append(class342.field4158[var7 & 63]); // L: 70
- } else {
- var3.append(class342.field4158[(var6 & 15) << 2]).append("="); // L: 72
- }
- } else {
- var3.append(class342.field4158[(var5 & 3) << 4]).append("=="); // L: 74
+ static int method2757(int var0, int var1) {
+ for (int var2 = 0; var2 < 8; ++var2) { // L: 1153
+ if (var1 <= var0 + 30) { // L: 1154
+ return var2; // L: 1155
}
+
+ var0 += 30; // L: 1157
+ var0 += var2 != 1 && var2 != 3 ? 5 : 20; // L: 1158
}
- String var1 = var3.toString(); // L: 76
- return var1; // L: 78
+ return 0; // L: 1160
}
-
- @ObfuscatedName("iw")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-197494883"
- )
- static void method2739(int var0, int var1) {
- int var2 = ChatChannel.fontBold12.stringWidth("Choose Option"); // L: 8871
-
- int var3;
- for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8872
- Font var7 = ChatChannel.fontBold12; // L: 8873
- String var8;
- if (var3 < 0) { // L: 8876
- var8 = ""; // L: 8877
- } else if (Client.menuTargets[var3].length() > 0) { // L: 8880
- var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3];
- } else {
- var8 = Client.menuActions[var3]; // L: 8881
- }
-
- int var6 = var7.stringWidth(var8); // L: 8883
- if (var6 > var2) { // L: 8884
- var2 = var6;
- }
- }
-
- var2 += 8; // L: 8886
- var3 = Client.menuOptionsCount * 15 + 22; // L: 8887
- int var4 = var0 - var2 / 2; // L: 8888
- if (var2 + var4 > GraphicsObject.canvasWidth) { // L: 8889
- var4 = GraphicsObject.canvasWidth - var2;
- }
-
- if (var4 < 0) { // L: 8890
- var4 = 0;
- }
-
- int var5 = var1; // L: 8891
- if (var1 + var3 > class433.canvasHeight) { // L: 8892
- var5 = class433.canvasHeight - var3;
- }
-
- if (var5 < 0) { // L: 8893
- var5 = 0;
- }
-
- BuddyRankComparator.menuX = var4; // L: 8894
- FontName.menuY = var5; // L: 8895
- KeyHandler.menuWidth = var2; // L: 8896
- class7.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8897
- } // L: 8898
-
- @ObfuscatedName("ka")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-58"
- )
- static void method2737() {
- for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11925
- int var1 = var0.group; // L: 11926
- if (WorldMapDecoration.loadInterface(var1)) { // L: 11927
- boolean var2 = true; // L: 11928
- Widget[] var3 = NetSocket.Widget_interfaceComponents[var1]; // L: 11929
-
- int var4;
- for (var4 = 0; var4 < var3.length; ++var4) { // L: 11930
- if (var3[var4] != null) { // L: 11931
- var2 = var3[var4].isIf3; // L: 11932
- break;
- }
- }
-
- if (!var2) { // L: 11936
- var4 = (int)var0.key; // L: 11937
- Widget var5 = class92.getWidget(var4); // L: 11938
- if (var5 != null) { // L: 11939
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var5);
- }
- }
- }
- }
-
- } // L: 11943
}
diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java
index ff0c4020ca..7b8098cb37 100644
--- a/runescape-client/src/main/java/class12.java
+++ b/runescape-client/src/main/java/class12.java
@@ -11,30 +11,29 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import org.bouncycastle.crypto.tls.TlsClientProtocol;
-@ObfuscatedName("w")
+@ObfuscatedName("z")
class class12 extends SSLSocket {
- @ObfuscatedName("uq")
+ @ObfuscatedName("sw")
+ @ObfuscatedGetter(
+ intValue = 731084091
+ )
+ static int field65;
+ @ObfuscatedName("lm")
@ObfuscatedSignature(
- descriptor = "Lcy;"
+ descriptor = "Lhk;"
)
- @Export("clientPreferences")
- static ClientPreferences clientPreferences;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -380169429
+ @Export("textureProvider")
+ static TextureProvider textureProvider;
+ @ObfuscatedName("pw")
+ @ObfuscatedSignature(
+ descriptor = "[Lkb;"
)
- @Export("Interpreter_intStackSize")
- static int Interpreter_intStackSize;
- @ObfuscatedName("cd")
- @ObfuscatedGetter(
- intValue = -1896109667
- )
- public static int field61;
- @ObfuscatedName("o")
+ static Widget[] field62;
+ @ObfuscatedName("c")
Certificate[] field63;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lg;"
+ descriptor = "Lk;"
)
final class15 this$0;
// $FF: synthetic field
@@ -43,97 +42,87 @@ class class12 extends SSLSocket {
final String val$host;
@ObfuscatedSignature(
- descriptor = "(Lg;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V"
+ descriptor = "(Lk;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V"
)
class12(class15 var1, TlsClientProtocol var2, String var3) {
- this.this$0 = var1; // L: 88
+ this.this$0 = var1; // L: 91
this.val$tlsClientProtocol = var2;
this.val$host = var3;
}
- public synchronized void close() throws IOException {
- this.val$tlsClientProtocol.close(); // L: 103
- } // L: 104
-
- public void addHandshakeCompletedListener(HandshakeCompletedListener var1) {
- } // L: 107
-
- public boolean getEnableSessionCreation() {
- return false; // L: 111
- }
-
- public String[] getEnabledCipherSuites() {
- return null; // L: 116
- }
-
- public String[] getEnabledProtocols() {
- return null; // L: 121
- }
-
- public SSLSession getSession() {
- return new class17(this); // L: 131
- }
-
public OutputStream getOutputStream() throws IOException {
- return this.val$tlsClientProtocol.getOutputStream(); // L: 98
+ return this.val$tlsClientProtocol.getOutputStream(); // L: 101
}
- public String[] getSupportedCipherSuites() {
- return null; // L: 246
- }
-
- public boolean getWantClientAuth() {
- return false; // L: 256
- }
-
- public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) {
- } // L: 260
-
- public void setEnabledCipherSuites(String[] var1) {
- } // L: 266
-
- public void setEnabledProtocols(String[] var1) {
- } // L: 269
-
- public void setNeedClientAuth(boolean var1) {
- } // L: 272
-
- public void setUseClientMode(boolean var1) {
- } // L: 275
-
- public void startHandshake() throws IOException {
- this.val$tlsClientProtocol.connect(new class13(this)); // L: 282
- } // L: 332
-
public InputStream getInputStream() throws IOException {
- return this.val$tlsClientProtocol.getInputStream(); // L: 93
- }
-
- public boolean getNeedClientAuth() {
- return false; // L: 126
- }
-
- public boolean getUseClientMode() {
- return false; // L: 251
- }
-
- public void setEnableSessionCreation(boolean var1) {
- } // L: 263
-
- public String[] getSupportedProtocols() {
- return null; // L: 241
+ return this.val$tlsClientProtocol.getInputStream(); // L: 96
}
public void setWantClientAuth(boolean var1) {
+ } // L: 281
+
+ public synchronized void close() throws IOException {
+ this.val$tlsClientProtocol.close(); // L: 106
+ } // L: 107
+
+ public void addHandshakeCompletedListener(HandshakeCompletedListener var1) {
+ } // L: 110
+
+ public String[] getEnabledCipherSuites() {
+ return null; // L: 119
+ }
+
+ public String[] getSupportedCipherSuites() {
+ return null; // L: 249
+ }
+
+ public boolean getNeedClientAuth() {
+ return false; // L: 129
+ }
+
+ public SSLSession getSession() {
+ return new class17(this); // L: 134
+ }
+
+ public boolean getEnableSessionCreation() {
+ return false; // L: 114
+ }
+
+ public boolean getUseClientMode() {
+ return false; // L: 254
+ }
+
+ public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) {
+ } // L: 263
+
+ public void setEnableSessionCreation(boolean var1) {
+ } // L: 266
+
+ public void setEnabledCipherSuites(String[] var1) {
+ } // L: 269
+
+ public void setNeedClientAuth(boolean var1) {
+ } // L: 275
+
+ public void setUseClientMode(boolean var1) {
} // L: 278
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Lbo;",
- garbageValue = "1838920898"
- )
- @Export("Messages_getMessage")
- static Message Messages_getMessage(int var0) {
- return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40
+ public String[] getEnabledProtocols() {
+ return null; // L: 124
}
+
+ public String[] getSupportedProtocols() {
+ return null; // L: 244
+ }
+
+ public boolean getWantClientAuth() {
+ return false; // L: 259
+ }
+
+ public void startHandshake() throws IOException {
+ this.val$tlsClientProtocol.connect(new class13(this)); // L: 285
+ } // L: 335
+
+ public void setEnabledProtocols(String[] var1) {
+ } // L: 272
}
diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java
index 79e7d8fddc..2dda96c297 100644
--- a/runescape-client/src/main/java/class120.java
+++ b/runescape-client/src/main/java/class120.java
@@ -2,25 +2,177 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dv")
+@ObfuscatedName("dw")
public class class120 implements class112 {
- @ObfuscatedName("ub")
+ @ObfuscatedName("gt")
@ObfuscatedSignature(
- descriptor = "Llb;"
+ descriptor = "Lfm;"
)
- @Export("grandExchangeEvents")
- static GrandExchangeEvents grandExchangeEvents;
- @ObfuscatedName("f")
- @Export("Widget_loadedInterfaces")
- public static boolean[] Widget_loadedInterfaces;
+ @Export("socketTask")
+ static Task socketTask;
- @ObfuscatedName("q")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(IB)Lfx;",
- garbageValue = "-81"
+ descriptor = "(II)Z",
+ garbageValue = "-1642942182"
)
- @Export("WorldMapElement_get")
- public static WorldMapElement WorldMapElement_get(int var0) {
- return var0 >= 0 && var0 < class344.WorldMapElement_cached.length && class344.WorldMapElement_cached[var0] != null ? class344.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63
+ public static boolean method2759(int var0) {
+ return (var0 >> 30 & 1) != 0; // L: 33
}
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-183815869"
+ )
+ static final int method2758() {
+ return ViewportMouse.ViewportMouse_x; // L: 103
+ }
+
+ @ObfuscatedName("fk")
+ @ObfuscatedSignature(
+ descriptor = "(Lgc;IIIB)V",
+ garbageValue = "-120"
+ )
+ static void method2761(SequenceDefinition var0, int var1, int var2, int var3) {
+ if (Client.soundEffectCount < 50 && class19.clientPreferences.method2262() != 0) { // L: 3703
+ if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3704
+ int var4 = var0.soundEffects[var1]; // L: 3705
+ if (var4 != 0) { // L: 3709
+ int var7 = var4 >> 8; // L: 3710
+ int var8 = var4 >> 4 & 7; // L: 3711
+ int var9 = var4 & 15; // L: 3712
+ Client.soundEffectIds[Client.soundEffectCount] = var7; // L: 3713
+ Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 3714
+ Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3715
+ Client.soundEffects[Client.soundEffectCount] = null; // L: 3716
+ int var10 = (var2 - 64) / 128; // L: 3717
+ int var11 = (var3 - 64) / 128; // L: 3718
+ Client.soundLocations[Client.soundEffectCount] = var9 + (var11 << 8) + (var10 << 16); // L: 3719
+ ++Client.soundEffectCount; // L: 3720
+ }
+
+ }
+ }
+ } // L: 3722
+
+ @ObfuscatedName("ko")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IIII)V",
+ garbageValue = "-1596298421"
+ )
+ @Export("drawMinimap")
+ static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
+ Renderable.playPcmPlayers(); // L: 12071
+ SpriteMask var4 = var0.getSpriteMask(false); // L: 12072
+ if (var4 != null) { // L: 12073
+ Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12074
+ if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12075
+ int var5 = Client.camAngleY & 2047; // L: 12076
+ int var6 = class101.localPlayer.x / 32 + 48; // L: 12077
+ int var7 = 464 - class101.localPlayer.y / 32; // L: 12078
+ FloorUnderlayDefinition.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12079
+
+ int var8;
+ int var10;
+ int var16;
+ for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12080
+ var16 = Client.mapIconXs[var8] * 4 + 2 - class101.localPlayer.x / 32; // L: 12081
+ var10 = Client.mapIconYs[var8] * 4 + 2 - class101.localPlayer.y / 32; // L: 12082
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12083
+ }
+
+ int var11;
+ int var12;
+ for (var8 = 0; var8 < 104; ++var8) { // L: 12085
+ for (var16 = 0; var16 < 104; ++var16) { // L: 12086
+ NodeDeque var14 = Client.groundItems[PacketWriter.Client_plane][var8][var16]; // L: 12087
+ if (var14 != null) { // L: 12088
+ var11 = var8 * 4 + 2 - class101.localPlayer.x / 32; // L: 12089
+ var12 = var16 * 4 + 2 - class101.localPlayer.y / 32; // L: 12090
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var11, var12, class9.mapDotSprites[0], var4); // L: 12091
+ }
+ }
+ }
+
+ for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12095
+ NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12096
+ if (var9 != null && var9.isVisible()) { // L: 12097
+ NPCComposition var18 = var9.definition; // L: 12098
+ if (var18 != null && var18.transforms != null) { // L: 12099
+ var18 = var18.transform();
+ }
+
+ if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12100
+ var11 = var9.x / 32 - class101.localPlayer.x / 32; // L: 12101
+ var12 = var9.y / 32 - class101.localPlayer.y / 32; // L: 12102
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var11, var12, class9.mapDotSprites[1], var4); // L: 12103
+ }
+ }
+ }
+
+ var8 = Players.Players_count; // L: 12107
+ int[] var17 = Players.Players_indices; // L: 12108
+
+ for (var10 = 0; var10 < var8; ++var10) { // L: 12109
+ Player var15 = Client.players[var17[var10]]; // L: 12110
+ if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class101.localPlayer) { // L: 12111
+ var12 = var15.x / 32 - class101.localPlayer.x / 32; // L: 12112
+ int var13 = var15.y / 32 - class101.localPlayer.y / 32; // L: 12113
+ if (var15.isFriend()) { // L: 12114
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class9.mapDotSprites[3], var4);
+ } else if (class101.localPlayer.team != 0 && var15.team != 0 && var15.team == class101.localPlayer.team) { // L: 12115
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class9.mapDotSprites[4], var4);
+ } else if (var15.isFriendsChatMember()) { // L: 12116
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class9.mapDotSprites[5], var4);
+ } else if (var15.isClanMember()) { // L: 12117
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class9.mapDotSprites[6], var4);
+ } else {
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class9.mapDotSprites[2], var4); // L: 12118
+ }
+ }
+ }
+
+ if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12121
+ if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12122
+ NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12123
+ if (var19 != null) { // L: 12124
+ var11 = var19.x / 32 - class101.localPlayer.x / 32; // L: 12125
+ var12 = var19.y / 32 - class101.localPlayer.y / 32; // L: 12126
+ UserComparator10.worldToMinimap(var1, var2, var11, var12, DynamicObject.mapMarkerSprites[1], var4); // L: 12127
+ }
+ }
+
+ if (Client.hintArrowType == 2) { // L: 12130
+ var10 = Client.hintArrowX * 4 - class28.baseX * 4 + 2 - class101.localPlayer.x / 32; // L: 12131
+ var11 = Client.hintArrowY * 4 - WorldMapLabelSize.baseY * 4 + 2 - class101.localPlayer.y / 32; // L: 12132
+ UserComparator10.worldToMinimap(var1, var2, var10, var11, DynamicObject.mapMarkerSprites[1], var4); // L: 12133
+ }
+
+ if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12135
+ Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12136
+ if (var20 != null) { // L: 12137
+ var11 = var20.x / 32 - class101.localPlayer.x / 32; // L: 12138
+ var12 = var20.y / 32 - class101.localPlayer.y / 32; // L: 12139
+ UserComparator10.worldToMinimap(var1, var2, var11, var12, DynamicObject.mapMarkerSprites[1], var4); // L: 12140
+ }
+ }
+ }
+
+ if (Client.destinationX != 0) { // L: 12144
+ var10 = Client.destinationX * 4 + 2 - class101.localPlayer.x / 32; // L: 12145
+ var11 = Client.destinationY * 4 + 2 - class101.localPlayer.y / 32; // L: 12146
+ ParamComposition.drawSpriteOnMinimap(var1, var2, var10, var11, DynamicObject.mapMarkerSprites[0], var4); // L: 12147
+ }
+
+ if (!class101.localPlayer.isHidden) { // L: 12149
+ Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+ }
+ } else {
+ Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12151
+ }
+
+ Client.field704[var3] = true; // L: 12152
+ }
+ } // L: 12153
}
diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java
index b2e71dc13d..fb47230736 100644
--- a/runescape-client/src/main/java/class121.java
+++ b/runescape-client/src/main/java/class121.java
@@ -1,56 +1,25 @@
-import java.util.Iterator;
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dr")
+@ObfuscatedName("di")
public class class121 {
- @ObfuscatedName("n")
- @ObfuscatedGetter(
- intValue = -1242696181
- )
- static int field1529;
-
- @ObfuscatedName("ff")
+ @ObfuscatedName("vc")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "2071231531"
+ descriptor = "Loe;"
)
- static boolean method2748() {
- if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1481
- while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1482
- ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1483
- if (!var0.isLoaded()) {
- return false; // L: 1484
- }
-
- ++Client.archiveLoadersDone; // L: 1485
- }
-
- return true; // L: 1487
- } else {
- return true; // L: 1486
- }
- }
-
- @ObfuscatedName("ku")
+ @Export("worldMap")
+ static WorldMap worldMap;
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "55"
+ descriptor = "Llh;"
)
- @Export("FriendSystem_invalidateIgnoreds")
- static final void FriendSystem_invalidateIgnoreds() {
- Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 12412
-
- while (var0.hasNext()) {
- Message var1 = (Message)var0.next(); // L: 12413
- var1.clearIsFromIgnored(); // L: 12415
- }
-
- if (PcmPlayer.friendsChat != null) { // L: 12419
- PcmPlayer.friendsChat.invalidateIgnoreds(); // L: 12420
- }
-
- } // L: 12422
+ @Export("WorldMapElement_archive")
+ static AbstractArchive WorldMapElement_archive;
+ @ObfuscatedName("en")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive6")
+ static Archive archive6;
}
diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java
index e376a9a56a..d6d5480f28 100644
--- a/runescape-client/src/main/java/class122.java
+++ b/runescape-client/src/main/java/class122.java
@@ -3,323 +3,362 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ds")
+@ObfuscatedName("da")
public class class122 extends DualNode {
- @ObfuscatedName("sd")
- @ObfuscatedSignature(
- descriptor = "Las;"
- )
- @Export("pcmStreamMixer")
- static PcmStreamMixer pcmStreamMixer;
- @ObfuscatedName("o")
+ @ObfuscatedName("dw")
+ @Export("mouseCam")
+ static boolean mouseCam;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -676167361
+ intValue = 1032049851
)
- int field1531;
+ int field1521;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "[[Ldo;"
+ )
+ public class117[][] field1518;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "[[Ldz;"
+ descriptor = "[[Ldo;"
)
- public class117[][] field1530;
- @ObfuscatedName("l")
+ class117[][] field1519;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = 2048888313
+ )
+ int field1520;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = -1006791161
+ )
+ int field1524;
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "[[Ldz;"
+ descriptor = "Lgm;"
)
- class117[][] field1532;
- @ObfuscatedName("k")
+ public Skeleton field1523;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 1182736645
+ intValue = 2081794131
)
- int field1533;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = 195847897
- )
- int field1534;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lgf;"
- )
- public Skeleton field1535;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 2017030435
- )
- int field1536;
- @ObfuscatedName("s")
- boolean field1537;
+ int field1522;
+ @ObfuscatedName("w")
+ boolean field1525;
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;IZ)V"
+ descriptor = "(Llh;Llh;IZ)V"
)
class122(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
- this.field1530 = null; // L: 14
- this.field1532 = null; // L: 15
- this.field1536 = 0; // L: 19
- this.field1531 = var3; // L: 44
- byte[] var5 = var1.takeFile(this.field1531 >> 16 & 65535, this.field1531 & 65535); // L: 45
- Buffer var6 = new Buffer(var5); // L: 46
- int var7 = var6.readUnsignedByte(); // L: 47
- int var8 = var6.readUnsignedShort(); // L: 48
+ this.field1518 = null; // L: 14
+ this.field1519 = null; // L: 15
+ this.field1522 = 0; // L: 19
+ this.field1521 = var3; // L: 44
+ byte[] var5 = var1.takeFile(this.field1521 >> 16 & 65535, this.field1521 & 65535); // L: 45
+ Buffer var6 = new Buffer(var5);
+ int var7 = var6.readUnsignedByte();
+ int var8 = var6.readUnsignedShort();
byte[] var9;
- if (var4) { // L: 50
+ if (var4) {
var9 = var2.getFile(0, var8);
} else {
- var9 = var2.getFile(var8, 0); // L: 51
+ var9 = var2.getFile(var8, 0);
}
- this.field1535 = new Skeleton(var8, var9); // L: 52
- this.method2750(var6, var7); // L: 53
+ this.field1523 = new Skeleton(var8, var9);
+ this.method2762(var6, var7); // L: 53
} // L: 54
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1451589844"
- )
- void method2750(Buffer var1, int var2) {
- this.field1533 = var1.readUnsignedShort(); // L: 57
- this.field1534 = var1.readUnsignedShort(); // L: 58
- this.field1536 = var1.readUnsignedByte(); // L: 59
- int var3 = var1.readUnsignedShort(); // L: 60
- this.field1532 = new class117[this.field1535.method4023().method4003()][]; // L: 61
- this.field1530 = new class117[this.field1535.method4018()][]; // L: 62
-
- for (int var4 = 0; var4 < var3; ++var4) { // L: 63
- class118 var5 = class160.method3169(var1.readUnsignedByte()); // L: 64
- int var6 = var1.readShortSmart(); // L: 65
- int var8 = var1.readUnsignedByte(); // L: 67
- class119 var9 = (class119)class291.findEnumerated(ItemContainer.method2060(), var8); // L: 69
- if (var9 == null) { // L: 70
- var9 = class119.field1508;
- }
-
- class117 var10 = new class117(); // L: 74
- var10.method2688(var1, var2); // L: 75
- int var11 = var5.method2732(); // L: 76
- class117[][] var12;
- if (var5 == class118.field1491) { // L: 78
- var12 = this.field1532; // L: 79
- } else {
- var12 = this.field1530; // L: 82
- }
-
- if (var12[var6] == null) { // L: 84
- var12[var6] = new class117[var11]; // L: 85
- }
-
- var12[var6][var9.method2738()] = var10; // L: 87
- if (var5 == class118.field1490) { // L: 88
- this.field1537 = true; // L: 89
- }
- }
-
- } // L: 92
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "64"
- )
- int method2779() {
- return this.field1533; // L: 95
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1081367730"
- )
- int method2752() {
- return this.field1534; // L: 99
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-47"
- )
- public int method2753() {
- return this.field1536; // L: 103
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "-98"
- )
- public int method2754() {
- return this.method2752() - this.method2779(); // L: 107
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "-65"
- )
- public boolean method2755() {
- return this.field1537; // L: 111
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(ILdb;IIB)V",
- garbageValue = "-94"
- )
- public void method2756(int var1, class115 var2, int var3, int var4) {
- class388 var5 = Tile.method3904(); // L: 115
- this.method2757(var5, var3, var2, var1); // L: 116
- this.method2758(var5, var3, var2, var1); // L: 117
- this.method2774(var5, var3, var2, var1); // L: 118
- var2.method2645(var5); // L: 119
- var5.method6865(); // L: 120
- } // L: 121
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(Lnw;ILdb;II)V",
- garbageValue = "-565216546"
- )
- void method2757(class388 var1, int var2, class115 var3, int var4) {
- float[] var5 = var3.method2647(this.field1536); // L: 124
- float var6 = var5[0]; // L: 125
- float var7 = var5[1]; // L: 126
- float var8 = var5[2]; // L: 127
- if (this.field1532[var2] != null) { // L: 128
- class117 var9 = this.field1532[var2][0]; // L: 129
- class117 var10 = this.field1532[var2][1]; // L: 130
- class117 var11 = this.field1532[var2][2]; // L: 131
- if (var9 != null) { // L: 132
- var6 = var9.method2689(var4);
- }
-
- if (var10 != null) { // L: 133
- var7 = var10.method2689(var4);
- }
-
- if (var11 != null) { // L: 134
- var8 = var11.method2689(var4);
- }
- }
-
- class387 var22;
- synchronized(class387.field4395) { // L: 138
- if (Frames.field2492 == 0) { // L: 139
- var22 = new class387();
- } else {
- class387.field4395[--Frames.field2492].method6782(); // L: 141
- var22 = class387.field4395[Frames.field2492]; // L: 142
- }
- }
-
- var22.method6784(1.0F, 0.0F, 0.0F, var6); // L: 147
- class387 var23;
- synchronized(class387.field4395) { // L: 150
- if (Frames.field2492 == 0) { // L: 151
- var23 = new class387();
- } else {
- class387.field4395[--Frames.field2492].method6782(); // L: 153
- var23 = class387.field4395[Frames.field2492]; // L: 154
- }
- }
-
- var23.method6784(0.0F, 1.0F, 0.0F, var7); // L: 159
- class387 var13;
- synchronized(class387.field4395) { // L: 162
- if (Frames.field2492 == 0) { // L: 163
- var13 = new class387();
- } else {
- class387.field4395[--Frames.field2492].method6782(); // L: 165
- var13 = class387.field4395[Frames.field2492]; // L: 166
- }
- }
-
- var13.method6784(0.0F, 0.0F, 1.0F, var8); // L: 171
- class387 var15;
- synchronized(class387.field4395) { // L: 174
- if (Frames.field2492 == 0) { // L: 175
- var15 = new class387();
- } else {
- class387.field4395[--Frames.field2492].method6782(); // L: 177
- var15 = class387.field4395[Frames.field2492]; // L: 178
- }
- }
-
- var15.method6783(var13); // L: 183
- var15.method6783(var22); // L: 184
- var15.method6783(var23); // L: 185
- class388 var17 = Tile.method3904(); // L: 186
- var17.method6817(var15); // L: 187
- var1.method6816(var17); // L: 188
- var22.method6779(); // L: 189
- var23.method6779(); // L: 190
- var13.method6779(); // L: 191
- var15.method6779(); // L: 192
- var17.method6865(); // L: 193
- } // L: 194
-
@ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lnw;ILdb;IB)V",
- garbageValue = "-29"
+ descriptor = "(Lqt;IB)V",
+ garbageValue = "73"
)
- void method2774(class388 var1, int var2, class115 var3, int var4) {
- float[] var5 = var3.method2655(this.field1536); // L: 197
- float var6 = var5[0]; // L: 198
- float var7 = var5[1]; // L: 199
- float var8 = var5[2]; // L: 200
- if (this.field1532[var2] != null) { // L: 201
- class117 var9 = this.field1532[var2][3]; // L: 202
- class117 var10 = this.field1532[var2][4]; // L: 203
- class117 var11 = this.field1532[var2][5]; // L: 204
- if (var9 != null) { // L: 205
- var6 = var9.method2689(var4);
+ void method2762(Buffer var1, int var2) {
+ this.field1520 = var1.readUnsignedShort(); // L: 57
+ this.field1524 = var1.readUnsignedShort(); // L: 58
+ this.field1522 = var1.readUnsignedByte(); // L: 59
+ int var3 = var1.readUnsignedShort(); // L: 60
+ this.field1519 = new class117[this.field1523.method4150().method4130()][]; // L: 61
+ this.field1518 = new class117[this.field1523.method4148()][]; // L: 62
+
+ for (int var4 = 0; var4 < var3; ++var4) { // L: 63
+ class118 var5 = class82.method2116(var1.readUnsignedByte()); // L: 64
+ int var6 = var1.readShortSmart(); // L: 65
+ class119 var7 = class19.method254(var1.readUnsignedByte()); // L: 66
+ class117 var8 = new class117(); // L: 67
+ var8.method2702(var1, var2); // L: 68
+ int var9 = var5.method2736(); // L: 69
+ class117[][] var10;
+ if (var5 == class118.field1477) { // L: 71
+ var10 = this.field1519; // L: 72
+ } else {
+ var10 = this.field1518; // L: 75
}
- if (var10 != null) { // L: 206
- var7 = var10.method2689(var4);
+ if (var10[var6] == null) { // L: 77
+ var10[var6] = new class117[var9]; // L: 78
}
- if (var11 != null) { // L: 207
- var8 = var11.method2689(var4);
+ var10[var6][var7.method2747()] = var8; // L: 80
+ if (var5 == class118.field1480) { // L: 81
+ this.field1525 = true; // L: 82
}
}
- var1.field4400[12] = var6; // L: 209
- var1.field4400[13] = var7; // L: 210
- var1.field4400[14] = var8; // L: 211
- } // L: 212
+ } // L: 85
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-44"
+ )
+ int method2786() {
+ return this.field1520; // L: 88
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1215555890"
+ )
+ int method2765() {
+ return this.field1524; // L: 92
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-60"
+ )
+ public int method2766() {
+ return this.field1522; // L: 96
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "-1618023267"
+ )
+ public int method2767() {
+ return this.method2765() - this.method2786(); // L: 100
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "-631493485"
+ )
+ public boolean method2778() {
+ return this.field1525; // L: 104
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(ILdc;III)V",
+ garbageValue = "-6832140"
+ )
+ public void method2790(int var1, class115 var2, int var3, int var4) {
+ class387 var5 = MenuAction.method1884(); // L: 108
+ this.method2770(var5, var3, var2, var1); // L: 109
+ this.method2772(var5, var3, var2, var1); // L: 110
+ this.method2779(var5, var3, var2, var1); // L: 111
+ var2.method2656(var5); // L: 112
+ var5.method6968(); // L: 113
+ } // L: 114
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(Lnw;ILdb;IB)V",
- garbageValue = "-6"
+ descriptor = "(Lny;ILdc;II)V",
+ garbageValue = "1743460808"
)
- void method2758(class388 var1, int var2, class115 var3, int var4) {
- float[] var5 = var3.method2649(this.field1536); // L: 215
- float var6 = var5[0]; // L: 216
- float var7 = var5[1]; // L: 217
- float var8 = var5[2]; // L: 218
- if (this.field1532[var2] != null) { // L: 219
- class117 var9 = this.field1532[var2][6]; // L: 220
- class117 var10 = this.field1532[var2][7]; // L: 221
- class117 var11 = this.field1532[var2][8]; // L: 222
- if (var9 != null) { // L: 223
- var6 = var9.method2689(var4);
+ void method2770(class387 var1, int var2, class115 var3, int var4) {
+ float[] var5 = var3.method2660(this.field1522); // L: 117
+ float var6 = var5[0]; // L: 118
+ float var7 = var5[1]; // L: 119
+ float var8 = var5[2]; // L: 120
+ if (this.field1519[var2] != null) { // L: 121
+ class117 var9 = this.field1519[var2][0]; // L: 122
+ class117 var10 = this.field1519[var2][1]; // L: 123
+ class117 var11 = this.field1519[var2][2]; // L: 124
+ if (var9 != null) { // L: 125
+ var6 = var9.method2701(var4);
}
- if (var10 != null) { // L: 224
- var7 = var10.method2689(var4);
+ if (var10 != null) { // L: 126
+ var7 = var10.method2701(var4);
}
- if (var11 != null) { // L: 225
- var8 = var11.method2689(var4);
+ if (var11 != null) { // L: 127
+ var8 = var11.method2701(var4);
}
}
- class388 var12 = Tile.method3904(); // L: 227
- var12.method6814(var6, var7, var8); // L: 228
- var1.method6816(var12); // L: 229
- var12.method6865(); // L: 230
- } // L: 231
+ class386 var22;
+ synchronized(class386.field4389) { // L: 131
+ if (class386.field4385 == 0) { // L: 132
+ var22 = new class386();
+ } else {
+ class386.field4389[--class386.field4385].method6951(); // L: 134
+ var22 = class386.field4389[class386.field4385]; // L: 135
+ }
+ }
+
+ var22.method6945(1.0F, 0.0F, 0.0F, var6); // L: 140
+ class386 var23;
+ synchronized(class386.field4389) { // L: 143
+ if (class386.field4385 == 0) { // L: 144
+ var23 = new class386();
+ } else {
+ class386.field4389[--class386.field4385].method6951(); // L: 146
+ var23 = class386.field4389[class386.field4385]; // L: 147
+ }
+ }
+
+ var23.method6945(0.0F, 1.0F, 0.0F, var7); // L: 152
+ class386 var13;
+ synchronized(class386.field4389) { // L: 155
+ if (class386.field4385 == 0) { // L: 156
+ var13 = new class386();
+ } else {
+ class386.field4389[--class386.field4385].method6951(); // L: 158
+ var13 = class386.field4389[class386.field4385]; // L: 159
+ }
+ }
+
+ var13.method6945(0.0F, 0.0F, 1.0F, var8); // L: 164
+ class386 var15;
+ synchronized(class386.field4389) { // L: 167
+ if (class386.field4385 == 0) { // L: 168
+ var15 = new class386();
+ } else {
+ class386.field4389[--class386.field4385].method6951(); // L: 170
+ var15 = class386.field4389[class386.field4385]; // L: 171
+ }
+ }
+
+ var15.method6938(var13); // L: 176
+ var15.method6938(var22); // L: 177
+ var15.method6938(var23); // L: 178
+ class387 var17 = MenuAction.method1884(); // L: 179
+ var17.method6967(var15); // L: 180
+ var1.method6962(var17); // L: 181
+ var22.method6936(); // L: 182
+ var23.method6936(); // L: 183
+ var13.method6936(); // L: 184
+ var15.method6936(); // L: 185
+ var17.method6968(); // L: 186
+ } // L: 187
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(Lny;ILdc;II)V",
+ garbageValue = "75323291"
+ )
+ void method2779(class387 var1, int var2, class115 var3, int var4) {
+ float[] var5 = var3.method2661(this.field1522); // L: 190
+ float var6 = var5[0]; // L: 191
+ float var7 = var5[1]; // L: 192
+ float var8 = var5[2]; // L: 193
+ if (this.field1519[var2] != null) { // L: 194
+ class117 var9 = this.field1519[var2][3]; // L: 195
+ class117 var10 = this.field1519[var2][4]; // L: 196
+ class117 var11 = this.field1519[var2][5]; // L: 197
+ if (var9 != null) { // L: 198
+ var6 = var9.method2701(var4);
+ }
+
+ if (var10 != null) { // L: 199
+ var7 = var10.method2701(var4);
+ }
+
+ if (var11 != null) { // L: 200
+ var8 = var11.method2701(var4);
+ }
+ }
+
+ var1.field4394[12] = var6; // L: 202
+ var1.field4394[13] = var7; // L: 203
+ var1.field4394[14] = var8; // L: 204
+ } // L: 205
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(Lny;ILdc;II)V",
+ garbageValue = "518596926"
+ )
+ void method2772(class387 var1, int var2, class115 var3, int var4) {
+ float[] var5 = var3.method2679(this.field1522); // L: 208
+ float var6 = var5[0]; // L: 209
+ float var7 = var5[1]; // L: 210
+ float var8 = var5[2]; // L: 211
+ if (this.field1519[var2] != null) { // L: 212
+ class117 var9 = this.field1519[var2][6]; // L: 213
+ class117 var10 = this.field1519[var2][7]; // L: 214
+ class117 var11 = this.field1519[var2][8]; // L: 215
+ if (var9 != null) { // L: 216
+ var6 = var9.method2701(var4);
+ }
+
+ if (var10 != null) { // L: 217
+ var7 = var10.method2701(var4);
+ }
+
+ if (var11 != null) { // L: 218
+ var8 = var11.method2701(var4);
+ }
+ }
+
+ class387 var12 = MenuAction.method1884(); // L: 220
+ var12.method6964(var6, var7, var8); // L: 221
+ var1.method6962(var12); // L: 222
+ var12.method6968(); // L: 223
+ } // L: 224
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lgr;",
+ garbageValue = "51486487"
+ )
+ public static HitSplatDefinition method2800(int var0) {
+ HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46
+ if (var1 != null) { // L: 47
+ return var1;
+ } else {
+ byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48
+ var1 = new HitSplatDefinition(); // L: 49
+ if (var2 != null) { // L: 50
+ var1.decode(new Buffer(var2));
+ }
+
+ HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51
+ return var1; // L: 52
+ }
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IIIB)I",
+ garbageValue = "58"
+ )
+ public static int method2763(int var0, int var1, int var2) {
+ var2 &= 3; // L: 9
+ if (var2 == 0) { // L: 10
+ return var0;
+ } else if (var2 == 1) { // L: 11
+ return var1;
+ } else {
+ return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13
+ }
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)Ljava/lang/String;",
+ garbageValue = "-1164971790"
+ )
+ @Export("colorStartTag")
+ static String colorStartTag(int var0) {
+ return ""; // L: 22
+ }
}
diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java
index f27cf24a5a..4ebe265c85 100644
--- a/runescape-client/src/main/java/class123.java
+++ b/runescape-client/src/main/java/class123.java
@@ -3,91 +3,95 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dt")
+@ObfuscatedName("df")
public enum class123 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1550(0, 0),
+ field1535(0, 0),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Ldf;"
+ )
+ field1529(1, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1545(1, 1),
- @ObfuscatedName("l")
+ field1542(2, 2),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1540(2, 2),
- @ObfuscatedName("k")
+ field1531(3, 3),
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1542(3, 3),
- @ObfuscatedName("a")
+ field1536(4, 4),
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1543(4, 4),
- @ObfuscatedName("m")
+ field1533(5, 5),
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1539(5, 5),
- @ObfuscatedName("p")
+ field1534(6, 6),
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "Ldt;"
+ descriptor = "Ldf;"
)
- field1541(6, 6),
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Ldt;"
- )
- field1546(7, 7),
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Ldt;"
- )
- field1547(8, 8);
-
- @ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = -1024399329
- )
- final int field1548;
+ field1532(7, 7),
@ObfuscatedName("y")
- @ObfuscatedGetter(
- intValue = -44674933
+ @ObfuscatedSignature(
+ descriptor = "Ldf;"
)
- final int field1549;
+ field1528(8, 8);
+
+ @ObfuscatedName("n")
+ @Export("userHomeDirectory")
+ static String userHomeDirectory;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = -980085823
+ )
+ final int field1537;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = 1512803197
+ )
+ final int field1538;
class123(int var3, int var4) {
- this.field1548 = var3; // L: 107
- this.field1549 = var4; // L: 108
- } // L: 109
+ this.field1537 = var3; // L: 117
+ this.field1538 = var4; // L: 118
+ } // L: 119
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field1549; // L: 112
+ return this.field1538; // L: 122
}
- @ObfuscatedName("lh")
+ @ObfuscatedName("lk")
@ObfuscatedSignature(
- descriptor = "(IIIZB)V",
- garbageValue = "16"
+ descriptor = "(IB)Lps;",
+ garbageValue = "-5"
)
- public static void method2781(int var0, int var1, int var2, boolean var3) {
- PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2955, Client.packetWriter.isaacCipher); // L: 12656
- var4.packetBuffer.method7551(var1); // L: 12657
- var4.packetBuffer.method7550(var0); // L: 12658
- var4.packetBuffer.method7596(var2); // L: 12659
- var4.packetBuffer.writeIntME(var3 ? Client.field482 * -1673751255 * 1079039769 : 0); // L: 12660
- Client.packetWriter.addNode(var4); // L: 12661
- } // L: 12662
+ static class436 method2813(int var0) {
+ class436 var1 = (class436)Client.Widget_cachedModels.get((long)var0); // L: 12477
+ if (var1 == null) { // L: 12478
+ var1 = new class436(class132.field1588, class285.method5516(var0), HealthBarUpdate.method2199(var0)); // L: 12479
+ Client.Widget_cachedModels.put(var1, (long)var0); // L: 12480
+ }
+
+ return var1; // L: 12482
+ }
}
diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java
index adaf9d9779..192b8f6c57 100644
--- a/runescape-client/src/main/java/class124.java
+++ b/runescape-client/src/main/java/class124.java
@@ -3,58 +3,120 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("df")
+@ObfuscatedName("dj")
public enum class124 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Ldf;"
+ descriptor = "Ldj;"
)
- field1556(3, 0),
+ field1546(0, 0),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Ldj;"
+ )
+ field1544(4, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Ldf;"
+ descriptor = "Ldj;"
)
- field1557(1, 1),
- @ObfuscatedName("l")
+ field1543(1, 2),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Ldf;"
+ descriptor = "Ldj;"
)
- field1553(2, 2),
- @ObfuscatedName("k")
+ field1550(2, 3),
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Ldf;"
+ descriptor = "Ldj;"
)
- field1551(0, 3),
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Ldf;"
- )
- field1555(4, 4);
+ field1547(3, 4);
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 2107670809
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "Lkb;"
)
- public final int field1552;
- @ObfuscatedName("p")
+ @Export("scriptDotWidget")
+ static Widget scriptDotWidget;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -24043459
+ intValue = -1017548215
+ )
+ public final int field1548;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = 972373499
)
@Export("id")
final int id;
class124(int var3, int var4) {
- this.field1552 = var3; // L: 17
+ this.field1548 = var3; // L: 17
this.id = var4; // L: 18
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id; // L: 23
}
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lpb;III)I",
+ garbageValue = "-1005056854"
+ )
+ static int method2818(IterableNodeHashTable var0, int var1, int var2) {
+ if (var0 == null) {
+ return var2;
+ } else {
+ IntegerNode var3 = (IntegerNode)var0.get((long)var1);
+ return var3 == null ? var2 : var3.integer;
+ }
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lgp;",
+ garbageValue = "15"
+ )
+ public static FloorOverlayDefinition method2814(int var0) {
+ FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 30
+ if (var1 != null) { // L: 31
+ return var1;
+ } else {
+ byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 32
+ var1 = new FloorOverlayDefinition(); // L: 33
+ if (var2 != null) { // L: 34
+ var1.decode(new Buffer(var2), var0);
+ }
+
+ var1.postDecode(); // L: 35
+ FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 36
+ return var1; // L: 37
+ }
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(B)[Lft;",
+ garbageValue = "127"
+ )
+ static VerticalAlignment[] method2820() {
+ return new VerticalAlignment[]{VerticalAlignment.field1963, VerticalAlignment.field1961, VerticalAlignment.VerticalAlignment_centered}; // L: 14
+ }
+
+ @ObfuscatedName("lw")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I)I",
+ garbageValue = "1998673549"
+ )
+ @Export("getWidgetFlags")
+ static int getWidgetFlags(Widget var0) {
+ IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 12289
+ return var1 != null ? var1.integer : var0.flags; // L: 12290 12291
+ }
}
diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java
index 7a153094f2..472f9ce155 100644
--- a/runescape-client/src/main/java/class125.java
+++ b/runescape-client/src/main/java/class125.java
@@ -1,150 +1,120 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("dm")
+@ObfuscatedName("dk")
public class class125 extends class128 {
- @ObfuscatedName("px")
- @ObfuscatedSignature(
- descriptor = "Lcu;"
- )
- @Export("varcs")
- static Varcs varcs;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -887084095
+ intValue = -901358283
)
- int field1561;
+ int field1557;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 963189529
+ )
+ int field1553;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1121955905
+ intValue = -1782830973
)
- int field1559;
- @ObfuscatedName("l")
+ int field1554;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -263123509
+ intValue = -1564673701
)
- int field1560;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -1343023729
- )
- int field1562;
+ int field1555;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class125(class131 var1) {
this.this$0 = var1;
- this.field1561 = -1; // L: 158
+ this.field1557 = -1; // L: 158
} // L: 163
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1561 = var1.readUnsignedShort(); // L: 166
- this.field1559 = var1.readInt(); // L: 167
- this.field1560 = var1.readUnsignedByte(); // L: 168
- this.field1562 = var1.readUnsignedByte(); // L: 169
+ void vmethod3150(Buffer var1) {
+ this.field1557 = var1.readUnsignedShort(); // L: 166
+ this.field1553 = var1.readInt(); // L: 167
+ this.field1554 = var1.readUnsignedByte(); // L: 168
+ this.field1555 = var1.readUnsignedByte(); // L: 169
} // L: 170
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2896(this.field1561, this.field1559, this.field1560, this.field1562); // L: 173
+ void vmethod3149(ClanSettings var1) {
+ var1.method2964(this.field1557, this.field1553, this.field1554, this.field1555); // L: 173
} // L: 174
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;ZI)[B",
- garbageValue = "1216365156"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "2000471685"
)
- public static byte[] method2791(Object var0, boolean var1) {
- if (var0 == null) { // L: 21
- return null;
- } else if (var0 instanceof byte[]) { // L: 22
- byte[] var3 = (byte[])((byte[])var0); // L: 23
- return var1 ? UrlRequester.method2537(var3) : var3; // L: 24
- } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27
- AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28
- return var2.get(); // L: 29
+ static String method2829() {
+ return class19.clientPreferences.method2247() ? NetCache.method5952(Login.Login_username) : Login.Login_username; // L: 272
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "718423512"
+ )
+ static void method2830() {
+ ItemContainer.itemContainers = new NodeHashTable(32); // L: 78
+ } // L: 79
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-61"
+ )
+ static int method2821(int var0, Script var1, boolean var2) {
+ Widget var3 = var2 ? class124.scriptDotWidget : GrandExchangeOfferOwnWorldComparator.scriptActiveWidget; // L: 1111
+ if (var0 == ScriptOpcodes.CC_GETX) { // L: 1112
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.x; // L: 1113
+ return 1; // L: 1114
+ } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1116
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.y; // L: 1117
+ return 1; // L: 1118
+ } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1120
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.width; // L: 1121
+ return 1; // L: 1122
+ } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1124
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.height; // L: 1125
+ return 1; // L: 1126
+ } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1128
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1129
+ return 1; // L: 1130
+ } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1132
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.parentId; // L: 1133
+ return 1; // L: 1134
} else {
- throw new IllegalArgumentException(); // L: 31
+ return 2; // L: 1136
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("ie")
@ObfuscatedSignature(
- descriptor = "(Lle;IB)V",
- garbageValue = "1"
+ descriptor = "(B)V",
+ garbageValue = "-111"
)
- static void method2796(Archive var0, int var1) {
- if (class300.NetCache_reference != null) { // L: 110
- class300.NetCache_reference.offset = var1 * 8 + 5;
- int var2 = class300.NetCache_reference.readInt();
- int var3 = class300.NetCache_reference.readInt();
- var0.loadIndex(var2, var3); // L: 114
- } else {
- class250.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
- NetCache.NetCache_archives[var1] = var0;
- }
- } // L: 115
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "([BIIIIIII[Lgh;I)V",
- garbageValue = "810433263"
- )
- static final void method2794(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
- int var10;
- for (int var9 = 0; var9 < 8; ++var9) { // L: 111
- for (var10 = 0; var10 < 8; ++var10) { // L: 112
- if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 113
- int[] var10000 = var8[var1].flags[var9 + var2];
- var10000[var10 + var3] &= -16777217;
- }
- }
- }
-
- Buffer var20 = new Buffer(var0); // L: 116
-
- for (var10 = 0; var10 < 4; ++var10) { // L: 117
- for (int var11 = 0; var11 < 64; ++var11) { // L: 118
- for (int var12 = 0; var12 < 64; ++var12) { // L: 119
- if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120
- int var17 = var11 & 7; // L: 125
- int var18 = var12 & 7; // L: 126
- int var19 = var7 & 3; // L: 129
- int var16;
- if (var19 == 0) { // L: 130
- var16 = var17; // L: 131
- } else if (var19 == 1) { // L: 134
- var16 = var18; // L: 135
- } else if (var19 == 2) { // L: 138
- var16 = 7 - var17; // L: 139
- } else {
- var16 = 7 - var18; // L: 142
- }
-
- class67.loadTerrain(var20, var1, var2 + var16, var3 + VarpDefinition.method3273(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 144
- } else {
- class67.loadTerrain(var20, 0, -1, -1, 0, 0, 0); // L: 146
- }
- }
- }
- }
-
- } // L: 150
+ static void method2824() {
+ Client.menuOptionsCount = 0; // L: 8423
+ Client.isMenuOpen = false; // L: 8424
+ } // L: 8425
}
diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java
index 89efcf64ce..a29383dfd4 100644
--- a/runescape-client/src/main/java/class126.java
+++ b/runescape-client/src/main/java/class126.java
@@ -1,69 +1,91 @@
+import java.util.Iterator;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dq")
+@ObfuscatedName("du")
public class class126 extends class128 {
- @ObfuscatedName("ci")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Llh;"
)
- @Export("worldSelectLeftSprite")
- static IndexedSprite worldSelectLeftSprite;
- @ObfuscatedName("o")
+ @Export("Widget_modelsArchive")
+ public static AbstractArchive Widget_modelsArchive;
+ @ObfuscatedName("cx")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
+ )
+ @Export("worldSelectFlagSprites")
+ static IndexedSprite[] worldSelectFlagSprites;
+ @ObfuscatedName("ig")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
+ )
+ @Export("scrollBarSprites")
+ static IndexedSprite[] scrollBarSprites;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- longValue = 5516505450809482133L
+ longValue = -8228182624755456153L
)
- long field1567;
- @ObfuscatedName("q")
- String field1566;
+ long field1562;
+ @ObfuscatedName("v")
+ String field1559;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class126(class131 var1) {
this.this$0 = var1;
- this.field1567 = -1L; // L: 74
- this.field1566 = null; // L: 75
+ this.field1562 = -1L; // L: 74
+ this.field1559 = null; // L: 75
} // L: 77
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
+ void vmethod3150(Buffer var1) {
if (var1.readUnsignedByte() != 255) { // L: 80
--var1.offset; // L: 81
- this.field1567 = var1.readLong(); // L: 82
+ this.field1562 = var1.readLong(); // L: 82
}
- this.field1566 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84
+ this.field1559 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84
} // L: 85
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2888(this.field1567, this.field1566, 0); // L: 88
+ void vmethod3149(ClanSettings var1) {
+ var1.method2956(this.field1562, this.field1559, 0); // L: 88
} // L: 89
- @ObfuscatedName("h")
+ @ObfuscatedName("km")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-904049199"
+ descriptor = "(B)V",
+ garbageValue = "78"
)
- static void method2799(int var0) {
- if (var0 != Login.loginIndex) { // L: 1964
- Login.loginIndex = var0; // L: 1965
+ @Export("FriendSystem_invalidateIgnoreds")
+ static final void FriendSystem_invalidateIgnoreds() {
+ Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 12195
+
+ while (var0.hasNext()) {
+ Message var1 = (Message)var0.next(); // L: 12196
+ var1.clearIsFromIgnored(); // L: 12198
}
- } // L: 1966
+
+ if (Huffman.friendsChat != null) { // L: 12202
+ Huffman.friendsChat.invalidateIgnoreds(); // L: 12203
+ }
+
+ } // L: 12205
}
diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java
index 410bba393d..174b7b51a9 100644
--- a/runescape-client/src/main/java/class127.java
+++ b/runescape-client/src/main/java/class127.java
@@ -1,168 +1,276 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dw")
+@ObfuscatedName("db")
public class class127 extends class128 {
- @ObfuscatedName("ue")
- @ObfuscatedSignature(
- descriptor = "Llh;"
- )
- public static class326 field1570;
- @ObfuscatedName("r")
- @Export("SpriteBuffer_pixels")
- public static byte[][] SpriteBuffer_pixels;
- @ObfuscatedName("iu")
- @ObfuscatedSignature(
- descriptor = "[Lqd;"
- )
- @Export("scrollBarSprites")
- static IndexedSprite[] scrollBarSprites;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -115567503
+ intValue = -1838469371
)
- int field1572;
+ int field1566;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class127(class131 var1) {
this.this$0 = var1;
- this.field1572 = -1; // L: 114
+ this.field1566 = -1; // L: 114
} // L: 116
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1572 = var1.readUnsignedShort(); // L: 119
+ void vmethod3150(Buffer var1) {
+ this.field1566 = var1.readUnsignedShort(); // L: 119
} // L: 120
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
+ )
+ void vmethod3149(ClanSettings var1) {
+ var1.method2957(this.field1566); // L: 123
+ } // L: 124
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IIILgu;Lgv;S)Z",
+ garbageValue = "21818"
+ )
+ public static final boolean method2844(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) {
+ int var5 = var0; // L: 137
+ int var6 = var1; // L: 138
+ byte var7 = 64; // L: 139
+ byte var8 = 64; // L: 140
+ int var9 = var0 - var7; // L: 141
+ int var10 = var1 - var8; // L: 142
+ class193.directions[var7][var8] = 99; // L: 143
+ class193.distances[var7][var8] = 0; // L: 144
+ byte var11 = 0; // L: 145
+ int var12 = 0; // L: 146
+ class193.bufferX[var11] = var0; // L: 147
+ int var20 = var11 + 1;
+ class193.bufferY[var11] = var1; // L: 148
+ int[][] var13 = var4.flags; // L: 149
+
+ while (true) {
+ label303:
+ while (true) {
+ int var14;
+ int var15;
+ int var16;
+ int var17;
+ int var18;
+ int var19;
+ do {
+ do {
+ do {
+ label280:
+ do {
+ if (var20 == var12) { // L: 150
+ class193.field2219 = var5; // L: 269
+ class394.field4429 = var6; // L: 270
+ return false; // L: 271
+ }
+
+ var5 = class193.bufferX[var12]; // L: 151
+ var6 = class193.bufferY[var12]; // L: 152
+ var12 = var12 + 1 & 4095; // L: 153
+ var18 = var5 - var9; // L: 154
+ var19 = var6 - var10; // L: 155
+ var14 = var5 - var4.xInset; // L: 156
+ var15 = var6 - var4.yInset; // L: 157
+ if (var3.hasArrived(var2, var5, var6, var4)) { // L: 158
+ class193.field2219 = var5; // L: 159
+ class394.field4429 = var6; // L: 160
+ return true; // L: 161
+ }
+
+ var16 = class193.distances[var18][var19] + 1; // L: 163
+ if (var18 > 0 && class193.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 164 165 166 167
+ var17 = 1;
+
+ while (true) {
+ if (var17 >= var2 - 1) {
+ class193.bufferX[var20] = var5 - 1; // L: 171
+ class193.bufferY[var20] = var6; // L: 172
+ var20 = var20 + 1 & 4095; // L: 173
+ class193.directions[var18 - 1][var19] = 2; // L: 174
+ class193.distances[var18 - 1][var19] = var16; // L: 175
+ break;
+ }
+
+ if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 169
+ break;
+ }
+
+ ++var17; // L: 168
+ }
+ }
+
+ if (var18 < 128 - var2 && class193.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 177 178 179 180
+ var17 = 1;
+
+ while (true) {
+ if (var17 >= var2 - 1) {
+ class193.bufferX[var20] = var5 + 1; // L: 184
+ class193.bufferY[var20] = var6; // L: 185
+ var20 = var20 + 1 & 4095; // L: 186
+ class193.directions[var18 + 1][var19] = 8; // L: 187
+ class193.distances[var18 + 1][var19] = var16; // L: 188
+ break;
+ }
+
+ if ((var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 182
+ break;
+ }
+
+ ++var17; // L: 181
+ }
+ }
+
+ if (var19 > 0 && class193.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 190 191 192 193
+ var17 = 1;
+
+ while (true) {
+ if (var17 >= var2 - 1) {
+ class193.bufferX[var20] = var5; // L: 197
+ class193.bufferY[var20] = var6 - 1; // L: 198
+ var20 = var20 + 1 & 4095; // L: 199
+ class193.directions[var18][var19 - 1] = 1; // L: 200
+ class193.distances[var18][var19 - 1] = var16; // L: 201
+ break;
+ }
+
+ if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 195
+ break;
+ }
+
+ ++var17; // L: 194
+ }
+ }
+
+ if (var19 < 128 - var2 && class193.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 203 204 205 206
+ var17 = 1;
+
+ while (true) {
+ if (var17 >= var2 - 1) {
+ class193.bufferX[var20] = var5; // L: 210
+ class193.bufferY[var20] = var6 + 1; // L: 211
+ var20 = var20 + 1 & 4095; // L: 212
+ class193.directions[var18][var19 + 1] = 4; // L: 213
+ class193.distances[var18][var19 + 1] = var16; // L: 214
+ break;
+ }
+
+ if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { // L: 208
+ break;
+ }
+
+ ++var17; // L: 207
+ }
+ }
+
+ if (var18 > 0 && var19 > 0 && class193.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 216 217 218
+ var17 = 1;
+
+ while (true) {
+ if (var17 >= var2) {
+ class193.bufferX[var20] = var5 - 1; // L: 223
+ class193.bufferY[var20] = var6 - 1; // L: 224
+ var20 = var20 + 1 & 4095; // L: 225
+ class193.directions[var18 - 1][var19 - 1] = 3; // L: 226
+ class193.distances[var18 - 1][var19 - 1] = var16; // L: 227
+ break;
+ }
+
+ if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 220 221
+ break;
+ }
+
+ ++var17; // L: 219
+ }
+ }
+
+ if (var18 < 128 - var2 && var19 > 0 && class193.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 229 230 231
+ var17 = 1;
+
+ while (true) {
+ if (var17 >= var2) {
+ class193.bufferX[var20] = var5 + 1; // L: 236
+ class193.bufferY[var20] = var6 - 1; // L: 237
+ var20 = var20 + 1 & 4095; // L: 238
+ class193.directions[var18 + 1][var19 - 1] = 9; // L: 239
+ class193.distances[var18 + 1][var19 - 1] = var16; // L: 240
+ break;
+ }
+
+ if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 233 234
+ break;
+ }
+
+ ++var17; // L: 232
+ }
+ }
+
+ if (var18 > 0 && var19 < 128 - var2 && class193.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 242 243 244
+ for (var17 = 1; var17 < var2; ++var17) { // L: 245
+ if ((var13[var14 - 1][var17 + var15] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 246 247
+ continue label280;
+ }
+ }
+
+ class193.bufferX[var20] = var5 - 1; // L: 249
+ class193.bufferY[var20] = var6 + 1; // L: 250
+ var20 = var20 + 1 & 4095; // L: 251
+ class193.directions[var18 - 1][var19 + 1] = 6; // L: 252
+ class193.distances[var18 - 1][var19 + 1] = var16; // L: 253
+ }
+ } while(var18 >= 128 - var2); // L: 255
+ } while(var19 >= 128 - var2);
+ } while(class193.directions[var18 + 1][var19 + 1] != 0); // L: 256
+ } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 257
+
+ for (var17 = 1; var17 < var2; ++var17) { // L: 258
+ if ((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 259 260
+ continue label303;
+ }
+ }
+
+ class193.bufferX[var20] = var5 + 1; // L: 262
+ class193.bufferY[var20] = var6 + 1; // L: 263
+ var20 = var20 + 1 & 4095; // L: 264
+ class193.directions[var18 + 1][var19 + 1] = 12; // L: 265
+ class193.distances[var18 + 1][var19 + 1] = var16; // L: 266
+ }
+ }
+ }
+
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(CB)C",
+ garbageValue = "-102"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2926(this.field1572); // L: 123
- } // L: 124
-
- @ObfuscatedName("o")
- public static final int method2805(double var0, double var2, double var4) {
- double var6 = var4; // L: 9
- double var8 = var4; // L: 10
- double var10 = var4; // L: 11
- if (var2 != 0.0D) { // L: 12
- double var12;
- if (var4 < 0.5D) { // L: 14
- var12 = (var2 + 1.0D) * var4;
- } else {
- var12 = var2 + var4 - var4 * var2; // L: 15
- }
-
- double var14 = var4 * 2.0D - var12; // L: 16
- double var16 = var0 + 0.3333333333333333D; // L: 17
- if (var16 > 1.0D) { // L: 18
- --var16;
- }
-
- double var20 = var0 - 0.3333333333333333D; // L: 20
- if (var20 < 0.0D) { // L: 21
- ++var20;
- }
-
- if (6.0D * var16 < 1.0D) { // L: 22
- var6 = var14 + (var12 - var14) * 6.0D * var16;
- } else if (var16 * 2.0D < 1.0D) { // L: 23
- var6 = var12;
- } else if (3.0D * var16 < 2.0D) {
- var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14;
- } else {
- var6 = var14;
- }
-
- if (var0 * 6.0D < 1.0D) {
- var8 = var14 + (var12 - var14) * 6.0D * var0;
- } else if (2.0D * var0 < 1.0D) {
- var8 = var12;
- } else if (3.0D * var0 < 2.0D) {
- var8 = var14 + 6.0D * (0.6666666666666666D - var0) * (var12 - var14);
- } else {
- var8 = var14;
- }
-
- if (6.0D * var20 < 1.0D) {
- var10 = var20 * 6.0D * (var12 - var14) + var14;
- } else if (var20 * 2.0D < 1.0D) {
- var10 = var12;
- } else if (3.0D * var20 < 2.0D) {
- var10 = var14 + (var12 - var14) * (0.6666666666666666D - var20) * 6.0D;
- } else {
- var10 = var14;
- }
+ static char method2848(char var0) {
+ if (var0 == 198) { // L: 95
+ return 'E';
+ } else if (var0 == 230) { // L: 96
+ return 'e';
+ } else if (var0 == 223) {
+ return 's'; // L: 97
+ } else if (var0 == 338) { // L: 98
+ return 'E';
+ } else {
+ return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100
}
-
- int var22 = (int)(256.0D * var6);
- int var13 = (int)(256.0D * var8);
- int var23 = (int)(var10 * 256.0D);
- int var15 = var23 + (var13 << 8) + (var22 << 16);
- return var15; // L: 39
- }
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(ILpx;B)Lfn;",
- garbageValue = "105"
- )
- public static class168 method2807(int var0, Buffer var1) {
- int var2 = var1.readUnsignedByte(); // L: 24
- boolean var3 = (var2 & 1) != 0; // L: 25
- boolean var4 = (var2 & 2) != 0; // L: 26
- class168 var5 = new class168(var0); // L: 27
- int var6;
- int[] var7;
- boolean var8;
- int var9;
- short var10;
- if (var3) { // L: 28
- var6 = var1.readUnsignedByte(); // L: 29
- var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32
- var8 = var5.field1847 != null && var7.length == var5.field1847.length; // L: 33
-
- for (var9 = 0; var9 < 2; ++var9) { // L: 34
- if (var7[var9] != 15) { // L: 35
- var10 = (short)var1.readUnsignedShort(); // L: 36
- if (var8) { // L: 37
- var5.field1847[var7[var9]] = var10; // L: 38
- }
- }
- }
- }
-
- if (var4) { // L: 43
- var6 = var1.readUnsignedByte(); // L: 44
- var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47
- var8 = var5.field1844 != null && var7.length == var5.field1844.length; // L: 48
-
- for (var9 = 0; var9 < 2; ++var9) { // L: 49
- if (var7[var9] != 15) { // L: 50
- var10 = (short)var1.readUnsignedShort(); // L: 51
- if (var8) { // L: 52
- var5.field1844[var7[var9]] = var10; // L: 53
- }
- }
- }
- }
-
- return var5; // L: 58
}
}
diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java
index 5aa737f7f5..986d00bad8 100644
--- a/runescape-client/src/main/java/class128.java
+++ b/runescape-client/src/main/java/class128.java
@@ -1,31 +1,31 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("dk")
+@ObfuscatedName("dh")
public abstract class class128 extends Node {
- @ObfuscatedName("lt")
- @ObfuscatedGetter(
- intValue = -1795055701
- )
- @Export("Client_plane")
- static int Client_plane;
-
class128() {
} // L: 68
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- abstract void vmethod3040(Buffer var1);
+ abstract void vmethod3150(Buffer var1);
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- abstract void vmethod3041(ClanSettings var1);
+ abstract void vmethod3149(ClanSettings var1);
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)[Ljw;",
+ garbageValue = "182200833"
+ )
+ public static class262[] method2856() {
+ return new class262[]{class262.field3020, class262.field3017, class262.field3019, class262.field3018, class262.field3015, class262.field3016, class262.field3021, class262.field3022, class262.field3023, class262.field3024}; // L: 17
+ }
}
diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java
index 103cc11299..0aa1ebc3a6 100644
--- a/runescape-client/src/main/java/class129.java
+++ b/runescape-client/src/main/java/class129.java
@@ -1,118 +1,66 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("du")
+@ObfuscatedName("de")
public class class129 extends class128 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -847833425
+ intValue = 1753824971
)
- int field1579;
- @ObfuscatedName("q")
- boolean field1577;
+ int field1575;
+ @ObfuscatedName("v")
+ boolean field1574;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class129(class131 var1) {
this.this$0 = var1;
- this.field1579 = -1; // L: 178
+ this.field1575 = -1; // L: 178
} // L: 181
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1579 = var1.readUnsignedShort(); // L: 184
- this.field1577 = var1.readUnsignedByte() == 1; // L: 185
+ void vmethod3150(Buffer var1) {
+ this.field1575 = var1.readUnsignedShort(); // L: 184
+ this.field1574 = var1.readUnsignedByte() == 1; // L: 185
} // L: 186
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2895(this.field1579, this.field1577); // L: 189
+ void vmethod3149(ClanSettings var1) {
+ var1.method2963(this.field1575, this.field1574); // L: 189
} // L: 190
- @ObfuscatedName("v")
- static boolean method2816(long var0) {
- return (int)(var0 >>> 16 & 1L) == 1; // L: 80
- }
-
- @ObfuscatedName("fr")
+ @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "49"
+ descriptor = "(IIS)I",
+ garbageValue = "26009"
)
- static final void method2812() {
- if (Client.logoutTimer > 0) { // L: 3053
- SecureRandomCallable.logOut(); // L: 3054
+ static final int method2864(int var0, int var1) {
+ if (var0 == -1) { // L: 919
+ return 12345678;
} else {
- Client.timer.method6375(); // L: 3057
- PendingSpawn.updateGameState(40); // L: 3058
- DirectByteArrayCopier.field3337 = Client.packetWriter.getSocket(); // L: 3059
- Client.packetWriter.removeSocket(); // L: 3060
- }
- } // L: 3055 3061
-
- @ObfuscatedName("gk")
- @ObfuscatedSignature(
- descriptor = "(Lki;III)V",
- garbageValue = "1747874161"
- )
- @Export("checkIfMinimapClicked")
- static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
- if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3854
- if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3855
- SpriteMask var3 = var0.getSpriteMask(true); // L: 3856
- if (var3 == null) { // L: 3857
- return;
- }
-
- int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3858
- int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3859
- if (var3.contains(var4, var5)) { // L: 3860
- var4 -= var3.width / 2; // L: 3861
- var5 -= var3.height / 2; // L: 3862
- int var6 = Client.camAngleY & 2047; // L: 3863
- int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3864
- int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3865
- int var9 = var8 * var4 + var5 * var7 >> 11; // L: 3866
- int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3867
- int var11 = var9 + ModelData0.localPlayer.x >> 7; // L: 3868
- int var12 = ModelData0.localPlayer.y - var10 >> 7; // L: 3869
- PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field3023, Client.packetWriter.isaacCipher); // L: 3871
- var13.packetBuffer.writeByte(18); // L: 3872
- var13.packetBuffer.method7596(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3873
- var13.packetBuffer.method7641(var12 + GrandExchangeOfferOwnWorldComparator.baseY); // L: 3874
- var13.packetBuffer.writeShort(var11 + SecureRandomCallable.baseX); // L: 3875
- var13.packetBuffer.writeByte(var4); // L: 3876
- var13.packetBuffer.writeByte(var5); // L: 3877
- var13.packetBuffer.writeShort(Client.camAngleY); // L: 3878
- var13.packetBuffer.writeByte(57); // L: 3879
- var13.packetBuffer.writeByte(0); // L: 3880
- var13.packetBuffer.writeByte(0); // L: 3881
- var13.packetBuffer.writeByte(89); // L: 3882
- var13.packetBuffer.writeShort(ModelData0.localPlayer.x); // L: 3883
- var13.packetBuffer.writeShort(ModelData0.localPlayer.y); // L: 3884
- var13.packetBuffer.writeByte(63); // L: 3885
- Client.packetWriter.addNode(var13); // L: 3886
- Client.destinationX = var11; // L: 3887
- Client.destinationY = var12; // L: 3888
- }
+ var1 = (var0 & 127) * var1 / 128; // L: 920
+ if (var1 < 2) { // L: 921
+ var1 = 2;
+ } else if (var1 > 126) { // L: 922
+ var1 = 126;
}
+ return (var0 & 65408) + var1; // L: 923
}
- } // L: 3891
+ }
}
diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java
index 2b47484df4..87927bf03a 100644
--- a/runescape-client/src/main/java/class13.java
+++ b/runescape-client/src/main/java/class13.java
@@ -2,45 +2,55 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Hashtable;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import org.bouncycastle.crypto.tls.DefaultTlsClient;
import org.bouncycastle.crypto.tls.TlsAuthentication;
-@ObfuscatedName("b")
+@ObfuscatedName("r")
class class13 extends DefaultTlsClient {
+ @ObfuscatedName("w")
+ @Export("SpriteBuffer_spritePalette")
+ public static int[] SpriteBuffer_spritePalette;
+ @ObfuscatedName("iu")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
+ )
+ @Export("mapSceneSprites")
+ static IndexedSprite[] mapSceneSprites;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lw;"
+ descriptor = "Lz;"
)
final class12 this$1;
@ObfuscatedSignature(
- descriptor = "(Lw;)V"
+ descriptor = "(Lz;)V"
)
class13(class12 var1) {
- this.this$1 = var1; // L: 282
+ this.this$1 = var1; // L: 285
}
public Hashtable getClientExtensions() throws IOException {
- Hashtable var1 = super.getClientExtensions(); // L: 285
- if (var1 == null) { // L: 286
- var1 = new Hashtable(); // L: 287
+ Hashtable var1 = super.getClientExtensions(); // L: 288
+ if (var1 == null) { // L: 289
+ var1 = new Hashtable(); // L: 290
}
- byte[] var2 = this.this$1.val$host.getBytes(); // L: 289
- ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 290
- DataOutputStream var4 = new DataOutputStream(var3); // L: 291
- var4.writeShort(var2.length + 3); // L: 292
- var4.writeByte(0); // L: 293
- var4.writeShort(var2.length); // L: 294
- var4.write(var2); // L: 295
- var4.close(); // L: 296
- var1.put(0, var3.toByteArray()); // L: 297
- return var1; // L: 298
+ byte[] var2 = this.this$1.val$host.getBytes(); // L: 292
+ ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 293
+ DataOutputStream var4 = new DataOutputStream(var3); // L: 294
+ var4.writeShort(var2.length + 3); // L: 295
+ var4.writeByte(0); // L: 296
+ var4.writeShort(var2.length); // L: 297
+ var4.write(var2); // L: 298
+ var4.close(); // L: 299
+ var1.put(0, var3.toByteArray()); // L: 300
+ return var1; // L: 301
}
public TlsAuthentication getAuthentication() throws IOException {
- return new class11(this); // L: 303
+ return new class11(this); // L: 306
}
}
diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java
index 0993b96bfe..467f2c7694 100644
--- a/runescape-client/src/main/java/class131.java
+++ b/runescape-client/src/main/java/class131.java
@@ -1,49 +1,46 @@
+import java.io.IOException;
+import java.net.Socket;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("eh")
+@ObfuscatedName("ej")
public class class131 {
- @ObfuscatedName("a")
- @Export("ArchiveDiskActionHandler_thread")
- static Thread ArchiveDiskActionHandler_thread;
- @ObfuscatedName("e")
- @Export("ByteArrayPool_arrays")
- static byte[][][] ByteArrayPool_arrays;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- longValue = 8236093129399313125L
+ longValue = -1512748666488385143L
)
- long field1588;
+ long field1582;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 713864739
+ )
+ int field1584;
@ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = 1513231141
- )
- int field1587;
- @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "Llk;"
)
- IterableNodeDeque field1589;
+ IterableNodeDeque field1585;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
public class131(Buffer var1) {
- this.field1587 = -1; // L: 9
- this.field1589 = new IterableNodeDeque(); // L: 10
- this.method2827(var1); // L: 28
+ this.field1584 = -1; // L: 9
+ this.field1585 = new IterableNodeDeque();
+ this.method2868(var1); // L: 28
} // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-1779541187"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "840156873"
)
- void method2827(Buffer var1) {
- this.field1588 = var1.readLong(); // L: 32
- this.field1587 = var1.readInt(); // L: 33
+ void method2868(Buffer var1) {
+ this.field1582 = var1.readLong(); // L: 32
+ this.field1584 = var1.readInt(); // L: 33
for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55
Object var3;
@@ -55,10 +52,10 @@ public class class131 {
var3 = new class143(this);
} else if (var2 == 4) { // L: 40
var3 = new class135(this);
- } else if (var2 == 6) {
- var3 = new class142(this); // L: 41
- } else if (var2 == 5) { // L: 42
- var3 = new class127(this);
+ } else if (var2 == 6) { // L: 41
+ var3 = new class142(this);
+ } else if (var2 == 5) {
+ var3 = new class127(this); // L: 42
} else if (var2 == 2) { // L: 43
var3 = new class132(this);
} else if (var2 == 7) { // L: 44
@@ -69,8 +66,8 @@ public class class131 {
var3 = new class146(this);
} else if (var2 == 9) { // L: 47
var3 = new class152(this);
- } else if (var2 == 10) { // L: 48
- var3 = new class138(this);
+ } else if (var2 == 10) {
+ var3 = new class138(this); // L: 48
} else if (var2 == 11) { // L: 49
var3 = new class133(this);
} else if (var2 == 12) { // L: 50
@@ -83,39 +80,162 @@ public class class131 {
var3 = new class147(this);
}
- ((class128)var3).vmethod3040(var1); // L: 53
- this.field1589.addFirst((Node)var3); // L: 54
+ ((class128)var3).vmethod3150(var1); // L: 53
+ this.field1585.addFirst((Node)var3); // L: 54
}
} // L: 57
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;I)V",
- garbageValue = "-1989711462"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1292823548"
)
- public void method2822(ClanSettings var1) {
- if (var1.field1635 == this.field1588 && this.field1587 == var1.field1636) { // L: 60
- for (class128 var2 = (class128)this.field1589.last(); var2 != null; var2 = (class128)this.field1589.previous()) { // L: 61
- var2.vmethod3041(var1); // L: 62
+ public void method2869(ClanSettings var1) {
+ if (var1.field1627 == this.field1582 && this.field1584 == var1.field1628) { // L: 60
+ for (class128 var2 = (class128)this.field1585.last(); var2 != null; var2 = (class128)this.field1585.previous()) { // L: 61
+ var2.vmethod3149(var1); // L: 62
}
- ++var1.field1636; // L: 64
+ ++var1.field1628; // L: 64
} else {
throw new RuntimeException("");
}
} // L: 65
- @ObfuscatedName("e")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "-2088063820"
+ descriptor = "(Ljava/net/Socket;IIB)Lnl;",
+ garbageValue = "-16"
)
- static int method2828(String var0) {
- if (var0.equals("centre")) { // L: 297
- return 1; // L: 298
+ public static AbstractSocket method2878(Socket var0, int var1, int var2) throws IOException {
+ return new BufferedNetSocket(var0, var1, var2); // L: 10
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(IIIZIZI)V",
+ garbageValue = "906922492"
+ )
+ @Export("doWorldSorting")
+ static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
+ if (var0 < var1) { // L: 177
+ int var6 = (var0 + var1) / 2; // L: 178
+ int var7 = var0; // L: 179
+ World var8 = class362.World_worlds[var6]; // L: 180
+ class362.World_worlds[var6] = class362.World_worlds[var1]; // L: 181
+ class362.World_worlds[var1] = var8; // L: 182
+
+ for (int var9 = var0; var9 < var1; ++var9) { // L: 183
+ if (MusicPatchPcmStream.method5445(class362.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184
+ World var10 = class362.World_worlds[var9]; // L: 185
+ class362.World_worlds[var9] = class362.World_worlds[var7]; // L: 186
+ class362.World_worlds[var7++] = var10; // L: 187
+ }
+ }
+
+ class362.World_worlds[var1] = class362.World_worlds[var7]; // L: 191
+ class362.World_worlds[var7] = var8; // L: 192
+ doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193
+ doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194
+ }
+
+ } // L: 196
+
+ @ObfuscatedName("ad")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-70"
+ )
+ static int method2875(int var0, Script var1, boolean var2) {
+ int var3;
+ int var6;
+ int var9;
+ if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2280
+ class446.Interpreter_intStackSize -= 2; // L: 2281
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2282
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2283
+ EnumComposition var10 = UserComparator7.getEnum(var3); // L: 2284
+ if (var10.outputType != 's') { // L: 2285
+ }
+
+ for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2286
+ if (var9 == var10.keys[var6]) { // L: 2287
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2288
+ var10 = null; // L: 2289
+ break;
+ }
+ }
+
+ if (var10 != null) { // L: 2293
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr;
+ }
+
+ return 1; // L: 2294
+ } else if (var0 != ScriptOpcodes.ENUM) { // L: 2296
+ if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2322
+ var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 2323
+ EnumComposition var4 = UserComparator7.getEnum(var3); // L: 2324
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var4.size(); // L: 2325
+ return 1; // L: 2326
+ } else {
+ return 2; // L: 2328
+ }
} else {
- return !var0.equals("bottom") && !var0.equals("right") ? 0 : 2; // L: 300 301 303
+ class446.Interpreter_intStackSize -= 4; // L: 2297
+ var3 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 2298
+ var9 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 2299
+ int var5 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 2300
+ var6 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 2301
+ EnumComposition var7 = UserComparator7.getEnum(var5); // L: 2302
+ if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2303
+ for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2308
+ if (var6 == var7.keys[var8]) { // L: 2309
+ if (var9 == 115) { // L: 2310
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8];
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2311
+ }
+
+ var7 = null; // L: 2312
+ break;
+ }
+ }
+
+ if (var7 != null) { // L: 2316
+ if (var9 == 115) { // L: 2317
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2318
+ }
+ }
+
+ return 1; // L: 2320
+ } else {
+ if (var9 == 115) { // L: 2304
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null";
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 2305
+ }
+
+ return 1; // L: 2306
+ }
}
}
+
+ @ObfuscatedName("fg")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "117"
+ )
+ static final void method2877() {
+ if (Client.logoutTimer > 0) { // L: 3009
+ MouseRecorder.logOut(); // L: 3010
+ } else {
+ Client.timer.method6510(); // L: 3013
+ HealthBarUpdate.updateGameState(40); // L: 3014
+ Message.field461 = Client.packetWriter.getSocket(); // L: 3015
+ Client.packetWriter.removeSocket(); // L: 3016
+ }
+ } // L: 3011 3017
}
diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java
index 82d80fccbc..a2333071db 100644
--- a/runescape-client/src/main/java/class132.java
+++ b/runescape-client/src/main/java/class132.java
@@ -2,215 +2,72 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ej")
+@ObfuscatedName("eb")
public class class132 extends class128 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -1443435093
+ @ObfuscatedName("er")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
)
- int field1599;
- @ObfuscatedName("q")
- byte field1597;
+ static Archive field1588;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = -1669105563
+ )
+ int field1590;
+ @ObfuscatedName("v")
+ byte field1589;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class132(class131 var1) {
this.this$0 = var1;
- this.field1599 = -1; // L: 128
+ this.field1590 = -1; // L: 128
} // L: 131
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1599 = var1.readUnsignedShort(); // L: 134
- this.field1597 = var1.readByte(); // L: 135
+ void vmethod3150(Buffer var1) {
+ this.field1590 = var1.readUnsignedShort(); // L: 134
+ this.field1589 = var1.readByte(); // L: 135
} // L: 136
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2930(this.field1599, this.field1597); // L: 139
+ void vmethod3149(ClanSettings var1) {
+ var1.method2961(this.field1590, this.field1589); // L: 139
} // L: 140
- @ObfuscatedName("k")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "(IS)J",
- garbageValue = "-14369"
+ descriptor = "(Law;I)V",
+ garbageValue = "-1204833299"
)
- public static long method2833(int var0) {
- return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 56
- }
+ public static final void method2885(class47 var0) {
+ ModelData0.pcmPlayerProvider = var0; // L: 45
+ } // L: 46
- @ObfuscatedName("s")
+ @ObfuscatedName("gz")
@ObfuscatedSignature(
- descriptor = "([BIIB)Z",
- garbageValue = "-32"
+ descriptor = "(I)V",
+ garbageValue = "854083418"
)
- static final boolean method2834(byte[] var0, int var1, int var2) {
- boolean var3 = true; // L: 211
- Buffer var4 = new Buffer(var0); // L: 212
- int var5 = -1; // L: 213
-
- label71:
- while (true) {
- int var6 = var4.method7531(); // L: 215
- if (var6 == 0) { // L: 216
- return var3; // L: 247
- }
-
- var5 += var6; // L: 217
- int var7 = 0; // L: 218
- boolean var8 = false; // L: 219
-
- while (true) {
- int var9;
- while (!var8) { // L: 221
- var9 = var4.readUShortSmart(); // L: 227
- if (var9 == 0) { // L: 228
- continue label71;
- }
-
- var7 += var9 - 1; // L: 229
- int var10 = var7 & 63; // L: 230
- int var11 = var7 >> 6 & 63; // L: 231
- int var12 = var4.readUnsignedByte() >> 2; // L: 232
- int var13 = var11 + var1; // L: 233
- int var14 = var10 + var2; // L: 234
- if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 235
- ObjectComposition var15 = class82.getObjectDefinition(var5); // L: 236
- if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 237
- if (!var15.needsModelFiles()) { // L: 238
- ++Client.field570; // L: 239
- var3 = false; // L: 240
- }
-
- var8 = true; // L: 242
- }
- }
- }
-
- var9 = var4.readUShortSmart(); // L: 222
- if (var9 == 0) { // L: 223
- break;
- }
-
- var4.readUnsignedByte(); // L: 224
- }
- }
- }
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(Laj;I)V",
- garbageValue = "-1921096355"
- )
- static void method2829(GameEngine var0) {
- while (TaskHandler.isKeyDown()) { // L: 1837
- if (class12.field61 == 13) { // L: 1838
- WorldMapScaleHandler.method4927(); // L: 1839
- return; // L: 1840
- }
-
- if (class12.field61 == 96) { // L: 1842
- if (Login.worldSelectPage > 0 && class126.worldSelectLeftSprite != null) { // L: 1843
- --Login.worldSelectPage; // L: 1844
- }
- } else if (class12.field61 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class424.worldSelectRightSprite != null) { // L: 1847 1848
- ++Login.worldSelectPage; // L: 1849
- }
+ static void method2887() {
+ if (class121.worldMap != null) { // L: 4337
+ class121.worldMap.method7192(PacketWriter.Client_plane, (class101.localPlayer.x >> 7) + class28.baseX, (class101.localPlayer.y >> 7) + WorldMapLabelSize.baseY, false); // L: 4338
+ class121.worldMap.loadCache(); // L: 4339
}
- if (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1853
- int var1 = Login.xPadding + 280; // L: 1854
- if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1855
- class306.changeWorldSelectSorting(0, 0); // L: 1856
- return; // L: 1857
- }
-
- if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1859
- class306.changeWorldSelectSorting(0, 1); // L: 1860
- return; // L: 1861
- }
-
- int var2 = Login.xPadding + 390; // L: 1863
- if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1864
- class306.changeWorldSelectSorting(1, 0); // L: 1865
- return; // L: 1866
- }
-
- if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1868
- class306.changeWorldSelectSorting(1, 1); // L: 1869
- return; // L: 1870
- }
-
- int var3 = Login.xPadding + 500; // L: 1872
- if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1873
- class306.changeWorldSelectSorting(2, 0); // L: 1874
- return; // L: 1875
- }
-
- if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1877
- class306.changeWorldSelectSorting(2, 1); // L: 1878
- return; // L: 1879
- }
-
- int var4 = Login.xPadding + 610; // L: 1881
- if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1882
- class306.changeWorldSelectSorting(3, 0); // L: 1883
- return; // L: 1884
- }
-
- if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1886
- class306.changeWorldSelectSorting(3, 1); // L: 1887
- return; // L: 1888
- }
-
- if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1890
- WorldMapScaleHandler.method4927(); // L: 1891
- return; // L: 1892
- }
-
- if (Login.hoveredWorldIndex != -1) { // L: 1894
- World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 1895
- InvDefinition.changeWorld(var5); // L: 1896
- WorldMapScaleHandler.method4927(); // L: 1897
- return; // L: 1898
- }
-
- if (Login.worldSelectPage > 0 && class126.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class126.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class433.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class433.canvasHeight / 2 + 50) { // L: 1900
- --Login.worldSelectPage; // L: 1901
- }
-
- if (Login.worldSelectPage < Login.worldSelectPagesCount && class424.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GraphicsObject.canvasWidth - class424.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GraphicsObject.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class433.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class433.canvasHeight / 2 + 50) { // L: 1903
- ++Login.worldSelectPage; // L: 1904
- }
- }
-
- } // L: 1907
-
- @ObfuscatedName("ip")
- @ObfuscatedSignature(
- descriptor = "(IIIII)V",
- garbageValue = "-1705854659"
- )
- static final void method2836(int var0, int var1, int var2, int var3) {
- for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8715
- if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8716
- Client.field652[var4] = true;
- }
- }
-
- } // L: 8718
+ } // L: 4341
}
diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java
index 396ddc7eba..b8985d6ada 100644
--- a/runescape-client/src/main/java/class133.java
+++ b/runescape-client/src/main/java/class133.java
@@ -1,60 +1,162 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("en")
+@ObfuscatedName("ez")
public class class133 extends class128 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1372494639
+ intValue = 447785145
)
- int field1605;
+ int field1594;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 149851621
+ )
+ int field1592;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -923115207
+ intValue = 1058395113
)
- int field1602;
- @ObfuscatedName("l")
+ int field1593;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 81969821
+ intValue = 509471079
)
- int field1603;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = 1344220301
- )
- int field1604;
+ int field1596;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class133(class131 var1) {
this.this$0 = var1; // L: 289
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1605 = var1.readInt(); // L: 292
- this.field1604 = var1.readInt(); // L: 293
- this.field1602 = var1.readUnsignedByte(); // L: 294
- this.field1603 = var1.readUnsignedByte(); // L: 295
+ void vmethod3150(Buffer var1) {
+ this.field1594 = var1.readInt(); // L: 292
+ this.field1596 = var1.readInt(); // L: 293
+ this.field1592 = var1.readUnsignedByte(); // L: 294
+ this.field1593 = var1.readUnsignedByte(); // L: 295
} // L: 296
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2898(this.field1605, this.field1604, this.field1602, this.field1603); // L: 299
+ void vmethod3149(ClanSettings var1) {
+ var1.method3004(this.field1594, this.field1596, this.field1592, this.field1593); // L: 299
} // L: 300
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(Lbc;Lbc;IZI)I",
+ garbageValue = "1196154271"
+ )
+ @Export("compareWorlds")
+ static int compareWorlds(World var0, World var1, int var2, boolean var3) {
+ if (var2 == 1) { // L: 211
+ int var4 = var0.population; // L: 212
+ int var5 = var1.population; // L: 213
+ if (!var3) { // L: 214
+ if (var4 == -1) { // L: 215
+ var4 = 2001;
+ }
+
+ if (var5 == -1) { // L: 216
+ var5 = 2001;
+ }
+ }
+
+ return var4 - var5; // L: 218
+ } else if (var2 == 2) { // L: 220
+ return var0.location - var1.location;
+ } else if (var2 == 3) { // L: 221
+ if (var0.activity.equals("-")) { // L: 222
+ if (var1.activity.equals("-")) { // L: 223
+ return 0;
+ } else {
+ return var3 ? -1 : 1; // L: 224
+ }
+ } else if (var1.activity.equals("-")) { // L: 226
+ return var3 ? 1 : -1;
+ } else {
+ return var0.activity.compareTo(var1.activity); // L: 227
+ }
+ } else if (var2 == 4) { // L: 229
+ return var0.method1594() ? (var1.method1594() ? 0 : 1) : (var1.method1594() ? -1 : 0);
+ } else if (var2 == 5) { // L: 230
+ return var0.method1628() ? (var1.method1628() ? 0 : 1) : (var1.method1628() ? -1 : 0);
+ } else if (var2 == 6) { // L: 231
+ return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
+ } else if (var2 == 7) { // L: 232
+ return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
+ } else {
+ return var0.id - var1.id; // L: 233
+ }
+ }
+
+ @ObfuscatedName("hv")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "2144459119"
+ )
+ @Export("updateItemPile")
+ static final void updateItemPile(int var0, int var1) {
+ NodeDeque var2 = Client.groundItems[PacketWriter.Client_plane][var0][var1]; // L: 7857
+ if (var2 == null) { // L: 7858
+ class356.scene.removeGroundItemPile(PacketWriter.Client_plane, var0, var1); // L: 7859
+ } else {
+ long var3 = -99999999L; // L: 7862
+ TileItem var5 = null; // L: 7863
+
+ TileItem var6;
+ for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7864 7865 7873
+ ItemComposition var7 = EnumComposition.ItemDefinition_get(var6.id); // L: 7866
+ long var11 = (long)var7.price; // L: 7867
+ if (var7.isStackable == 1) {
+ var11 *= (long)(var6.quantity + 1); // L: 7868
+ }
+
+ if (var11 > var3) { // L: 7869
+ var3 = var11; // L: 7870
+ var5 = var6; // L: 7871
+ }
+ }
+
+ if (var5 == null) { // L: 7875
+ class356.scene.removeGroundItemPile(PacketWriter.Client_plane, var0, var1); // L: 7876
+ } else {
+ var2.addLast(var5); // L: 7879
+ TileItem var13 = null; // L: 7880
+ TileItem var8 = null; // L: 7881
+
+ for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7882 7883 7888
+ if (var5.id != var6.id) { // L: 7884
+ if (var13 == null) { // L: 7885
+ var13 = var6;
+ }
+
+ if (var6.id != var13.id && var8 == null) { // L: 7886
+ var8 = var6;
+ }
+ }
+ }
+
+ long var9 = TaskHandler.calculateTag(var0, var1, 3, false, 0); // L: 7890
+ class356.scene.newGroundItemPile(PacketWriter.Client_plane, var0, var1, SceneTilePaint.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, PacketWriter.Client_plane), var5, var9, var13, var8); // L: 7891
+ }
+ }
+ } // L: 7860 7877 7892
}
diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java
index 2a6a47b054..eea596f74d 100644
--- a/runescape-client/src/main/java/class134.java
+++ b/runescape-client/src/main/java/class134.java
@@ -3,86 +3,588 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("eb")
+@ObfuscatedName("eg")
public class class134 extends class144 {
- @ObfuscatedName("d")
+ @ObfuscatedName("bc")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Llb;"
)
- @Export("Widget_archive")
- public static AbstractArchive Widget_archive;
- @ObfuscatedName("o")
+ @Export("clientLanguage")
+ static Language clientLanguage;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -457086001
+ intValue = 1975185263
)
- int field1608;
+ int field1602;
+ @ObfuscatedName("v")
+ byte field1599;
@ObfuscatedName("q")
- byte field1607;
- @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 369270557
+ intValue = -984007901
)
- int field1609;
- @ObfuscatedName("k")
- String field1606;
+ int field1600;
+ @ObfuscatedName("f")
+ String field1598;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lee;"
+ descriptor = "Leu;"
)
final class145 this$0;
@ObfuscatedSignature(
- descriptor = "(Lee;)V"
+ descriptor = "(Leu;)V"
)
class134(class145 var1) {
this.this$0 = var1;
- this.field1608 = -1; // L: 101
+ this.field1602 = -1; // L: 101
} // L: 106
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1212008489"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "355261812"
)
- void vmethod3037(Buffer var1) {
- this.field1608 = var1.readUnsignedShort(); // L: 109
- this.field1607 = var1.readByte();
- this.field1609 = var1.readUnsignedShort();
+ void vmethod3137(Buffer var1) {
+ this.field1602 = var1.readUnsignedShort(); // L: 109
+ this.field1599 = var1.readByte(); // L: 110
+ this.field1600 = var1.readUnsignedShort(); // L: 111
var1.readLong(); // L: 112
- this.field1606 = var1.readStringCp1252NullTerminated(); // L: 113
+ this.field1598 = var1.readStringCp1252NullTerminated(); // L: 113
} // L: 114
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lex;I)V",
+ garbageValue = "1368590037"
+ )
+ void vmethod3138(ClanChannel var1) {
+ ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1602); // L: 117
+ var2.rank = this.field1599; // L: 118
+ var2.world = this.field1600; // L: 119
+ var2.username = new Username(this.field1598); // L: 120
+ } // L: 121
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)Ljava/lang/String;",
+ garbageValue = "499606325"
+ )
+ public static String method2904(Buffer var0) {
+ String var1;
+ try {
+ int var2 = var0.readUShortSmart(); // L: 63
+ if (var2 > 32767) { // L: 64
+ var2 = 32767;
+ }
+
+ byte[] var3 = new byte[var2]; // L: 65
+ var0.offset += class281.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 66
+ String var4 = SceneTilePaint.decodeStringCp1252(var3, 0, var2); // L: 67
+ var1 = var4; // L: 68
+ } catch (Exception var6) { // L: 70
+ var1 = "Cabbage"; // L: 71
+ }
+
+ return var1; // L: 74
+ }
+
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1640110130"
+ descriptor = "(II)I",
+ garbageValue = "128188876"
)
- void vmethod3032(ClanChannel var1) {
- ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1608); // L: 117
- var2.rank = this.field1607; // L: 118
- var2.world = this.field1609; // L: 119
- var2.username = new Username(this.field1606); // L: 120
- } // L: 121
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "-574473090"
- )
- public static int method2841(int var0, int var1) {
- int var2 = var0 >>> 31; // L: 110
- return (var0 + var2) / var1 - var2; // L: 111
+ public static int method2906(int var0) {
+ return var0 >> 17 & 7; // L: 17
}
- @ObfuscatedName("lu")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1592310985"
+ descriptor = "(Lgg;[Lgv;I)V",
+ garbageValue = "1741307207"
)
- static void method2850() {
- if (Client.oculusOrbState == 1) { // L: 12674
- Client.field575 = true; // L: 12675
+ static final void method2905(Scene var0, CollisionMap[] var1) {
+ int var2;
+ int var3;
+ int var4;
+ int var5;
+ for (var2 = 0; var2 < 4; ++var2) { // L: 543
+ for (var3 = 0; var3 < 104; ++var3) { // L: 544
+ for (var4 = 0; var4 < 104; ++var4) { // L: 545
+ if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 546
+ var5 = var2; // L: 547
+ if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 548
+ var5 = var2 - 1;
+ }
+
+ if (var5 >= 0) { // L: 549
+ var1[var5].setBlockedByFloor(var3, var4);
+ }
+ }
+ }
+ }
}
- } // L: 12677
+ Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 554
+ if (Tiles.rndHue < -8) { // L: 555
+ Tiles.rndHue = -8;
+ }
+
+ if (Tiles.rndHue > 8) { // L: 556
+ Tiles.rndHue = 8;
+ }
+
+ Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 557
+ if (Tiles.rndLightness < -16) { // L: 558
+ Tiles.rndLightness = -16;
+ }
+
+ if (Tiles.rndLightness > 16) { // L: 559
+ Tiles.rndLightness = 16;
+ }
+
+ int var9;
+ int var10;
+ int var11;
+ int var12;
+ int var13;
+ int var14;
+ int var15;
+ int var16;
+ int[] var10000;
+ int var17;
+ int var18;
+ for (var2 = 0; var2 < 4; ++var2) { // L: 560
+ byte[][] var42 = UserComparator6.field1415[var2]; // L: 561
+ boolean var48 = true; // L: 562
+ boolean var49 = true; // L: 563
+ boolean var6 = true; // L: 564
+ boolean var7 = true; // L: 565
+ boolean var8 = true; // L: 566
+ var9 = (int)Math.sqrt(5100.0D); // L: 567
+ var10 = var9 * 768 >> 8; // L: 568
+
+ int var19;
+ int var20;
+ for (var11 = 1; var11 < 103; ++var11) { // L: 569
+ for (var12 = 1; var12 < 103; ++var12) { // L: 570
+ var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 571
+ var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 572
+ var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 573
+ var16 = (var13 << 8) / var15; // L: 574
+ var17 = 65536 / var15; // L: 575
+ var18 = (var14 << 8) / var15; // L: 576
+ var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; // L: 577
+ var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); // L: 578
+ class430.field4651[var12][var11] = var19 - var20; // L: 579
+ }
+ }
+
+ for (var11 = 0; var11 < 104; ++var11) { // L: 582
+ MusicPatchNode2.Tiles_hue[var11] = 0; // L: 583
+ Tiles.Tiles_saturation[var11] = 0; // L: 584
+ Varcs.Tiles_lightness[var11] = 0; // L: 585
+ class465.Tiles_hueMultiplier[var11] = 0; // L: 586
+ WorldMapScaleHandler.field2877[var11] = 0; // L: 587
+ }
+
+ for (var11 = -5; var11 < 109; ++var11) { // L: 589
+ for (var12 = 0; var12 < 104; ++var12) { // L: 590
+ var13 = var11 + 5; // L: 591
+ int var10002;
+ if (var13 >= 0 && var13 < 104) { // L: 592
+ var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 593
+ if (var14 > 0) { // L: 594
+ var16 = var14 - 1; // L: 596
+ FloorUnderlayDefinition var43 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 598
+ FloorUnderlayDefinition var45;
+ if (var43 != null) { // L: 599
+ var45 = var43; // L: 600
+ } else {
+ byte[] var44 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 603
+ var43 = new FloorUnderlayDefinition(); // L: 604
+ if (var44 != null) { // L: 605
+ var43.decode(new Buffer(var44), var16);
+ }
+
+ var43.postDecode(); // L: 606
+ FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var43, (long)var16); // L: 607
+ var45 = var43; // L: 608
+ }
+
+ var10000 = MusicPatchNode2.Tiles_hue; // L: 611
+ var10000[var12] += var45.hue;
+ var10000 = Tiles.Tiles_saturation; // L: 612
+ var10000[var12] += var45.saturation;
+ var10000 = Varcs.Tiles_lightness; // L: 613
+ var10000[var12] += var45.lightness;
+ var10000 = class465.Tiles_hueMultiplier; // L: 614
+ var10000[var12] += var45.hueMultiplier;
+ var10002 = WorldMapScaleHandler.field2877[var12]++; // L: 615
+ }
+ }
+
+ var14 = var11 - 5; // L: 618
+ if (var14 >= 0 && var14 < 104) { // L: 619
+ var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 620
+ if (var15 > 0) { // L: 621
+ var17 = var15 - 1; // L: 623
+ FloorUnderlayDefinition var56 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); // L: 625
+ FloorUnderlayDefinition var47;
+ if (var56 != null) { // L: 626
+ var47 = var56; // L: 627
+ } else {
+ byte[] var46 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); // L: 630
+ var56 = new FloorUnderlayDefinition(); // L: 631
+ if (var46 != null) { // L: 632
+ var56.decode(new Buffer(var46), var17);
+ }
+
+ var56.postDecode(); // L: 633
+ FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var56, (long)var17); // L: 634
+ var47 = var56; // L: 635
+ }
+
+ var10000 = MusicPatchNode2.Tiles_hue; // L: 638
+ var10000[var12] -= var47.hue;
+ var10000 = Tiles.Tiles_saturation; // L: 639
+ var10000[var12] -= var47.saturation;
+ var10000 = Varcs.Tiles_lightness; // L: 640
+ var10000[var12] -= var47.lightness;
+ var10000 = class465.Tiles_hueMultiplier; // L: 641
+ var10000[var12] -= var47.hueMultiplier;
+ var10002 = WorldMapScaleHandler.field2877[var12]--; // L: 642
+ }
+ }
+ }
+
+ if (var11 >= 1 && var11 < 103) { // L: 646
+ var12 = 0; // L: 647
+ var13 = 0; // L: 648
+ var14 = 0; // L: 649
+ var15 = 0; // L: 650
+ var16 = 0; // L: 651
+
+ for (var17 = -5; var17 < 109; ++var17) { // L: 652
+ var18 = var17 + 5; // L: 653
+ if (var18 >= 0 && var18 < 104) { // L: 654
+ var12 += MusicPatchNode2.Tiles_hue[var18]; // L: 655
+ var13 += Tiles.Tiles_saturation[var18]; // L: 656
+ var14 += Varcs.Tiles_lightness[var18]; // L: 657
+ var15 += class465.Tiles_hueMultiplier[var18]; // L: 658
+ var16 += WorldMapScaleHandler.field2877[var18]; // L: 659
+ }
+
+ var19 = var17 - 5; // L: 661
+ if (var19 >= 0 && var19 < 104) { // L: 662
+ var12 -= MusicPatchNode2.Tiles_hue[var19]; // L: 663
+ var13 -= Tiles.Tiles_saturation[var19]; // L: 664
+ var14 -= Varcs.Tiles_lightness[var19]; // L: 665
+ var15 -= class465.Tiles_hueMultiplier[var19]; // L: 666
+ var16 -= WorldMapScaleHandler.field2877[var19]; // L: 667
+ }
+
+ if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 669 670 671 672
+ if (var2 < Tiles.Tiles_minPlane) { // L: 675
+ Tiles.Tiles_minPlane = var2;
+ }
+
+ var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 676
+ int var21 = Tiles.Tiles_overlays[var2][var11][var17] & 255; // L: 677
+ if (var20 > 0 || var21 > 0) { // L: 678
+ int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 679
+ int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 680
+ int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 681
+ int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 682
+ int var26 = class430.field4651[var11][var17]; // L: 683
+ int var27 = class430.field4651[var11 + 1][var17]; // L: 684
+ int var28 = class430.field4651[var11 + 1][var17 + 1]; // L: 685
+ int var29 = class430.field4651[var11][var17 + 1]; // L: 686
+ int var30 = -1; // L: 687
+ int var31 = -1; // L: 688
+ int var32;
+ int var33;
+ if (var20 > 0) { // L: 689
+ var32 = var12 * 256 / var15; // L: 690
+ var33 = var13 / var16; // L: 691
+ int var34 = var14 / var16; // L: 692
+ var30 = class21.hslToRgb(var32, var33, var34); // L: 693
+ var32 = var32 + Tiles.rndHue & 255; // L: 694
+ var34 += Tiles.rndLightness; // L: 695
+ if (var34 < 0) { // L: 696
+ var34 = 0;
+ } else if (var34 > 255) { // L: 697
+ var34 = 255;
+ }
+
+ var31 = class21.hslToRgb(var32, var33, var34); // L: 698
+ }
+
+ if (var2 > 0) { // L: 700
+ boolean var54 = true; // L: 701
+ if (var20 == 0 && Tiles.Tiles_shapes[var2][var11][var17] != 0) { // L: 702
+ var54 = false;
+ }
+
+ if (var21 > 0 && !class124.method2814(var21 - 1).hideUnderlay) { // L: 703
+ var54 = false;
+ }
+
+ if (var54 && var22 == var23 && var22 == var24 && var25 == var22) { // L: 704 705
+ var10000 = class1.field2[var2][var11];
+ var10000[var17] |= 2340;
+ }
+ }
+
+ var32 = 0; // L: 708
+ if (var31 != -1) { // L: 709
+ var32 = Rasterizer3D.Rasterizer3D_colorPalette[class129.method2864(var31, 96)];
+ }
+
+ if (var21 == 0) { // L: 710
+ var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class129.method2864(var30, var26), class129.method2864(var30, var27), class129.method2864(var30, var28), class129.method2864(var30, var29), 0, 0, 0, 0, var32, 0); // L: 711
+ } else {
+ var33 = Tiles.Tiles_shapes[var2][var11][var17] + 1; // L: 714
+ byte var55 = Tiles.field996[var2][var11][var17]; // L: 715
+ FloorOverlayDefinition var35 = class124.method2814(var21 - 1); // L: 716
+ int var36 = var35.texture; // L: 717
+ int var37;
+ int var38;
+ int var39;
+ int var40;
+ if (var36 >= 0) { // L: 720
+ var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 721
+ var37 = -1; // L: 722
+ } else if (var35.primaryRgb == 16711935) { // L: 725
+ var37 = -2; // L: 726
+ var36 = -1; // L: 727
+ var38 = -2; // L: 728
+ } else {
+ var37 = class21.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 731
+ var39 = var35.hue + Tiles.rndHue & 255; // L: 732
+ var40 = var35.lightness + Tiles.rndLightness; // L: 733
+ if (var40 < 0) { // L: 734
+ var40 = 0;
+ } else if (var40 > 255) { // L: 735
+ var40 = 255;
+ }
+
+ var38 = class21.hslToRgb(var39, var35.saturation, var40); // L: 736
+ }
+
+ var39 = 0; // L: 739
+ if (var38 != -2) { // L: 740
+ var39 = Rasterizer3D.Rasterizer3D_colorPalette[ModeWhere.method6079(var38, 96)];
+ }
+
+ if (var35.secondaryRgb != -1) { // L: 741
+ var40 = var35.secondaryHue + Tiles.rndHue & 255; // L: 742
+ int var41 = var35.secondaryLightness + Tiles.rndLightness; // L: 743
+ if (var41 < 0) { // L: 744
+ var41 = 0;
+ } else if (var41 > 255) { // L: 745
+ var41 = 255;
+ }
+
+ var38 = class21.hslToRgb(var40, var35.secondarySaturation, var41); // L: 746
+ var39 = Rasterizer3D.Rasterizer3D_colorPalette[ModeWhere.method6079(var38, 96)]; // L: 747
+ }
+
+ var0.addTile(var2, var11, var17, var33, var55, var36, var22, var23, var24, var25, class129.method2864(var30, var26), class129.method2864(var30, var27), class129.method2864(var30, var28), class129.method2864(var30, var29), ModeWhere.method6079(var37, var26), ModeWhere.method6079(var37, var27), ModeWhere.method6079(var37, var28), ModeWhere.method6079(var37, var29), var32, var39); // L: 749
+ }
+ }
+ }
+ }
+ }
+ }
+
+ for (var11 = 1; var11 < 103; ++var11) { // L: 756
+ for (var12 = 1; var12 < 103; ++var12) { // L: 757
+ var0.setTileMinPlane(var2, var12, var11, Huffman.method5474(var2, var12, var11)); // L: 758
+ }
+ }
+
+ Tiles.Tiles_underlays[var2] = null; // L: 761
+ Tiles.Tiles_overlays[var2] = null; // L: 762
+ Tiles.Tiles_shapes[var2] = null; // L: 763
+ Tiles.field996[var2] = null; // L: 764
+ UserComparator6.field1415[var2] = null; // L: 765
+ }
+
+ var0.method4186(-50, -10, -50); // L: 767
+
+ for (var2 = 0; var2 < 104; ++var2) { // L: 768
+ for (var3 = 0; var3 < 104; ++var3) { // L: 769
+ if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 770
+ var0.setLinkBelow(var2, var3);
+ }
+ }
+ }
+
+ var2 = 1; // L: 773
+ var3 = 2; // L: 774
+ var4 = 4; // L: 775
+
+ for (var5 = 0; var5 < 4; ++var5) { // L: 776
+ if (var5 > 0) { // L: 777
+ var2 <<= 3; // L: 778
+ var3 <<= 3; // L: 779
+ var4 <<= 3; // L: 780
+ }
+
+ for (int var50 = 0; var50 <= var5; ++var50) { // L: 782
+ for (int var51 = 0; var51 <= 104; ++var51) { // L: 783
+ for (int var52 = 0; var52 <= 104; ++var52) { // L: 784
+ short var53;
+ if ((class1.field2[var50][var52][var51] & var2) != 0) { // L: 785
+ var9 = var51; // L: 786
+ var10 = var51; // L: 787
+ var11 = var50; // L: 788
+
+ for (var12 = var50; var9 > 0 && (class1.field2[var50][var52][var9 - 1] & var2) != 0; --var9) { // L: 789 790
+ }
+
+ while (var10 < 104 && (class1.field2[var50][var52][var10 + 1] & var2) != 0) { // L: 791
+ ++var10;
+ }
+
+ label441:
+ while (var11 > 0) { // L: 792
+ for (var13 = var9; var13 <= var10; ++var13) { // L: 793
+ if ((class1.field2[var11 - 1][var52][var13] & var2) == 0) {
+ break label441;
+ }
+ }
+
+ --var11; // L: 794
+ }
+
+ label430:
+ while (var12 < var5) { // L: 796
+ for (var13 = var9; var13 <= var10; ++var13) { // L: 797
+ if ((class1.field2[var12 + 1][var52][var13] & var2) == 0) {
+ break label430;
+ }
+ }
+
+ ++var12; // L: 798
+ }
+
+ var13 = (var12 + 1 - var11) * (var10 - var9 + 1); // L: 800
+ if (var13 >= 8) { // L: 801
+ var53 = 240; // L: 802
+ var15 = Tiles.Tiles_heights[var12][var52][var9] - var53; // L: 803
+ var16 = Tiles.Tiles_heights[var11][var52][var9]; // L: 804
+ Scene.Scene_addOccluder(var5, 1, var52 * 128, var52 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 805
+
+ for (var17 = var11; var17 <= var12; ++var17) { // L: 806
+ for (var18 = var9; var18 <= var10; ++var18) { // L: 807
+ var10000 = class1.field2[var17][var52];
+ var10000[var18] &= ~var2;
+ }
+ }
+ }
+ }
+
+ if ((class1.field2[var50][var52][var51] & var3) != 0) { // L: 811
+ var9 = var52; // L: 812
+ var10 = var52; // L: 813
+ var11 = var50; // L: 814
+
+ for (var12 = var50; var9 > 0 && (class1.field2[var50][var9 - 1][var51] & var3) != 0; --var9) { // L: 815 816
+ }
+
+ while (var10 < 104 && (class1.field2[var50][var10 + 1][var51] & var3) != 0) { // L: 817
+ ++var10;
+ }
+
+ label494:
+ while (var11 > 0) { // L: 818
+ for (var13 = var9; var13 <= var10; ++var13) { // L: 819
+ if ((class1.field2[var11 - 1][var13][var51] & var3) == 0) {
+ break label494;
+ }
+ }
+
+ --var11; // L: 820
+ }
+
+ label483:
+ while (var12 < var5) { // L: 822
+ for (var13 = var9; var13 <= var10; ++var13) { // L: 823
+ if ((class1.field2[var12 + 1][var13][var51] & var3) == 0) {
+ break label483;
+ }
+ }
+
+ ++var12; // L: 824
+ }
+
+ var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 826
+ if (var13 >= 8) { // L: 827
+ var53 = 240; // L: 828
+ var15 = Tiles.Tiles_heights[var12][var9][var51] - var53; // L: 829
+ var16 = Tiles.Tiles_heights[var11][var9][var51]; // L: 830
+ Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var51 * 128, var51 * 128, var15, var16); // L: 831
+
+ for (var17 = var11; var17 <= var12; ++var17) { // L: 832
+ for (var18 = var9; var18 <= var10; ++var18) { // L: 833
+ var10000 = class1.field2[var17][var18];
+ var10000[var51] &= ~var3;
+ }
+ }
+ }
+ }
+
+ if ((class1.field2[var50][var52][var51] & var4) != 0) { // L: 837
+ var9 = var52; // L: 838
+ var10 = var52; // L: 839
+ var11 = var51; // L: 840
+
+ for (var12 = var51; var11 > 0 && (class1.field2[var50][var52][var11 - 1] & var4) != 0; --var11) { // L: 841 842
+ }
+
+ while (var12 < 104 && (class1.field2[var50][var52][var12 + 1] & var4) != 0) { // L: 843
+ ++var12;
+ }
+
+ label547:
+ while (var9 > 0) { // L: 844
+ for (var13 = var11; var13 <= var12; ++var13) { // L: 845
+ if ((class1.field2[var50][var9 - 1][var13] & var4) == 0) {
+ break label547;
+ }
+ }
+
+ --var9; // L: 846
+ }
+
+ label536:
+ while (var10 < 104) { // L: 848
+ for (var13 = var11; var13 <= var12; ++var13) { // L: 849
+ if ((class1.field2[var50][var10 + 1][var13] & var4) == 0) {
+ break label536;
+ }
+ }
+
+ ++var10; // L: 850
+ }
+
+ if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { // L: 852
+ var13 = Tiles.Tiles_heights[var50][var9][var11]; // L: 853
+ Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 854
+
+ for (var14 = var9; var14 <= var10; ++var14) { // L: 855
+ for (var15 = var11; var15 <= var12; ++var15) { // L: 856
+ var10000 = class1.field2[var50][var14];
+ var10000[var15] &= ~var4;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ } // L: 864
}
diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java
index 874d9e19ce..7465e11b4f 100644
--- a/runescape-client/src/main/java/class135.java
+++ b/runescape-client/src/main/java/class135.java
@@ -1,71 +1,515 @@
-import java.awt.FontMetrics;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("ea")
public class class135 extends class128 {
- @ObfuscatedName("uw")
- @ObfuscatedSignature(
- descriptor = "Lnc;"
- )
- @Export("masterDisk")
- static ArchiveDisk masterDisk;
- @ObfuscatedName("ul")
- @ObfuscatedSignature(
- descriptor = "Lom;"
- )
- @Export("platformInfo")
- static PlatformInfo platformInfo;
- @ObfuscatedName("ab")
- @Export("loginScreenFontMetrics")
- static FontMetrics loginScreenFontMetrics;
- @ObfuscatedName("o")
- boolean field1614;
+ @ObfuscatedName("c")
+ boolean field1607;
+ @ObfuscatedName("v")
+ byte field1605;
@ObfuscatedName("q")
- byte field1613;
- @ObfuscatedName("l")
- byte field1615;
- @ObfuscatedName("k")
- byte field1622;
- @ObfuscatedName("a")
- byte field1616;
+ byte field1609;
+ @ObfuscatedName("f")
+ byte field1608;
+ @ObfuscatedName("j")
+ byte field1606;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class135(class131 var1) {
this.this$0 = var1; // L: 248
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1614 = var1.readUnsignedByte() == 1; // L: 251
- this.field1613 = var1.readByte(); // L: 252
- this.field1615 = var1.readByte(); // L: 253
- this.field1622 = var1.readByte(); // L: 254
- this.field1616 = var1.readByte(); // L: 255
+ void vmethod3150(Buffer var1) {
+ this.field1607 = var1.readUnsignedByte() == 1;
+ this.field1605 = var1.readByte(); // L: 252
+ this.field1609 = var1.readByte(); // L: 253
+ this.field1608 = var1.readByte();
+ this.field1606 = var1.readByte();
} // L: 256
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.allowGuests = this.field1614; // L: 259
- var1.field1633 = this.field1613; // L: 260
- var1.field1641 = this.field1615; // L: 261
- var1.field1642 = this.field1622; // L: 262
- var1.field1648 = this.field1616; // L: 263
+ void vmethod3149(ClanSettings var1) {
+ var1.allowGuests = this.field1607;
+ var1.field1637 = this.field1605; // L: 260
+ var1.field1633 = this.field1609; // L: 261
+ var1.field1634 = this.field1608;
+ var1.field1645 = this.field1606;
} // L: 264
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lcw;III)V",
+ garbageValue = "891167101"
+ )
+ @Export("runScript")
+ static void runScript(ScriptEvent var0, int var1, int var2) {
+ Object[] var3 = var0.args; // L: 120
+ Script var4;
+ int var20;
+ if (MilliClock.isWorldMapEvent(var0.type)) { // L: 122
+ class21.worldMapEvent = (WorldMapEvent)var3[0]; // L: 123
+ WorldMapElement var5 = class432.WorldMapElement_get(class21.worldMapEvent.mapElement); // L: 124
+ var4 = class149.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 125
+ } else {
+ var20 = (Integer)var3[0]; // L: 128
+ var4 = Language.getScript(var20); // L: 129
+ }
+
+ if (var4 != null) { // L: 131
+ class446.Interpreter_intStackSize = 0; // L: 134
+ Interpreter.Interpreter_stringStackSize = 0; // L: 135
+ var20 = -1; // L: 136
+ int[] var6 = var4.opcodes; // L: 137
+ int[] var7 = var4.intOperands; // L: 138
+ byte var8 = -1; // L: 139
+ Interpreter.Interpreter_frameDepth = 0; // L: 140
+ Interpreter.field829 = false; // L: 141
+ boolean var9 = false; // L: 142
+ int var10 = 0; // L: 143
+ boolean var30 = false;
+
+ label952: {
+ label953: {
+ try {
+ int var13;
+ try {
+ var30 = true; // L: 145
+ Interpreter.Interpreter_intLocals = new int[var4.localIntCount]; // L: 146
+ int var11 = 0; // L: 147
+ class326.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 148
+ int var12 = 0;
+
+ int var14;
+ String var21;
+ for (var13 = 1; var13 < var3.length; ++var13) { // L: 149
+ if (var3[var13] instanceof Integer) { // L: 150
+ var14 = (Integer)var3[var13]; // L: 151
+ if (var14 == -2147483647) { // L: 152
+ var14 = var0.mouseX;
+ }
+
+ if (var14 == -2147483646) { // L: 153
+ var14 = var0.mouseY;
+ }
+
+ if (var14 == -2147483645) { // L: 154
+ var14 = var0.widget != null ? var0.widget.id * -1598663557 * -1038587213 : -1;
+ }
+
+ if (var14 == -2147483644) { // L: 155
+ var14 = var0.opIndex;
+ }
+
+ if (var14 == -2147483643) { // L: 156
+ var14 = var0.widget != null ? var0.widget.childIndex * 9919479 * -385493561 : -1;
+ }
+
+ if (var14 == -2147483642) { // L: 157
+ var14 = var0.dragTarget != null ? var0.dragTarget.id * -1598663557 * -1038587213 : -1;
+ }
+
+ if (var14 == -2147483641) { // L: 158
+ var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 9919479 * -385493561 : -1;
+ }
+
+ if (var14 == -2147483640) { // L: 159
+ var14 = var0.keyTyped;
+ }
+
+ if (var14 == -2147483639) { // L: 160
+ var14 = var0.keyPressed;
+ }
+
+ Interpreter.Interpreter_intLocals[var11++] = var14; // L: 161
+ } else if (var3[var13] instanceof String) { // L: 163
+ var21 = (String)var3[var13]; // L: 164
+ if (var21.equals("event_opbase")) { // L: 165
+ var21 = var0.targetName;
+ }
+
+ class326.Interpreter_stringLocals[var12++] = var21; // L: 166
+ }
+ }
+
+ Interpreter.field850 = var0.field1056; // L: 170
+
+ while (true) {
+ ++var10; // L: 172
+ if (var10 > var1) { // L: 173
+ throw new RuntimeException();
+ }
+
+ ++var20; // L: 174
+ int var33 = var6[var20];
+ if (var33 >= 100) { // L: 175
+ boolean var35;
+ if (var4.intOperands[var20] == 1) { // L: 393
+ var35 = true;
+ } else {
+ var35 = false; // L: 394
+ }
+
+ var14 = Friend.method6619(var33, var4, var35); // L: 395
+ switch(var14) { // L: 396
+ case 0:
+ var30 = false;
+ break label952;
+ case 1:
+ default:
+ break;
+ case 2:
+ throw new IllegalStateException(); // L: 399
+ }
+ } else if (var33 == ScriptOpcodes.ICONST) { // L: 176
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var7[var20]; // L: 177
+ } else if (var33 == ScriptOpcodes.GET_VARP) { // L: 180
+ var13 = var7[var20]; // L: 181
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 182
+ } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 185
+ var13 = var7[var20]; // L: 186
+ Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 187
+ class306.changeGameOptions(var13); // L: 188
+ } else if (var33 == ScriptOpcodes.SCONST) { // L: 191
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 192
+ } else if (var33 == ScriptOpcodes.JUMP) { // L: 195
+ var20 += var7[var20]; // L: 196
+ } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 199
+ class446.Interpreter_intStackSize -= 2; // L: 200
+ if (Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]) { // L: 201
+ var20 += var7[var20];
+ }
+ } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 204
+ class446.Interpreter_intStackSize -= 2; // L: 205
+ if (Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]) { // L: 206
+ var20 += var7[var20];
+ }
+ } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 209
+ class446.Interpreter_intStackSize -= 2; // L: 210
+ if (Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]) { // L: 211
+ var20 += var7[var20];
+ }
+ } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 214
+ class446.Interpreter_intStackSize -= 2; // L: 215
+ if (Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]) { // L: 216
+ var20 += var7[var20];
+ }
+ } else if (var33 == ScriptOpcodes.RETURN) { // L: 219
+ if (Interpreter.Interpreter_frameDepth == 0) {
+ var30 = false;
+ break;
+ }
+
+ ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 221
+ var4 = var40.script; // L: 222
+ var6 = var4.opcodes; // L: 223
+ var7 = var4.intOperands; // L: 224
+ var20 = var40.pc; // L: 225
+ Interpreter.Interpreter_intLocals = var40.intLocals; // L: 226
+ class326.Interpreter_stringLocals = var40.stringLocals; // L: 227
+ } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 230
+ var13 = var7[var20]; // L: 231
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class388.getVarbit(var13); // L: 232
+ } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 235
+ var13 = var7[var20]; // L: 236
+ PacketBufferNode.method5200(var13, Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 237
+ } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 240
+ class446.Interpreter_intStackSize -= 2; // L: 241
+ if (Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]) { // L: 242
+ var20 += var7[var20];
+ }
+ } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 245
+ class446.Interpreter_intStackSize -= 2; // L: 246
+ if (Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]) { // L: 247
+ var20 += var7[var20];
+ }
+ } else if (var33 == ScriptOpcodes.ILOAD) { // L: 250
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var7[var20]]; // L: 251
+ } else if (var33 == ScriptOpcodes.ISTORE) { // L: 254
+ Interpreter.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 255
+ } else if (var33 == ScriptOpcodes.SLOAD) { // L: 258
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class326.Interpreter_stringLocals[var7[var20]]; // L: 259
+ } else if (var33 == ScriptOpcodes.SSTORE) { // L: 262
+ class326.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 263
+ } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 266
+ var13 = var7[var20]; // L: 267
+ Interpreter.Interpreter_stringStackSize -= var13; // L: 268
+ var21 = User.method6679(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); // L: 269
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 270
+ } else if (var33 == ScriptOpcodes.POP_INT) { // L: 273
+ --class446.Interpreter_intStackSize; // L: 274
+ } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 277
+ --Interpreter.Interpreter_stringStackSize; // L: 278
+ } else {
+ int var17;
+ if (var33 != ScriptOpcodes.INVOKE) { // L: 281
+ if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 304
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class308.varcs.getInt(var7[var20]); // L: 305
+ } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 308
+ class308.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 309
+ } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 312
+ var13 = var7[var20] >> 16; // L: 313
+ var14 = var7[var20] & 65535; // L: 314
+ int var24 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 315
+ if (var24 < 0 || var24 > 5000) { // L: 316
+ throw new RuntimeException(); // L: 317
+ }
+
+ Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 319
+ byte var25 = -1; // L: 320
+ if (var14 == 105) { // L: 321
+ var25 = 0;
+ }
+
+ for (var17 = 0; var17 < var24; ++var17) { // L: 322
+ Interpreter.Interpreter_arrays[var13][var17] = var25;
+ }
+ } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 325
+ var13 = var7[var20]; // L: 326
+ var14 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 327
+ if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 328
+ throw new RuntimeException(); // L: 329
+ }
+
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 331
+ } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 334
+ var13 = var7[var20]; // L: 335
+ class446.Interpreter_intStackSize -= 2; // L: 336
+ var14 = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 337
+ if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 338
+ throw new RuntimeException(); // L: 339
+ }
+
+ Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 341
+ } else {
+ String var22;
+ if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 344
+ var22 = class308.varcs.getStringOld(var7[var20]); // L: 345
+ if (var22 == null) { // L: 346
+ var22 = "null";
+ }
+
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var22; // L: 347
+ } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 350
+ class308.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 351
+ } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 354
+ var22 = class308.varcs.getString(var7[var20]); // L: 355
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var22; // L: 356
+ } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 359
+ class308.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 360
+ } else if (var33 == ScriptOpcodes.SWITCH) { // L: 363
+ IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 364
+ IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 365
+ if (var37 != null) { // L: 366
+ var20 += var37.integer;
+ }
+ } else {
+ Integer var39;
+ if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 369
+ var39 = WorldMapID.field2842.getTitleGroupValue(var7[var20]); // L: 370
+ if (var39 == null) { // L: 371
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 372
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var39; // L: 375
+ }
+ } else {
+ if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 379
+ throw new IllegalStateException(); // L: 389
+ }
+
+ var39 = FontName.field4584.method7055(var7[var20]); // L: 380
+ if (var39 == null) { // L: 381
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 382
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var39; // L: 385
+ }
+ }
+ }
+ }
+ } else {
+ var13 = var7[var20]; // L: 282
+ Script var36 = Language.getScript(var13); // L: 283
+ int[] var15 = new int[var36.localIntCount]; // L: 284
+ String[] var16 = new String[var36.localStringCount]; // L: 285
+
+ for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 286
+ var15[var17] = Interpreter.Interpreter_intStack[var17 + (class446.Interpreter_intStackSize - var36.intArgumentCount)];
+ }
+
+ for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 287
+ var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var36.stringArgumentCount)];
+ }
+
+ class446.Interpreter_intStackSize -= var36.intArgumentCount; // L: 288
+ Interpreter.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 289
+ ScriptFrame var23 = new ScriptFrame(); // L: 290
+ var23.script = var4; // L: 291
+ var23.pc = var20; // L: 292
+ var23.intLocals = Interpreter.Interpreter_intLocals; // L: 293
+ var23.stringLocals = class326.Interpreter_stringLocals; // L: 294
+ Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 295
+ var4 = var36; // L: 296
+ var6 = var36.opcodes; // L: 297
+ var7 = var36.intOperands; // L: 298
+ var20 = -1; // L: 299
+ Interpreter.Interpreter_intLocals = var15; // L: 300
+ class326.Interpreter_stringLocals = var16; // L: 301
+ }
+ }
+ }
+ } catch (Exception var31) { // L: 409
+ var9 = true; // L: 410
+ StringBuilder var27 = new StringBuilder(30); // L: 412
+ var27.append("").append(var4.key).append(" "); // L: 413
+
+ for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 414
+ var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" ");
+ }
+
+ var27.append("").append(var8); // L: 415
+ class249.RunException_sendStackTrace(var27.toString(), var31); // L: 416
+ var30 = false;
+ break label953;
+ }
+ } finally {
+ if (var30) {
+ while (Interpreter.field843.size() > 0) {
+ class93 var19 = (class93)Interpreter.field843.remove(0); // L: 421
+ TextureProvider.widgetDefaultMenuAction(var19.method2391(), var19.method2392(), var19.method2400(), var19.method2393(), "");
+ }
+
+ if (Interpreter.field829) { // L: 424
+ Interpreter.field829 = false; // L: 425
+ Occluder.method4354(); // L: 426
+ }
+
+ if (!var9 && var2 > 0 && var10 >= var2) {
+ class249.RunException_sendStackTrace("Warning: Script " + var4.field967 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+ }
+
+ }
+ }
+
+ while (Interpreter.field843.size() > 0) {
+ class93 var41 = (class93)Interpreter.field843.remove(0);
+ TextureProvider.widgetDefaultMenuAction(var41.method2391(), var41.method2392(), var41.method2400(), var41.method2393(), "");
+ }
+
+ if (Interpreter.field829) {
+ Interpreter.field829 = false;
+ Occluder.method4354();
+ }
+
+ if (!var9 && var2 > 0 && var10 >= var2) {
+ class249.RunException_sendStackTrace("Warning: Script " + var4.field967 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+ }
+
+ return; // L: 220
+ }
+
+ while (Interpreter.field843.size() > 0) { // L: 420
+ class93 var26 = (class93)Interpreter.field843.remove(0);
+ TextureProvider.widgetDefaultMenuAction(var26.method2391(), var26.method2392(), var26.method2400(), var26.method2393(), "");
+ }
+
+ if (Interpreter.field829) {
+ Interpreter.field829 = false;
+ Occluder.method4354();
+ }
+
+ if (!var9 && var2 > 0 && var10 >= var2) {
+ class249.RunException_sendStackTrace("Warning: Script " + var4.field967 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+ }
+
+ return; // L: 432
+ }
+
+ while (Interpreter.field843.size() > 0) {
+ class93 var34 = (class93)Interpreter.field843.remove(0);
+ TextureProvider.widgetDefaultMenuAction(var34.method2391(), var34.method2392(), var34.method2400(), var34.method2393(), ""); // L: 422
+ }
+
+ if (Interpreter.field829) {
+ Interpreter.field829 = false;
+ Occluder.method4354();
+ }
+
+ if (!var9 && var2 > 0 && var10 >= var2) { // L: 428
+ class249.RunException_sendStackTrace("Warning: Script " + var4.field967 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 429
+ }
+
+ }
+ } // L: 132 404
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(IB)I",
+ garbageValue = "-3"
+ )
+ public static int method2910(int var0) {
+ --var0; // L: 50
+ var0 |= var0 >>> 1; // L: 51
+ var0 |= var0 >>> 2; // L: 52
+ var0 |= var0 >>> 4; // L: 53
+ var0 |= var0 >>> 8; // L: 54
+ var0 |= var0 >>> 16; // L: 55
+ return var0 + 1; // L: 56
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(ZI)V",
+ garbageValue = "1627158309"
+ )
+ @Export("Login_promptCredentials")
+ static void Login_promptCredentials(boolean var0) {
+ if (!class353.client.method1102() && !class353.client.method1103()) { // L: 1164
+ Login.Login_response1 = ""; // L: 1168
+ Login.Login_response2 = "Enter your username/email & password."; // L: 1169
+ Login.Login_response3 = ""; // L: 1170
+ WorldMapData_1.method4872(2); // L: 1171
+ if (var0) { // L: 1172
+ Login.Login_password = "";
+ }
+
+ KeyHandler.method286(); // L: 1173
+ class29.method357(); // L: 1174
+ } else {
+ WorldMapData_1.method4872(10); // L: 1165
+ }
+ } // L: 1166 1175
+
+ @ObfuscatedName("gt")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-802967854"
+ )
+ static void method2917() {
+ int var0 = Players.Players_count; // L: 4793
+ int[] var1 = Players.Players_indices; // L: 4794
+
+ for (int var2 = 0; var2 < var0; ++var2) { // L: 4795
+ if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4796
+ ByteArrayPool.addPlayerToScene(Client.players[var1[var2]], true); // L: 4797
+ }
+ }
+
+ } // L: 4799
}
diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java
index b5cb0f178a..d6f4c97e6d 100644
--- a/runescape-client/src/main/java/class136.java
+++ b/runescape-client/src/main/java/class136.java
@@ -1,42 +1,45 @@
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
+import java.net.URL;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("er")
+@ObfuscatedName("ed")
public class class136 extends class144 {
- @ObfuscatedName("o")
+ @ObfuscatedName("z")
@ObfuscatedGetter(
- intValue = -862261103
+ intValue = 108140015
)
- int field1624;
+ static int field1612;
+ @ObfuscatedName("m")
+ @Export("BZip2Decompressor_block")
+ static int[] BZip2Decompressor_block;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1682759161
+ )
+ int field1615;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lee;"
+ descriptor = "Leu;"
)
final class145 this$0;
@ObfuscatedSignature(
- descriptor = "(Lee;)V"
+ descriptor = "(Leu;)V"
)
class136(class145 var1) {
this.this$0 = var1;
- this.field1624 = -1; // L: 82
+ this.field1615 = -1; // L: 82
} // L: 84
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1212008489"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "355261812"
)
- void vmethod3037(Buffer var1) {
- this.field1624 = var1.readUnsignedShort(); // L: 87
+ void vmethod3137(Buffer var1) {
+ this.field1615 = var1.readUnsignedShort(); // L: 87
var1.readUnsignedByte(); // L: 88
if (var1.readUnsignedByte() != 255) { // L: 89
--var1.offset; // L: 90
@@ -45,815 +48,61 @@ public class class136 extends class144 {
} // L: 93
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1640110130"
+ descriptor = "(Lex;I)V",
+ garbageValue = "1368590037"
)
- void vmethod3032(ClanChannel var1) {
- var1.removeMember(this.field1624);
+ void vmethod3138(ClanChannel var1) {
+ var1.removeMember(this.field1615); // L: 96
+ } // L: 97
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "1973466779"
+ )
+ @Export("loadWorlds")
+ static boolean loadWorlds() {
+ try {
+ if (class174.World_request == null) { // L: 31
+ class174.World_request = class138.urlRequester.request(new URL(Client.field481));
+ } else if (class174.World_request.isDone()) { // L: 33
+ byte[] var0 = class174.World_request.getResponse(); // L: 34
+ Buffer var1 = new Buffer(var0); // L: 35
+ var1.readInt(); // L: 36
+ World.World_count = var1.readUnsignedShort(); // L: 37
+ class362.World_worlds = new World[World.World_count]; // L: 38
+
+ World var3;
+ for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47
+ var3 = class362.World_worlds[var2] = new World(); // L: 40
+ var3.id = var1.readUnsignedShort(); // L: 41
+ var3.properties = var1.readInt(); // L: 42
+ var3.host = var1.readStringCp1252NullTerminated(); // L: 43
+ var3.activity = var1.readStringCp1252NullTerminated(); // L: 44
+ var3.location = var1.readUnsignedByte(); // L: 45
+ var3.population = var1.readShort(); // L: 46
+ }
+
+ MouseRecorder.sortWorlds(class362.World_worlds, 0, class362.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
+ class174.World_request = null; // L: 50
+ return true; // L: 51
+ }
+ } catch (Exception var4) { // L: 55
+ var4.printStackTrace(); // L: 56
+ class174.World_request = null; // L: 57
+ }
+
+ return false; // L: 59
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Lfw;",
- garbageValue = "-185692115"
+ descriptor = "(III)I",
+ garbageValue = "695321125"
)
- @Export("SpotAnimationDefinition_get")
- public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
- SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32
- if (var1 != null) { // L: 33
- return var1;
- } else {
- byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34
- var1 = new SpotAnimationDefinition(); // L: 35
- var1.id = var0; // L: 36
- if (var2 != null) { // L: 37
- var1.decode(new Buffer(var2));
- }
-
- SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38
- return var1; // L: 39
- }
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Laj;Lmx;I)V",
- garbageValue = "617611550"
- )
- @Export("loginScreen")
- static void loginScreen(GameEngine var0, Font var1) {
- if (Login.worldSelectOpen) { // L: 288
- class132.method2829(var0); // L: 289
- } else {
- if ((MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 292
- class12.clientPreferences.method2305(!class12.clientPreferences.method2226()); // L: 293
- if (!class12.clientPreferences.method2226()) { // L: 294
- class118.method2733(AbstractUserComparator.archive6, "scape main", "", 255, false);
- } else {
- ApproximateRouteStrategy.method1110(); // L: 295
- }
- }
-
- if (Client.gameState != 5) { // L: 297
- if (-1L == Login.field883) { // L: 298
- Login.field883 = class113.method2624() + 1000L; // L: 299
- }
-
- long var2 = class113.method2624(); // L: 301
- if (class121.method2748() && Login.field909 == -1L) { // L: 302 303
- Login.field909 = var2; // L: 304
- if (Login.field909 > Login.field883) { // L: 305
- Login.field883 = Login.field909; // L: 306
- }
- }
-
- if (Client.gameState == 10 || Client.gameState == 11) { // L: 310
- int var4;
- if (Language.Language_EN == class263.clientLanguage) { // L: 311
- if (MouseHandler.MouseHandler_lastButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 312
- var4 = Login.xPadding + 5; // L: 313
- short var5 = 463; // L: 314
- byte var6 = 100; // L: 315
- byte var7 = 35; // L: 316
- if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 317
- Player.method2135(); // L: 318
- return; // L: 319
- }
- }
-
- if (NPC.World_request != null) { // L: 322
- Player.method2135();
- }
- }
-
- var4 = MouseHandler.MouseHandler_lastButton; // L: 324
- int var30 = MouseHandler.MouseHandler_lastPressedX; // L: 325
- int var31 = MouseHandler.MouseHandler_lastPressedY; // L: 326
- if (var4 == 0) { // L: 327
- var30 = MouseHandler.MouseHandler_x; // L: 328
- var31 = MouseHandler.MouseHandler_y; // L: 329
- }
-
- if (!Login.mouseCam && var4 == 4) { // L: 331
- var4 = 1;
- }
-
- int var34;
- short var35;
- if (Login.loginIndex == 0) { // L: 332
- boolean var44 = false; // L: 333
-
- while (TaskHandler.isKeyDown()) { // L: 334
- if (class12.field61 == 84) { // L: 335
- var44 = true; // L: 336
- }
- }
-
- var34 = Decimator.loginBoxCenter - 80; // L: 339
- var35 = 291; // L: 340
- if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 341
- ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 342
- }
-
- var34 = Decimator.loginBoxCenter + 80; // L: 344
- if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20 || var44) { // L: 345
- if ((Client.worldProperties & 33554432) != 0) { // L: 346
- Login.Login_response0 = ""; // L: 347
- Login.Login_response1 = "This is a Beta world."; // L: 348
- Login.Login_response2 = "Your normal account will not be affected."; // L: 349
- Login.Login_response3 = ""; // L: 350
- class126.method2799(1); // L: 351
- if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 353
- Login.currentLoginField = 1; // L: 354
- } else {
- Login.currentLoginField = 0; // L: 357
- }
- } else if ((Client.worldProperties & 4) != 0) { // L: 361
- if ((Client.worldProperties & 1024) != 0) { // L: 362
- Login.Login_response1 = "This is a High Risk PvP world."; // L: 363
- Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 364
- Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 365
- } else {
- Login.Login_response1 = "This is a PvP world."; // L: 368
- Login.Login_response2 = "Players can attack each other"; // L: 369
- Login.Login_response3 = "almost everywhere."; // L: 370
- }
-
- Login.Login_response0 = "Warning!"; // L: 372
- class126.method2799(1); // L: 373
- if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 375
- Login.currentLoginField = 1; // L: 376
- } else {
- Login.currentLoginField = 0; // L: 379
- }
- } else if ((Client.worldProperties & 1024) != 0) { // L: 383
- Login.Login_response1 = "This is a High Risk world."; // L: 384
- Login.Login_response2 = "The Protect Item prayer will"; // L: 385
- Login.Login_response3 = "not work on this world."; // L: 386
- Login.Login_response0 = "Warning!"; // L: 387
- class126.method2799(1); // L: 388
- if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 390
- Login.currentLoginField = 1; // L: 391
- } else {
- Login.currentLoginField = 0; // L: 394
- }
- } else {
- PcmPlayer.Login_promptCredentials(false); // L: 399
- }
- }
- } else {
- short var8;
- int var32;
- if (Login.loginIndex == 1) { // L: 403
- while (true) {
- if (!TaskHandler.isKeyDown()) { // L: 404
- var32 = Decimator.loginBoxCenter - 80; // L: 412
- var8 = 321; // L: 413
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 414
- PcmPlayer.Login_promptCredentials(false); // L: 415
- }
-
- var32 = Decimator.loginBoxCenter + 80; // L: 417
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 418
- class126.method2799(0); // L: 419
- }
- break;
- }
-
- if (class12.field61 == 84) { // L: 405
- PcmPlayer.Login_promptCredentials(false); // L: 406
- } else if (class12.field61 == 13) { // L: 408
- class126.method2799(0); // L: 409
- }
- }
- } else {
- int var11;
- short var33;
- boolean var36;
- if (Login.loginIndex == 2) { // L: 422
- var33 = 201; // L: 423
- var32 = var33 + 52; // L: 424
- if (var4 == 1 && var31 >= var32 - 12 && var31 < var32 + 2) { // L: 425
- Login.currentLoginField = 0;
- }
-
- var32 += 15; // L: 426
- if (var4 == 1 && var31 >= var32 - 12 && var31 < var32 + 2) { // L: 427
- Login.currentLoginField = 1;
- }
-
- var32 += 15; // L: 428
- var33 = 361; // L: 429
- if (ChatChannel.field976 != null) { // L: 430
- var34 = ChatChannel.field976.highX / 2; // L: 431
- if (var4 == 1 && var30 >= ChatChannel.field976.lowX - var34 && var30 <= var34 + ChatChannel.field976.lowX && var31 >= var33 - 15 && var31 < var33) { // L: 432
- switch(Login.field907) { // L: 433
- case 1:
- class345.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 441
- class126.method2799(5); // L: 442
- return; // L: 443
- case 2:
- ScriptEvent.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 436
- }
- }
- }
-
- var34 = Decimator.loginBoxCenter - 80; // L: 448
- var35 = 321; // L: 449
- if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 450
- Login.Login_username = Login.Login_username.trim(); // L: 451
- if (Login.Login_username.length() == 0) { // L: 452
- class345.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 453
- return; // L: 454
- }
-
- if (Login.Login_password.length() == 0) { // L: 456
- class345.setLoginResponseString("", "Please enter your password.", ""); // L: 457
- return; // L: 458
- }
-
- class345.setLoginResponseString("", "Connecting to server...", ""); // L: 460
- ObjectSound.method1730(false); // L: 461
- PendingSpawn.updateGameState(20); // L: 462
- return; // L: 463
- }
-
- var34 = Login.loginBoxX + 180 + 80; // L: 465
- if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 466
- class126.method2799(0); // L: 467
- Login.Login_username = ""; // L: 468
- Login.Login_password = ""; // L: 469
- WorldMapCacheName.field2912 = 0; // L: 470
- class92.otp = ""; // L: 471
- Login.field900 = true; // L: 472
- }
-
- var34 = Decimator.loginBoxCenter + -117; // L: 474
- var35 = 277; // L: 475
- Login.field879 = var30 >= var34 && var30 < var34 + class16.field81 && var31 >= var35 && var31 < var35 + class268.field3212; // L: 476
- if (var4 == 1 && Login.field879) { // L: 477
- Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 478
- if (!Client.Login_isUsernameRemembered && class12.clientPreferences.method2241() != null) { // L: 479
- class12.clientPreferences.method2297((String)null); // L: 480
- }
- }
-
- var34 = Decimator.loginBoxCenter + 24; // L: 483
- var35 = 277; // L: 484
- Login.field881 = var30 >= var34 && var30 < var34 + class16.field81 && var31 >= var35 && var31 < var35 + class268.field3212; // L: 485
- if (var4 == 1 && Login.field881) { // L: 486
- class12.clientPreferences.method2223(!class12.clientPreferences.method2257()); // L: 487
- if (!class12.clientPreferences.method2257()) { // L: 488
- Login.Login_username = ""; // L: 489
- class12.clientPreferences.method2297((String)null); // L: 490
- if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 492
- Login.currentLoginField = 1; // L: 493
- } else {
- Login.currentLoginField = 0; // L: 496
- }
- }
- }
-
- label1340:
- while (true) {
- int var40;
- Transferable var47;
- do {
- while (true) {
- label1256:
- do {
- while (true) {
- while (TaskHandler.isKeyDown()) { // L: 501
- if (class12.field61 != 13) { // L: 502
- if (Login.currentLoginField != 0) { // L: 511
- continue label1256;
- }
-
- char var37 = InvDefinition.field1850; // L: 512
-
- for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var37 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 514 515
- }
-
- if (class12.field61 == 85 && Login.Login_username.length() > 0) { // L: 518
- Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
- }
-
- if (class12.field61 == 84 || class12.field61 == 80) { // L: 519
- Login.currentLoginField = 1;
- }
-
- char var38 = InvDefinition.field1850; // L: 521
- boolean var41 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var38) != -1; // L: 523
- if (var41 && Login.Login_username.length() < 320) { // L: 525
- Login.Login_username = Login.Login_username + InvDefinition.field1850;
- }
- } else {
- class126.method2799(0); // L: 503
- Login.Login_username = ""; // L: 504
- Login.Login_password = ""; // L: 505
- WorldMapCacheName.field2912 = 0; // L: 506
- class92.otp = ""; // L: 507
- Login.field900 = true; // L: 508
- }
- }
-
- return; // L: 950
- }
- } while(Login.currentLoginField != 1); // L: 527
-
- if (class12.field61 == 85 && Login.Login_password.length() > 0) { // L: 528
- Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 529
- } else if (class12.field61 == 84 || class12.field61 == 80) { // L: 531
- Login.currentLoginField = 0; // L: 532
- if (class12.field61 == 84) { // L: 533
- Login.Login_username = Login.Login_username.trim(); // L: 534
- if (Login.Login_username.length() == 0) { // L: 535
- class345.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 536
- return; // L: 537
- }
-
- if (Login.Login_password.length() == 0) { // L: 539
- class345.setLoginResponseString("", "Please enter your password.", ""); // L: 540
- return; // L: 541
- }
-
- class345.setLoginResponseString("", "Connecting to server...", ""); // L: 543
- ObjectSound.method1730(false); // L: 544
- PendingSpawn.updateGameState(20); // L: 545
- return; // L: 546
- }
- }
-
- if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class12.field61 == 67) { // L: 549
- Clipboard var46 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 550
- var47 = var46.getContents(class82.client); // L: 551
- var40 = 20 - Login.Login_password.length(); // L: 552
- break;
- }
-
- char var42 = InvDefinition.field1850; // L: 602
- if ((var42 < ' ' || var42 >= 127) && (var42 <= 127 || var42 >= 160) && (var42 <= 160 || var42 > 255)) { // L: 604
- label1472: {
- if (var42 != 0) { // L: 608
- char[] var48 = class341.cp1252AsciiExtension; // L: 610
-
- for (int var49 = 0; var49 < var48.length; ++var49) { // L: 611
- char var14 = var48[var49]; // L: 612
- if (var42 == var14) { // L: 614
- var36 = true; // L: 615
- break label1472; // L: 616
- }
- }
- }
-
- var36 = false; // L: 622
- }
- } else {
- var36 = true; // L: 605
- }
-
- if (var36) { // L: 624
- char var50 = InvDefinition.field1850; // L: 626
- boolean var39 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var50) != -1; // L: 628
- if (var39 && Login.Login_password.length() < 20) { // L: 630 631
- Login.Login_password = Login.Login_password + InvDefinition.field1850; // L: 632
- }
- }
- }
- } while(var40 <= 0); // L: 553
-
- try {
- String var13 = (String)var47.getTransferData(DataFlavor.stringFlavor); // L: 555
- int var43 = Math.min(var40, var13.length()); // L: 556
- int var15 = 0;
-
- while (true) {
- if (var15 >= var43) {
- Login.Login_password = Login.Login_password + var13.substring(0, var43); // L: 594
- continue label1340;
- }
-
- char var17 = var13.charAt(var15); // L: 560
- boolean var16;
- if (var17 >= ' ' && var17 < 127 || var17 > 127 && var17 < 160 || var17 > 160 && var17 <= 255) { // L: 562
- var16 = true; // L: 563
- } else {
- label1486: {
- if (var17 != 0) { // L: 566
- char[] var18 = class341.cp1252AsciiExtension; // L: 568
-
- for (int var19 = 0; var19 < var18.length; ++var19) { // L: 569
- char var20 = var18[var19]; // L: 570
- if (var17 == var20) { // L: 572
- var16 = true; // L: 573
- break label1486; // L: 574
- }
- }
- }
-
- var16 = false; // L: 580
- }
- }
-
- if (!var16) { // L: 582
- break;
- }
-
- char var45 = var13.charAt(var15); // L: 584
- boolean var23 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var45) != -1; // L: 586
- if (!var23) { // L: 588
- break;
- }
-
- ++var15; // L: 557
- }
-
- class126.method2799(3); // L: 590
- return; // L: 591
- } catch (UnsupportedFlavorException var28) { // L: 596
- } catch (IOException var29) { // L: 597
- }
- }
- } else if (Login.loginIndex == 3) { // L: 641
- var32 = Login.loginBoxX + 180; // L: 642
- var8 = 276; // L: 643
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 644
- WorldMapData_1.method4706(false); // L: 645
- }
-
- var32 = Login.loginBoxX + 180; // L: 647
- var8 = 326; // L: 648
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 649
- class345.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 650
- class126.method2799(5); // L: 651
- return; // L: 652
- }
- } else {
- int var10;
- if (Login.loginIndex == 4) { // L: 655
- var32 = Login.loginBoxX + 180 - 80; // L: 656
- var8 = 321; // L: 657
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 658
- class92.otp.trim(); // L: 659
- if (class92.otp.length() != 6) { // L: 660
- class345.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 661
- return; // L: 662
- }
-
- WorldMapCacheName.field2912 = Integer.parseInt(class92.otp); // L: 664
- class92.otp = ""; // L: 665
- ObjectSound.method1730(true); // L: 666
- class345.setLoginResponseString("", "Connecting to server...", ""); // L: 667
- PendingSpawn.updateGameState(20); // L: 668
- return; // L: 669
- }
-
- if (var4 == 1 && var30 >= Login.loginBoxX + 180 - 9 && var30 <= Login.loginBoxX + 180 + 130 && var31 >= 263 && var31 <= 296) { // L: 671
- Login.field900 = !Login.field900; // L: 672
- }
-
- if (var4 == 1 && var30 >= Login.loginBoxX + 180 - 34 && var30 <= Login.loginBoxX + 34 + 180 && var31 >= 351 && var31 <= 363) { // L: 674
- ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 675
- }
-
- var32 = Login.loginBoxX + 180 + 80; // L: 677
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 678
- class126.method2799(0); // L: 679
- Login.Login_username = ""; // L: 680
- Login.Login_password = ""; // L: 681
- WorldMapCacheName.field2912 = 0; // L: 682
- class92.otp = ""; // L: 683
- }
-
- while (TaskHandler.isKeyDown()) { // L: 685
- boolean var9 = false; // L: 686
-
- for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 687
- if (InvDefinition.field1850 == "1234567890".charAt(var10)) { // L: 688
- var9 = true; // L: 689
- break; // L: 690
- }
- }
-
- if (class12.field61 == 13) { // L: 693
- class126.method2799(0); // L: 694
- Login.Login_username = ""; // L: 695
- Login.Login_password = ""; // L: 696
- WorldMapCacheName.field2912 = 0; // L: 697
- class92.otp = ""; // L: 698
- } else {
- if (class12.field61 == 85 && class92.otp.length() > 0) { // L: 701
- class92.otp = class92.otp.substring(0, class92.otp.length() - 1);
- }
-
- if (class12.field61 == 84) { // L: 702
- class92.otp.trim(); // L: 703
- if (class92.otp.length() != 6) { // L: 704
- class345.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 705
- return; // L: 706
- }
-
- WorldMapCacheName.field2912 = Integer.parseInt(class92.otp); // L: 708
- class92.otp = ""; // L: 709
- ObjectSound.method1730(true); // L: 710
- class345.setLoginResponseString("", "Connecting to server...", ""); // L: 711
- PendingSpawn.updateGameState(20); // L: 712
- return; // L: 713
- }
-
- if (var9 && class92.otp.length() < 6) { // L: 715
- class92.otp = class92.otp + InvDefinition.field1850;
- }
- }
- }
- } else if (Login.loginIndex == 5) { // L: 719
- var32 = Login.loginBoxX + 180 - 80; // L: 720
- var8 = 321; // L: 721
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 722
- class21.method280(); // L: 723
- return; // L: 724
- }
-
- var32 = Login.loginBoxX + 180 + 80; // L: 726
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 727
- PcmPlayer.Login_promptCredentials(true); // L: 728
- }
-
- var35 = 361; // L: 730
- if (ChatChannel.field977 != null) { // L: 731
- var10 = ChatChannel.field977.highX / 2; // L: 732
- if (var4 == 1 && var30 >= ChatChannel.field977.lowX - var10 && var30 <= var10 + ChatChannel.field977.lowX && var31 >= var35 - 15 && var31 < var35) { // L: 733
- ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 734
- }
- }
-
- while (TaskHandler.isKeyDown()) { // L: 737
- var36 = false; // L: 738
-
- for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 739
- if (InvDefinition.field1850 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 740
- var36 = true; // L: 741
- break; // L: 742
- }
- }
-
- if (class12.field61 == 13) { // L: 745
- PcmPlayer.Login_promptCredentials(true); // L: 746
- } else {
- if (class12.field61 == 85 && Login.Login_username.length() > 0) { // L: 749
- Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
- }
-
- if (class12.field61 == 84) { // L: 750
- class21.method280(); // L: 751
- return; // L: 752
- }
-
- if (var36 && Login.Login_username.length() < 320) { // L: 754
- Login.Login_username = Login.Login_username + InvDefinition.field1850;
- }
- }
- }
- } else if (Login.loginIndex != 6) { // L: 758
- if (Login.loginIndex == 7) { // L: 769
- if (class92.field1273 && !Client.onMobile) { // L: 770
- var32 = Decimator.loginBoxCenter - 150; // L: 771
- var34 = var32 + 40 + 240 + 25; // L: 772
- var35 = 231; // L: 773
- var10 = var35 + 40; // L: 774
- if (var4 == 1 && var30 >= var32 && var30 <= var34 && var31 >= var35 && var31 <= var10) { // L: 775
- Login.field896 = PcmPlayer.method693(var32, var30); // L: 776
- }
-
- var11 = Login.loginBoxX + 180 - 80; // L: 778
- short var12 = 321; // L: 779
- boolean var25;
- if (var4 == 1 && var30 >= var11 - 75 && var30 <= var11 + 75 && var31 >= var12 - 20 && var31 <= var12 + 20) { // L: 780
- var25 = GraphicsObject.method1867(); // L: 781
- if (var25) { // L: 782
- PendingSpawn.updateGameState(50); // L: 783
- return; // L: 784
- }
- }
-
- var11 = Login.loginBoxX + 180 + 80; // L: 787
- if (var4 == 1 && var30 >= var11 - 75 && var30 <= var11 + 75 && var31 >= var12 - 20 && var31 <= var12 + 20) { // L: 788
- Login.field876 = new String[8]; // L: 789
- PcmPlayer.Login_promptCredentials(true); // L: 790
- }
-
- while (TaskHandler.isKeyDown()) { // L: 792
- if (class12.field61 == 101) { // L: 793
- Login.field876[Login.field896] = null; // L: 794
- }
-
- if (class12.field61 == 85) { // L: 796
- if (Login.field876[Login.field896] == null && Login.field896 > 0) { // L: 797
- --Login.field896; // L: 798
- }
-
- Login.field876[Login.field896] = null; // L: 800
- }
-
- if (InvDefinition.field1850 >= '0' && InvDefinition.field1850 <= '9') { // L: 802
- Login.field876[Login.field896] = "" + InvDefinition.field1850; // L: 803
- if (Login.field896 < 7) { // L: 804
- ++Login.field896; // L: 805
- }
- }
-
- if (class12.field61 == 84) { // L: 808
- var25 = GraphicsObject.method1867(); // L: 809
- if (var25) { // L: 810
- PendingSpawn.updateGameState(50); // L: 811
- }
-
- return; // L: 813
- }
- }
- } else {
- var32 = Login.loginBoxX + 180 - 80; // L: 818
- var8 = 321; // L: 819
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 820
- ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=dob/set_dob.ws", true, false); // L: 821
- class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 822
- class126.method2799(6); // L: 823
- return; // L: 824
- }
-
- var32 = Login.loginBoxX + 180 + 80; // L: 826
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 827
- PcmPlayer.Login_promptCredentials(true); // L: 828
- }
- }
- } else if (Login.loginIndex == 8) { // L: 832
- var32 = Login.loginBoxX + 180 - 80; // L: 833
- var8 = 321; // L: 834
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 835
- ScriptEvent.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 836
- class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 837
- class126.method2799(6); // L: 838
- return; // L: 839
- }
-
- var32 = Login.loginBoxX + 180 + 80; // L: 841
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 842
- PcmPlayer.Login_promptCredentials(true); // L: 843
- }
- } else if (Login.loginIndex == 9) { // L: 846
- var32 = Login.loginBoxX + 180; // L: 847
- var8 = 311; // L: 848
- if (class12.field61 == 84 || class12.field61 == 13 || var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 849
- WorldMapData_1.method4706(false); // L: 850
- }
- } else if (Login.loginIndex == 10) { // L: 853
- var32 = Login.loginBoxX + 180; // L: 854
- var8 = 209; // L: 855
- if (class12.field61 == 84 || var4 == 1 && var30 >= var32 - 109 && var30 <= var32 + 109 && var31 >= var8 && var31 <= var8 + 68) { // L: 856
- class345.setLoginResponseString("", "Connecting to server...", ""); // L: 857
- Client.field517 = class443.field4730; // L: 858
- ObjectSound.method1730(false); // L: 859
- PendingSpawn.updateGameState(20); // L: 860
- }
- } else if (Login.loginIndex == 12) { // L: 863
- var32 = Decimator.loginBoxCenter; // L: 864
- var8 = 233; // L: 865
- Bounds var26 = var1.method6219(0, 30, "terms of use, privacy policy, and end user licence", var32, var8); // L: 866
- Bounds var21 = var1.method6219(32, 32, "terms of use, privacy policy, and end user licence", var32, var8); // L: 867
- Bounds var22 = var1.method6219(70, 34, "terms of use, privacy policy, and end user licence", var32, var8); // L: 868
- var34 = var8 + 17; // L: 869
- Bounds var24 = var1.method6219(0, 34, "agreement (EULA).", var32, var34); // L: 870
- if (var4 == 1) { // L: 871
- if (var26.method6742(var30, var31)) { // L: 872
- ScriptEvent.openURL("https://www.jagex.com/terms", true, false); // L: 873
- } else if (var21.method6742(var30, var31)) { // L: 875
- ScriptEvent.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 876
- } else if (var22.method6742(var30, var31) || var24.method6742(var30, var31)) { // L: 878
- ScriptEvent.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 879
- }
- }
-
- var32 = Decimator.loginBoxCenter - 80; // L: 882
- var8 = 311; // L: 883
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 884
- class12.clientPreferences.method2306(Client.field484); // L: 886
- WorldMapData_1.method4706(true); // L: 888
- }
-
- var32 = Decimator.loginBoxCenter + 80; // L: 890
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 891
- Login.loginIndex = 13; // L: 892
- }
- } else if (Login.loginIndex == 13) { // L: 895
- var32 = Decimator.loginBoxCenter; // L: 896
- var8 = 321; // L: 897
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 898
- WorldMapData_1.method4706(true); // L: 899
- }
- } else if (Login.loginIndex == 14) { // L: 902
- String var27 = ""; // L: 903
- switch(Login.field887) { // L: 904
- case 0:
- var27 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 909
- break; // L: 910
- case 1:
- var27 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 906
- break; // L: 907
- default:
- PcmPlayer.Login_promptCredentials(false); // L: 912
- }
-
- var34 = Login.loginBoxX + 180; // L: 915
- var35 = 276; // L: 916
- if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 917
- ScriptEvent.openURL(var27, true, false); // L: 918
- class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 919
- class126.method2799(6); // L: 920
- return; // L: 921
- }
-
- var34 = Login.loginBoxX + 180; // L: 923
- var35 = 326; // L: 924
- if (var4 == 1 && var30 >= var34 - 75 && var30 <= var34 + 75 && var31 >= var35 - 20 && var31 <= var35 + 20) { // L: 925
- PcmPlayer.Login_promptCredentials(false); // L: 926
- }
- } else if (Login.loginIndex == 24) { // L: 929
- var32 = Login.loginBoxX + 180; // L: 930
- var8 = 301; // L: 931
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 932
- WorldMapData_1.method4706(false); // L: 933
- }
- } else if (Login.loginIndex == 26) { // L: 936
- var32 = Login.loginBoxX + 180 - 80; // L: 937
- var8 = 321; // L: 938
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 939
- ScriptEvent.openURL(WorldMapData_1.method4707("secure", true) + "m=dob/set_dob.ws", true, false); // L: 940
- class345.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 941
- class126.method2799(6); // L: 942
- return; // L: 943
- }
-
- var32 = Login.loginBoxX + 180 + 80; // L: 945
- if (var4 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var8 - 20 && var31 <= var8 + 20) { // L: 946
- PcmPlayer.Login_promptCredentials(true); // L: 947
- }
- }
- } else {
- while (true) {
- do {
- if (!TaskHandler.isKeyDown()) { // L: 759
- var33 = 321; // L: 764
- if (var4 == 1 && var31 >= var33 - 20 && var31 <= var33 + 20) { // L: 765
- PcmPlayer.Login_promptCredentials(true); // L: 766
- }
-
- return;
- }
- } while(class12.field61 != 84 && class12.field61 != 13); // L: 760
-
- PcmPlayer.Login_promptCredentials(true); // L: 761
- }
- }
- }
- }
- }
-
- }
- }
- }
- } // L: 290
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "412461879"
- )
- public static final void method2865(int var0, int var1) {
- ViewportMouse.ViewportMouse_x = var0; // L: 94
- ViewportMouse.ViewportMouse_y = var1; // L: 95
- ViewportMouse.ViewportMouse_isInViewport = true; // L: 96
- ViewportMouse.ViewportMouse_entityCount = 0; // L: 97
- ViewportMouse.ViewportMouse_false0 = false; // L: 98
- } // L: 99
-
- @ObfuscatedName("fz")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "748851559"
- )
- static int method2868() {
- if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1491
- int var0 = 0; // L: 1492
-
- for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1493
- var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1494
- }
-
- return var0 * 10000 / Client.field770; // L: 1496
- } else {
- return 10000;
- }
+ public static int method2923(int var0, int var1) {
+ return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 24
}
}
diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java
index 8af44b9208..cf5710bc74 100644
--- a/runescape-client/src/main/java/class137.java
+++ b/runescape-client/src/main/java/class137.java
@@ -1,288 +1,80 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("eo")
public class class137 extends class128 {
- @ObfuscatedName("o")
- String field1626;
+ @ObfuscatedName("c")
+ String field1616;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class137(class131 var1) {
this.this$0 = var1; // L: 229
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1626 = var1.readStringCp1252NullTerminated(); // L: 232
+ void vmethod3150(Buffer var1) {
+ this.field1616 = var1.readStringCp1252NullTerminated(); // L: 232
var1.readInt(); // L: 233
} // L: 234
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.name = this.field1626; // L: 237
+ void vmethod3149(ClanSettings var1) {
+ var1.name = this.field1616; // L: 237
} // L: 238
- @ObfuscatedName("o")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IB)Z",
- garbageValue = "0"
+ descriptor = "(IIII)I",
+ garbageValue = "-1955259353"
)
- @Export("isWorldMapEvent")
- public static boolean isWorldMapEvent(int var0) {
- return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
+ public static int method2931(int var0, int var1, int var2) {
+ int var3 = VarpDefinition.method3374(var2 - var1 + 1); // L: 37
+ var3 <<= var1; // L: 38
+ return var0 & ~var3; // L: 39
}
- @ObfuscatedName("i")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "43434510"
+ descriptor = "(CLlb;I)I",
+ garbageValue = "991712888"
)
- static int method2873(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1882
- class12.Interpreter_intStackSize -= 3; // L: 1883
- WorldMapLabelSize.queueSoundEffect(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]); // L: 1884
- return 1; // L: 1885
- } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1887
- WorldMapIcon_0.playSong(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1888
- return 1; // L: 1889
- } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1891
- class12.Interpreter_intStackSize -= 2; // L: 1892
- class306.method5593(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 1893
- return 1; // L: 1894
- } else {
- class83 var3;
- class82 var4;
- int var5;
- int var6;
- String var7;
- if (var0 != 3212 && var0 != 3213 && var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1896
- if (var0 != 3214 && var0 != 3215 && var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 2008
- return var0 == 3211 ? 1 : 2; // L: 2117 2118 2120
- } else {
- var3 = class83.field1088; // L: 2009
- var4 = class82.field1073; // L: 2010
- boolean var8 = false; // L: 2011
- if (var0 == 3214) { // L: 2012
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2013
- var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 2014
- if (var3 == null) { // L: 2015
- throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 2016
- }
- }
-
- if (var0 == 3215) { // L: 2019
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2020
- var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 2021
- if (var4 == null) { // L: 2022
- throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 2023
- }
- }
-
- if (var0 == 3210) { // L: 2026
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2027
- var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 2028
- if (var3 == null) { // L: 2029
- var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 2030
- if (var4 == null) { // L: 2031
- throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 2032
- }
- }
- } else if (var0 == 3182) { // L: 2036
- var3 = class83.field1092; // L: 2037
- } else if (var0 == 3204) { // L: 2039
- var4 = class82.field1078; // L: 2040
- } else if (var0 == 3206) { // L: 2042
- var4 = class82.field1075; // L: 2043
- } else if (var0 == 3208) { // L: 2045
- var4 = class82.field1076; // L: 2046
- }
-
- if (var4 == class82.field1073) { // L: 2048
- switch(var3.field1090) { // L: 2049
- case 1:
- var5 = class12.clientPreferences.method2257() ? 1 : 0; // L: 2052
- break;
- case 2:
- var5 = class12.clientPreferences.method2226() ? 1 : 0; // L: 2067
- break; // L: 2068
- case 3:
- var5 = class12.clientPreferences.method2229() ? 1 : 0; // L: 2072
- break; // L: 2073
- case 4:
- var5 = class12.clientPreferences.method2231(); // L: 2057
- break; // L: 2058
- case 5:
- var5 = GameBuild.method5586(); // L: 2077
- break; // L: 2078
- default:
- var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 2062
- throw new RuntimeException(var7); // L: 2063
- }
- } else {
- switch(var4.field1077) { // L: 2083
- case 1:
- var5 = class12.clientPreferences.method2222() ? 1 : 0; // L: 2109
- break;
- case 2:
- var6 = class12.clientPreferences.method2248(); // L: 2097
- var5 = Math.round((float)(var6 * 100) / 255.0F); // L: 2098
- break; // L: 2099
- case 3:
- var6 = class12.clientPreferences.method2244(); // L: 2103
- var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2104
- break; // L: 2105
- case 4:
- var6 = class12.clientPreferences.method2239(); // L: 2086
- var5 = Math.round((float)(var6 * 100) / 127.0F); // L: 2087
- break; // L: 2088
- default:
- var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 2092
- throw new RuntimeException(var7); // L: 2093
- }
- }
-
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5; // L: 2114
- return 1; // L: 2115
- }
- } else {
- var3 = class83.field1088; // L: 1897
- var4 = class82.field1073; // L: 1898
- var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1899
- if (var0 == 3212) { // L: 1900
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1901
- var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 1902
- if (var3 == null) { // L: 1903
- throw new RuntimeException(String.format("Unrecognized device option %d", var6)); // L: 1904
- }
- }
-
- if (var0 == 3213) { // L: 1907
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1908
- var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 1909
- if (var4 == null) { // L: 1910
- throw new RuntimeException(String.format("Unrecognized game option %d", var6)); // L: 1911
- }
- }
-
- if (var0 == 3209) { // L: 1914
- var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1915
- var3 = (class83)class291.findEnumerated(class141.method2962(), var6); // L: 1916
- if (var3 == null) { // L: 1917
- var4 = (class82)class291.findEnumerated(Player.method2159(), var6); // L: 1918
- if (var4 == null) { // L: 1919
- throw new RuntimeException(String.format("Unrecognized client option %d", var6)); // L: 1920
- }
- }
- } else if (var0 == 3181) { // L: 1924
- var3 = class83.field1092; // L: 1925
- } else if (var0 == 3203) { // L: 1927
- var4 = class82.field1078; // L: 1928
- } else if (var0 == 3205) { // L: 1930
- var4 = class82.field1075; // L: 1931
- } else if (var0 == 3207) { // L: 1933
- var4 = class82.field1076; // L: 1934
- }
-
- if (var4 == class82.field1073) { // L: 1936
- switch(var3.field1090) { // L: 1937
- case 1:
- class12.clientPreferences.method2223(var5 == 1); // L: 1961
- break; // L: 1962
- case 2:
- class12.clientPreferences.method2305(var5 == 1); // L: 1966
- break; // L: 1967
- case 3:
- class12.clientPreferences.method2227(var5 == 1); // L: 1940
- break;
- case 4:
- if (var5 < 0) { // L: 1955
- var5 = 0;
- }
-
- class12.clientPreferences.method2230(var5); // L: 1956
- break; // L: 1957
- case 5:
- World.method1664(var5); // L: 1945
- break; // L: 1946
- default:
- var7 = String.format("Unkown device option: %s.", var3.toString()); // L: 1950
- throw new RuntimeException(var7); // L: 1951
- }
- } else {
- switch(var4.field1077) { // L: 1972
- case 1:
- class12.clientPreferences.method2219(var5 == 1); // L: 1994
- break; // L: 1995
- case 2:
- var5 = Math.min(Math.max(var5, 0), 100); // L: 1980
- var6 = Math.round((float)(var5 * 255) / 100.0F); // L: 1981
- class291.method5390(var6); // L: 1982
- break; // L: 1983
- case 3:
- var5 = Math.min(Math.max(var5, 0), 100); // L: 1987
- var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 1988
- class67.method1881(var6); // L: 1989
- break; // L: 1990
- case 4:
- var5 = Math.min(Math.max(var5, 0), 100); // L: 1999
- var6 = Math.round((float)(var5 * 127) / 100.0F); // L: 2000
- MouseHandler.method591(var6); // L: 2001
- break; // L: 2002
- default:
- var7 = String.format("Unkown game option: %s.", var4.toString()); // L: 1975
- throw new RuntimeException(var7); // L: 1976
- }
- }
-
- return 1; // L: 2006
- }
+ @Export("lowercaseChar")
+ static int lowercaseChar(char var0, Language var1) {
+ int var2 = var0 << 4; // L: 104
+ if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105
+ var0 = Character.toLowerCase(var0); // L: 106
+ var2 = (var0 << 4) + 1; // L: 107
}
+
+ if (var0 == 241 && var1 == Language.Language_ES) { // L: 109
+ var2 = 1762;
+ }
+
+ return var2; // L: 110
}
- @ObfuscatedName("gm")
+ @ObfuscatedName("br")
@ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "2079145454"
+ descriptor = "(II)Ljava/lang/Object;",
+ garbageValue = "1239702190"
)
- @Export("addNpcsToScene")
- static final void addNpcsToScene(boolean var0) {
- for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4982
- NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4983
- if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4984
- int var3 = var2.x >> 7; // L: 4985
- int var4 = var2.y >> 7; // L: 4986
- if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4987
- if (var2.field1167 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4988
- if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4989
- continue;
- }
-
- Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4990
- }
-
- long var5 = VarbitComposition.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4992
- var2.playerCycle = Client.cycle; // L: 4993
- class175.scene.drawEntity(class128.Client_plane, var2.x, var2.y, class202.getTileHeight(var2.field1167 * 64 - 64 + var2.x, var2.field1167 * 64 - 64 + var2.y, class128.Client_plane), var2.field1167 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4994
- }
- }
- }
-
- } // L: 4998
+ static Object method2937(int var0) {
+ return InvDefinition.method3360((class432)Actor.findEnumerated(class432.method7566(), var0)); // L: 5010
+ }
}
diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java
index 83d63b7191..ee5736a4a2 100644
--- a/runescape-client/src/main/java/class138.java
+++ b/runescape-client/src/main/java/class138.java
@@ -2,109 +2,82 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("ec")
+@ObfuscatedName("eq")
public class class138 extends class128 {
- @ObfuscatedName("hs")
- @Export("xteaKeys")
- static int[][] xteaKeys;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -1158452921
+ @ObfuscatedName("he")
+ @ObfuscatedSignature(
+ descriptor = "Lcd;"
)
- int field1629;
- @ObfuscatedName("q")
- String field1627;
+ @Export("urlRequester")
+ static UrlRequester urlRequester;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = -1956537991
+ )
+ int field1623;
+ @ObfuscatedName("v")
+ String field1620;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class138(class131 var1) {
this.this$0 = var1; // L: 323
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1629 = var1.readInt(); // L: 326
- this.field1627 = var1.readStringCp1252NullTerminated(); // L: 327
+ void vmethod3150(Buffer var1) {
+ this.field1623 = var1.readInt(); // L: 326
+ this.field1620 = var1.readStringCp1252NullTerminated(); // L: 327
} // L: 328
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2900(this.field1629, this.field1627); // L: 331
+ void vmethod3149(ClanSettings var1) {
+ var1.method2968(this.field1623, this.field1620); // L: 331
} // L: 332
- @ObfuscatedName("b")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1258686923"
+ descriptor = "(Llh;B)V",
+ garbageValue = "4"
)
- static int method2880(int var0, Script var1, boolean var2) {
- Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1130
- if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1131
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1132
- return 1; // L: 1133
- } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1135
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1136
- return 1; // L: 1137
- } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1139
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.text; // L: 1140
- return 1; // L: 1141
- } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1143
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1144
- return 1; // L: 1145
- } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1147
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1148
- return 1; // L: 1149
- } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1151
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1152
- return 1; // L: 1153
- } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1155
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1156
- return 1; // L: 1157
- } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1159
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1160
- return 1; // L: 1161
- } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1163
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1164
- return 1; // L: 1165
- } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1167
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1168
- return 1; // L: 1169
- } else if (var0 == 1610) { // L: 1171
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1172
- return 1; // L: 1173
- } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1175
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color; // L: 1176
- return 1; // L: 1177
- } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1179
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.color2; // L: 1180
- return 1; // L: 1181
- } else if (var0 == 1613) { // L: 1183
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1184
- return 1; // L: 1185
- } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1187
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1188
- return 1; // L: 1189
- } else if (var0 != 1615 && var0 != 1616) { // L: 1191
- return 2; // L: 1195
- } else {
- ++class12.Interpreter_intStackSize; // L: 1192
- return 1; // L: 1193
+ public static void method2948(AbstractArchive var0) {
+ class435.field4666 = var0; // L: 19
+ } // L: 20
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IZIZI)V",
+ garbageValue = "1195912675"
+ )
+ @Export("sortWorldList")
+ static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
+ if (class362.World_worlds != null) { // L: 171
+ class131.doWorldSorting(0, class362.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
}
+
+ } // L: 174
+
+ @ObfuscatedName("hj")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "1549613437"
+ )
+ static boolean method2944() {
+ return (Client.drawPlayerNames & 8) != 0; // L: 4953
}
}
diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java
index 0662f48a5b..639b5a5ab1 100644
--- a/runescape-client/src/main/java/class14.java
+++ b/runescape-client/src/main/java/class14.java
@@ -2,75 +2,990 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("t")
+@ObfuscatedName("u")
public class class14 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 93944069
+ intValue = -2053769865
)
- final int field76;
+ final int field81;
+ @ObfuscatedName("v")
+ final String field77;
@ObfuscatedName("q")
- final String field74;
- @ObfuscatedName("l")
- final ThreadFactory field73;
- @ObfuscatedName("k")
- final ThreadPoolExecutor field77;
+ final ThreadFactory field78;
+ @ObfuscatedName("f")
+ final ThreadPoolExecutor field84;
public class14(String var1, int var2, int var3) {
- this.field74 = var1; // L: 15
- this.field76 = var2; // L: 16
- this.field73 = new class16(this); // L: 17
- this.field77 = this.method164(var3); // L: 18
+ this.field77 = var1; // L: 15
+ this.field81 = var2; // L: 16
+ this.field78 = new class16(this); // L: 17
+ this.field84 = this.method149(var3); // L: 18
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;",
- garbageValue = "-398664409"
+ descriptor = "(IS)Ljava/util/concurrent/ThreadPoolExecutor;",
+ garbageValue = "8960"
)
- final ThreadPoolExecutor method164(int var1) {
- return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field76), this.field73); // L: 22
+ final ThreadPoolExecutor method149(int var1) {
+ return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field81), this.field78); // L: 22
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ly;I)Lh;",
- garbageValue = "-344605411"
+ descriptor = "(Ls;I)La;",
+ garbageValue = "-1856685329"
)
- public class19 method160(class10 var1) {
- if (this.field77.getQueue().remainingCapacity() <= 0) { // L: 26
- System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field77.getCorePoolSize() + " Queue capacity " + this.field76); // L: 27
+ public class19 method150(class10 var1) {
+ if (this.field84.getQueue().remainingCapacity() <= 0) { // L: 26
+ System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field84.getCorePoolSize() + " Queue capacity " + this.field81); // L: 27
return new class19("Queue full"); // L: 28
} else {
- class19 var2 = new class19(this.field77.submit(new class20(this, var1))); // L: 30
+ class19 var2 = new class19(this.field84.submit(new class20(this, var1))); // L: 30
return var2; // L: 31
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-1785406977"
+ garbageValue = "93427456"
)
- public final void method161() {
+ public final void method151() {
try {
- this.field77.shutdown(); // L: 36
+ this.field84.shutdown(); // L: 36
} catch (Exception var2) { // L: 38
System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39
}
} // L: 41
- @ObfuscatedName("jo")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/String;",
- garbageValue = "1828837420"
+ descriptor = "(Lpq;II)V",
+ garbageValue = "-80281997"
)
- static final String method165(int var0) {
- return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10881 10882
+ @Export("readPlayerUpdate")
+ static void readPlayerUpdate(PacketBuffer var0, int var1) {
+ boolean var2 = var0.readBits(1) == 1; // L: 410
+ if (var2) { // L: 411
+ Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+ }
+
+ int var3 = var0.readBits(2); // L: 412
+ Player var4 = Client.players[var1]; // L: 413
+ if (var3 == 0) { // L: 414
+ if (var2) { // L: 415
+ var4.field1088 = false; // L: 416
+ } else if (Client.localPlayerIndex == var1) { // L: 419
+ throw new RuntimeException();
+ } else {
+ Players.Players_regions[var1] = (var4.plane << 28) + (class28.baseX + var4.pathX[0] >> 13 << 14) + (WorldMapLabelSize.baseY + var4.pathY[0] >> 13); // L: 420
+ if (var4.field1165 != -1) { // L: 421
+ Players.Players_orientations[var1] = var4.field1165;
+ } else {
+ Players.Players_orientations[var1] = var4.orientation; // L: 422
+ }
+
+ Players.Players_targetIndices[var1] = var4.targetIndex; // L: 423
+ Client.players[var1] = null; // L: 424
+ if (var0.readBits(1) != 0) { // L: 425
+ ModelData0.updateExternalPlayer(var0, var1);
+ }
+
+ }
+ } else {
+ int var5;
+ int var6;
+ int var7;
+ if (var3 == 1) { // L: 428
+ var5 = var0.readBits(3); // L: 429
+ var6 = var4.pathX[0]; // L: 430
+ var7 = var4.pathY[0]; // L: 431
+ if (var5 == 0) { // L: 432
+ --var6; // L: 433
+ --var7; // L: 434
+ } else if (var5 == 1) { // L: 436
+ --var7;
+ } else if (var5 == 2) { // L: 437
+ ++var6; // L: 438
+ --var7; // L: 439
+ } else if (var5 == 3) { // L: 441
+ --var6;
+ } else if (var5 == 4) { // L: 442
+ ++var6;
+ } else if (var5 == 5) { // L: 443
+ --var6; // L: 444
+ ++var7; // L: 445
+ } else if (var5 == 6) { // L: 447
+ ++var7;
+ } else if (var5 == 7) { // L: 448
+ ++var6; // L: 449
+ ++var7; // L: 450
+ }
+
+ if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 452
+ var4.resetPath(var6, var7); // L: 453
+ var4.field1088 = false; // L: 454
+ } else if (var2) { // L: 456
+ var4.field1088 = true; // L: 457
+ var4.tileX = var6; // L: 458
+ var4.tileY = var7; // L: 459
+ } else {
+ var4.field1088 = false; // L: 462
+ var4.method2139(var6, var7, Players.field1304[var1]); // L: 463
+ }
+
+ } else if (var3 == 2) { // L: 467
+ var5 = var0.readBits(4); // L: 468
+ var6 = var4.pathX[0]; // L: 469
+ var7 = var4.pathY[0]; // L: 470
+ if (var5 == 0) { // L: 471
+ var6 -= 2; // L: 472
+ var7 -= 2; // L: 473
+ } else if (var5 == 1) { // L: 475
+ --var6; // L: 476
+ var7 -= 2; // L: 477
+ } else if (var5 == 2) { // L: 479
+ var7 -= 2;
+ } else if (var5 == 3) { // L: 480
+ ++var6; // L: 481
+ var7 -= 2; // L: 482
+ } else if (var5 == 4) { // L: 484
+ var6 += 2; // L: 485
+ var7 -= 2; // L: 486
+ } else if (var5 == 5) { // L: 488
+ var6 -= 2; // L: 489
+ --var7; // L: 490
+ } else if (var5 == 6) { // L: 492
+ var6 += 2; // L: 493
+ --var7; // L: 494
+ } else if (var5 == 7) { // L: 496
+ var6 -= 2;
+ } else if (var5 == 8) { // L: 497
+ var6 += 2;
+ } else if (var5 == 9) { // L: 498
+ var6 -= 2; // L: 499
+ ++var7; // L: 500
+ } else if (var5 == 10) { // L: 502
+ var6 += 2; // L: 503
+ ++var7; // L: 504
+ } else if (var5 == 11) { // L: 506
+ var6 -= 2; // L: 507
+ var7 += 2; // L: 508
+ } else if (var5 == 12) { // L: 510
+ --var6; // L: 511
+ var7 += 2; // L: 512
+ } else if (var5 == 13) { // L: 514
+ var7 += 2;
+ } else if (var5 == 14) { // L: 515
+ ++var6; // L: 516
+ var7 += 2; // L: 517
+ } else if (var5 == 15) { // L: 519
+ var6 += 2; // L: 520
+ var7 += 2; // L: 521
+ }
+
+ if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 523
+ var4.resetPath(var6, var7); // L: 524
+ var4.field1088 = false; // L: 525
+ } else if (var2) { // L: 527
+ var4.field1088 = true; // L: 528
+ var4.tileX = var6; // L: 529
+ var4.tileY = var7; // L: 530
+ } else {
+ var4.field1088 = false; // L: 533
+ var4.method2139(var6, var7, Players.field1304[var1]); // L: 534
+ }
+
+ } else {
+ var5 = var0.readBits(1); // L: 538
+ int var8;
+ int var9;
+ int var10;
+ int var11;
+ if (var5 == 0) { // L: 539
+ var6 = var0.readBits(12); // L: 540
+ var7 = var6 >> 10; // L: 541
+ var8 = var6 >> 5 & 31; // L: 542
+ if (var8 > 15) { // L: 543
+ var8 -= 32;
+ }
+
+ var9 = var6 & 31; // L: 544
+ if (var9 > 15) { // L: 545
+ var9 -= 32;
+ }
+
+ var10 = var8 + var4.pathX[0]; // L: 546
+ var11 = var9 + var4.pathY[0]; // L: 547
+ if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 548
+ var4.resetPath(var10, var11); // L: 549
+ var4.field1088 = false; // L: 550
+ } else if (var2) { // L: 552
+ var4.field1088 = true; // L: 553
+ var4.tileX = var10; // L: 554
+ var4.tileY = var11; // L: 555
+ } else {
+ var4.field1088 = false; // L: 558
+ var4.method2139(var10, var11, Players.field1304[var1]); // L: 559
+ }
+
+ var4.plane = (byte)(var7 + var4.plane & 3); // L: 561
+ if (Client.localPlayerIndex == var1) { // L: 562
+ PacketWriter.Client_plane = var4.plane;
+ }
+
+ } else {
+ var6 = var0.readBits(30); // L: 565
+ var7 = var6 >> 28; // L: 566
+ var8 = var6 >> 14 & 16383; // L: 567
+ var9 = var6 & 16383; // L: 568
+ var10 = (var8 + class28.baseX + var4.pathX[0] & 16383) - class28.baseX; // L: 569
+ var11 = (var9 + WorldMapLabelSize.baseY + var4.pathY[0] & 16383) - WorldMapLabelSize.baseY; // L: 570
+ if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 571
+ var4.resetPath(var10, var11); // L: 572
+ var4.field1088 = false; // L: 573
+ } else if (var2) { // L: 575
+ var4.field1088 = true; // L: 576
+ var4.tileX = var10; // L: 577
+ var4.tileY = var11; // L: 578
+ } else {
+ var4.field1088 = false; // L: 581
+ var4.method2139(var10, var11, Players.field1304[var1]); // L: 582
+ }
+
+ var4.plane = (byte)(var7 + var4.plane & 3); // L: 584
+ if (Client.localPlayerIndex == var1) { // L: 585
+ PacketWriter.Client_plane = var4.plane;
+ }
+
+ }
+ }
+ }
+ } // L: 417 426 465 536 563 586
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-46"
+ )
+ public static void method148() {
+ PlayerComposition.Widget_cachedSpriteMasks.clear(); // L: 279
+ } // L: 280
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(III)I",
+ garbageValue = "-1085625206"
+ )
+ static final int method156(int var0, int var1) {
+ int var2 = class154.method3169(45365 + var0, 91923 + var1, 4) - 128 + (class154.method3169(10294 + var0, 37821 + var1, 2) - 128 >> 1) + (class154.method3169(var0, var1, 1) - 128 >> 2); // L: 873
+ var2 = (int)(0.3D * (double)var2) + 35; // L: 874
+ if (var2 < 10) { // L: 875
+ var2 = 10;
+ } else if (var2 > 60) { // L: 876
+ var2 = 60;
+ }
+
+ return var2; // L: 877
+ }
+
+ @ObfuscatedName("ai")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-455048359"
+ )
+ static int method155(int var0, Script var1, boolean var2) {
+ if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4494
+ if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4499
+ if (var0 == 6750) { // L: 4503
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4504
+ return 1; // L: 4505
+ } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4507
+ if (var0 == 6754) { // L: 4511
+ int var3 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 4512
+ NPCComposition var4 = BuddyRankComparator.getNpcDefinition(var3); // L: 4513
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4514
+ return 1; // L: 4515
+ } else {
+ return 2; // L: 4517
+ }
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4508
+ return 1; // L: 4509
+ }
+ } else {
+ --class446.Interpreter_intStackSize; // L: 4500
+ return 1; // L: 4501
+ }
+ } else {
+ class446.Interpreter_intStackSize -= 2; // L: 4495
+ --Interpreter.Interpreter_stringStackSize; // L: 4496
+ return 1; // L: 4497
+ }
+ }
+
+ @ObfuscatedName("jw")
+ @ObfuscatedSignature(
+ descriptor = "([Lkb;IIIIIIIII)V",
+ garbageValue = "-2125768585"
+ )
+ @Export("drawInterface")
+ static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10095
+ Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10096
+
+ for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10097
+ Widget var10 = var0[var9]; // L: 10098
+ if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10099 10100
+ int var11;
+ if (var8 == -1) { // L: 10102
+ Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10103
+ Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10104
+ Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10105
+ Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10106
+ var11 = ++Client.rootWidgetCount - 1; // L: 10107
+ } else {
+ var11 = var8; // L: 10109
+ }
+
+ var10.rootIndex = var11; // L: 10110
+ var10.cycle = Client.cycle; // L: 10111
+ if (!var10.isIf3 || !Frames.isComponentHidden(var10)) { // L: 10112
+ if (var10.contentType > 0) { // L: 10113
+ WorldMapData_1.method4874(var10);
+ }
+
+ int var12 = var10.x + var6; // L: 10114
+ int var13 = var7 + var10.y; // L: 10115
+ int var14 = var10.transparencyTop; // L: 10116
+ int var15;
+ int var16;
+ if (var10 == Client.clickedWidget) { // L: 10117
+ if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10118
+ class12.field62 = var0; // L: 10119
+ UserComparator5.field1389 = var6; // L: 10120
+ SecureRandomFuture.field960 = var7; // L: 10121
+ continue; // L: 10122
+ }
+
+ if (Client.isDraggingWidget && Client.field767) { // L: 10124
+ var15 = MouseHandler.MouseHandler_x; // L: 10125
+ var16 = MouseHandler.MouseHandler_y; // L: 10126
+ var15 -= Client.widgetClickX; // L: 10127
+ var16 -= Client.widgetClickY; // L: 10128
+ if (var15 < Client.field664) { // L: 10129
+ var15 = Client.field664;
+ }
+
+ if (var15 + var10.width > Client.field664 + Client.clickedWidgetParent.width) { // L: 10130
+ var15 = Client.field664 + Client.clickedWidgetParent.width - var10.width;
+ }
+
+ if (var16 < Client.field550) { // L: 10131
+ var16 = Client.field550;
+ }
+
+ if (var16 + var10.height > Client.field550 + Client.clickedWidgetParent.height) { // L: 10132
+ var16 = Client.field550 + Client.clickedWidgetParent.height - var10.height;
+ }
+
+ var12 = var15; // L: 10133
+ var13 = var16; // L: 10134
+ }
+
+ if (!var10.isScrollBar) { // L: 10136
+ var14 = 128;
+ }
+ }
+
+ int var17;
+ int var18;
+ int var19;
+ int var20;
+ int var21;
+ int var22;
+ if (var10.type == 2) { // L: 10142
+ var15 = var2; // L: 10143
+ var16 = var3; // L: 10144
+ var17 = var4; // L: 10145
+ var18 = var5; // L: 10146
+ } else if (var10.type == 9) { // L: 10148
+ var19 = var12; // L: 10149
+ var20 = var13; // L: 10150
+ var21 = var12 + var10.width; // L: 10151
+ var22 = var13 + var10.height; // L: 10152
+ if (var21 < var12) { // L: 10153
+ var19 = var21; // L: 10155
+ var21 = var12; // L: 10156
+ }
+
+ if (var22 < var13) { // L: 10158
+ var20 = var22; // L: 10160
+ var22 = var13; // L: 10161
+ }
+
+ ++var21; // L: 10163
+ ++var22; // L: 10164
+ var15 = var19 > var2 ? var19 : var2; // L: 10165
+ var16 = var20 > var3 ? var20 : var3; // L: 10166
+ var17 = var21 < var4 ? var21 : var4; // L: 10167
+ var18 = var22 < var5 ? var22 : var5; // L: 10168
+ } else {
+ var19 = var12 + var10.width; // L: 10171
+ var20 = var13 + var10.height; // L: 10172
+ var15 = var12 > var2 ? var12 : var2; // L: 10173
+ var16 = var13 > var3 ? var13 : var3; // L: 10174
+ var17 = var19 < var4 ? var19 : var4; // L: 10175
+ var18 = var20 < var5 ? var20 : var5; // L: 10176
+ }
+
+ if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10178
+ if (var10.contentType != 0) { // L: 10179
+ if (var10.contentType == 1336) { // L: 10180
+ if (class19.clientPreferences.method2252()) { // L: 10181
+ var13 += 15; // L: 10182
+ DevicePcmPlayerProvider.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10183
+ var13 += 15; // L: 10184
+ Runtime var42 = Runtime.getRuntime(); // L: 10185
+ var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10186
+ var21 = 16776960; // L: 10187
+ if (var20 > 327680 && !Client.isLowDetail) { // L: 10188
+ var21 = 16711680;
+ }
+
+ DevicePcmPlayerProvider.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10189
+ var13 += 15; // L: 10190
+ }
+ continue;
+ }
+
+ if (var10.contentType == 1337) { // L: 10194
+ Client.viewportX = var12; // L: 10195
+ Client.viewportY = var13; // L: 10196
+ ServerPacket.drawEntities(var12, var13, var10.width, var10.height); // L: 10197
+ Client.field703[var10.rootIndex] = true; // L: 10198
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10199
+ continue; // L: 10200
+ }
+
+ if (var10.contentType == 1338) { // L: 10202
+ class120.drawMinimap(var10, var12, var13, var11); // L: 10203
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10204
+ continue; // L: 10205
+ }
+
+ if (var10.contentType == 1339) { // L: 10207
+ NPC.drawCompass(var10, var12, var13, var11); // L: 10208
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10209
+ continue; // L: 10210
+ }
+
+ if (var10.contentType == 1400) { // L: 10212
+ class121.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10213
+ }
+
+ if (var10.contentType == 1401) { // L: 10215
+ class121.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10216
+ }
+
+ if (var10.contentType == 1402) { // L: 10218
+ Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10219
+ }
+ }
+
+ if (var10.type == 0) { // L: 10222
+ if (!var10.isIf3 && Frames.isComponentHidden(var10) && var10 != Language.mousedOverWidgetIf1) { // L: 10223
+ continue;
+ }
+
+ if (!var10.isIf3) { // L: 10224
+ if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10225
+ var10.scrollY = var10.scrollHeight - var10.height;
+ }
+
+ if (var10.scrollY < 0) { // L: 10226
+ var10.scrollY = 0;
+ }
+ }
+
+ drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10228
+ if (var10.children != null) { // L: 10229
+ drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+ }
+
+ InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 10230
+ if (var30 != null) { // L: 10231
+ class193.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10232
+ }
+
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10234
+ Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10235
+ } else if (var10.type == 11) { // L: 10237
+ if (Frames.isComponentHidden(var10) && var10 != Language.mousedOverWidgetIf1) { // L: 10238
+ continue;
+ }
+
+ if (var10.children != null) { // L: 10239
+ drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+ }
+
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10240
+ Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10241
+ }
+
+ if (Client.isResizable || Client.field751[var11] || Client.gameDrawingMode > 1) { // L: 10243
+ if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10244 10245
+ class201.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+ }
+
+ if (var10.type != 1) { // L: 10247
+ int var23;
+ int var24;
+ int var25;
+ int var26;
+ if (var10.type == 2) { // L: 10250
+ var19 = 0; // L: 10251
+
+ for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10252
+ for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10253
+ var22 = var12 + var21 * (var10.paddingX + 32); // L: 10254
+ var23 = var13 + var20 * (var10.paddingY + 32); // L: 10255
+ if (var19 < 20) { // L: 10256
+ var22 += var10.inventoryXOffsets[var19]; // L: 10257
+ var23 += var10.inventoryYOffsets[var19]; // L: 10258
+ }
+
+ if (var10.itemIds[var19] <= 0) { // L: 10260
+ if (var10.inventorySprites != null && var19 < 20) { // L: 10305
+ SpritePixels var46 = var10.getInventorySprite(var19); // L: 10306
+ if (var46 != null) { // L: 10307
+ var46.drawTransBgAt(var22, var23);
+ } else if (Widget.field3366) { // L: 10308
+ ChatChannel.invalidateWidget(var10);
+ }
+ }
+ } else {
+ boolean var37 = false; // L: 10261
+ boolean var38 = false; // L: 10262
+ var26 = var10.itemIds[var19] - 1; // L: 10263
+ if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Interpreter.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10264
+ SpritePixels var35;
+ if (Client.isItemSelected == 1 && var19 == EnumComposition.selectedItemSlot && var10.id == ModeWhere.selectedItemWidget) { // L: 10266
+ var35 = class346.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
+ } else {
+ var35 = class346.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10267
+ }
+
+ if (var35 != null) { // L: 10268
+ if (var10 == Interpreter.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10269
+ var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10270
+ var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10271
+ if (var24 < 5 && var24 > -5) { // L: 10272
+ var24 = 0;
+ }
+
+ if (var25 < 5 && var25 > -5) { // L: 10273
+ var25 = 0;
+ }
+
+ if (Client.itemDragDuration < 5) { // L: 10274
+ var24 = 0; // L: 10275
+ var25 = 0; // L: 10276
+ }
+
+ var35.drawTransAt(var22 + var24, var25 + var23, 128); // L: 10278
+ if (var1 != -1) { // L: 10279
+ Widget var28 = var0[var1 & 65535]; // L: 10280
+ int var29;
+ if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10281
+ var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field555 / 3; // L: 10282
+ if (var29 > Client.field555 * 10) { // L: 10283
+ var29 = Client.field555 * 10;
+ }
+
+ if (var29 > var28.scrollY) { // L: 10284
+ var29 = var28.scrollY;
+ }
+
+ var28.scrollY -= var29; // L: 10285
+ Client.draggedWidgetY += var29; // L: 10286
+ ChatChannel.invalidateWidget(var28); // L: 10287
+ }
+
+ if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10289
+ var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field555 / 3; // L: 10290
+ if (var29 > Client.field555 * 10) { // L: 10291
+ var29 = Client.field555 * 10;
+ }
+
+ if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10292
+ var29 = var28.scrollHeight - var28.height - var28.scrollY;
+ }
+
+ var28.scrollY += var29; // L: 10293
+ Client.draggedWidgetY -= var29; // L: 10294
+ ChatChannel.invalidateWidget(var28); // L: 10295
+ }
+ }
+ } else if (var10 == class1.field4 && var19 == Client.field600) { // L: 10299
+ var35.drawTransAt(var22, var23, 128);
+ } else {
+ var35.drawTransBgAt(var22, var23); // L: 10300
+ }
+ } else {
+ ChatChannel.invalidateWidget(var10); // L: 10302
+ }
+ }
+ }
+
+ ++var19; // L: 10310
+ }
+ }
+ } else if (var10.type == 3) { // L: 10315
+ if (ObjectSound.runCs1(var10)) { // L: 10317
+ var19 = var10.color2; // L: 10318
+ if (var10 == Language.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10319
+ var19 = var10.mouseOverColor2;
+ }
+ } else {
+ var19 = var10.color; // L: 10322
+ if (var10 == Language.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10323
+ var19 = var10.mouseOverColor;
+ }
+ }
+
+ if (var10.fill) { // L: 10325
+ switch(var10.fillMode.field4781) { // L: 10326
+ case 1:
+ Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10331
+ break; // L: 10332
+ case 2:
+ Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10328
+ break; // L: 10329
+ default:
+ if (var14 == 0) { // L: 10334
+ Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
+ } else {
+ Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10335
+ }
+ }
+ } else if (var14 == 0) { // L: 10340
+ Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
+ } else {
+ Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10341
+ }
+ } else {
+ Font var39;
+ if (var10.type == 4) { // L: 10345
+ var39 = var10.getFont(); // L: 10346
+ if (var39 == null) { // L: 10347
+ if (Widget.field3366) { // L: 10348
+ ChatChannel.invalidateWidget(var10);
+ }
+ } else {
+ String var44 = var10.text; // L: 10352
+ if (ObjectSound.runCs1(var10)) { // L: 10353
+ var20 = var10.color2; // L: 10354
+ if (var10 == Language.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10355
+ var20 = var10.mouseOverColor2;
+ }
+
+ if (var10.text2.length() > 0) { // L: 10356
+ var44 = var10.text2;
+ }
+ } else {
+ var20 = var10.color; // L: 10359
+ if (var10 == Language.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10360
+ var20 = var10.mouseOverColor;
+ }
+ }
+
+ if (var10.isIf3 && var10.itemId != -1) { // L: 10362
+ ItemComposition var45 = EnumComposition.ItemDefinition_get(var10.itemId); // L: 10363
+ var44 = var45.name; // L: 10364
+ if (var44 == null) { // L: 10365
+ var44 = "null";
+ }
+
+ if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10366
+ var44 = class122.colorStartTag(16748608) + var44 + "" + " " + 'x' + WorldMapSprite.formatItemStacks(var10.itemQuantity);
+ }
+ }
+
+ if (var10 == Client.meslayerContinueWidget) { // L: 10368
+ var44 = "Please wait..."; // L: 10369
+ var20 = var10.color; // L: 10370
+ }
+
+ if (!var10.isIf3) { // L: 10372
+ var44 = class10.method74(var44, var10);
+ }
+
+ var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10373
+ }
+ } else if (var10.type == 5) { // L: 10376
+ SpritePixels var40;
+ if (!var10.isIf3) { // L: 10377
+ var40 = var10.getSprite(ObjectSound.runCs1(var10), class138.urlRequester); // L: 10378
+ if (var40 != null) { // L: 10379
+ var40.drawTransBgAt(var12, var13);
+ } else if (Widget.field3366) { // L: 10380
+ ChatChannel.invalidateWidget(var10);
+ }
+ } else {
+ if (var10.itemId != -1) { // L: 10384
+ var40 = class346.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
+ } else {
+ var40 = var10.getSprite(false, class138.urlRequester); // L: 10385
+ }
+
+ if (var40 == null) { // L: 10386
+ if (Widget.field3366) { // L: 10410
+ ChatChannel.invalidateWidget(var10);
+ }
+ } else {
+ var20 = var40.width; // L: 10387
+ var21 = var40.height; // L: 10388
+ if (!var10.spriteTiling) { // L: 10389
+ var22 = var10.width * 4096 / var20; // L: 10403
+ if (var10.spriteAngle != 0) { // L: 10404
+ var40.method8180(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
+ } else if (var14 != 0) { // L: 10405
+ var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+ } else if (var20 == var10.width && var21 == var10.height) { // L: 10406
+ var40.drawTransBgAt(var12, var13); // L: 10407
+ } else {
+ var40.drawScaledAt(var12, var13, var10.width, var10.height);
+ }
+ } else {
+ Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10390
+ var22 = (var20 - 1 + var10.width) / var20; // L: 10391
+ var23 = (var21 - 1 + var10.height) / var21; // L: 10392
+
+ for (var24 = 0; var24 < var22; ++var24) { // L: 10393
+ for (var25 = 0; var25 < var23; ++var25) { // L: 10394
+ if (var10.spriteAngle != 0) { // L: 10395
+ var40.method8180(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
+ } else if (var14 != 0) { // L: 10396
+ var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
+ } else {
+ var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); // L: 10397
+ }
+ }
+ }
+
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10400
+ }
+ }
+ }
+ } else {
+ ItemComposition var33;
+ if (var10.type == 6) { // L: 10414
+ boolean var36 = ObjectSound.runCs1(var10); // L: 10415
+ if (var36) { // L: 10417
+ var20 = var10.sequenceId2;
+ } else {
+ var20 = var10.sequenceId; // L: 10418
+ }
+
+ Model var41 = null; // L: 10419
+ var22 = 0; // L: 10420
+ if (var10.itemId != -1) { // L: 10421
+ var33 = EnumComposition.ItemDefinition_get(var10.itemId); // L: 10422
+ if (var33 != null) { // L: 10423
+ var33 = var33.getCountObj(var10.itemQuantity); // L: 10424
+ var41 = var33.getModel(1); // L: 10425
+ if (var41 != null) { // L: 10426
+ var41.calculateBoundsCylinder(); // L: 10427
+ var22 = var41.height / 2; // L: 10428
+ } else {
+ ChatChannel.invalidateWidget(var10); // L: 10430
+ }
+ }
+ } else if (var10.modelType == 5) { // L: 10433
+ if (var10.modelId == 0) { // L: 10434
+ var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+ } else {
+ var41 = class101.localPlayer.getModel(); // L: 10435
+ }
+ } else if (var20 == -1) { // L: 10437
+ var41 = var10.getModel((SequenceDefinition)null, -1, var36, class101.localPlayer.appearance); // L: 10438
+ if (var41 == null && Widget.field3366) { // L: 10439
+ ChatChannel.invalidateWidget(var10);
+ }
+ } else {
+ SequenceDefinition var47 = ScriptFrame.SequenceDefinition_get(var20); // L: 10442
+ var41 = var10.getModel(var47, var10.modelFrame, var36, class101.localPlayer.appearance); // L: 10443
+ if (var41 == null && Widget.field3366) { // L: 10444
+ ChatChannel.invalidateWidget(var10);
+ }
+ }
+
+ Rasterizer3D.method4021(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10446
+ var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10447
+ var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10448
+ if (var41 != null) { // L: 10449
+ if (!var10.isIf3) { // L: 10450
+ var41.method4442(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+ } else {
+ var41.calculateBoundsCylinder(); // L: 10452
+ if (var10.modelOrthog) { // L: 10453
+ var41.method4462(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+ } else {
+ var41.method4442(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10454
+ }
+ }
+ }
+
+ Rasterizer3D.Rasterizer3D_method3(); // L: 10457
+ } else {
+ if (var10.type == 7) { // L: 10460
+ var39 = var10.getFont(); // L: 10461
+ if (var39 == null) { // L: 10462
+ if (Widget.field3366) { // L: 10463
+ ChatChannel.invalidateWidget(var10);
+ }
+ continue;
+ }
+
+ var20 = 0; // L: 10466
+
+ for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10467
+ for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10468
+ if (var10.itemIds[var20] > 0) { // L: 10469
+ var33 = EnumComposition.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10470
+ String var34;
+ if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10472
+ var34 = class122.colorStartTag(16748608) + var33.name + ""; // L: 10473
+ } else {
+ var34 = class122.colorStartTag(16748608) + var33.name + "" + " " + 'x' + WorldMapSprite.formatItemStacks(var10.itemQuantities[var20]);
+ }
+
+ var25 = var22 * (var10.paddingX + 115) + var12; // L: 10474
+ var26 = var13 + (var10.paddingY + 12) * var21; // L: 10475
+ if (var10.textXAlignment == 0) { // L: 10476
+ var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+ } else if (var10.textXAlignment == 1) { // L: 10477
+ var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+ } else {
+ var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 10478
+ }
+ }
+
+ ++var20; // L: 10480
+ }
+ }
+ }
+
+ if (var10.type == 8 && var10 == SoundSystem.field313 && Client.field646 == Client.field638) { // L: 10484 10485
+ var19 = 0; // L: 10486
+ var20 = 0; // L: 10487
+ Font var31 = DevicePcmPlayerProvider.fontPlain12; // L: 10488
+ String var32 = var10.text; // L: 10489
+
+ String var43;
+ for (var32 = class10.method74(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10491 10492 10504
+ var24 = var32.indexOf("
"); // L: 10493
+ if (var24 != -1) { // L: 10494
+ var43 = var32.substring(0, var24); // L: 10495
+ var32 = var32.substring(var24 + 4); // L: 10496
+ } else {
+ var43 = var32; // L: 10499
+ var32 = ""; // L: 10500
+ }
+
+ var25 = var31.stringWidth(var43); // L: 10502
+ if (var25 > var19) { // L: 10503
+ var19 = var25;
+ }
+ }
+
+ var19 += 6; // L: 10506
+ var20 += 7; // L: 10507
+ var24 = var12 + var10.width - 5 - var19; // L: 10508
+ var25 = var13 + var10.height + 5; // L: 10509
+ if (var24 < var12 + 5) { // L: 10510
+ var24 = var12 + 5;
+ }
+
+ if (var24 + var19 > var4) { // L: 10511
+ var24 = var4 - var19;
+ }
+
+ if (var25 + var20 > var5) { // L: 10512
+ var25 = var5 - var20;
+ }
+
+ Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10513
+ Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10514
+ var32 = var10.text; // L: 10515
+ var26 = var25 + var31.ascent + 2; // L: 10516
+
+ for (var32 = class10.method74(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10517 10518 10529
+ int var27 = var32.indexOf("
"); // L: 10519
+ if (var27 != -1) { // L: 10520
+ var43 = var32.substring(0, var27); // L: 10521
+ var32 = var32.substring(var27 + 4); // L: 10522
+ } else {
+ var43 = var32; // L: 10525
+ var32 = ""; // L: 10526
+ }
+
+ var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10528
+ }
+ }
+
+ if (var10.type == 9) { // L: 10533
+ if (var10.field3402) { // L: 10538
+ var19 = var12; // L: 10539
+ var20 = var13 + var10.height; // L: 10540
+ var21 = var12 + var10.width; // L: 10541
+ var22 = var13; // L: 10542
+ } else {
+ var19 = var12; // L: 10545
+ var20 = var13; // L: 10546
+ var21 = var12 + var10.width; // L: 10547
+ var22 = var13 + var10.height; // L: 10548
+ }
+
+ if (var10.lineWid == 1) { // L: 10550
+ Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10551
+ } else {
+ JagexCache.method3262(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10554
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ } // L: 10559
+
+ @ObfuscatedName("lm")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;II)Ljava/lang/String;",
+ garbageValue = "-1990972086"
+ )
+ static String method157(Widget var0, int var1) {
+ int var3 = class124.getWidgetFlags(var0); // L: 12310
+ boolean var2 = (var3 >> var1 + 1 & 1) != 0; // L: 12312
+ if (!var2 && var0.onOp == null) { // L: 12314
+ return null;
+ } else {
+ return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; // L: 12315 12316 12318
+ }
}
}
diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java
index ef6b72e8bf..d84ff8137f 100644
--- a/runescape-client/src/main/java/class140.java
+++ b/runescape-client/src/main/java/class140.java
@@ -1,77 +1,122 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ed")
+@ObfuscatedName("ei")
public class class140 extends class144 {
- @ObfuscatedName("jv")
- @ObfuscatedGetter(
- intValue = 2112481743
+ @ObfuscatedName("ea")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
)
- static int field1666;
- @ObfuscatedName("o")
- String field1664;
+ @Export("archive2")
+ static Archive archive2;
+ @ObfuscatedName("c")
+ String field1655;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 718016379
+ )
+ int field1651;
@ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = 185909857
- )
- int field1661;
- @ObfuscatedName("l")
- byte field1662;
+ byte field1652;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lee;"
+ descriptor = "Leu;"
)
final class145 this$0;
@ObfuscatedSignature(
- descriptor = "(Lee;)V"
+ descriptor = "(Leu;)V"
)
class140(class145 var1) {
this.this$0 = var1;
- this.field1664 = null; // L: 55
+ this.field1655 = null; // L: 55
} // L: 59
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1212008489"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "355261812"
)
- void vmethod3037(Buffer var1) {
+ void vmethod3137(Buffer var1) {
if (var1.readUnsignedByte() != 255) { // L: 62
--var1.offset; // L: 63
var1.readLong(); // L: 64
}
- this.field1664 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66
- this.field1661 = var1.readUnsignedShort(); // L: 67
- this.field1662 = var1.readByte(); // L: 68
+ this.field1655 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66
+ this.field1651 = var1.readUnsignedShort(); // L: 67
+ this.field1652 = var1.readByte(); // L: 68
var1.readLong(); // L: 69
} // L: 70
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1640110130"
+ descriptor = "(Lex;I)V",
+ garbageValue = "1368590037"
)
- void vmethod3032(ClanChannel var1) {
+ void vmethod3138(ClanChannel var1) {
ClanChannelMember var2 = new ClanChannelMember(); // L: 73
- var2.username = new Username(this.field1664); // L: 74
- var2.world = this.field1661; // L: 75
- var2.rank = this.field1662; // L: 76
+ var2.username = new Username(this.field1655); // L: 74
+ var2.world = this.field1651; // L: 75
+ var2.rank = this.field1652; // L: 76
var1.addMember(var2); // L: 77
} // L: 78
- @ObfuscatedName("gs")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1349623910"
+ descriptor = "(II)Lkb;",
+ garbageValue = "1295683453"
)
- static void method2951() {
- PacketBufferNode var0 = WallDecoration.getPacketBufferNode(ClientPacket.field3054, Client.packetWriter.isaacCipher); // L: 4366
- var0.packetBuffer.writeByte(ClanChannelMember.getWindowedMode()); // L: 4367
- var0.packetBuffer.writeShort(GraphicsObject.canvasWidth); // L: 4368
- var0.packetBuffer.writeShort(class433.canvasHeight); // L: 4369
- Client.packetWriter.addNode(var0); // L: 4370
- } // L: 4371
+ @Export("getWidget")
+ public static Widget getWidget(int var0) {
+ int var1 = var0 >> 16; // L: 220
+ int var2 = var0 & 65535; // L: 221
+ if (SoundCache.Widget_interfaceComponents[var1] == null || SoundCache.Widget_interfaceComponents[var1][var2] == null) { // L: 222
+ boolean var3 = WorldMapSection2.loadInterface(var1); // L: 223
+ if (!var3) { // L: 224
+ return null;
+ }
+ }
+
+ return SoundCache.Widget_interfaceComponents[var1][var2]; // L: 226
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(IIZI)Ljava/lang/String;",
+ garbageValue = "1221665034"
+ )
+ static String method3038(int var0, int var1, boolean var2) {
+ if (var1 >= 2 && var1 <= 36) { // L: 120
+ if (var2 && var0 >= 0) { // L: 121
+ int var3 = 2; // L: 122
+
+ for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 123 124 126
+ var4 /= var1; // L: 125
+ }
+
+ char[] var5 = new char[var3]; // L: 128
+ var5[0] = '+'; // L: 129
+
+ for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 130
+ int var7 = var0; // L: 131
+ var0 /= var1; // L: 132
+ int var8 = var7 - var0 * var1; // L: 133
+ if (var8 >= 10) { // L: 134
+ var5[var6] = (char)(var8 + 87);
+ } else {
+ var5[var6] = (char)(var8 + 48); // L: 135
+ }
+ }
+
+ return new String(var5); // L: 137
+ } else {
+ return Integer.toString(var0, var1);
+ }
+ } else {
+ throw new IllegalArgumentException("" + var1);
+ }
+ }
}
diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java
index d8e59dcbc7..eb17ced2d3 100644
--- a/runescape-client/src/main/java/class141.java
+++ b/runescape-client/src/main/java/class141.java
@@ -3,117 +3,109 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ew")
+@ObfuscatedName("ec")
public class class141 extends class144 {
- @ObfuscatedName("o")
+ @ObfuscatedName("jm")
@ObfuscatedGetter(
- intValue = -390226113
+ intValue = -1799721325
)
- int field1670;
+ @Export("oculusOrbFocalPointY")
+ static int oculusOrbFocalPointY;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1400461077
+ )
+ int field1659;
+ @ObfuscatedName("v")
+ byte field1660;
@ObfuscatedName("q")
- byte field1668;
- @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = 1954797197
+ intValue = 1585058459
)
- int field1669;
- @ObfuscatedName("k")
- String field1671;
+ int field1658;
+ @ObfuscatedName("f")
+ String field1656;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lee;"
+ descriptor = "Leu;"
)
final class145 this$0;
@ObfuscatedSignature(
- descriptor = "(Lee;)V"
+ descriptor = "(Leu;)V"
)
class141(class145 var1) {
this.this$0 = var1;
- this.field1670 = -1; // L: 125
+ this.field1659 = -1; // L: 125
} // L: 130
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1212008489"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "355261812"
)
- void vmethod3037(Buffer var1) {
+ void vmethod3137(Buffer var1) {
var1.readUnsignedByte(); // L: 133
- this.field1670 = var1.readUnsignedShort(); // L: 134
- this.field1668 = var1.readByte(); // L: 135
- this.field1669 = var1.readUnsignedShort(); // L: 136
+ this.field1659 = var1.readUnsignedShort(); // L: 134
+ this.field1660 = var1.readByte(); // L: 135
+ this.field1658 = var1.readUnsignedShort(); // L: 136
var1.readLong(); // L: 137
- this.field1671 = var1.readStringCp1252NullTerminated(); // L: 138
+ this.field1656 = var1.readStringCp1252NullTerminated(); // L: 138
var1.readUnsignedByte(); // L: 139
} // L: 140
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1640110130"
+ descriptor = "(Lex;I)V",
+ garbageValue = "1368590037"
)
- void vmethod3032(ClanChannel var1) {
- ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1670); // L: 143
- var2.rank = this.field1668; // L: 144
- var2.world = this.field1669; // L: 145
- var2.username = new Username(this.field1671); // L: 146
+ void vmethod3138(ClanChannel var1) {
+ ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1659); // L: 143
+ var2.rank = this.field1660; // L: 144
+ var2.world = this.field1658; // L: 145
+ var2.username = new Username(this.field1656); // L: 146
} // L: 147
- @ObfuscatedName("k")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)[Lcm;",
- garbageValue = "-33"
+ descriptor = "(II)I",
+ garbageValue = "-113948023"
)
- static class83[] method2962() {
- return new class83[]{class83.field1087, class83.field1088, class83.field1092, class83.field1084, class83.field1086, class83.field1083}; // L: 17
+ public static int method3048(int var0) {
+ return (var0 & class438.field4680) - 1; // L: 26
}
- @ObfuscatedName("w")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IB)Lgt;",
- garbageValue = "19"
+ descriptor = "(IIIIIII)I",
+ garbageValue = "-612042966"
)
- @Export("getFrames")
- static Frames getFrames(int var0) {
- Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 316
- if (var1 != null) { // L: 317
+ public static int method3044(int var0, int var1, int var2, int var3, int var4, int var5) {
+ if ((var5 & 1) == 1) { // L: 38
+ int var6 = var3; // L: 39
+ var3 = var4; // L: 40
+ var4 = var6; // L: 41
+ }
+
+ var2 &= 3; // L: 43
+ if (var2 == 0) { // L: 44
return var1;
+ } else if (var2 == 1) { // L: 45
+ return 7 - var0 - (var3 - 1);
} else {
- AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 319
- AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 320
- boolean var5 = true; // L: 322
- int[] var6 = var3.getGroupFileIds(var0); // L: 323
-
- for (int var7 = 0; var7 < var6.length; ++var7) { // L: 324
- byte[] var8 = var3.getFile(var0, var6[var7]); // L: 325
- if (var8 == null) { // L: 326
- var5 = false; // L: 327
- } else {
- int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 330
- byte[] var10 = var4.getFile(var9, 0); // L: 333
- if (var10 == null) { // L: 334
- var5 = false;
- }
- }
- }
-
- Frames var2;
- if (!var5) { // L: 336
- var2 = null; // L: 337
- } else {
- try {
- var2 = new Frames(var3, var4, var0, false); // L: 341
- } catch (Exception var12) { // L: 343
- var2 = null; // L: 344
- }
- }
-
- if (var2 != null) { // L: 348
- SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
- }
-
- return var2; // L: 349
+ return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 46
}
}
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1644827355"
+ )
+ public static void method3047() {
+ ObjectComposition.ObjectDefinition_cached.clear(); // L: 429
+ ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 430
+ ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 431
+ ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 432
+ } // L: 433
}
diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java
index 44c0473794..8eb95214c7 100644
--- a/runescape-client/src/main/java/class142.java
+++ b/runescape-client/src/main/java/class142.java
@@ -1,64 +1,280 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ev")
+@ObfuscatedName("eh")
public class class142 extends class128 {
- @ObfuscatedName("o")
+ @ObfuscatedName("j")
+ @Export("SpriteBuffer_yOffsets")
+ public static int[] SpriteBuffer_yOffsets;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 12867453
+ intValue = -1198516523
)
- int field1676;
+ @Export("idxCount")
+ static int idxCount;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1343108627
+ )
+ int field1664;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class142(class131 var1) {
this.this$0 = var1;
- this.field1676 = -1; // L: 213
+ this.field1664 = -1; // L: 213
} // L: 215
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1676 = var1.readUnsignedShort(); // L: 218
+ void vmethod3150(Buffer var1) {
+ this.field1664 = var1.readUnsignedShort(); // L: 218
} // L: 219
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2892(this.field1676); // L: 222
+ void vmethod3149(ClanSettings var1) {
+ var1.method3019(this.field1664); // L: 222
} // L: 223
- @ObfuscatedName("li")
+ @ObfuscatedName("n")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "1893570048"
+ descriptor = "(IIIIIIILgg;Lgv;I)V",
+ garbageValue = "-1981768066"
)
- static final void method2967(int var0, int var1) {
- if (Client.currentClanChannels[var0] != null) { // L: 12477
- if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3005()) { // L: 12478
- ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12479
- if (var2.rank == -1) { // L: 12480
- PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2958, Client.packetWriter.isaacCipher); // L: 12481
- var3.packetBuffer.writeByte(3 + class392.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12482
- var3.packetBuffer.writeByte(var0); // L: 12483
- var3.packetBuffer.writeShort(var1); // L: 12484
- var3.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12485
- Client.packetWriter.addNode(var3); // L: 12486
+ static final void method3050(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
+ ObjectComposition var9 = class162.getObjectDefinition(var4); // L: 956
+ int var10;
+ int var11;
+ if (var5 != 1 && var5 != 3) { // L: 959
+ var10 = var9.sizeX; // L: 964
+ var11 = var9.sizeY; // L: 965
+ } else {
+ var10 = var9.sizeY; // L: 960
+ var11 = var9.sizeX; // L: 961
+ }
+
+ int var12;
+ int var13;
+ if (var10 + var2 <= 104) { // L: 971
+ var12 = (var10 >> 1) + var2; // L: 972
+ var13 = var2 + (var10 + 1 >> 1); // L: 973
+ } else {
+ var12 = var2; // L: 976
+ var13 = var2 + 1; // L: 977
+ }
+
+ int var14;
+ int var15;
+ if (var3 + var11 <= 104) { // L: 979
+ var14 = var3 + (var11 >> 1); // L: 980
+ var15 = var3 + (var11 + 1 >> 1); // L: 981
+ } else {
+ var14 = var3; // L: 984
+ var15 = var3 + 1; // L: 985
+ }
+
+ int[][] var16 = Tiles.Tiles_heights[var1]; // L: 987
+ int var17 = var16[var12][var15] + var16[var13][var14] + var16[var12][var14] + var16[var13][var15] >> 2; // L: 988
+ int var18 = (var2 << 7) + (var10 << 6); // L: 989
+ int var19 = (var3 << 7) + (var11 << 6); // L: 990
+ long var20 = TaskHandler.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 991
+ int var22 = (var5 << 6) + var6; // L: 992
+ if (var9.int3 == 1) { // L: 993
+ var22 += 256;
+ }
+
+ Object var30;
+ if (var6 == 22) { // L: 994
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 996
+ var30 = var9.getModel(22, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 997
+ }
+
+ var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 998
+ if (var9.interactType == 1) { // L: 999
+ var8.setBlockedByFloorDec(var2, var3);
+ }
+
+ } else if (var6 != 10 && var6 != 11) { // L: 1002
+ if (var6 >= 12) { // L: 1010
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1012
+ var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1013
+ }
+
+ var7.method4188(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1014
+ if (var9.interactType != 0) { // L: 1015
+ var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+ }
+
+ } else if (var6 == 0) { // L: 1018
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1020
+ var30 = var9.getModel(0, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1021
+ }
+
+ var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1007[var5], 0, var20, var22); // L: 1022
+ if (var9.interactType != 0) { // L: 1023
+ var8.method3878(var2, var3, var6, var5, var9.boolean1);
+ }
+
+ } else if (var6 == 1) { // L: 1026
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1028
+ var30 = var9.getModel(1, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1029
+ }
+
+ var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1011[var5], 0, var20, var22); // L: 1030
+ if (var9.interactType != 0) { // L: 1031
+ var8.method3878(var2, var3, var6, var5, var9.boolean1);
+ }
+
+ } else {
+ int var23;
+ if (var6 == 2) { // L: 1034
+ var23 = var5 + 1 & 3; // L: 1035
+ Object var25;
+ Object var31;
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1038
+ var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 1039
+ var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 1040
+ } else {
+ var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1043
+ var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1044
+ }
+
+ var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field1007[var5], Tiles.field1007[var23], var20, var22); // L: 1046
+ if (var9.interactType != 0) { // L: 1047
+ var8.method3878(var2, var3, var6, var5, var9.boolean1);
+ }
+
+ } else if (var6 == 3) { // L: 1050
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1052
+ var30 = var9.getModel(3, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1053
+ }
+
+ var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1011[var5], 0, var20, var22); // L: 1054
+ if (var9.interactType != 0) { // L: 1055
+ var8.method3878(var2, var3, var6, var5, var9.boolean1);
+ }
+
+ } else if (var6 == 9) { // L: 1058
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1060
+ var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1061
+ }
+
+ var7.method4188(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1062
+ if (var9.interactType != 0) { // L: 1063
+ var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+ }
+
+ } else if (var6 == 4) { // L: 1066
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1068
+ var30 = var9.getModel(4, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1069
+ }
+
+ var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1007[var5], 0, 0, 0, var20, var22); // L: 1070
+ } else {
+ long var24;
+ Object var26;
+ if (var6 == 5) { // L: 1073
+ var23 = 16; // L: 1074
+ var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1075
+ if (0L != var24) { // L: 1076
+ var23 = class162.getObjectDefinition(Decimator.Entity_unpackID(var24)).int2;
+ }
+
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1078
+ var26 = var9.getModel(4, var5, var16, var18, var17, var19);
+ } else {
+ var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1079
+ }
+
+ var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field1007[var5], 0, var23 * Tiles.field1003[var5], var23 * Tiles.field1005[var5], var20, var22); // L: 1080
+ } else if (var6 == 6) { // L: 1083
+ var23 = 8; // L: 1084
+ var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1085
+ if (var24 != 0L) { // L: 1086
+ var23 = class162.getObjectDefinition(Decimator.Entity_unpackID(var24)).int2 / 2;
+ }
+
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1088
+ var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
+ } else {
+ var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1089
+ }
+
+ var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field1006[var5], var23 * Tiles.field1002[var5], var20, var22); // L: 1090
+ } else if (var6 == 7) { // L: 1093
+ int var29 = var5 + 2 & 3; // L: 1095
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1096
+ var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1097
+ }
+
+ var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1098
+ } else if (var6 == 8) { // L: 1101
+ var23 = 8; // L: 1102
+ var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1103
+ if (var24 != 0L) { // L: 1104
+ var23 = class162.getObjectDefinition(Decimator.Entity_unpackID(var24)).int2 / 2;
+ }
+
+ int var28 = var5 + 2 & 3; // L: 1107
+ Object var27;
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1108
+ var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1109
+ var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1110
+ } else {
+ var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1113
+ var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1114
+ }
+
+ var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field1006[var5], var23 * Tiles.field1002[var5], var20, var22); // L: 1116
+ }
}
}
+ } else {
+ if (var9.animationId == -1 && var9.transforms == null) { // L: 1004
+ var30 = var9.getModel(10, var5, var16, var18, var17, var19);
+ } else {
+ var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1005
+ }
+
+ if (var30 != null) { // L: 1006
+ var7.method4188(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
+ }
+
+ if (var9.interactType != 0) { // L: 1007
+ var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+ }
+
}
- } // L: 12487
+ } // L: 1000 1008 1016 1024 1032 1048 1056 1064 1071 1081 1091 1099 1117 1119
}
diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java
index e5c6e258fe..b87c884498 100644
--- a/runescape-client/src/main/java/class143.java
+++ b/runescape-client/src/main/java/class143.java
@@ -1,227 +1,65 @@
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Random;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("el")
+@ObfuscatedName("ek")
public class class143 extends class128 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- longValue = -5075875744694294941L
+ @ObfuscatedName("ur")
+ @ObfuscatedSignature(
+ descriptor = "Lls;"
)
- long field1679;
+ @Export("grandExchangeEvents")
+ static GrandExchangeEvents grandExchangeEvents;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ longValue = -4142648210474393183L
+ )
+ long field1668;
+ @ObfuscatedName("v")
+ String field1667;
@ObfuscatedName("q")
- String field1680;
- @ObfuscatedName("l")
@ObfuscatedGetter(
- intValue = -130404941
+ intValue = 81354487
)
- int field1678;
+ int field1669;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class143(class131 var1) {
this.this$0 = var1;
- this.field1679 = -1L;
- this.field1680 = null;
- this.field1678 = 0;
+ this.field1668 = -1L; // L: 93
+ this.field1667 = null; // L: 94
+ this.field1669 = 0; // L: 95
} // L: 97
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- if (var1.readUnsignedByte() != 255) {
- --var1.offset;
- this.field1679 = var1.readLong();
+ void vmethod3150(Buffer var1) {
+ if (var1.readUnsignedByte() != 255) { // L: 100
+ --var1.offset; // L: 101
+ this.field1668 = var1.readLong(); // L: 102
}
- this.field1680 = var1.readStringCp1252NullTerminatedOrNull();
- this.field1678 = var1.readUnsignedShort();
- }
+ this.field1667 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104
+ this.field1669 = var1.readUnsignedShort(); // L: 105
+ } // L: 106
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2888(this.field1679, this.field1680, this.field1678); // L: 109
- }
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(JLjava/lang/String;I)I",
- garbageValue = "-1230431234"
- )
- static final int method2972(long var0, String var2) {
- Random var3 = new Random(); // L: 35
- Buffer var4 = new Buffer(128); // L: 36
- Buffer var5 = new Buffer(128); // L: 37
- int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 38 39 40 41 42
- var4.writeByte(10); // L: 43
-
- int var7;
- for (var7 = 0; var7 < 4; ++var7) { // L: 44
- var4.writeInt(var3.nextInt()); // L: 45
- }
-
- var4.writeInt(var6[0]); // L: 47
- var4.writeInt(var6[1]); // L: 48
- var4.writeLong(var0); // L: 49
- var4.writeLong(0L); // L: 50
-
- for (var7 = 0; var7 < 4; ++var7) { // L: 51
- var4.writeInt(var3.nextInt()); // L: 52
- }
-
- var4.encryptRsa(class65.field854, class65.field862); // L: 54
- var5.writeByte(10); // L: 55
-
- for (var7 = 0; var7 < 3; ++var7) { // L: 56
- var5.writeInt(var3.nextInt()); // L: 57
- }
-
- var5.writeLong(var3.nextLong()); // L: 59
- var5.writeLongMedium(var3.nextLong()); // L: 60
- IntHashTable.method8124(var5); // L: 61
- var5.writeLong(var3.nextLong()); // L: 62
- var5.encryptRsa(class65.field854, class65.field862); // L: 63
- var7 = class392.stringCp1252NullTerminatedByteSize(var2); // L: 64
- if (var7 % 8 != 0) { // L: 65
- var7 += 8 - var7 % 8;
- }
-
- Buffer var8 = new Buffer(var7); // L: 66
- var8.writeStringCp1252NullTerminated(var2); // L: 67
- var8.offset = var7; // L: 68
- var8.xteaEncryptAll(var6); // L: 69
- Buffer var9 = new Buffer(var8.offset + var5.offset + var4.offset + 5); // L: 70
- var9.writeByte(2); // L: 71
- var9.writeByte(var4.offset); // L: 72
- var9.writeBytes(var4.array, 0, var4.offset); // L: 73
- var9.writeByte(var5.offset); // L: 74
- var9.writeBytes(var5.array, 0, var5.offset); // L: 75
- var9.writeShort(var8.offset); // L: 76
- var9.writeBytes(var8.array, 0, var8.offset); // L: 77
- String var10 = class119.method2745(var9.array); // L: 78
-
- try {
- URL var11 = new URL(WorldMapData_1.method4707("services", false) + "m=accountappeal/login.ws"); // L: 80
- URLConnection var12 = var11.openConnection(); // L: 81
- var12.setDoInput(true); // L: 82
- var12.setDoOutput(true); // L: 83
- var12.setConnectTimeout(5000); // L: 84
- OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream());
- var13.write("data2=" + UserComparator6.method2619(var10) + "&dest=" + UserComparator6.method2619("passwordchoice.ws"));
- var13.flush();
- InputStream var14 = var12.getInputStream();
- var9 = new Buffer(new byte[1000]); // L: 89
-
- do {
- int var15 = var14.read(var9.array, var9.offset, 1000 - var9.offset);
- if (var15 == -1) {
- var13.close();
- var14.close();
- String var18 = new String(var9.array);
- if (var18.startsWith("OFFLINE")) { // L: 101
- return 4;
- } else if (var18.startsWith("WRONG")) {
- return 7; // L: 105
- } else if (var18.startsWith("RELOAD")) { // L: 107
- return 3; // L: 108
- } else if (var18.startsWith("Not permitted for social network accounts.")) { // L: 110
- return 6; // L: 111
- } else {
- var9.xteaDecryptAll(var6); // L: 113
-
- while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 114
- --var9.offset; // L: 115
- }
-
- var18 = new String(var9.array, 0, var9.offset); // L: 117
- boolean var16;
- if (var18 == null) { // L: 120
- var16 = false; // L: 121
- } else {
- label83: {
- try {
- new URL(var18);
- } catch (MalformedURLException var19) { // L: 127
- var16 = false; // L: 128
- break label83; // L: 129
- }
-
- var16 = true; // L: 131
- }
- }
-
- if (var16) { // L: 133
- ScriptEvent.openURL(var18, true, false); // L: 134
- return 2; // L: 135
- } else {
- return 5; // L: 137
- }
- }
- }
-
- var9.offset += var15; // L: 93
- } while(var9.offset < 1000);
-
- return 5;
- } catch (Throwable var20) { // L: 139
- var20.printStackTrace(); // L: 140
- return 5; // L: 141
- }
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "-53"
- )
- @Export("iLog")
- public static int iLog(int var0) {
- int var1 = 0; // L: 85
- if (var0 < 0 || var0 >= 65536) { // L: 86
- var0 >>>= 16; // L: 87
- var1 += 16; // L: 88
- }
-
- if (var0 >= 256) { // L: 90
- var0 >>>= 8; // L: 91
- var1 += 8; // L: 92
- }
-
- if (var0 >= 16) { // L: 94
- var0 >>>= 4; // L: 95
- var1 += 4; // L: 96
- }
-
- if (var0 >= 4) { // L: 98
- var0 >>>= 2; // L: 99
- var1 += 2; // L: 100
- }
-
- if (var0 >= 1) { // L: 102
- var0 >>>= 1; // L: 103
- ++var1; // L: 104
- }
-
- return var0 + var1; // L: 106
- }
+ void vmethod3149(ClanSettings var1) {
+ var1.method2956(this.field1668, this.field1667, this.field1669); // L: 109
+ } // L: 110
}
diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java
index 7d7d67a382..52f34b3903 100644
--- a/runescape-client/src/main/java/class144.java
+++ b/runescape-client/src/main/java/class144.java
@@ -1,169 +1,22 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ef")
+@ObfuscatedName("el")
public abstract class class144 extends Node {
- @ObfuscatedName("nz")
- @ObfuscatedSignature(
- descriptor = "Lki;"
- )
- @Export("mousedOverWidgetIf1")
- static Widget mousedOverWidgetIf1;
-
class144() {
} // L: 49
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1212008489"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "355261812"
)
- abstract void vmethod3037(Buffer var1);
+ abstract void vmethod3137(Buffer var1);
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1640110130"
+ descriptor = "(Lex;I)V",
+ garbageValue = "1368590037"
)
- abstract void vmethod3032(ClanChannel var1);
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lcr;B)V",
- garbageValue = "64"
- )
- @Export("runScriptEvent")
- public static void runScriptEvent(ScriptEvent var0) {
- class10.runScript(var0, 500000, 475000); // L: 108
- } // L: 109
-
- @ObfuscatedName("hc")
- @ObfuscatedSignature(
- descriptor = "(ZLpc;I)V",
- garbageValue = "1354871323"
- )
- @Export("loadRegions")
- static final void loadRegions(boolean var0, PacketBuffer var1) {
- Client.isInInstance = var0; // L: 5556
- int var3;
- int var4;
- int var5;
- int var6;
- int var7;
- int var8;
- if (!Client.isInInstance) { // L: 5557
- int var2 = var1.method7576(); // L: 5558
- var3 = var1.readUnsignedShort(); // L: 5559
- var4 = var1.readUnsignedShort(); // L: 5560
- class138.xteaKeys = new int[var4][4]; // L: 5561
-
- for (var5 = 0; var5 < var4; ++var5) { // L: 5562
- for (var6 = 0; var6 < 4; ++var6) { // L: 5563
- class138.xteaKeys[var5][var6] = var1.readInt(); // L: 5564
- }
- }
-
- class241.regions = new int[var4]; // L: 5567
- class83.regionMapArchiveIds = new int[var4]; // L: 5568
- class17.regionLandArchiveIds = new int[var4]; // L: 5569
- InterfaceParent.regionLandArchives = new byte[var4][]; // L: 5570
- FloorUnderlayDefinition.regionMapArchives = new byte[var4][]; // L: 5571
- boolean var16 = false; // L: 5572
- if (Client.field493) { // L: 5573
- if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5574
- var16 = true;
- }
-
- if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5575
- var16 = true;
- }
- }
-
- var4 = 0; // L: 5577
-
- for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5578
- for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5579
- var8 = var7 + (var6 << 8); // L: 5580
- if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5581
- class241.regions[var4] = var8; // L: 5582
- class83.regionMapArchiveIds[var4] = Message.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5583
- class17.regionLandArchiveIds[var4] = Message.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5584
- ++var4; // L: 5585
- }
- }
- }
-
- class329.method5875(var3, var2, true); // L: 5588
- } else {
- boolean var15 = var1.method7546() == 1; // L: 5591
- var3 = var1.method7554(); // L: 5592
- var4 = var1.method7554(); // L: 5593
- var5 = var1.readUnsignedShort(); // L: 5594
- var1.importIndex(); // L: 5595
-
- int var9;
- for (var6 = 0; var6 < 4; ++var6) { // L: 5596
- for (var7 = 0; var7 < 13; ++var7) { // L: 5597
- for (var8 = 0; var8 < 13; ++var8) { // L: 5598
- var9 = var1.readBits(1); // L: 5599
- if (var9 == 1) {
- Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5600
- } else {
- Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5601
- }
- }
- }
- }
-
- var1.exportIndex(); // L: 5605
- class138.xteaKeys = new int[var5][4]; // L: 5606
-
- for (var6 = 0; var6 < var5; ++var6) { // L: 5607
- for (var7 = 0; var7 < 4; ++var7) { // L: 5608
- class138.xteaKeys[var6][var7] = var1.readInt(); // L: 5609
- }
- }
-
- class241.regions = new int[var5]; // L: 5612
- class83.regionMapArchiveIds = new int[var5]; // L: 5613
- class17.regionLandArchiveIds = new int[var5]; // L: 5614
- InterfaceParent.regionLandArchives = new byte[var5][]; // L: 5615
- FloorUnderlayDefinition.regionMapArchives = new byte[var5][]; // L: 5616
- var5 = 0; // L: 5617
-
- for (var6 = 0; var6 < 4; ++var6) { // L: 5618
- for (var7 = 0; var7 < 13; ++var7) { // L: 5619
- for (var8 = 0; var8 < 13; ++var8) { // L: 5620
- var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5621
- if (var9 != -1) { // L: 5622
- int var10 = var9 >> 14 & 1023; // L: 5623
- int var11 = var9 >> 3 & 2047; // L: 5624
- int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5625
-
- int var13;
- for (var13 = 0; var13 < var5; ++var13) { // L: 5626
- if (class241.regions[var13] == var12) {
- var12 = -1; // L: 5627
- break; // L: 5628
- }
- }
-
- if (var12 != -1) { // L: 5630
- class241.regions[var5] = var12; // L: 5631
- var13 = var12 >> 8 & 255; // L: 5632
- int var14 = var12 & 255; // L: 5633
- class83.regionMapArchiveIds[var5] = Message.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5634
- class17.regionLandArchiveIds[var5] = Message.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5635
- ++var5; // L: 5636
- }
- }
- }
- }
- }
-
- class329.method5875(var3, var4, !var15); // L: 5642
- }
-
- } // L: 5644
+ abstract void vmethod3138(ClanChannel var1);
}
diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java
index d1da2121a2..b3d5058303 100644
--- a/runescape-client/src/main/java/class145.java
+++ b/runescape-client/src/main/java/class145.java
@@ -1,54 +1,59 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ee")
+@ObfuscatedName("eu")
public class class145 {
- @ObfuscatedName("ik")
- @ObfuscatedGetter(
- intValue = -627241765
- )
- static int field1690;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- longValue = -4087609161665050259L
- )
- long field1683;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- longValue = 1088515563671951847L
- )
- long field1688;
- @ObfuscatedName("l")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "[Lqu;"
)
- IterableNodeDeque field1685;
+ @Export("title_muteSprite")
+ static IndexedSprite[] title_muteSprite;
+ @ObfuscatedName("hd")
+ @Export("regionMapArchives")
+ static byte[][] regionMapArchives;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ longValue = -5828286279618007477L
+ )
+ long field1675;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ longValue = 4268736804944836751L
+ )
+ long field1673;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Llk;"
+ )
+ IterableNodeDeque field1676;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
public class145(Buffer var1) {
- this.field1688 = -1L; // L: 10
- this.field1685 = new IterableNodeDeque(); // L: 11
- this.method2985(var1); // L: 19
+ this.field1673 = -1L; // L: 10
+ this.field1676 = new IterableNodeDeque(); // L: 11
+ this.method3074(var1); // L: 19
} // L: 20
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;B)V",
- garbageValue = "-84"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-73"
)
- void method2985(Buffer var1) {
- this.field1683 = var1.readLong(); // L: 23
- this.field1688 = var1.readLong(); // L: 24
+ void method3074(Buffer var1) {
+ this.field1675 = var1.readLong(); // L: 23
+ this.field1673 = var1.readLong(); // L: 24
for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36
Object var3;
if (var2 == 1) { // L: 28
var3 = new class140(this);
- } else if (var2 == 4) {
- var3 = new class151(this); // L: 29
+ } else if (var2 == 4) { // L: 29
+ var3 = new class151(this);
} else if (var2 == 3) { // L: 30
var3 = new class136(this);
} else if (var2 == 2) { // L: 31
@@ -61,41 +66,44 @@ public class class145 {
var3 = new class141(this);
}
- ((class144)var3).vmethod3037(var1); // L: 34
- this.field1685.addFirst((Node)var3); // L: 35
+ ((class144)var3).vmethod3137(var1); // L: 34
+ this.field1676.addFirst((Node)var3); // L: 35
}
} // L: 38
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1678529975"
+ descriptor = "(Lex;B)V",
+ garbageValue = "84"
)
- public void method2987(ClanChannel var1) {
- if (this.field1683 == var1.key && var1.field1709 == this.field1688) { // L: 41
- for (class144 var2 = (class144)this.field1685.last(); var2 != null; var2 = (class144)this.field1685.previous()) { // L: 42
- var2.vmethod3032(var1); // L: 43
+ public void method3075(ClanChannel var1) {
+ if (this.field1675 == var1.key && this.field1673 == var1.field1693) { // L: 41
+ for (class144 var2 = (class144)this.field1676.last(); var2 != null; var2 = (class144)this.field1676.previous()) { // L: 42
+ var2.vmethod3138(var1); // L: 43
}
- ++var1.field1709; // L: 45
+ ++var1.field1693; // L: 45
} else {
throw new RuntimeException("");
}
} // L: 46
- @ObfuscatedName("js")
+ @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "708009599"
+ descriptor = "(Lkb;II)V",
+ garbageValue = "-1531941035"
)
- static boolean method2991(int var0) {
- for (int var1 = 0; var1 < Client.field719; ++var1) { // L: 11734
- if (Client.field721[var1] == var0) { // L: 11735
- return true;
+ @Export("Widget_setKeyIgnoreHeld")
+ static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
+ if (var0.field3448 == null) { // L: 1030
+ throw new RuntimeException(); // L: 1031
+ } else {
+ if (var0.field3517 == null) { // L: 1033
+ var0.field3517 = new int[var0.field3448.length]; // L: 1034
}
- }
- return false; // L: 11737
- }
+ var0.field3517[var1] = Integer.MAX_VALUE; // L: 1036
+ }
+ } // L: 1037
}
diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java
index 109c178579..84a361737f 100644
--- a/runescape-client/src/main/java/class146.java
+++ b/runescape-client/src/main/java/class146.java
@@ -1,139 +1,62 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("es")
+@ObfuscatedName("ep")
public class class146 extends class128 {
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "Lmx;"
- )
- @Export("ItemDefinition_fontPlain11")
- public static Font ItemDefinition_fontPlain11;
- @ObfuscatedName("iv")
- @ObfuscatedSignature(
- descriptor = "[Lqr;"
- )
- @Export("mapMarkerSprites")
- static SpritePixels[] mapMarkerSprites;
- @ObfuscatedName("o")
+ @ObfuscatedName("sg")
@ObfuscatedGetter(
- intValue = 51449257
+ intValue = -1417840077
)
- int field1692;
- @ObfuscatedName("q")
+ static int field1682;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 1435457431
+ intValue = 1388421223
)
- int field1695;
+ int field1683;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 132668311
+ )
+ int field1679;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class146(class131 var1) {
this.this$0 = var1; // L: 271
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1692 = var1.readInt(); // L: 274
- this.field1695 = var1.readInt(); // L: 275
+ void vmethod3150(Buffer var1) {
+ this.field1683 = var1.readInt(); // L: 274
+ this.field1679 = var1.readInt(); // L: 275
} // L: 276
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2909(this.field1692, this.field1695); // L: 279
+ void vmethod3149(ClanSettings var1) {
+ var1.method2965(this.field1683, this.field1679); // L: 279
} // L: 280
- @ObfuscatedName("s")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lbx;",
- garbageValue = "-280328153"
+ descriptor = "(Llh;I)V",
+ garbageValue = "-1659219140"
)
- @Export("getNextWorldListWorld")
- static World getNextWorldListWorld() {
- return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 252 253
- }
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "605367947"
- )
- static final int method2993() {
- return ViewportMouse.ViewportMouse_x; // L: 102
- }
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(II)Lds;",
- garbageValue = "1375495552"
- )
- static class122 method2997(int var0) {
- class122 var1 = (class122)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0); // L: 362
- if (var1 != null) { // L: 363
- return var1;
- } else {
- var1 = PendingSpawn.method2161(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 364
- if (var1 != null) { // L: 365
- SequenceDefinition.SequenceDefinition_cachedModel.put(var1, (long)var0);
- }
-
- return var1; // L: 366
- }
- }
-
- @ObfuscatedName("kn")
- @ObfuscatedSignature(
- descriptor = "(Lki;B)Lki;",
- garbageValue = "-106"
- )
- static Widget method2992(Widget var0) {
- Widget var2 = var0; // L: 11947
- int var4 = UrlRequester.getWidgetFlags(var0); // L: 11950
- int var3 = var4 >> 17 & 7; // L: 11952
- int var5 = var3; // L: 11954
- Widget var1;
- if (var3 == 0) { // L: 11955
- var1 = null; // L: 11956
- } else {
- int var6 = 0;
-
- while (true) {
- if (var6 >= var5) {
- var1 = var2; // L: 11966
- break;
- }
-
- var2 = class92.getWidget(var2.parentId); // L: 11960
- if (var2 == null) { // L: 11961
- var1 = null; // L: 11962
- break; // L: 11963
- }
-
- ++var6; // L: 11959
- }
- }
-
- Widget var7 = var1; // L: 11968
- if (var1 == null) { // L: 11969
- var7 = var0.parent;
- }
-
- return var7; // L: 11970
- }
+ public static void method3082(AbstractArchive var0) {
+ FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; // L: 26
+ } // L: 27
}
diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java
index e9f7fbcea0..4405faaddb 100644
--- a/runescape-client/src/main/java/class147.java
+++ b/runescape-client/src/main/java/class147.java
@@ -3,62 +3,48 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("eg")
+@ObfuscatedName("em")
public class class147 extends class128 {
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 1715614877
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
)
- @Export("KitDefinition_fileCount")
- public static int KitDefinition_fileCount;
- @ObfuscatedName("ej")
+ @Export("SpotAnimationDefinition_modelArchive")
+ public static AbstractArchive SpotAnimationDefinition_modelArchive;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- longValue = 7229837819444879765L
+ intValue = -1269941877
)
- static long field1704;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 876557161
- )
- int field1699;
+ int field1686;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class147(class131 var1) {
this.this$0 = var1;
- this.field1699 = -1; // L: 144
+ this.field1686 = -1; // L: 144
} // L: 146
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1699 = var1.readUnsignedShort(); // L: 149
+ void vmethod3150(Buffer var1) {
+ this.field1686 = var1.readUnsignedShort(); // L: 149
} // L: 150
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2894(this.field1699); // L: 153
+ void vmethod3149(ClanSettings var1) {
+ var1.method3016(this.field1686); // L: 153
} // L: 154
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "107"
- )
- public static int method3000(int var0) {
- return class271.field3220[var0]; // L: 49
- }
}
diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java
index c97a71d9e8..7fbe271d03 100644
--- a/runescape-client/src/main/java/class149.java
+++ b/runescape-client/src/main/java/class149.java
@@ -2,33 +2,23 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ex")
+@ObfuscatedName("ey")
public class class149 {
- @ObfuscatedName("hr")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lmx;"
+ descriptor = "(IIIB)Lbi;",
+ garbageValue = "-90"
)
- @Export("fontPlain12")
- static Font fontPlain12;
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1924718791"
- )
- static void method3024() {
- Tiles.Tiles_minPlane = 99; // L: 48
- Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49
- Tiles.Tiles_overlays = new byte[4][104][104]; // L: 50
- Tiles.Tiles_shapes = new byte[4][104][104]; // L: 51
- RunException.field4812 = new byte[4][104][104]; // L: 52
- VerticalAlignment.field1993 = new int[4][105][105]; // L: 53
- NPC.field1259 = new byte[4][105][105]; // L: 54
- Interpreter.field839 = new int[105][105]; // L: 55
- class154.Tiles_hue = new int[104]; // L: 56
- MusicPatch.Tiles_saturation = new int[104]; // L: 57
- WallDecoration.Tiles_lightness = new int[104]; // L: 58
- Tiles.Tiles_hueMultiplier = new int[104]; // L: 59
- MenuAction.field866 = new int[104]; // L: 60
- } // L: 61
+ @Export("getWorldMapScript")
+ static Script getWorldMapScript(int var0, int var1, int var2) {
+ int var3 = (var1 << 8) + var0; // L: 40
+ Script var5 = Huffman.method5480(var3, var0); // L: 43
+ if (var5 != null) { // L: 44
+ return var5; // L: 45
+ } else {
+ int var6 = (-3 - var2 << 8) + var0; // L: 49
+ var5 = Huffman.method5480(var6, var0); // L: 52
+ return var5 != null ? var5 : null; // L: 53 56
+ }
+ }
}
diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java
index 5a8bb19e66..23c8f0ccf4 100644
--- a/runescape-client/src/main/java/class15.java
+++ b/runescape-client/src/main/java/class15.java
@@ -12,10 +12,15 @@ import net.runelite.mapping.ObfuscatedSignature;
import org.bouncycastle.crypto.tls.TlsClientProtocol;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-@ObfuscatedName("g")
+@ObfuscatedName("k")
public class class15 extends SSLSocketFactory {
- @ObfuscatedName("o")
- SecureRandom field78;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lk;"
+ )
+ public static class15 field85;
+ @ObfuscatedName("c")
+ SecureRandom field86;
static {
if (Security.getProvider("BC") == null) { // L: 40
@@ -25,52 +30,52 @@ public class class15 extends SSLSocketFactory {
} // L: 41
public class15() {
- this.field78 = new SecureRandom(); // L: 43
- }
+ this.field86 = new SecureRandom(); // L: 43
+ } // L: 46
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;",
- garbageValue = "-2042805034"
+ descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;",
+ garbageValue = "-63"
)
- SSLSocket method169(String var1, TlsClientProtocol var2) {
- return new class12(this, var2, var1); // L: 88
- }
-
- public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException {
- if (var1 == null) { // L: 47
- var1 = new Socket(); // L: 48
- }
-
- if (!var1.isConnected()) { // L: 50
- var1.connect(new InetSocketAddress(var2, var3)); // L: 51
- }
-
- TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field78); // L: 53
- return this.method169(var2, var5); // L: 54
+ SSLSocket method164(String var1, TlsClientProtocol var2) {
+ return new class12(this, var2, var1); // L: 91
}
public String[] getDefaultCipherSuites() {
- return null; // L: 59
+ return null; // L: 62
+ }
+
+ public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException {
+ if (var1 == null) { // L: 50
+ var1 = new Socket(); // L: 51
+ }
+
+ if (!var1.isConnected()) { // L: 53
+ var1.connect(new InetSocketAddress(var2, var3)); // L: 54
+ }
+
+ TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field86); // L: 56
+ return this.method164(var2, var5); // L: 57
}
public String[] getSupportedCipherSuites() {
- return null; // L: 64
+ return null; // L: 67
}
public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException {
- return null; // L: 69
+ return null; // L: 72
}
public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException {
- return null; // L: 79
- }
-
- public Socket createSocket(InetAddress var1, int var2) throws IOException {
- return null; // L: 74
+ return null; // L: 82
}
public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException {
- return null; // L: 84
+ return null; // L: 87
+ }
+
+ public Socket createSocket(InetAddress var1, int var2) throws IOException {
+ return null; // L: 77
}
}
diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java
index 8e7c14685b..6c9e97a026 100644
--- a/runescape-client/src/main/java/class150.java
+++ b/runescape-client/src/main/java/class150.java
@@ -1,70 +1,129 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ei")
+@ObfuscatedName("ev")
public class class150 extends class128 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- longValue = 2165429326426467319L
+ @ObfuscatedName("rf")
+ @ObfuscatedSignature(
+ descriptor = "Lex;"
)
- long field1722;
- @ObfuscatedName("q")
- String field1720;
+ @Export("guestClanChannel")
+ static ClanChannel guestClanChannel;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ longValue = -8713006525766535939L
+ )
+ long field1707;
+ @ObfuscatedName("v")
+ String field1708;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class150(class131 var1) {
this.this$0 = var1;
- this.field1722 = -1L; // L: 194
- this.field1720 = null; // L: 195
+ this.field1707 = -1L; // L: 194
+ this.field1708 = null; // L: 195
} // L: 197
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
+ void vmethod3150(Buffer var1) {
if (var1.readUnsignedByte() != 255) { // L: 200
--var1.offset; // L: 201
- this.field1722 = var1.readLong(); // L: 202
+ this.field1707 = var1.readLong(); // L: 202
}
- this.field1720 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204
+ this.field1708 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204
} // L: 205
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- void vmethod3041(ClanSettings var1) {
- var1.method2891(this.field1722, this.field1720); // L: 208
+ void vmethod3149(ClanSettings var1) {
+ var1.method2959(this.field1707, this.field1708); // L: 208
} // L: 209
- @ObfuscatedName("lq")
+ @ObfuscatedName("iv")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
- garbageValue = "773068902"
+ descriptor = "(III)V",
+ garbageValue = "-22445945"
)
- static String method3026(String var0) {
- PlayerType[] var1 = class118.PlayerType_values(); // L: 12681
+ static final void method3135(int var0, int var1) {
+ if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8437
+ if (Client.showMouseOverText) { // L: 8438
+ int var2 = class240.method5005(); // L: 8439
+ String var3;
+ if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8441
+ var3 = "Use" + " " + Client.selectedItemName + " " + "->";
+ } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8442
+ var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+ } else {
+ String var4;
+ if (var2 < 0) { // L: 8446
+ var4 = ""; // L: 8447
+ } else if (Client.menuTargets[var2].length() > 0) { // L: 8450
+ var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2];
+ } else {
+ var4 = Client.menuActions[var2]; // L: 8451
+ }
- for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12682
- PlayerType var3 = var1[var2]; // L: 12683
- if (var3.modIcon != -1 && var0.startsWith(StudioGame.method5590(var3.modIcon))) { // L: 12685 12686
- var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12687
- break;
+ var3 = var4; // L: 8453
+ }
+
+ if (Client.menuOptionsCount > 2) { // L: 8455
+ var3 = var3 + class122.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+ }
+
+ TileItem.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8456
}
}
+ } // L: 8457
- return var0; // L: 12694
- }
+ @ObfuscatedName("jy")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;Lgs;IIZB)V",
+ garbageValue = "119"
+ )
+ @Export("addWidgetItemMenuItem")
+ static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
+ String[] var5 = var1.inventoryActions; // L: 10868
+ byte var6 = -1; // L: 10869
+ String var7 = null; // L: 10870
+ if (var5 != null && var5[var3] != null) { // L: 10871
+ if (var3 == 0) { // L: 10872
+ var6 = 33;
+ } else if (var3 == 1) { // L: 10873
+ var6 = 34;
+ } else if (var3 == 2) {
+ var6 = 35; // L: 10874
+ } else if (var3 == 3) { // L: 10875
+ var6 = 36;
+ } else {
+ var6 = 37; // L: 10876
+ }
+
+ var7 = var5[var3]; // L: 10877
+ } else if (var3 == 4) { // L: 10880
+ var6 = 37; // L: 10881
+ var7 = "Drop"; // L: 10882
+ }
+
+ if (var6 != -1 && var7 != null) { // L: 10885
+ class268.insertMenuItem(var7, class122.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10886
+ }
+
+ } // L: 10888
}
diff --git a/runescape-client/src/main/java/class151.java b/runescape-client/src/main/java/class151.java
index a1a16be7f1..959e2455d4 100644
--- a/runescape-client/src/main/java/class151.java
+++ b/runescape-client/src/main/java/class151.java
@@ -1,59 +1,199 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ey")
+@ObfuscatedName("ee")
public class class151 extends class144 {
- @ObfuscatedName("pn")
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 692320949
+ intValue = -1270572839
)
- static int field1729;
- @ObfuscatedName("o")
- String field1728;
+ @Export("musicTrackFileId")
+ public static int musicTrackFileId;
+ @ObfuscatedName("c")
+ String field1712;
+ @ObfuscatedName("v")
+ byte field1710;
@ObfuscatedName("q")
- byte field1725;
- @ObfuscatedName("l")
- byte field1727;
+ byte field1711;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lee;"
+ descriptor = "Leu;"
)
final class145 this$0;
@ObfuscatedSignature(
- descriptor = "(Lee;)V"
+ descriptor = "(Leu;)V"
)
class151(class145 var1) {
this.this$0 = var1; // L: 155
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "1212008489"
+ descriptor = "(Lqt;I)V",
+ garbageValue = "355261812"
)
- void vmethod3037(Buffer var1) {
- this.field1728 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158
- if (this.field1728 != null) { // L: 159
+ void vmethod3137(Buffer var1) {
+ this.field1712 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158
+ if (this.field1712 != null) { // L: 159
var1.readUnsignedByte(); // L: 160
- this.field1725 = var1.readByte(); // L: 161
- this.field1727 = var1.readByte(); // L: 162
+ this.field1710 = var1.readByte(); // L: 161
+ this.field1711 = var1.readByte(); // L: 162
}
} // L: 164
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Let;I)V",
- garbageValue = "1640110130"
+ descriptor = "(Lex;I)V",
+ garbageValue = "1368590037"
)
- void vmethod3032(ClanChannel var1) {
- var1.name = this.field1728; // L: 167
- if (this.field1728 != null) { // L: 168
- var1.field1711 = this.field1725; // L: 169
- var1.field1706 = this.field1727; // L: 170
+ void vmethod3138(ClanChannel var1) {
+ var1.name = this.field1712; // L: 167
+ if (this.field1712 != null) { // L: 168
+ var1.field1695 = this.field1710; // L: 169
+ var1.field1696 = this.field1711; // L: 170
}
} // L: 172
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lbc;",
+ garbageValue = "1585435431"
+ )
+ @Export("worldListStart")
+ static World worldListStart() {
+ World.World_listCount = 0; // L: 237
+ return Interpreter.getNextWorldListWorld(); // L: 238
+ }
+
+ @ObfuscatedName("h")
+ @ObfuscatedSignature(
+ descriptor = "(Lap;S)V",
+ garbageValue = "-24407"
+ )
+ static void method3136(GameEngine var0) {
+ while (class18.isKeyDown()) { // L: 1835
+ if (class272.field3196 == 13) { // L: 1836
+ Tiles.method2021(); // L: 1837
+ return; // L: 1838
+ }
+
+ if (class272.field3196 == 96) { // L: 1840
+ if (Login.worldSelectPage > 0 && class266.worldSelectLeftSprite != null) { // L: 1841
+ --Login.worldSelectPage; // L: 1842
+ }
+ } else if (class272.field3196 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && SceneTilePaint.worldSelectRightSprite != null) { // L: 1845 1846
+ ++Login.worldSelectPage; // L: 1847
+ }
+ }
+
+ if (MouseHandler.MouseHandler_lastButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1851
+ int var1 = Login.xPadding + 280; // L: 1852
+ if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1853
+ ReflectionCheck.changeWorldSelectSorting(0, 0); // L: 1854
+ return; // L: 1855
+ }
+
+ if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1857
+ ReflectionCheck.changeWorldSelectSorting(0, 1); // L: 1858
+ return; // L: 1859
+ }
+
+ int var2 = Login.xPadding + 390; // L: 1861
+ if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1862
+ ReflectionCheck.changeWorldSelectSorting(1, 0); // L: 1863
+ return; // L: 1864
+ }
+
+ if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1866
+ ReflectionCheck.changeWorldSelectSorting(1, 1); // L: 1867
+ return; // L: 1868
+ }
+
+ int var3 = Login.xPadding + 500; // L: 1870
+ if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1871
+ ReflectionCheck.changeWorldSelectSorting(2, 0); // L: 1872
+ return; // L: 1873
+ }
+
+ if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1875
+ ReflectionCheck.changeWorldSelectSorting(2, 1); // L: 1876
+ return; // L: 1877
+ }
+
+ int var4 = Login.xPadding + 610; // L: 1879
+ if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1880
+ ReflectionCheck.changeWorldSelectSorting(3, 0); // L: 1881
+ return; // L: 1882
+ }
+
+ if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1884
+ ReflectionCheck.changeWorldSelectSorting(3, 1); // L: 1885
+ return; // L: 1886
+ }
+
+ if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1888
+ Tiles.method2021(); // L: 1889
+ return; // L: 1890
+ }
+
+ if (Login.hoveredWorldIndex != -1) { // L: 1892
+ World var5 = class362.World_worlds[Login.hoveredWorldIndex]; // L: 1893
+ class295.changeWorld(var5); // L: 1894
+ Tiles.method2021(); // L: 1895
+ return; // L: 1896
+ }
+
+ if (Login.worldSelectPage > 0 && class266.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class266.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class78.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class78.canvasHeight / 2 + 50) { // L: 1898
+ --Login.worldSelectPage; // L: 1899
+ }
+
+ if (Login.worldSelectPage < Login.worldSelectPagesCount && SceneTilePaint.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Script.canvasWidth - SceneTilePaint.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Script.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class78.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class78.canvasHeight / 2 + 50) { // L: 1901
+ ++Login.worldSelectPage; // L: 1902
+ }
+ }
+
+ } // L: 1905
+
+ @ObfuscatedName("hz")
+ @ObfuscatedSignature(
+ descriptor = "(Lcg;I)V",
+ garbageValue = "47717415"
+ )
+ static final void method3146(PendingSpawn var0) {
+ long var1 = 0L; // L: 7795
+ int var3 = -1; // L: 7796
+ int var4 = 0; // L: 7797
+ int var5 = 0; // L: 7798
+ if (var0.type == 0) { // L: 7799
+ var1 = class356.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
+ }
+
+ if (var0.type == 1) { // L: 7800
+ var1 = class356.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
+ }
+
+ if (var0.type == 2) { // L: 7801
+ var1 = class356.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
+ }
+
+ if (var0.type == 3) { // L: 7802
+ var1 = class356.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
+ }
+
+ if (0L != var1) { // L: 7803
+ int var6 = class356.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7804
+ var3 = Decimator.Entity_unpackID(var1); // L: 7805
+ var4 = var6 & 31; // L: 7806
+ var5 = var6 >> 6 & 3; // L: 7807
+ }
+
+ var0.objectId = var3; // L: 7809
+ var0.field1122 = var4; // L: 7810
+ var0.field1121 = var5; // L: 7811
+ } // L: 7812
}
diff --git a/runescape-client/src/main/java/class152.java b/runescape-client/src/main/java/class152.java
index f2887bc453..9a4efde9e5 100644
--- a/runescape-client/src/main/java/class152.java
+++ b/runescape-client/src/main/java/class152.java
@@ -1,128 +1,62 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ep")
+@ObfuscatedName("ef")
public class class152 extends class128 {
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "Lan;"
- )
- @Export("soundCache")
- public static SoundCache soundCache;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -1265615631
+ intValue = 557898497
)
- int field1731;
- @ObfuscatedName("q")
+ int field1715;
+ @ObfuscatedName("v")
@ObfuscatedGetter(
- longValue = 811865021811254987L
+ longValue = -6189068569361167089L
)
- long field1732;
+ long field1716;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leh;"
+ descriptor = "Lej;"
)
final class131 this$0;
@ObfuscatedSignature(
- descriptor = "(Leh;)V"
+ descriptor = "(Lej;)V"
)
class152(class131 var1) {
this.this$0 = var1; // L: 307
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-611912046"
+ descriptor = "(Lqt;B)V",
+ garbageValue = "5"
)
- void vmethod3040(Buffer var1) {
- this.field1731 = var1.readInt(); // L: 310
- this.field1732 = var1.readLong(); // L: 311
+ void vmethod3150(Buffer var1) {
+ this.field1715 = var1.readInt(); // L: 310
+ this.field1716 = var1.readLong(); // L: 311
} // L: 312
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lek;B)V",
- garbageValue = "-73"
- )
- void vmethod3041(ClanSettings var1) {
- var1.method2889(this.field1731, this.field1732); // L: 315
- } // L: 316
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "-1235895203"
- )
- public static boolean method3039(int var0) {
- return (var0 >> 22 & 1) != 0; // L: 21
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1863816537"
- )
- static void method3044() {
- Messages.Messages_channels.clear(); // L: 50
- Messages.Messages_hashTable.clear(); // L: 51
- Messages.Messages_queue.clear(); // L: 52
- Messages.Messages_count = 0; // L: 53
- } // L: 54
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(IIZI)Ljava/lang/String;",
- garbageValue = "-2058943082"
- )
- static String method3046(int var0, int var1, boolean var2) {
- if (var1 >= 2 && var1 <= 36) { // L: 111
- if (var2 && var0 >= 0) { // L: 112
- int var3 = 2; // L: 113
-
- for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 114 115 117
- var4 /= var1; // L: 116
- }
-
- char[] var5 = new char[var3]; // L: 119
- var5[0] = '+'; // L: 120
-
- for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 121
- int var7 = var0; // L: 122
- var0 /= var1; // L: 123
- int var8 = var7 - var0 * var1; // L: 124
- if (var8 >= 10) { // L: 125
- var5[var6] = (char)(var8 + 87);
- } else {
- var5[var6] = (char)(var8 + 48); // L: 126
- }
- }
-
- return new String(var5); // L: 128
- } else {
- return Integer.toString(var0, var1);
- }
- } else {
- throw new IllegalArgumentException("" + var1);
- }
- }
-
@ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lki;IIII)V",
- garbageValue = "-48842919"
+ descriptor = "(Len;I)V",
+ garbageValue = "-1718344311"
)
- @Export("Widget_setKeyRate")
- static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
- if (var0.field3476 == null) { // L: 1012
- throw new RuntimeException(); // L: 1013
+ void vmethod3149(ClanSettings var1) {
+ var1.method2967(this.field1715, this.field1716); // L: 315
+ } // L: 316
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(III)I",
+ garbageValue = "2011587938"
+ )
+ static int method3147(int var0, int var1) {
+ ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14
+ if (var2 == null) { // L: 15
+ return -1;
} else {
- var0.field3476[var1] = var2; // L: 1015
- var0.field3481[var1] = var3; // L: 1016
+ return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17
}
- } // L: 1017
+ }
}
diff --git a/runescape-client/src/main/java/class154.java b/runescape-client/src/main/java/class154.java
index db879e656d..deb86bf1bb 100644
--- a/runescape-client/src/main/java/class154.java
+++ b/runescape-client/src/main/java/class154.java
@@ -2,83 +2,728 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ez")
-public class class154 extends class166 {
- @ObfuscatedName("v")
- @Export("Tiles_hue")
- static int[] Tiles_hue;
- @ObfuscatedName("o")
- String field1738;
+@ObfuscatedName("et")
+public class class154 extends class165 {
+ @ObfuscatedName("c")
+ String field1720;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leq;"
+ descriptor = "Les;"
)
final class155 this$0;
@ObfuscatedSignature(
- descriptor = "(Leq;Ljava/lang/String;Ljava/lang/String;)V"
+ descriptor = "(Les;Ljava/lang/String;Ljava/lang/String;)V"
)
class154(class155 var1, String var2, String var3) {
- super(var1, var2); // L: 372
- this.this$0 = var1; // L: 371
- this.field1738 = var3; // L: 373
- } // L: 374
+ super(var1, var2); // L: 390
+ this.this$0 = var1; // L: 389
+ this.field1720 = var3; // L: 391
+ } // L: 392
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1005057629"
+ descriptor = "(B)I",
+ garbageValue = "-118"
)
- public int vmethod3227() {
- return 1; // L: 377
+ public int vmethod3314() {
+ return 1; // L: 395
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(B)Ljava/lang/String;",
- garbageValue = "59"
+ garbageValue = "11"
)
- public String vmethod3238() {
- return this.field1738; // L: 382
+ public String vmethod3320() {
+ return this.field1720; // L: 400
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;I)Z",
- garbageValue = "169526997"
+ descriptor = "(CI)Z",
+ garbageValue = "-431729145"
)
- public static boolean method3059(AbstractArchive var0, AbstractArchive var1) {
- GrandExchangeOfferWorldComparator.WorldMapElement_archive = var1; // L: 44
- if (!var0.isFullyLoaded()) { // L: 45
- return false; // L: 46
- } else {
- WorldMapElement.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48
- class344.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 49
+ static final boolean method3163(char var0) {
+ return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
+ }
- for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 50
- byte[] var3 = var0.takeFile(35, var2); // L: 51
- class344.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52
- if (var3 != null) { // L: 53
- class344.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54
- class344.WorldMapElement_cached[var2].method3291(); // L: 55
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(III)I",
+ garbageValue = "678269677"
+ )
+ static int method3170(int var0, int var1) {
+ if (var0 == -2) { // L: 15
+ return 12345678;
+ } else if (var0 == -1) { // L: 16
+ if (var1 < 0) { // L: 17
+ var1 = 0; // L: 18
+ } else if (var1 > 127) { // L: 20
+ var1 = 127; // L: 21
+ }
+
+ var1 = 127 - var1; // L: 23
+ return var1; // L: 24
+ } else {
+ var1 = (var0 & 127) * var1 / 128; // L: 26
+ if (var1 < 2) { // L: 27
+ var1 = 2;
+ } else if (var1 > 126) { // L: 28
+ var1 = 126;
+ }
+
+ return (var0 & 65408) + var1; // L: 29
+ }
+ }
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(IIIB)I",
+ garbageValue = "-54"
+ )
+ static final int method3169(int var0, int var1, int var2) {
+ int var3 = var0 / var2; // L: 881
+ int var4 = var0 & var2 - 1; // L: 882
+ int var5 = var1 / var2; // L: 883
+ int var6 = var1 & var2 - 1; // L: 884
+ int var7 = SoundSystem.method740(var3, var5); // L: 885
+ int var8 = SoundSystem.method740(var3 + 1, var5); // L: 886
+ int var9 = SoundSystem.method740(var3, var5 + 1); // L: 887
+ int var10 = SoundSystem.method740(var3 + 1, var5 + 1); // L: 888
+ int var11 = SequenceDefinition.method3827(var7, var8, var4, var2); // L: 889
+ int var12 = SequenceDefinition.method3827(var9, var10, var4, var2); // L: 890
+ int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 893
+ int var13 = ((65536 - var14) * var11 >> 16) + (var12 * var14 >> 16); // L: 894
+ return var13; // L: 896
+ }
+
+ @ObfuscatedName("hu")
+ @ObfuscatedSignature(
+ descriptor = "(Lcj;IIIIII)V",
+ garbageValue = "678056346"
+ )
+ @Export("drawActor2d")
+ static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
+ if (var0 != null && var0.isVisible()) { // L: 4957
+ if (var0 instanceof NPC) { // L: 4958
+ NPCComposition var6 = ((NPC)var0).definition; // L: 4959
+ if (var6.transforms != null) { // L: 4960
+ var6 = var6.transform();
+ }
+
+ if (var6 == null) { // L: 4961
+ return;
}
}
- return true; // L: 58
- }
- }
+ int var76 = Players.Players_count; // L: 4963
+ int[] var7 = Players.Players_indices; // L: 4964
+ byte var8 = 0; // L: 4965
+ Player var10;
+ int var92;
+ if (var1 < var76 && var0.playerCycle == Client.cycle) { // L: 4966
+ var10 = (Player)var0; // L: 4968
+ boolean var9;
+ if (Client.drawPlayerNames == 0) { // L: 4970
+ var9 = false; // L: 4971
+ } else if (var10 != class101.localPlayer) { // L: 4974
+ boolean var11 = (Client.drawPlayerNames & 4) != 0; // L: 4977
+ boolean var12 = var11; // L: 4979
+ if (!var11) { // L: 4980
+ boolean var13 = (Client.drawPlayerNames & 1) != 0; // L: 4983
+ var12 = var13 && var10.isFriend(); // L: 4985
+ }
+
+ var9 = var12 || Language.method6070() && var10.isFriendsChatMember(); // L: 4987
+ } else {
+ var9 = class138.method2944(); // L: 4989
+ }
+
+ if (var9) { // L: 4991
+ Player var77 = (Player)var0; // L: 4992
+ if (var1 < var76) { // L: 4993
+ var92 = var0.defaultHeight + 15; // L: 4994
+ class220.worldToScreen(var0.x, var0.y, var92); // L: 4996
+ AbstractFont var78 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4998
+ byte var14 = 9; // L: 4999
+ var78.drawCentered(var77.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var14, 16777215, 0); // L: 5000
+ var8 = 18; // L: 5001
+ }
+ }
+ }
+
+ int var89 = -2; // L: 5005
+ int var17;
+ int var23;
+ int var24;
+ int var79;
+ if (!var0.healthBars.method6147()) { // L: 5006
+ var79 = var0.defaultHeight + 15; // L: 5007
+ class220.worldToScreen(var0.x, var0.y, var79); // L: 5009
+
+ for (HealthBar var96 = (HealthBar)var0.healthBars.last(); var96 != null; var96 = (HealthBar)var0.healthBars.previous()) { // L: 5011
+ HealthBarUpdate var81 = var96.get(Client.cycle); // L: 5012
+ if (var81 == null) { // L: 5013
+ if (var96.isEmpty()) { // L: 5071
+ var96.remove();
+ }
+ } else {
+ HealthBarDefinition var97 = var96.definition; // L: 5014
+ SpritePixels var82 = var97.getBackSprite(); // L: 5015
+ SpritePixels var83 = var97.getFrontSprite(); // L: 5016
+ var17 = 0; // L: 5018
+ int var84;
+ if (var82 != null && var83 != null) { // L: 5019
+ if (var97.widthPadding * 2 < var83.subWidth) { // L: 5020
+ var17 = var97.widthPadding;
+ }
+
+ var84 = var83.subWidth - var17 * 2; // L: 5021
+ } else {
+ var84 = var97.width; // L: 5023
+ }
+
+ int var18 = 255; // L: 5024
+ boolean var85 = true; // L: 5025
+ int var86 = Client.cycle - var81.cycle; // L: 5026
+ int var87 = var84 * var81.health2 / var97.width; // L: 5027
+ int var88;
+ int var99;
+ if (var81.cycleOffset > var86) { // L: 5028
+ var88 = var97.field1881 == 0 ? 0 : var97.field1881 * (var86 / var97.field1881); // L: 5029
+ var23 = var84 * var81.health / var97.width; // L: 5030
+ var99 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 5031
+ } else {
+ var99 = var87; // L: 5034
+ var88 = var97.int5 + var81.cycleOffset - var86; // L: 5035
+ if (var97.int3 >= 0) { // L: 5036
+ var18 = (var88 << 8) / (var97.int5 - var97.int3);
+ }
+ }
+
+ if (var81.health2 > 0 && var99 < 1) { // L: 5038
+ var99 = 1;
+ }
+
+ if (var82 != null && var83 != null) { // L: 5039
+ if (var84 == var99) { // L: 5040
+ var99 += var17 * 2;
+ } else {
+ var99 += var17; // L: 5041
+ }
+
+ var88 = var82.subHeight; // L: 5042
+ var89 += var88; // L: 5043
+ var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 5044
+ var24 = var3 + Client.viewportTempY - var89; // L: 5045
+ var23 -= var17; // L: 5046
+ if (var18 >= 0 && var18 < 255) { // L: 5047
+ var82.drawTransAt(var23, var24, var18); // L: 5048
+ Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var99 + var23, var24 + var88); // L: 5049
+ var83.drawTransAt(var23, var24, var18); // L: 5050
+ } else {
+ var82.drawTransBgAt(var23, var24); // L: 5053
+ Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var99 + var23, var88 + var24); // L: 5054
+ var83.drawTransBgAt(var23, var24); // L: 5055
+ }
+
+ Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5057
+ var89 += 2; // L: 5058
+ } else {
+ var89 += 5; // L: 5061
+ if (Client.viewportTempX > -1) { // L: 5062
+ var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 5063
+ var23 = var3 + Client.viewportTempY - var89; // L: 5064
+ Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var99, 5, 65280); // L: 5065
+ Rasterizer2D.Rasterizer2D_fillRectangle(var88 + var99, var23, var84 - var99, 5, 16711680); // L: 5066
+ }
+
+ var89 += 2; // L: 5068
+ }
+ }
+ }
+ }
+
+ if (var89 == -2) { // L: 5074
+ var89 += 7;
+ }
+
+ var89 += var8; // L: 5075
+ int var91;
+ if (var1 < var76) { // L: 5076
+ var10 = (Player)var0; // L: 5077
+ if (var10.isHidden) { // L: 5078
+ return;
+ }
+
+ if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 5079
+ var91 = var0.defaultHeight + 15; // L: 5080
+ class220.worldToScreen(var0.x, var0.y, var91); // L: 5082
+ if (Client.viewportTempX > -1) { // L: 5084
+ if (var10.headIconPk != -1) { // L: 5085
+ var89 += 25; // L: 5086
+ Message.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5087
+ }
+
+ if (var10.headIconPrayer != -1) { // L: 5089
+ var89 += 25; // L: 5090
+ class28.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5091
+ }
+ }
+ }
+
+ if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 5095
+ var91 = var0.defaultHeight + 15; // L: 5096
+ class220.worldToScreen(var0.x, var0.y, var91); // L: 5098
+ if (Client.viewportTempX > -1) { // L: 5100
+ var89 += UserComparator4.headIconHintSprites[1].subHeight; // L: 5101
+ UserComparator4.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5102
+ }
+ }
+ } else {
+ NPCComposition var90 = ((NPC)var0).definition; // L: 5107
+ if (var90.transforms != null) { // L: 5108
+ var90 = var90.transform();
+ }
+
+ if (var90.headIconPrayer >= 0 && var90.headIconPrayer < class28.headIconPrayerSprites.length) { // L: 5109
+ var91 = var0.defaultHeight + 15; // L: 5110
+ class220.worldToScreen(var0.x, var0.y, var91); // L: 5112
+ if (Client.viewportTempX > -1) { // L: 5114
+ class28.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5115
+ }
+ }
+
+ if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5118
+ var91 = var0.defaultHeight + 15; // L: 5119
+ class220.worldToScreen(var0.x, var0.y, var91); // L: 5121
+ if (Client.viewportTempX > -1) { // L: 5123
+ UserComparator4.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
+ }
+ }
+ }
+
+ if (var0.overheadText != null && (var1 >= var76 || !var0.field1152 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5126 5127
+ var79 = var0.defaultHeight; // L: 5128
+ class220.worldToScreen(var0.x, var0.y, var79); // L: 5130
+ if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5132
+ Client.overheadTextXOffsets[Client.overheadTextCount] = TileItem.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5133
+ Client.overheadTextAscents[Client.overheadTextCount] = TileItem.fontBold12.ascent; // L: 5134
+ Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5135
+ Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5136
+ Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5137
+ Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5138
+ Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5139
+ Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5140
+ ++Client.overheadTextCount; // L: 5141
+ }
+ }
+
+ for (var79 = 0; var79 < 4; ++var79) { // L: 5145
+ var91 = var0.hitSplatCycles[var79]; // L: 5146
+ var92 = var0.hitSplatTypes[var79]; // L: 5147
+ HitSplatDefinition var98 = null; // L: 5148
+ int var93 = 0; // L: 5149
+ if (var92 >= 0) { // L: 5150
+ if (var91 <= Client.cycle) { // L: 5151
+ continue;
+ }
+
+ var98 = class122.method2800(var0.hitSplatTypes[var79]); // L: 5152
+ var93 = var98.field2026; // L: 5153
+ if (var98 != null && var98.transforms != null) { // L: 5154
+ var98 = var98.transform(); // L: 5155
+ if (var98 == null) { // L: 5156
+ var0.hitSplatCycles[var79] = -1; // L: 5157
+ continue; // L: 5158
+ }
+ }
+ } else if (var91 < 0) { // L: 5162
+ continue;
+ }
+
+ int var15 = var0.hitSplatTypes2[var79]; // L: 5163
+ HitSplatDefinition var16 = null; // L: 5164
+ if (var15 >= 0) { // L: 5165
+ var16 = class122.method2800(var15); // L: 5166
+ if (var16 != null && var16.transforms != null) { // L: 5167
+ var16 = var16.transform();
+ }
+ }
+
+ if (var91 - var93 <= Client.cycle) { // L: 5169
+ if (var98 == null) { // L: 5170
+ var0.hitSplatCycles[var79] = -1; // L: 5171
+ } else {
+ var17 = var0.defaultHeight / 2; // L: 5174
+ class220.worldToScreen(var0.x, var0.y, var17); // L: 5176
+ if (Client.viewportTempX > -1) { // L: 5178
+ boolean var94 = true; // L: 5179
+ if (var79 == 1) { // L: 5180
+ Client.viewportTempY -= 20; // L: 5181
+ }
+
+ if (var79 == 2) { // L: 5183
+ Client.viewportTempX -= 15; // L: 5184
+ Client.viewportTempY -= 10; // L: 5185
+ }
+
+ if (var79 == 3) { // L: 5187
+ Client.viewportTempX += 15; // L: 5188
+ Client.viewportTempY -= 10; // L: 5189
+ }
+
+ SpritePixels var19 = null; // L: 5191
+ SpritePixels var20 = null; // L: 5192
+ SpritePixels var21 = null; // L: 5193
+ SpritePixels var22 = null; // L: 5194
+ var23 = 0; // L: 5195
+ var24 = 0; // L: 5196
+ int var25 = 0; // L: 5197
+ int var26 = 0; // L: 5198
+ int var27 = 0; // L: 5199
+ int var28 = 0; // L: 5200
+ int var29 = 0; // L: 5201
+ int var30 = 0; // L: 5202
+ SpritePixels var31 = null; // L: 5203
+ SpritePixels var32 = null; // L: 5204
+ SpritePixels var33 = null; // L: 5205
+ SpritePixels var34 = null; // L: 5206
+ int var35 = 0; // L: 5207
+ int var36 = 0; // L: 5208
+ int var37 = 0; // L: 5209
+ int var38 = 0; // L: 5210
+ int var39 = 0; // L: 5211
+ int var40 = 0; // L: 5212
+ int var41 = 0; // L: 5213
+ int var42 = 0; // L: 5214
+ int var43 = 0; // L: 5215
+ var19 = var98.method3623(); // L: 5216
+ int var44;
+ if (var19 != null) { // L: 5217
+ var23 = var19.subWidth; // L: 5218
+ var44 = var19.subHeight; // L: 5219
+ if (var44 > var43) { // L: 5220
+ var43 = var44;
+ }
+
+ var27 = var19.xOffset; // L: 5221
+ }
+
+ var20 = var98.method3643(); // L: 5223
+ if (var20 != null) { // L: 5224
+ var24 = var20.subWidth; // L: 5225
+ var44 = var20.subHeight; // L: 5226
+ if (var44 > var43) { // L: 5227
+ var43 = var44;
+ }
+
+ var28 = var20.xOffset; // L: 5228
+ }
+
+ var21 = var98.method3625(); // L: 5230
+ if (var21 != null) { // L: 5231
+ var25 = var21.subWidth; // L: 5232
+ var44 = var21.subHeight; // L: 5233
+ if (var44 > var43) { // L: 5234
+ var43 = var44;
+ }
+
+ var29 = var21.xOffset; // L: 5235
+ }
+
+ var22 = var98.method3626(); // L: 5237
+ if (var22 != null) { // L: 5238
+ var26 = var22.subWidth; // L: 5239
+ var44 = var22.subHeight; // L: 5240
+ if (var44 > var43) { // L: 5241
+ var43 = var44;
+ }
+
+ var30 = var22.xOffset; // L: 5242
+ }
+
+ if (var16 != null) { // L: 5244
+ var31 = var16.method3623(); // L: 5245
+ if (var31 != null) { // L: 5246
+ var35 = var31.subWidth; // L: 5247
+ var44 = var31.subHeight; // L: 5248
+ if (var44 > var43) { // L: 5249
+ var43 = var44;
+ }
+
+ var39 = var31.xOffset; // L: 5250
+ }
+
+ var32 = var16.method3643(); // L: 5252
+ if (var32 != null) { // L: 5253
+ var36 = var32.subWidth; // L: 5254
+ var44 = var32.subHeight; // L: 5255
+ if (var44 > var43) { // L: 5256
+ var43 = var44;
+ }
+
+ var40 = var32.xOffset; // L: 5257
+ }
+
+ var33 = var16.method3625(); // L: 5259
+ if (var33 != null) { // L: 5260
+ var37 = var33.subWidth; // L: 5261
+ var44 = var33.subHeight; // L: 5262
+ if (var44 > var43) { // L: 5263
+ var43 = var44;
+ }
+
+ var41 = var33.xOffset; // L: 5264
+ }
+
+ var34 = var16.method3626(); // L: 5266
+ if (var34 != null) { // L: 5267
+ var38 = var34.subWidth; // L: 5268
+ var44 = var34.subHeight; // L: 5269
+ if (var44 > var43) { // L: 5270
+ var43 = var44;
+ }
+
+ var42 = var34.xOffset; // L: 5271
+ }
+ }
+
+ Font var80 = var98.getFont(); // L: 5276
+ if (var80 == null) { // L: 5277
+ var80 = MouseHandler.fontPlain11;
+ }
+
+ Font var45;
+ if (var16 != null) { // L: 5278
+ var45 = var16.getFont(); // L: 5279
+ if (var45 == null) { // L: 5280
+ var45 = MouseHandler.fontPlain11;
+ }
+ } else {
+ var45 = MouseHandler.fontPlain11; // L: 5282
+ }
+
+ String var46 = null; // L: 5283
+ String var47 = null; // L: 5284
+ boolean var48 = false; // L: 5285
+ int var49 = 0; // L: 5286
+ var46 = var98.getString(var0.hitSplatValues[var79]); // L: 5287
+ int var95 = var80.stringWidth(var46); // L: 5288
+ if (var16 != null) { // L: 5289
+ var47 = var16.getString(var0.hitSplatValues2[var79]); // L: 5290
+ var49 = var45.stringWidth(var47); // L: 5291
+ }
+
+ int var50 = 0; // L: 5293
+ int var51 = 0; // L: 5294
+ if (var24 > 0) { // L: 5295
+ if (var21 == null && var22 == null) { // L: 5296
+ var50 = 1; // L: 5297
+ } else {
+ var50 = var95 / var24 + 1;
+ }
+ }
+
+ if (var16 != null && var36 > 0) { // L: 5299 5300
+ if (var33 == null && var34 == null) { // L: 5301
+ var51 = 1; // L: 5302
+ } else {
+ var51 = var49 / var36 + 1;
+ }
+ }
+
+ int var52 = 0; // L: 5305
+ int var53 = var52; // L: 5306
+ if (var23 > 0) { // L: 5307
+ var52 += var23;
+ }
+
+ var52 += 2; // L: 5308
+ int var54 = var52; // L: 5309
+ if (var25 > 0) { // L: 5310
+ var52 += var25;
+ }
+
+ int var55 = var52; // L: 5311
+ int var56 = var52; // L: 5312
+ int var57;
+ if (var24 > 0) { // L: 5313
+ var57 = var50 * var24; // L: 5314
+ var52 += var57; // L: 5315
+ var56 += (var57 - var95) / 2; // L: 5316
+ } else {
+ var52 += var95; // L: 5319
+ }
+
+ var57 = var52; // L: 5321
+ if (var26 > 0) { // L: 5322
+ var52 += var26;
+ }
+
+ int var58 = 0; // L: 5323
+ int var59 = 0; // L: 5324
+ int var60 = 0; // L: 5325
+ int var61 = 0; // L: 5326
+ int var62 = 0; // L: 5327
+ int var63;
+ if (var16 != null) { // L: 5328
+ var52 += 2; // L: 5329
+ var58 = var52; // L: 5330
+ if (var35 > 0) { // L: 5331
+ var52 += var35;
+ }
+
+ var52 += 2; // L: 5332
+ var59 = var52; // L: 5333
+ if (var37 > 0) { // L: 5334
+ var52 += var37;
+ }
+
+ var60 = var52; // L: 5335
+ var62 = var52; // L: 5336
+ if (var36 > 0) { // L: 5337
+ var63 = var51 * var36; // L: 5338
+ var52 += var63; // L: 5339
+ var62 += (var63 - var49) / 2; // L: 5340
+ } else {
+ var52 += var49; // L: 5343
+ }
+
+ var61 = var52; // L: 5345
+ if (var38 > 0) { // L: 5346
+ var52 += var38;
+ }
+ }
+
+ var63 = var0.hitSplatCycles[var79] - Client.cycle; // L: 5348
+ int var64 = var98.field2031 - var63 * var98.field2031 / var98.field2026; // L: 5349
+ int var65 = var63 * var98.field2032 / var98.field2026 + -var98.field2032; // L: 5350
+ int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 5351
+ int var67 = var3 + Client.viewportTempY - 12 + var65; // L: 5352
+ int var68 = var67; // L: 5353
+ int var69 = var43 + var67; // L: 5354
+ int var70 = var67 + var98.field2019 + 15; // L: 5355
+ int var71 = var70 - var80.maxAscent; // L: 5356
+ int var72 = var70 + var80.maxDescent; // L: 5357
+ if (var71 < var67) { // L: 5358
+ var68 = var71;
+ }
+
+ if (var72 > var69) { // L: 5359
+ var69 = var72;
+ }
+
+ int var73 = 0; // L: 5360
+ int var74;
+ int var75;
+ if (var16 != null) { // L: 5361
+ var73 = var67 + var16.field2019 + 15; // L: 5362
+ var74 = var73 - var45.maxAscent; // L: 5363
+ var75 = var73 + var45.maxDescent; // L: 5364
+ if (var74 < var68) { // L: 5365
+ ;
+ }
+
+ if (var75 > var69) { // L: 5366
+ ;
+ }
+ }
+
+ var74 = 255; // L: 5368
+ if (var98.field2030 >= 0) { // L: 5369
+ var74 = (var63 << 8) / (var98.field2026 - var98.field2030);
+ }
+
+ if (var74 >= 0 && var74 < 255) { // L: 5370
+ if (var19 != null) { // L: 5371
+ var19.drawTransAt(var66 + var53 - var27, var67, var74);
+ }
+
+ if (var21 != null) { // L: 5372
+ var21.drawTransAt(var54 + var66 - var29, var67, var74);
+ }
+
+ if (var20 != null) { // L: 5373
+ for (var75 = 0; var75 < var50; ++var75) { // L: 5374
+ var20.drawTransAt(var24 * var75 + (var55 + var66 - var28), var67, var74); // L: 5375
+ }
+ }
+
+ if (var22 != null) { // L: 5378
+ var22.drawTransAt(var57 + var66 - var30, var67, var74);
+ }
+
+ var80.drawAlpha(var46, var66 + var56, var70, var98.textColor, 0, var74); // L: 5379
+ if (var16 != null) { // L: 5380
+ if (var31 != null) { // L: 5381
+ var31.drawTransAt(var66 + var58 - var39, var67, var74);
+ }
+
+ if (var33 != null) { // L: 5382
+ var33.drawTransAt(var66 + var59 - var41, var67, var74);
+ }
+
+ if (var32 != null) { // L: 5383
+ for (var75 = 0; var75 < var51; ++var75) { // L: 5384
+ var32.drawTransAt(var75 * var36 + (var66 + var60 - var40), var67, var74); // L: 5385
+ }
+ }
+
+ if (var34 != null) { // L: 5388
+ var34.drawTransAt(var66 + var61 - var42, var67, var74);
+ }
+
+ var45.drawAlpha(var47, var62 + var66, var73, var16.textColor, 0, var74); // L: 5389
+ }
+ } else {
+ if (var19 != null) { // L: 5393
+ var19.drawTransBgAt(var53 + var66 - var27, var67);
+ }
+
+ if (var21 != null) { // L: 5394
+ var21.drawTransBgAt(var54 + var66 - var29, var67);
+ }
+
+ if (var20 != null) { // L: 5395
+ for (var75 = 0; var75 < var50; ++var75) { // L: 5396
+ var20.drawTransBgAt(var24 * var75 + (var55 + var66 - var28), var67); // L: 5397
+ }
+ }
+
+ if (var22 != null) { // L: 5400
+ var22.drawTransBgAt(var57 + var66 - var30, var67);
+ }
+
+ var80.draw(var46, var56 + var66, var70, var98.textColor | -16777216, 0); // L: 5401
+ if (var16 != null) { // L: 5402
+ if (var31 != null) { // L: 5403
+ var31.drawTransBgAt(var58 + var66 - var39, var67);
+ }
+
+ if (var33 != null) { // L: 5404
+ var33.drawTransBgAt(var59 + var66 - var41, var67);
+ }
+
+ if (var32 != null) { // L: 5405
+ for (var75 = 0; var75 < var51; ++var75) { // L: 5406
+ var32.drawTransBgAt(var36 * var75 + (var60 + var66 - var40), var67); // L: 5407
+ }
+ }
+
+ if (var34 != null) { // L: 5410
+ var34.drawTransBgAt(var61 + var66 - var42, var67);
+ }
+
+ var45.draw(var47, var62 + var66, var73, var16.textColor | -16777216, 0); // L: 5411
+ }
+ }
+ }
+ }
+ }
+ }
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lpt;IIB)I",
- garbageValue = "52"
- )
- static int method3061(IterableNodeHashTable var0, int var1, int var2) {
- if (var0 == null) { // L: 33
- return var2;
- } else {
- IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34
- return var3 == null ? var2 : var3.integer; // L: 35 36
}
- }
+ } // L: 5416
}
diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java
index 29a67420af..f550127a06 100644
--- a/runescape-client/src/main/java/class155.java
+++ b/runescape-client/src/main/java/class155.java
@@ -4,81 +4,73 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-@ObfuscatedName("eq")
+@ObfuscatedName("es")
public class class155 {
- @ObfuscatedName("le")
- @ObfuscatedSignature(
- descriptor = "Lki;"
- )
- @Export("hoveredItemContainer")
- static Widget hoveredItemContainer;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -1553344027
- )
- int field1744;
- @ObfuscatedName("v")
- String field1745;
@ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "Lcb;"
+ @ObfuscatedGetter(
+ intValue = -793347601
)
- UrlRequest field1746;
- @ObfuscatedName("c")
- String field1742;
- @ObfuscatedName("w")
- float[] field1749;
- @ObfuscatedName("b")
- ArrayList field1748;
+ int field1726;
+ @ObfuscatedName("i")
+ String field1730;
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "Lct;"
+ )
+ UrlRequest field1729;
@ObfuscatedName("t")
- ArrayList field1750;
- @ObfuscatedName("g")
- ArrayList field1751;
+ String field1732;
+ @ObfuscatedName("z")
+ float[] field1733;
+ @ObfuscatedName("r")
+ ArrayList field1734;
+ @ObfuscatedName("u")
+ ArrayList field1735;
+ @ObfuscatedName("k")
+ ArrayList field1736;
+ @ObfuscatedName("h")
+ Map field1731;
@ObfuscatedName("x")
- Map field1743;
- @ObfuscatedName("n")
- Map field1753;
+ Map field1724;
public class155() {
- this.field1744 = -1; // L: 24
- this.field1742 = null; // L: 27
- this.field1749 = new float[4]; // L: 28
- this.field1748 = new ArrayList(); // L: 29
- this.field1750 = new ArrayList(); // L: 30
- this.field1751 = new ArrayList(); // L: 31
- this.field1743 = new HashMap(); // L: 32
- this.field1753 = new HashMap(); // L: 33
+ this.field1726 = -1; // L: 24
+ this.field1732 = null; // L: 27
+ this.field1733 = new float[4]; // L: 28
+ this.field1734 = new ArrayList(); // L: 29
+ this.field1735 = new ArrayList(); // L: 30
+ this.field1736 = new ArrayList(); // L: 31
+ this.field1731 = new HashMap();
+ this.field1724 = new HashMap(); // L: 33
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lce;B)Z",
- garbageValue = "57"
+ descriptor = "(Ljava/lang/String;Lcd;I)Z",
+ garbageValue = "-34327555"
)
- public boolean method3085(String var1, UrlRequester var2) {
+ public boolean method3174(String var1, UrlRequester var2) {
if (var1 != null && !var1.isEmpty()) { // L: 36
if (var2 == null) { // L: 39
return false; // L: 40
} else {
- this.method3073(); // L: 42
+ this.method3226(); // L: 42
try {
- this.field1745 = var1; // L: 44
- this.field1746 = var2.request(new URL(this.field1745)); // L: 45
- this.field1744 = 0; // L: 46
+ this.field1730 = var1; // L: 44
+ this.field1729 = var2.request(new URL(this.field1730)); // L: 45
+ this.field1726 = 0; // L: 46
return true; // L: 47
} catch (MalformedURLException var4) { // L: 49
- this.method3073(); // L: 50
- this.field1744 = 100; // L: 51
+ this.method3226(); // L: 50
+ this.field1726 = 100; // L: 51
return false; // L: 52
}
}
@@ -87,223 +79,223 @@ public class class155 {
}
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lce;I)V",
- garbageValue = "2008517320"
+ descriptor = "(Lcd;I)V",
+ garbageValue = "1224527567"
)
- public void method3064(UrlRequester var1) {
- switch(this.field1744) { // L: 57
+ public void method3175(UrlRequester var1) {
+ switch(this.field1726) { // L: 57
case 0:
- this.method3074(var1);
- break; // L: 64
+ this.method3185(var1); // L: 62
+ break; // L: 63
case 1:
- this.method3121(); // L: 59
+ this.method3186(); // L: 59
break;
default:
- return; // L: 62
+ return; // L: 65
}
} // L: 67
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "649568402"
+ garbageValue = "1504474906"
)
- public int method3067() {
- return this.field1744; // L: 70
+ public int method3176() {
+ return this.field1726; // L: 70
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "-1638920385"
+ garbageValue = "-2119043872"
)
- public int method3066(String var1) {
- return this.field1743.containsKey(var1) ? (Integer)this.field1743.get(var1) : -1; // L: 74
+ public int method3196(String var1) {
+ return this.field1731.containsKey(var1) ? (Integer)this.field1731.get(var1) : -1; // L: 74
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
- garbageValue = "-57"
+ descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
+ garbageValue = "1630145340"
)
- public String method3097(String var1) {
- return (String)((String)(this.field1753.containsKey(var1) ? this.field1753.get(var1) : null)); // L: 78
+ public String method3178(String var1) {
+ return (String)((String)(this.field1724.containsKey(var1) ? this.field1724.get(var1) : null)); // L: 78
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(I)Ljava/util/ArrayList;",
- garbageValue = "1949744865"
+ garbageValue = "1021496869"
)
- public ArrayList method3110() {
- return this.field1750; // L: 82
+ public ArrayList method3179() {
+ return this.field1735; // L: 82
}
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(I)Ljava/util/ArrayList;",
- garbageValue = "1585296838"
+ descriptor = "(B)Ljava/util/ArrayList;",
+ garbageValue = "100"
)
- public ArrayList method3069() {
- return this.field1751; // L: 86
+ public ArrayList method3190() {
+ return this.field1736; // L: 86
}
- @ObfuscatedName("s")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-304867639"
+ garbageValue = "2042009009"
)
- public String method3075() {
- return this.field1742; // L: 90
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(B)[F",
- garbageValue = "63"
- )
- public float[] method3071() {
- return this.field1749; // L: 94
- }
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(I)Ljava/util/ArrayList;",
- garbageValue = "126443556"
- )
- public ArrayList method3072() {
- return this.field1748; // L: 98
+ public String method3201() {
+ return this.field1732; // L: 90
}
@ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1659374882"
+ descriptor = "(I)[F",
+ garbageValue = "208203188"
)
- void method3073() {
- this.field1746 = null; // L: 102
- this.field1742 = null; // L: 103
- this.field1749[0] = 0.0F; // L: 104
- this.field1749[1] = 0.0F; // L: 105
- this.field1749[2] = 1.0F; // L: 106
- this.field1749[3] = 1.0F; // L: 107
- this.field1748.clear(); // L: 108
- this.field1750.clear(); // L: 109
- this.field1751.clear(); // L: 110
- this.field1743.clear(); // L: 111
- this.field1753.clear(); // L: 112
+ public float[] method3182() {
+ return this.field1733; // L: 94
+ }
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(B)Ljava/util/ArrayList;",
+ garbageValue = "1"
+ )
+ public ArrayList method3183() {
+ return this.field1734; // L: 98
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(S)V",
+ garbageValue = "-10689"
+ )
+ void method3226() {
+ this.field1729 = null; // L: 102
+ this.field1732 = null; // L: 103
+ this.field1733[0] = 0.0F; // L: 104
+ this.field1733[1] = 0.0F; // L: 105
+ this.field1733[2] = 1.0F; // L: 106
+ this.field1733[3] = 1.0F; // L: 107
+ this.field1734.clear(); // L: 108
+ this.field1735.clear(); // L: 109
+ this.field1736.clear(); // L: 110
+ this.field1731.clear(); // L: 111
+ this.field1724.clear(); // L: 112
} // L: 113
- @ObfuscatedName("c")
+ @ObfuscatedName("t")
@ObfuscatedSignature(
- descriptor = "(Lce;B)V",
- garbageValue = "107"
+ descriptor = "(Lcd;B)V",
+ garbageValue = "9"
)
- void method3074(UrlRequester var1) {
- if (this.field1746 != null && this.field1746.isDone()) { // L: 116
- byte[] var2 = this.field1746.getResponse(); // L: 119
+ void method3185(UrlRequester var1) {
+ if (this.field1729 != null && this.field1729.isDone()) { // L: 116
+ byte[] var2 = this.field1729.getResponse(); // L: 119
if (var2 == null) { // L: 120
- this.method3073(); // L: 121
- this.field1744 = 100; // L: 122
+ this.method3226(); // L: 121
+ this.field1726 = 100; // L: 122
} else {
JSONObject var3;
try {
- class400 var4 = new class400(var2); // L: 127
- var3 = var4.method6947(); // L: 128
+ class399 var4 = new class399(var2); // L: 127
+ var3 = var4.method7100(); // L: 128
var3 = var3.getJSONObject("message"); // L: 129
} catch (Exception var9) { // L: 131
- this.method3073(); // L: 132
- this.field1744 = 102; // L: 133
+ this.method3226(); // L: 132
+ this.field1726 = 102; // L: 133
return; // L: 134
}
try {
- this.method3076(var3.getJSONArray("images"), var1); // L: 137
+ this.method3202(var3.getJSONArray("images"), var1); // L: 137
} catch (Exception var8) { // L: 139
- this.field1750.clear(); // L: 140
+ this.field1735.clear(); // L: 140
}
try {
- this.method3098(var3.getJSONArray("labels")); // L: 143
+ this.method3191(var3.getJSONArray("labels")); // L: 143
} catch (Exception var7) { // L: 145
- this.field1751.clear(); // L: 146
+ this.field1736.clear(); // L: 146
}
try {
- this.method3083(var3.getJSONObject("behaviour")); // L: 149
+ this.method3177(var3.getJSONObject("behaviour")); // L: 149
} catch (Exception var6) { // L: 151
- this.field1742 = null; // L: 152
- this.field1749[0] = 0.0F; // L: 153
- this.field1749[1] = 0.0F; // L: 154
- this.field1749[2] = 1.0F; // L: 155
- this.field1749[3] = 1.0F; // L: 156
- this.field1748.clear(); // L: 157
+ this.field1732 = null; // L: 152
+ this.field1733[0] = 0.0F; // L: 153
+ this.field1733[1] = 0.0F; // L: 154
+ this.field1733[2] = 1.0F; // L: 155
+ this.field1733[3] = 1.0F; // L: 156
+ this.field1734.clear(); // L: 157
}
try {
- this.method3079(var3.getJSONObject("meta")); // L: 160
+ this.method3189(var3.getJSONObject("meta")); // L: 160
} catch (Exception var5) { // L: 162
- this.field1743.clear(); // L: 163
- this.field1753.clear(); // L: 164
+ this.field1731.clear(); // L: 163
+ this.field1724.clear(); // L: 164
}
- this.field1744 = this.field1750.size() > 0 ? 1 : 2; // L: 166
- this.field1746 = null; // L: 167
+ this.field1726 = this.field1735.size() > 0 ? 1 : 2; // L: 166
+ this.field1729 = null; // L: 167
}
}
} // L: 117 123 168
- @ObfuscatedName("w")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "533215283"
+ descriptor = "(B)V",
+ garbageValue = "-29"
)
- void method3121() {
- Iterator var1 = this.field1750.iterator(); // L: 171
+ void method3186() {
+ Iterator var1 = this.field1735.iterator(); // L: 171
class160 var2;
do {
if (!var1.hasNext()) {
- var1 = this.field1750.iterator(); // L: 179
+ var1 = this.field1735.iterator(); // L: 179
while (var1.hasNext()) {
var2 = (class160)var1.next(); // L: 180
- if (var2.field1783 != null) { // L: 182
- byte[] var3 = var2.field1783.getResponse(); // L: 183
+ if (var2.field1772 != null) { // L: 182
+ byte[] var3 = var2.field1772.getResponse(); // L: 183
if (var3 != null && var3.length > 0) { // L: 184
- this.field1744 = 2; // L: 185
+ this.field1726 = 2; // L: 185
return; // L: 186
}
}
}
- this.method3073(); // L: 191
- this.field1744 = 101; // L: 192
+ this.method3226(); // L: 191
+ this.field1726 = 101; // L: 192
return; // L: 193
}
var2 = (class160)var1.next(); // L: 172
- } while(var2.field1783 == null || var2.field1783.isDone()); // L: 174
+ } while(var2.field1772 == null || var2.field1772.isDone()); // L: 174
} // L: 175
- @ObfuscatedName("b")
+ @ObfuscatedName("r")
@ObfuscatedSignature(
- descriptor = "(Lorg/json/JSONArray;Lce;B)V",
- garbageValue = "120"
+ descriptor = "(Lorg/json/JSONArray;Lcd;B)V",
+ garbageValue = "1"
)
- void method3076(JSONArray var1, UrlRequester var2) throws JSONException {
+ void method3202(JSONArray var1, UrlRequester var2) throws JSONException {
if (var1 != null) { // L: 196
for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 197
try {
JSONObject var4 = var1.getJSONObject(var3); // L: 199
class160 var5 = new class160(this); // L: 200
- var5.field1783 = var2.request(new URL(var4.getString("src"))); // L: 201
- var5.field1782 = ChatChannel.method1965(var4, "placement"); // L: 202
- this.field1750.add(var5); // L: 203
+ var5.field1772 = var2.request(new URL(var4.getString("src"))); // L: 201
+ var5.field1770 = class181.method3566(var4, "placement"); // L: 202
+ this.field1735.add(var5); // L: 203
} catch (MalformedURLException var6) { // L: 205
}
}
@@ -311,230 +303,117 @@ public class class155 {
}
} // L: 207
- @ObfuscatedName("t")
+ @ObfuscatedName("u")
@ObfuscatedSignature(
- descriptor = "(Lorg/json/JSONArray;I)V",
- garbageValue = "-867893619"
+ descriptor = "(Lorg/json/JSONArray;B)V",
+ garbageValue = "112"
)
- void method3098(JSONArray var1) throws JSONException {
+ void method3191(JSONArray var1) throws JSONException {
if (var1 != null) { // L: 210
for (int var2 = 0; var2 < var1.length(); ++var2) { // L: 211
JSONObject var3 = var1.getJSONObject(var2); // L: 212
- class162 var4 = new class162(this); // L: 213
- var4.field1803 = var3.getString("text"); // L: 214
- var4.field1811 = class131.method2828(var3.getString("align_x")); // L: 215
- var4.field1806 = class131.method2828(var3.getString("align_y")); // L: 216
- var4.field1807 = var3.getInt("font"); // L: 217
- var4.field1804 = ChatChannel.method1965(var3, "placement"); // L: 218
- this.field1751.add(var4); // L: 219
+ class161 var4 = new class161(this); // L: 213
+ var4.field1775 = var3.getString("text"); // L: 214
+ String var7 = var3.getString("align_x"); // L: 217
+ byte var6;
+ if (var7.equals("centre")) { // L: 219
+ var6 = 1; // L: 220
+ } else if (!var7.equals("bottom") && !var7.equals("right")) { // L: 223
+ var6 = 0; // L: 227
+ } else {
+ var6 = 2; // L: 224
+ }
+
+ var4.field1773 = var6; // L: 229
+ String var10 = var3.getString("align_y"); // L: 232
+ byte var9;
+ if (var10.equals("centre")) { // L: 234
+ var9 = 1; // L: 235
+ } else if (!var10.equals("bottom") && !var10.equals("right")) { // L: 238
+ var9 = 0; // L: 242
+ } else {
+ var9 = 2; // L: 239
+ }
+
+ var4.field1777 = var9; // L: 244
+ var4.field1779 = var3.getInt("font"); // L: 245
+ var4.field1776 = class181.method3566(var3, "placement"); // L: 246
+ this.field1736.add(var4); // L: 247
}
}
- } // L: 221
+ } // L: 249
- @ObfuscatedName("g")
+ @ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(Lorg/json/JSONObject;I)V",
- garbageValue = "-1307418854"
+ garbageValue = "-1263600305"
)
- void method3083(JSONObject var1) throws JSONException {
- if (var1 != null) { // L: 224
- this.field1749 = ChatChannel.method1965(var1, "clickbounds"); // L: 225
- this.field1742 = var1.getString("endpoint"); // L: 226
- String[] var2 = JSONObject.getNames(var1); // L: 227
+ void method3177(JSONObject var1) throws JSONException {
+ if (var1 != null) { // L: 252
+ this.field1733 = class181.method3566(var1, "clickbounds"); // L: 253
+ this.field1732 = var1.getString("endpoint"); // L: 254
+ String[] var2 = JSONObject.getNames(var1); // L: 255
- for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 228
- if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { // L: 229
+ for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 256
+ if (!var2[var3].equals("clickbounds") && !var2[var3].equals("endpoint")) { // L: 257
try {
- int var4 = var1.getInt(var2[var3]); // L: 231
- this.field1748.add(new class163(this, var2[var3], var4)); // L: 232
+ int var4 = var1.getInt(var2[var3]); // L: 259
+ this.field1734.add(new class162(this, var2[var3], var4)); // L: 260
} catch (Exception var8) {
try {
- String var5 = var1.getString(var2[var3]); // L: 236
- if (var5.equals("true")) { // L: 237
- this.field1748.add(new class163(this, var2[var3], 1)); // L: 238
- } else if (var5.equals("false")) { // L: 240
- this.field1748.add(new class163(this, var2[var3], 0)); // L: 241
+ String var5 = var1.getString(var2[var3]); // L: 264
+ if (var5.equals("true")) { // L: 265
+ this.field1734.add(new class162(this, var2[var3], 1)); // L: 266
+ } else if (var5.equals("false")) { // L: 268
+ this.field1734.add(new class162(this, var2[var3], 0)); // L: 269
} else {
- this.field1748.add(new class154(this, var2[var3], var5)); // L: 244
+ this.field1734.add(new class154(this, var2[var3], var5)); // L: 272
}
- } catch (Exception var7) { // L: 247
+ } catch (Exception var7) { // L: 275
}
}
}
}
}
- } // L: 251
+ } // L: 279
- @ObfuscatedName("x")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(Lorg/json/JSONObject;B)V",
- garbageValue = "1"
+ descriptor = "(Lorg/json/JSONObject;I)V",
+ garbageValue = "-1948226322"
)
- void method3079(JSONObject var1) throws JSONException {
- String[] var2 = JSONObject.getNames(var1); // L: 254
+ void method3189(JSONObject var1) throws JSONException {
+ String[] var2 = JSONObject.getNames(var1); // L: 282
- for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 255
+ for (int var3 = 0; var3 < var1.length(); ++var3) { // L: 283
try {
- int var4 = var1.getInt(var2[var3]); // L: 257
- this.field1743.put(var2[var3], var4); // L: 258
+ int var4 = var1.getInt(var2[var3]); // L: 285
+ this.field1731.put(var2[var3], var4); // L: 286
} catch (Exception var8) {
try {
- String var5 = var1.getString(var2[var3]); // L: 262
- if (var5.equals("true")) { // L: 263
- this.field1743.put(var2[var3], 1); // L: 264
- } else if (var5.equals("false")) { // L: 266
- this.field1743.put(var2[var3], 0); // L: 267
+ String var5 = var1.getString(var2[var3]); // L: 290
+ if (var5.equals("true")) { // L: 291
+ this.field1731.put(var2[var3], 1); // L: 292
+ } else if (var5.equals("false")) { // L: 294
+ this.field1731.put(var2[var3], 0); // L: 295
} else {
- this.field1753.put(var2[var3], var5); // L: 270
+ this.field1724.put(var2[var3], var5); // L: 298
}
- } catch (Exception var7) { // L: 273
+ } catch (Exception var7) { // L: 301
}
}
}
- } // L: 276
+ } // L: 304
- @ObfuscatedName("u")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1124617312"
+ descriptor = "(II)I",
+ garbageValue = "-1008936985"
)
- static int method3124(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 2124
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.cycle; // L: 2125
- return 1; // L: 2126
- } else {
- int var3;
- int var4;
- if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 2128
- class12.Interpreter_intStackSize -= 2; // L: 2129
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2130
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2131
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Message.method1079(var3, var4); // L: 2132
- return 1; // L: 2133
- } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 2135
- class12.Interpreter_intStackSize -= 2; // L: 2136
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2137
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2138
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class290.ItemContainer_getCount(var3, var4); // L: 2139
- return 1; // L: 2140
- } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 2142
- class12.Interpreter_intStackSize -= 2; // L: 2143
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2144
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2145
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Skeleton.method4019(var3, var4); // L: 2146
- return 1; // L: 2147
- } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 2149
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2150
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = DirectByteArrayCopier.getInvDefinition(var3).size; // L: 2151
- return 1; // L: 2152
- } else if (var0 == ScriptOpcodes.STAT) { // L: 2154
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2155
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 2156
- return 1; // L: 2157
- } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 2159
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2160
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 2161
- return 1; // L: 2162
- } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 2164
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2165
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 2166
- return 1; // L: 2167
- } else {
- int var5;
- if (var0 == ScriptOpcodes.COORD) { // L: 2169
- var3 = class128.Client_plane; // L: 2170
- var4 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 2171
- var5 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 2172
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 2173
- return 1; // L: 2174
- } else if (var0 == ScriptOpcodes.COORDX) { // L: 2176
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2177
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 2178
- return 1; // L: 2179
- } else if (var0 == ScriptOpcodes.COORDZ) { // L: 2181
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2182
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 >> 28; // L: 2183
- return 1; // L: 2184
- } else if (var0 == ScriptOpcodes.COORDY) { // L: 2186
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2187
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 & 16383; // L: 2188
- return 1; // L: 2189
- } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 2191
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 2192
- return 1; // L: 2193
- } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 2195
- class12.Interpreter_intStackSize -= 2; // L: 2196
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] + 32768; // L: 2197
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2198
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Message.method1079(var3, var4); // L: 2199
- return 1; // L: 2200
- } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 2202
- class12.Interpreter_intStackSize -= 2; // L: 2203
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] + 32768; // L: 2204
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2205
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class290.ItemContainer_getCount(var3, var4); // L: 2206
- return 1; // L: 2207
- } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2209
- class12.Interpreter_intStackSize -= 2; // L: 2210
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] + 32768; // L: 2211
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2212
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Skeleton.method4019(var3, var4); // L: 2213
- return 1; // L: 2214
- } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2216
- if (Client.staffModLevel >= 2) { // L: 2217
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.staffModLevel;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2218
- }
-
- return 1; // L: 2219
- } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2221
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2222
- return 1; // L: 2223
- } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2225
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.worldId; // L: 2226
- return 1; // L: 2227
- } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2229
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2230
- return 1; // L: 2231
- } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2233
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.weight; // L: 2234
- return 1; // L: 2235
- } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2237
- if (Client.playerMod) { // L: 2238
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2239
- }
-
- return 1; // L: 2240
- } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2242
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2243
- return 1; // L: 2244
- } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2246
- class12.Interpreter_intStackSize -= 4; // L: 2247
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2248
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2249
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2250
- int var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 2251
- var3 += var4 << 14; // L: 2252
- var3 += var5 << 28; // L: 2253
- var3 += var6; // L: 2254
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 2255
- return 1; // L: 2256
- } else if (var0 == 3326) { // L: 2258
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.field492; // L: 2259
- return 1; // L: 2260
- } else if (var0 == 3327) { // L: 2262
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.field681; // L: 2263
- return 1; // L: 2264
- } else {
- return 2; // L: 2266
- }
- }
- }
+ public static int method3194(int var0) {
+ return class401.field4443[var0 & 16383]; // L: 32
}
}
diff --git a/runescape-client/src/main/java/class158.java b/runescape-client/src/main/java/class158.java
index 6d7fa8f3b4..e46e7222a2 100644
--- a/runescape-client/src/main/java/class158.java
+++ b/runescape-client/src/main/java/class158.java
@@ -2,12 +2,12 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fy")
+@ObfuscatedName("fh")
public interface class158 {
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-479610962"
+ descriptor = "(B)I",
+ garbageValue = "-105"
)
@Export("useRotation")
int useRotation();
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index a466268349..a280863642 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -1,3 +1,13 @@
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
import net.runelite.mapping.Export;
@@ -5,64 +15,945 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("x")
+@ObfuscatedName("h")
public class class16 implements ThreadFactory {
- @ObfuscatedName("bu")
- @ObfuscatedGetter(
- intValue = 172876195
- )
- static int field81;
- @ObfuscatedName("es")
+ @ObfuscatedName("y")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Lqe;"
)
- @Export("archive13")
- static Archive archive13;
- @ObfuscatedName("o")
- final ThreadGroup field84;
- @ObfuscatedName("q")
- final AtomicInteger field80;
+ @Export("leftTitleSprite")
+ static SpritePixels leftTitleSprite;
+ @ObfuscatedName("jn")
+ @ObfuscatedGetter(
+ intValue = 733600801
+ )
+ @Export("cameraY")
+ static int cameraY;
+ @ObfuscatedName("c")
+ final ThreadGroup field93;
+ @ObfuscatedName("v")
+ final AtomicInteger field88;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lt;"
+ descriptor = "Lu;"
)
final class14 this$0;
@ObfuscatedSignature(
- descriptor = "(Lt;)V"
+ descriptor = "(Lu;)V"
)
class16(class14 var1) {
this.this$0 = var1; // L: 68
- this.field80 = new AtomicInteger(1); // L: 66
+ this.field88 = new AtomicInteger(1); // L: 66
SecurityManager var2 = System.getSecurityManager(); // L: 69
- this.field84 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70
+ this.field93 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70
} // L: 71
public Thread newThread(Runnable var1) {
- Thread var2 = new Thread(this.field84, var1, this.this$0.field74 + "-rest-request-" + this.field80.getAndIncrement(), 0L); // L: 75
+ Thread var2 = new Thread(this.field93, var1, this.this$0.field77 + "-rest-request-" + this.field88.getAndIncrement(), 0L); // L: 75
var2.setDaemon(true); // L: 76
var2.setPriority(5); // L: 77
return var2; // L: 78
}
- @ObfuscatedName("o")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Llp;B)V",
- garbageValue = "1"
+ descriptor = "(Lap;Lmt;B)V",
+ garbageValue = "5"
)
- public static void method179(AbstractArchive var0) {
- } // L: 16
+ @Export("loginScreen")
+ static void loginScreen(GameEngine var0, Font var1) {
+ if (Login.worldSelectOpen) { // L: 307
+ class151.method3136(var0); // L: 308
+ } else {
+ int var4;
+ if ((MouseHandler.MouseHandler_lastButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 311
+ class19.clientPreferences.method2248(!class19.clientPreferences.method2317()); // L: 312
+ if (!class19.clientPreferences.method2317()) { // L: 313
+ Archive var2 = class121.archive6; // L: 314
+ int var3 = var2.getGroupId("scape main"); // L: 316
+ var4 = var2.getFileId(var3, ""); // L: 317
+ AttackOption.method2410(var2, var3, var4, 255, false); // L: 318
+ } else {
+ ReflectionCheck.method579(); // L: 321
+ }
+ }
- @ObfuscatedName("fm")
- @ObfuscatedSignature(
- descriptor = "(Lgq;IIII)V",
- garbageValue = "1179464267"
- )
- static void method182(SequenceDefinition var0, int var1, int var2, int var3) {
- if (Client.soundEffectCount < 50 && class12.clientPreferences.method2239() != 0) { // L: 3762
- if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3763
- MouseHandler.method588(var0.soundEffects[var1], var2, var3); // L: 3764
+ if (Client.gameState != 5) { // L: 323
+ if (-1L == Login.field923) { // L: 324
+ Login.field923 = class115.method2692() + 1000L; // L: 325
+ }
+
+ long var21 = class115.method2692(); // L: 327
+ if (class342.method6312() && Login.field925 == -1L) { // L: 328 329
+ Login.field925 = var21; // L: 330
+ if (Login.field925 > Login.field923) { // L: 331
+ Login.field923 = Login.field925; // L: 332
+ }
+ }
+
+ if (Client.gameState == 10 || Client.gameState == 11) { // L: 336
+ if (Language.Language_EN == class134.clientLanguage) { // L: 337
+ if (MouseHandler.MouseHandler_lastButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 338
+ var4 = Login.xPadding + 5; // L: 339
+ short var5 = 463; // L: 340
+ byte var6 = 100; // L: 341
+ byte var7 = 35; // L: 342
+ if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 343
+ class118.method2738(); // L: 344
+ return; // L: 345
+ }
+ }
+
+ if (class174.World_request != null) { // L: 348
+ class118.method2738();
+ }
+ }
+
+ var4 = MouseHandler.MouseHandler_lastButton; // L: 350
+ int var48 = MouseHandler.MouseHandler_lastPressedX; // L: 351
+ int var49 = MouseHandler.MouseHandler_lastPressedY; // L: 352
+ if (var4 == 0) { // L: 353
+ var48 = MouseHandler.MouseHandler_x; // L: 354
+ var49 = MouseHandler.MouseHandler_y; // L: 355
+ }
+
+ if (!class122.mouseCam && var4 == 4) { // L: 357
+ var4 = 1;
+ }
+
+ int var52;
+ short var53;
+ if (Login.loginIndex == 0) { // L: 358
+ boolean var64 = false; // L: 359
+
+ while (class18.isKeyDown()) { // L: 360
+ if (class272.field3196 == 84) { // L: 361
+ var64 = true; // L: 362
+ }
+ }
+
+ var52 = Canvas.loginBoxCenter - 80; // L: 365
+ var53 = 291; // L: 366
+ if (var4 == 1 && var48 >= var52 - 75 && var48 <= var52 + 75 && var49 >= var53 - 20 && var49 <= var53 + 20) { // L: 367
+ class258.openURL(ModeWhere.method6080("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 368
+ }
+
+ var52 = Canvas.loginBoxCenter + 80; // L: 370
+ if (var4 == 1 && var48 >= var52 - 75 && var48 <= var52 + 75 && var49 >= var53 - 20 && var49 <= var53 + 20 || var64) { // L: 371
+ if ((Client.worldProperties & 33554432) != 0) { // L: 372
+ Login.Login_response0 = ""; // L: 373
+ Login.Login_response1 = "This is a Beta world."; // L: 374
+ Login.Login_response2 = "Your normal account will not be affected."; // L: 375
+ Login.Login_response3 = ""; // L: 376
+ WorldMapData_1.method4872(1); // L: 377
+ class29.method357(); // L: 378
+ } else if ((Client.worldProperties & 4) != 0) { // L: 380
+ if ((Client.worldProperties & 1024) != 0) { // L: 381
+ Login.Login_response1 = "This is a High Risk PvP world."; // L: 382
+ Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 383
+ Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 384
+ } else {
+ Login.Login_response1 = "This is a PvP world."; // L: 387
+ Login.Login_response2 = "Players can attack each other"; // L: 388
+ Login.Login_response3 = "almost everywhere."; // L: 389
+ }
+
+ Login.Login_response0 = "Warning!"; // L: 391
+ WorldMapData_1.method4872(1); // L: 392
+ class29.method357(); // L: 393
+ } else if ((Client.worldProperties & 1024) != 0) { // L: 395
+ Login.Login_response1 = "This is a High Risk world."; // L: 396
+ Login.Login_response2 = "The Protect Item prayer will"; // L: 397
+ Login.Login_response3 = "not work on this world."; // L: 398
+ Login.Login_response0 = "Warning!"; // L: 399
+ WorldMapData_1.method4872(1); // L: 400
+ class29.method357(); // L: 401
+ } else {
+ class135.Login_promptCredentials(false); // L: 404
+ }
+ }
+ } else {
+ short var8;
+ int var50;
+ if (Login.loginIndex == 1) { // L: 408
+ while (true) {
+ if (!class18.isKeyDown()) { // L: 409
+ var50 = Canvas.loginBoxCenter - 80; // L: 417
+ var8 = 321; // L: 418
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 419
+ class135.Login_promptCredentials(false); // L: 420
+ }
+
+ var50 = Canvas.loginBoxCenter + 80; // L: 422
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 423
+ WorldMapData_1.method4872(0); // L: 424
+ }
+ break;
+ }
+
+ if (class272.field3196 == 84) { // L: 410
+ class135.Login_promptCredentials(false); // L: 411
+ } else if (class272.field3196 == 13) { // L: 413
+ WorldMapData_1.method4872(0); // L: 414
+ }
+ }
+ } else {
+ int var11;
+ int var19;
+ short var51;
+ boolean var55;
+ if (Login.loginIndex == 2) { // L: 427
+ var51 = 201; // L: 428
+ var50 = var51 + 52; // L: 429
+ if (var4 == 1 && var49 >= var50 - 12 && var49 < var50 + 2) { // L: 430
+ Login.currentLoginField = 0;
+ }
+
+ var50 += 15; // L: 431
+ if (var4 == 1 && var49 >= var50 - 12 && var49 < var50 + 2) { // L: 432
+ Login.currentLoginField = 1;
+ }
+
+ var50 += 15; // L: 433
+ var51 = 361; // L: 434
+ if (ArchiveLoader.field1022 != null) { // L: 435
+ var52 = ArchiveLoader.field1022.highX / 2; // L: 436
+ if (var4 == 1 && var48 >= ArchiveLoader.field1022.lowX - var52 && var48 <= var52 + ArchiveLoader.field1022.lowX && var49 >= var51 - 15 && var49 < var51) { // L: 437
+ switch(Login.field902) { // L: 438
+ case 1:
+ class101.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 446
+ WorldMapData_1.method4872(5); // L: 447
+ return; // L: 448
+ case 2:
+ class258.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 441
+ }
+ }
+ }
+
+ var52 = Canvas.loginBoxCenter - 80; // L: 453
+ var53 = 321; // L: 454
+ if (var4 == 1 && var48 >= var52 - 75 && var48 <= var52 + 75 && var49 >= var53 - 20 && var49 <= var53 + 20) { // L: 455
+ Login.Login_username = Login.Login_username.trim(); // L: 456
+ if (Login.Login_username.length() == 0) { // L: 457
+ class101.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 458
+ return; // L: 459
+ }
+
+ if (Login.Login_password.length() == 0) { // L: 461
+ class101.setLoginResponseString("", "Please enter your password.", ""); // L: 462
+ return; // L: 463
+ }
+
+ class101.setLoginResponseString("", "Connecting to server...", ""); // L: 465
+ TriBool.method6791(false); // L: 466
+ HealthBarUpdate.updateGameState(20); // L: 467
+ return; // L: 468
+ }
+
+ var52 = Login.loginBoxX + 180 + 80; // L: 470
+ if (var4 == 1 && var48 >= var52 - 75 && var48 <= var52 + 75 && var49 >= var53 - 20 && var49 <= var53 + 20) { // L: 471
+ WorldMapData_1.method4872(0); // L: 472
+ Login.Login_username = ""; // L: 473
+ Login.Login_password = ""; // L: 474
+ class240.field2846 = 0; // L: 475
+ World.otp = ""; // L: 476
+ Login.field895 = true; // L: 477
+ }
+
+ var52 = Canvas.loginBoxCenter + -117; // L: 479
+ var53 = 277; // L: 480
+ Login.field912 = var48 >= var52 && var48 < var52 + ReflectionCheck.field247 && var49 >= var53 && var49 < var53 + MouseRecorder.field1064; // L: 481
+ if (var4 == 1 && Login.field912) { // L: 482
+ Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 483
+ if (!Client.Login_isUsernameRemembered && class19.clientPreferences.method2264() != null) { // L: 484
+ class19.clientPreferences.method2260((String)null); // L: 485
+ }
+ }
+
+ var52 = Canvas.loginBoxCenter + 24; // L: 488
+ var53 = 277; // L: 489
+ Login.field913 = var48 >= var52 && var48 < var52 + ReflectionCheck.field247 && var49 >= var53 && var49 < var53 + MouseRecorder.field1064; // L: 490
+ if (var4 == 1 && Login.field913) { // L: 491
+ class19.clientPreferences.method2246(!class19.clientPreferences.method2247()); // L: 492
+ if (!class19.clientPreferences.method2247()) { // L: 493
+ Login.Login_username = ""; // L: 494
+ class19.clientPreferences.method2260((String)null); // L: 495
+ class29.method357(); // L: 496
+ }
+ }
+
+ label1389:
+ while (true) {
+ int var59;
+ Transferable var69;
+ do {
+ while (true) {
+ label1307:
+ do {
+ while (true) {
+ while (class18.isKeyDown()) { // L: 499
+ if (class272.field3196 != 13) { // L: 500
+ if (Login.currentLoginField != 0) { // L: 509
+ continue label1307;
+ }
+
+ char var56 = HealthBar.field1258; // L: 510
+
+ for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var56 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 512 513
+ }
+
+ if (class272.field3196 == 85 && Login.Login_username.length() > 0) { // L: 516
+ Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+ }
+
+ if (class272.field3196 == 84 || class272.field3196 == 80) { // L: 517
+ Login.currentLoginField = 1;
+ }
+
+ char var57 = HealthBar.field1258; // L: 519
+ boolean var61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var57) != -1; // L: 521
+ if (var61 && Login.Login_username.length() < 320) { // L: 523
+ Login.Login_username = Login.Login_username + HealthBar.field1258;
+ }
+ } else {
+ WorldMapData_1.method4872(0); // L: 501
+ Login.Login_username = ""; // L: 502
+ Login.Login_password = ""; // L: 503
+ class240.field2846 = 0; // L: 504
+ World.otp = ""; // L: 505
+ Login.field895 = true; // L: 506
+ }
+ }
+
+ return; // L: 1072
+ }
+ } while(Login.currentLoginField != 1); // L: 525
+
+ if (class272.field3196 == 85 && Login.Login_password.length() > 0) { // L: 526
+ Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 527
+ } else if (class272.field3196 == 84 || class272.field3196 == 80) { // L: 529
+ Login.currentLoginField = 0; // L: 530
+ if (class272.field3196 == 84) { // L: 531
+ Login.Login_username = Login.Login_username.trim(); // L: 532
+ if (Login.Login_username.length() == 0) { // L: 533
+ class101.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 534
+ return; // L: 535
+ }
+
+ if (Login.Login_password.length() == 0) { // L: 537
+ class101.setLoginResponseString("", "Please enter your password.", ""); // L: 538
+ return; // L: 539
+ }
+
+ class101.setLoginResponseString("", "Connecting to server...", ""); // L: 541
+ TriBool.method6791(false); // L: 542
+ HealthBarUpdate.updateGameState(20); // L: 543
+ return; // L: 544
+ }
+ }
+
+ if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class272.field3196 == 67) { // L: 547
+ Clipboard var68 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 548
+ var69 = var68.getContents(class353.client); // L: 549
+ var59 = 20 - Login.Login_password.length(); // L: 550
+ break;
+ }
+
+ char var62 = HealthBar.field1258; // L: 600
+ if ((var62 < ' ' || var62 >= 127) && (var62 <= 127 || var62 >= 160) && (var62 <= 160 || var62 > 255)) { // L: 602
+ label1514: {
+ if (var62 != 0) { // L: 606
+ char[] var71 = class340.cp1252AsciiExtension; // L: 608
+
+ for (int var72 = 0; var72 < var71.length; ++var72) { // L: 609
+ char var14 = var71[var72]; // L: 610
+ if (var62 == var14) { // L: 612
+ var55 = true; // L: 613
+ break label1514; // L: 614
+ }
+ }
+ }
+
+ var55 = false; // L: 620
+ }
+ } else {
+ var55 = true; // L: 603
+ }
+
+ if (var55) { // L: 622
+ char var74 = HealthBar.field1258; // L: 624
+ boolean var58 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var74) != -1; // L: 626
+ if (var58 && Login.Login_password.length() < 20) { // L: 628 629
+ Login.Login_password = Login.Login_password + HealthBar.field1258; // L: 630
+ }
+ }
+ }
+ } while(var59 <= 0); // L: 551
+
+ try {
+ String var60 = (String)var69.getTransferData(DataFlavor.stringFlavor); // L: 553
+ int var63 = Math.min(var59, var60.length()); // L: 554
+ int var15 = 0;
+
+ while (true) {
+ if (var15 >= var63) {
+ Login.Login_password = Login.Login_password + var60.substring(0, var63); // L: 592
+ continue label1389;
+ }
+
+ char var65 = var60.charAt(var15); // L: 558
+ boolean var16;
+ if ((var65 < ' ' || var65 >= 127) && (var65 <= 127 || var65 >= 160) && (var65 <= 160 || var65 > 255)) { // L: 560
+ label1517: {
+ if (var65 != 0) { // L: 564
+ char[] var66 = class340.cp1252AsciiExtension; // L: 566
+
+ for (var19 = 0; var19 < var66.length; ++var19) { // L: 567
+ char var20 = var66[var19]; // L: 568
+ if (var65 == var20) { // L: 570
+ var16 = true; // L: 571
+ break label1517; // L: 572
+ }
+ }
+ }
+
+ var16 = false; // L: 578
+ }
+ } else {
+ var16 = true; // L: 561
+ }
+
+ if (!var16) { // L: 580
+ break;
+ }
+
+ char var67 = var60.charAt(var15); // L: 582
+ boolean var25 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var67) != -1; // L: 584
+ if (!var25) { // L: 586
+ break;
+ }
+
+ ++var15; // L: 555
+ }
+
+ WorldMapData_1.method4872(3); // L: 588
+ return; // L: 589
+ } catch (UnsupportedFlavorException var46) { // L: 594
+ } catch (IOException var47) { // L: 595
+ }
+ }
+ } else if (Login.loginIndex == 3) { // L: 639
+ var50 = Login.loginBoxX + 180; // L: 640
+ var8 = 276; // L: 641
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 642
+ class101.method2547(false); // L: 643
+ }
+
+ var50 = Login.loginBoxX + 180; // L: 645
+ var8 = 326; // L: 646
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 647
+ class101.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 648
+ WorldMapData_1.method4872(5); // L: 649
+ return; // L: 650
+ }
+ } else {
+ int var10;
+ if (Login.loginIndex == 4) { // L: 653
+ var50 = Login.loginBoxX + 180 - 80; // L: 654
+ var8 = 321; // L: 655
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 656
+ World.otp.trim(); // L: 657
+ if (World.otp.length() != 6) { // L: 658
+ class101.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 659
+ return; // L: 660
+ }
+
+ class240.field2846 = Integer.parseInt(World.otp); // L: 662
+ World.otp = ""; // L: 663
+ TriBool.method6791(true); // L: 664
+ class101.setLoginResponseString("", "Connecting to server...", ""); // L: 665
+ HealthBarUpdate.updateGameState(20); // L: 666
+ return; // L: 667
+ }
+
+ if (var4 == 1 && var48 >= Login.loginBoxX + 180 - 9 && var48 <= Login.loginBoxX + 180 + 130 && var49 >= 263 && var49 <= 296) { // L: 669
+ Login.field895 = !Login.field895; // L: 670
+ }
+
+ if (var4 == 1 && var48 >= Login.loginBoxX + 180 - 34 && var48 <= Login.loginBoxX + 34 + 180 && var49 >= 351 && var49 <= 363) { // L: 672
+ class258.openURL(ModeWhere.method6080("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 673
+ }
+
+ var50 = Login.loginBoxX + 180 + 80; // L: 675
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 676
+ WorldMapData_1.method4872(0); // L: 677
+ Login.Login_username = ""; // L: 678
+ Login.Login_password = ""; // L: 679
+ class240.field2846 = 0; // L: 680
+ World.otp = ""; // L: 681
+ }
+
+ while (class18.isKeyDown()) { // L: 683
+ boolean var9 = false; // L: 684
+
+ for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 685
+ if (HealthBar.field1258 == "1234567890".charAt(var10)) { // L: 686
+ var9 = true; // L: 687
+ break; // L: 688
+ }
+ }
+
+ if (class272.field3196 == 13) { // L: 691
+ WorldMapData_1.method4872(0); // L: 692
+ Login.Login_username = ""; // L: 693
+ Login.Login_password = ""; // L: 694
+ class240.field2846 = 0; // L: 695
+ World.otp = ""; // L: 696
+ } else {
+ if (class272.field3196 == 85 && World.otp.length() > 0) { // L: 699
+ World.otp = World.otp.substring(0, World.otp.length() - 1);
+ }
+
+ if (class272.field3196 == 84) { // L: 700
+ World.otp.trim(); // L: 701
+ if (World.otp.length() != 6) { // L: 702
+ class101.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 703
+ return; // L: 704
+ }
+
+ class240.field2846 = Integer.parseInt(World.otp); // L: 706
+ World.otp = ""; // L: 707
+ TriBool.method6791(true); // L: 708
+ class101.setLoginResponseString("", "Connecting to server...", ""); // L: 709
+ HealthBarUpdate.updateGameState(20); // L: 710
+ return; // L: 711
+ }
+
+ if (var9 && World.otp.length() < 6) { // L: 713
+ World.otp = World.otp + HealthBar.field1258;
+ }
+ }
+ }
+ } else if (Login.loginIndex == 5) { // L: 717
+ var50 = Login.loginBoxX + 180 - 80; // L: 718
+ var8 = 321; // L: 719
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 720
+ Login.Login_username = Login.Login_username.trim(); // L: 722
+ if (Login.Login_username.length() == 0) { // L: 723
+ class101.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 724
+ } else {
+ long var31;
+ try {
+ URL var26 = new URL(ModeWhere.method6080("services", false) + "m=accountappeal/login.ws"); // L: 731
+ URLConnection var13 = var26.openConnection(); // L: 732
+ var13.setRequestProperty("connection", "close"); // L: 733
+ var13.setDoInput(true); // L: 734
+ var13.setDoOutput(true); // L: 735
+ var13.setConnectTimeout(5000); // L: 736
+ OutputStreamWriter var73 = new OutputStreamWriter(var13.getOutputStream()); // L: 737
+ var73.write("data1=req"); // L: 738
+ var73.flush(); // L: 739
+ InputStream var75 = var13.getInputStream(); // L: 740
+ Buffer var76 = new Buffer(new byte[1000]); // L: 741
+
+ while (true) {
+ int var17 = var75.read(var76.array, var76.offset, 1000 - var76.offset); // L: 743
+ if (var17 == -1) { // L: 744
+ var76.offset = 0; // L: 751
+ long var33 = var76.readLong(); // L: 752
+ var31 = var33; // L: 753
+ break;
+ }
+
+ var76.offset += var17; // L: 745
+ if (var76.offset >= 1000) { // L: 746
+ var31 = 0L; // L: 747
+ break;
+ }
+ }
+ } catch (Exception var44) { // L: 755
+ var31 = 0L; // L: 756
+ }
+
+ int var54;
+ if (var31 == 0L) { // L: 760
+ var54 = 5;
+ } else {
+ var54 = WorldMapAreaData.method5082(var31, Login.Login_username); // L: 761
+ }
+
+ switch(var54) { // L: 762
+ case 2:
+ class101.setLoginResponseString(Strings.field3894, Strings.field3926, Strings.field3896); // L: 770
+ WorldMapData_1.method4872(6); // L: 771
+ break; // L: 772
+ case 3:
+ class101.setLoginResponseString("", "Error connecting to server.", ""); // L: 777
+ break; // L: 778
+ case 4:
+ class101.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 780
+ break;
+ case 5:
+ class101.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 767
+ break; // L: 768
+ case 6:
+ class101.setLoginResponseString("", "Error connecting to server.", ""); // L: 774
+ break; // L: 775
+ case 7:
+ class101.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 764
+ }
+ }
+
+ return; // L: 784
+ }
+
+ var50 = Login.loginBoxX + 180 + 80; // L: 786
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 787
+ class135.Login_promptCredentials(true); // L: 788
+ }
+
+ var53 = 361; // L: 790
+ if (PcmPlayer.field294 != null) { // L: 791
+ var10 = PcmPlayer.field294.highX / 2; // L: 792
+ if (var4 == 1 && var48 >= PcmPlayer.field294.lowX - var10 && var48 <= var10 + PcmPlayer.field294.lowX && var49 >= var53 - 15 && var49 < var53) { // L: 793
+ class258.openURL(ModeWhere.method6080("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 794
+ }
+ }
+
+ while (class18.isKeyDown()) { // L: 797
+ var55 = false; // L: 798
+
+ for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 799
+ if (HealthBar.field1258 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 800
+ var55 = true; // L: 801
+ break; // L: 802
+ }
+ }
+
+ if (class272.field3196 == 13) { // L: 805
+ class135.Login_promptCredentials(true); // L: 806
+ } else {
+ if (class272.field3196 == 85 && Login.Login_username.length() > 0) { // L: 809
+ Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+ }
+
+ if (class272.field3196 == 84) { // L: 810
+ Login.Login_username = Login.Login_username.trim(); // L: 812
+ if (Login.Login_username.length() == 0) { // L: 813
+ class101.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 814
+ } else {
+ long var35;
+ try {
+ URL var28 = new URL(ModeWhere.method6080("services", false) + "m=accountappeal/login.ws"); // L: 821
+ URLConnection var29 = var28.openConnection(); // L: 822
+ var29.setRequestProperty("connection", "close"); // L: 823
+ var29.setDoInput(true); // L: 824
+ var29.setDoOutput(true); // L: 825
+ var29.setConnectTimeout(5000); // L: 826
+ OutputStreamWriter var30 = new OutputStreamWriter(var29.getOutputStream()); // L: 827
+ var30.write("data1=req"); // L: 828
+ var30.flush(); // L: 829
+ InputStream var37 = var29.getInputStream(); // L: 830
+ Buffer var18 = new Buffer(new byte[1000]); // L: 831
+
+ while (true) {
+ var19 = var37.read(var18.array, var18.offset, 1000 - var18.offset); // L: 833
+ if (var19 == -1) { // L: 834
+ var18.offset = 0; // L: 841
+ long var38 = var18.readLong(); // L: 842
+ var35 = var38; // L: 843
+ break;
+ }
+
+ var18.offset += var19; // L: 835
+ if (var18.offset >= 1000) { // L: 836
+ var35 = 0L; // L: 837
+ break;
+ }
+ }
+ } catch (Exception var45) { // L: 845
+ var35 = 0L; // L: 846
+ }
+
+ if (var35 == 0L) { // L: 850
+ var11 = 5;
+ } else {
+ var11 = WorldMapAreaData.method5082(var35, Login.Login_username); // L: 851
+ }
+
+ switch(var11) { // L: 852
+ case 2:
+ class101.setLoginResponseString(Strings.field3894, Strings.field3926, Strings.field3896); // L: 860
+ WorldMapData_1.method4872(6); // L: 861
+ break; // L: 862
+ case 3:
+ class101.setLoginResponseString("", "Error connecting to server.", ""); // L: 864
+ break; // L: 865
+ case 4:
+ class101.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 867
+ break; // L: 868
+ case 5:
+ class101.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 870
+ break;
+ case 6:
+ class101.setLoginResponseString("", "Error connecting to server.", ""); // L: 857
+ break; // L: 858
+ case 7:
+ class101.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 854
+ }
+ }
+
+ return; // L: 874
+ }
+
+ if (var55 && Login.Login_username.length() < 320) { // L: 876
+ Login.Login_username = Login.Login_username + HealthBar.field1258;
+ }
+ }
+ }
+ } else if (Login.loginIndex != 6) { // L: 880
+ if (Login.loginIndex == 7) { // L: 891
+ if (VarpDefinition.field1821 && !Client.onMobile) { // L: 892
+ var50 = Canvas.loginBoxCenter - 150; // L: 893
+ var52 = var50 + 40 + 240 + 25; // L: 894
+ var53 = 231; // L: 895
+ var10 = var53 + 40; // L: 896
+ if (var4 == 1 && var48 >= var50 && var48 <= var52 && var49 >= var53 && var49 <= var10) { // L: 897
+ Login.field910 = class119.method2757(var50, var48); // L: 898
+ }
+
+ var11 = Login.loginBoxX + 180 - 80; // L: 900
+ short var12 = 321; // L: 901
+ boolean var27;
+ if (var4 == 1 && var48 >= var11 - 75 && var48 <= var11 + 75 && var49 >= var12 - 20 && var49 <= var12 + 20) { // L: 902
+ var27 = GrandExchangeOfferUnitPriceComparator.method6031(); // L: 903
+ if (var27) { // L: 904
+ HealthBarUpdate.updateGameState(50); // L: 905
+ return; // L: 906
+ }
+ }
+
+ var11 = Login.loginBoxX + 180 + 80; // L: 909
+ if (var4 == 1 && var48 >= var11 - 75 && var48 <= var11 + 75 && var49 >= var12 - 20 && var49 <= var12 + 20) { // L: 910
+ Login.field911 = new String[8]; // L: 911
+ class135.Login_promptCredentials(true); // L: 912
+ }
+
+ while (class18.isKeyDown()) { // L: 914
+ if (class272.field3196 == 101) { // L: 915
+ Login.field911[Login.field910] = null; // L: 916
+ }
+
+ if (class272.field3196 == 85) { // L: 918
+ if (Login.field911[Login.field910] == null && Login.field910 > 0) { // L: 919
+ --Login.field910; // L: 920
+ }
+
+ Login.field911[Login.field910] = null; // L: 922
+ }
+
+ if (HealthBar.field1258 >= '0' && HealthBar.field1258 <= '9') { // L: 924
+ Login.field911[Login.field910] = "" + HealthBar.field1258; // L: 925
+ if (Login.field910 < 7) { // L: 926
+ ++Login.field910; // L: 927
+ }
+ }
+
+ if (class272.field3196 == 84) { // L: 930
+ var27 = GrandExchangeOfferUnitPriceComparator.method6031(); // L: 931
+ if (var27) { // L: 932
+ HealthBarUpdate.updateGameState(50); // L: 933
+ }
+
+ return; // L: 935
+ }
+ }
+ } else {
+ var50 = Login.loginBoxX + 180 - 80; // L: 940
+ var8 = 321; // L: 941
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 942
+ class258.openURL(ModeWhere.method6080("secure", true) + "m=dob/set_dob.ws", true, false); // L: 943
+ class101.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 944
+ WorldMapData_1.method4872(6); // L: 945
+ return; // L: 946
+ }
+
+ var50 = Login.loginBoxX + 180 + 80; // L: 948
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 949
+ class135.Login_promptCredentials(true); // L: 950
+ }
+ }
+ } else if (Login.loginIndex == 8) { // L: 954
+ var50 = Login.loginBoxX + 180 - 80; // L: 955
+ var8 = 321; // L: 956
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 957
+ class258.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 958
+ class101.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 959
+ WorldMapData_1.method4872(6); // L: 960
+ return; // L: 961
+ }
+
+ var50 = Login.loginBoxX + 180 + 80; // L: 963
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 964
+ class135.Login_promptCredentials(true); // L: 965
+ }
+ } else if (Login.loginIndex == 9) { // L: 968
+ var50 = Login.loginBoxX + 180; // L: 969
+ var8 = 311; // L: 970
+ if (class272.field3196 == 84 || class272.field3196 == 13 || var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 971
+ class101.method2547(false); // L: 972
+ }
+ } else if (Login.loginIndex == 10) { // L: 975
+ var50 = Login.loginBoxX + 180; // L: 976
+ var8 = 209; // L: 977
+ if (class272.field3196 == 84 || var4 == 1 && var48 >= var50 - 109 && var48 <= var50 + 109 && var49 >= var8 && var49 <= var8 + 68) { // L: 978
+ class101.setLoginResponseString("", "Connecting to server...", ""); // L: 979
+ Client.field516 = class446.field4750; // L: 980
+ TriBool.method6791(false); // L: 981
+ HealthBarUpdate.updateGameState(20); // L: 982
+ }
+ } else if (Login.loginIndex == 12) { // L: 985
+ var50 = Canvas.loginBoxCenter; // L: 986
+ var8 = 233; // L: 987
+ Bounds var42 = var1.method6372(0, 30, "terms of use, privacy policy, and end user licence", var50, var8); // L: 988
+ Bounds var23 = var1.method6372(32, 32, "terms of use, privacy policy, and end user licence", var50, var8); // L: 989
+ Bounds var24 = var1.method6372(70, 34, "terms of use, privacy policy, and end user licence", var50, var8); // L: 990
+ var52 = var8 + 17; // L: 991
+ Bounds var70 = var1.method6372(0, 34, "agreement (EULA).", var50, var52); // L: 992
+ if (var4 == 1) { // L: 993
+ if (var42.method6894(var48, var49)) { // L: 994
+ class258.openURL("https://www.jagex.com/terms", true, false); // L: 995
+ } else if (var23.method6894(var48, var49)) { // L: 997
+ class258.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 998
+ } else if (var24.method6894(var48, var49) || var70.method6894(var48, var49)) { // L: 1000
+ class258.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 1001
+ }
+ }
+
+ var50 = Canvas.loginBoxCenter - 80; // L: 1004
+ var8 = 311; // L: 1005
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 1006
+ class19.clientPreferences.method2307(Client.field482); // L: 1008
+ class101.method2547(true); // L: 1010
+ }
+
+ var50 = Canvas.loginBoxCenter + 80; // L: 1012
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 1013
+ Login.loginIndex = 13; // L: 1014
+ }
+ } else if (Login.loginIndex == 13) { // L: 1017
+ var50 = Canvas.loginBoxCenter; // L: 1018
+ var8 = 321; // L: 1019
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 1020
+ class101.method2547(true); // L: 1021
+ }
+ } else if (Login.loginIndex == 14) { // L: 1024
+ String var43 = ""; // L: 1025
+ switch(Login.field897) { // L: 1026
+ case 0:
+ var43 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1031
+ break; // L: 1032
+ case 1:
+ var43 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1028
+ break; // L: 1029
+ default:
+ class135.Login_promptCredentials(false); // L: 1034
+ }
+
+ var52 = Login.loginBoxX + 180; // L: 1037
+ var53 = 276; // L: 1038
+ if (var4 == 1 && var48 >= var52 - 75 && var48 <= var52 + 75 && var49 >= var53 - 20 && var49 <= var53 + 20) { // L: 1039
+ class258.openURL(var43, true, false); // L: 1040
+ class101.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1041
+ WorldMapData_1.method4872(6); // L: 1042
+ return; // L: 1043
+ }
+
+ var52 = Login.loginBoxX + 180; // L: 1045
+ var53 = 326; // L: 1046
+ if (var4 == 1 && var48 >= var52 - 75 && var48 <= var52 + 75 && var49 >= var53 - 20 && var49 <= var53 + 20) { // L: 1047
+ class135.Login_promptCredentials(false); // L: 1048
+ }
+ } else if (Login.loginIndex == 24) { // L: 1051
+ var50 = Login.loginBoxX + 180; // L: 1052
+ var8 = 301; // L: 1053
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 1054
+ class101.method2547(false); // L: 1055
+ }
+ } else if (Login.loginIndex == 26) { // L: 1058
+ var50 = Login.loginBoxX + 180 - 80; // L: 1059
+ var8 = 321; // L: 1060
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 1061
+ class258.openURL(ModeWhere.method6080("secure", true) + "m=dob/set_dob.ws", true, false); // L: 1062
+ class101.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1063
+ WorldMapData_1.method4872(6); // L: 1064
+ return; // L: 1065
+ }
+
+ var50 = Login.loginBoxX + 180 + 80; // L: 1067
+ if (var4 == 1 && var48 >= var50 - 75 && var48 <= var50 + 75 && var49 >= var8 - 20 && var49 <= var8 + 20) { // L: 1068
+ class135.Login_promptCredentials(true); // L: 1069
+ }
+ }
+ } else {
+ while (true) {
+ do {
+ if (!class18.isKeyDown()) { // L: 881
+ var51 = 321; // L: 886
+ if (var4 == 1 && var49 >= var51 - 20 && var49 <= var51 + 20) { // L: 887
+ class135.Login_promptCredentials(true); // L: 888
+ }
+
+ return;
+ }
+ } while(class272.field3196 != 84 && class272.field3196 != 13); // L: 882
+
+ class135.Login_promptCredentials(true); // L: 883
+ }
+ }
+ }
+ }
+ }
+
+ }
}
}
- } // L: 3765
+ } // L: 309
+
+ @ObfuscatedName("fx")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "2067958159"
+ )
+ @Export("playSong")
+ static void playSong(int var0) {
+ if (var0 == -1 && !Client.playingJingle) { // L: 3758
+ ReflectionCheck.method579(); // L: 3759
+ } else if (var0 != -1 && var0 != Client.currentTrackGroupId && class19.clientPreferences.method2258() != 0 && !Client.playingJingle) { // L: 3761
+ Archive var1 = class121.archive6; // L: 3762
+ int var2 = class19.clientPreferences.method2258(); // L: 3763
+ class272.musicPlayerStatus = 1; // L: 3765
+ class272.musicTrackArchive = var1; // L: 3766
+ class272.musicTrackGroupId = var0; // L: 3767
+ class151.musicTrackFileId = 0; // L: 3768
+ class272.musicTrackVolume = var2; // L: 3769
+ class11.musicTrackBoolean = false; // L: 3770
+ class272.pcmSampleLength = 2; // L: 3771
+ }
+
+ Client.currentTrackGroupId = var0; // L: 3774
+ } // L: 3775
+
+ @ObfuscatedName("ji")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIIIS)V",
+ garbageValue = "16886"
+ )
+ @Export("updateRootInterface")
+ static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ if (WorldMapSection2.loadInterface(var0)) { // L: 11044
+ class29.updateInterface(SoundCache.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11045
+ }
+ } // L: 11046
}
diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java
index f4d294e2e6..bfc96267cc 100644
--- a/runescape-client/src/main/java/class160.java
+++ b/runescape-client/src/main/java/class160.java
@@ -2,260 +2,178 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fd")
+@ObfuscatedName("fb")
public class class160 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lcb;"
+ descriptor = "Lct;"
)
- public UrlRequest field1783;
- @ObfuscatedName("q")
- public float[] field1782;
+ public UrlRequest field1772;
+ @ObfuscatedName("v")
+ public float[] field1770;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leq;"
+ descriptor = "Les;"
)
final class155 this$0;
@ObfuscatedSignature(
- descriptor = "(Leq;)V"
+ descriptor = "(Les;)V"
)
class160(class155 var1) {
this.this$0 = var1;
- this.field1782 = new float[4]; // L: 308
- } // L: 310
+ this.field1770 = new float[4]; // L: 326
+ } // L: 328
- @ObfuscatedName("o")
+ @ObfuscatedName("i")
@ObfuscatedSignature(
- descriptor = "(IB)Lfa;",
- garbageValue = "31"
+ descriptor = "(I)[I",
+ garbageValue = "112467614"
)
- public static FloorUnderlayDefinition method3171(int var0) {
- FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 21
- if (var1 != null) { // L: 22
- return var1;
- } else {
- byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 23
- var1 = new FloorUnderlayDefinition(); // L: 24
- if (var2 != null) { // L: 25
- var1.decode(new Buffer(var2), var0);
- }
+ public static int[] method3285() {
+ int[] var0 = new int[KeyHandler.field146]; // L: 265
- var1.postDecode(); // L: 26
- FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 27
- return var1; // L: 28
+ for (int var1 = 0; var1 < KeyHandler.field146; ++var1) { // L: 266
+ var0[var1] = KeyHandler.field142[var1]; // L: 267
}
+
+ return var0; // L: 269
}
- @ObfuscatedName("a")
+ @ObfuscatedName("id")
@ObfuscatedSignature(
- descriptor = "(II)Ldl;",
- garbageValue = "-638516469"
+ descriptor = "(Lco;IIIB)V",
+ garbageValue = "9"
)
- static class118 method3169(int var0) {
- class118 var1 = (class118)class291.findEnumerated(HealthBar.method2333(), var0); // L: 35
- if (var1 == null) {
- var1 = class118.field1498; // L: 36
- }
-
- return var1; // L: 37
- }
-
- @ObfuscatedName("je")
- @ObfuscatedSignature(
- descriptor = "(Lki;IIB)V",
- garbageValue = "43"
- )
- @Export("Widget_addToMenu")
- static final void Widget_addToMenu(Widget var0, int var1, int var2) {
- if (var0.buttonType == 1) { // L: 11008
- Projectile.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 11009
- }
-
- String var3;
- if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 11012
- var3 = TriBool.Widget_getSpellActionName(var0); // L: 11013
- if (var3 != null) { // L: 11014
- Projectile.insertMenuItemNoShift(var3, class166.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 11015
+ @Export("addNpcToMenu")
+ static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) {
+ NPCComposition var4 = var0.definition; // L: 9879
+ if (Client.menuOptionsCount < 400) { // L: 9880
+ if (var4.transforms != null) { // L: 9881
+ var4 = var4.transform();
}
- }
- if (var0.buttonType == 3) { // L: 11019
- Projectile.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 11020
- }
+ if (var4 != null) { // L: 9882
+ if (var4.isInteractable) { // L: 9883
+ if (!var4.isFollower || Client.followerIndex == var1) { // L: 9884
+ String var5 = var0.method2360(); // L: 9885
+ int var6;
+ int var9;
+ if (var4.combatLevel != 0 && var0.field1204 != 0) { // L: 9886
+ var6 = var0.field1204 != -1 ? var0.field1204 * -1036005949 * 71404267 : var4.combatLevel * -1544891593 * 471159431; // L: 9887
+ var9 = class101.localPlayer.combatLevel; // L: 9890
+ int var10 = var9 - var6; // L: 9892
+ String var8;
+ if (var10 < -9) { // L: 9893
+ var8 = class122.colorStartTag(16711680); // L: 9894
+ } else if (var10 < -6) { // L: 9897
+ var8 = class122.colorStartTag(16723968); // L: 9898
+ } else if (var10 < -3) { // L: 9901
+ var8 = class122.colorStartTag(16740352); // L: 9902
+ } else if (var10 < 0) { // L: 9905
+ var8 = class122.colorStartTag(16756736); // L: 9906
+ } else if (var10 > 9) { // L: 9909
+ var8 = class122.colorStartTag(65280); // L: 9910
+ } else if (var10 > 6) { // L: 9913
+ var8 = class122.colorStartTag(4259584); // L: 9914
+ } else if (var10 > 3) { // L: 9917
+ var8 = class122.colorStartTag(8453888); // L: 9918
+ } else if (var10 > 0) { // L: 9921
+ var8 = class122.colorStartTag(12648192); // L: 9922
+ } else {
+ var8 = class122.colorStartTag(16776960); // L: 9925
+ }
- if (var0.buttonType == 4) { // L: 11023
- Projectile.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 11024
- }
+ var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 9927
+ }
- if (var0.buttonType == 5) { // L: 11027
- Projectile.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 11028
- }
+ if (var4.isFollower && Client.followerOpsLowPriority) { // L: 9929
+ class4.insertMenuItemNoShift("Examine", class122.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9930
+ }
- if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 11031
- Projectile.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 11032
- }
-
- int var4;
- int var5;
- int var19;
- if (var0.type == 2) { // L: 11035
- var19 = 0; // L: 11036
-
- for (var4 = 0; var4 < var0.height; ++var4) { // L: 11037
- for (var5 = 0; var5 < var0.width; ++var5) { // L: 11038
- int var6 = (var0.paddingX + 32) * var5; // L: 11039
- int var7 = (var0.paddingY + 32) * var4; // L: 11040
- if (var19 < 20) { // L: 11041
- var6 += var0.inventoryXOffsets[var19]; // L: 11042
- var7 += var0.inventoryYOffsets[var19]; // L: 11043
- }
-
- if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 11045
- Client.dragItemSlotDestination = var19; // L: 11046
- class155.hoveredItemContainer = var0; // L: 11047
- if (var0.itemIds[var19] > 0) { // L: 11048
- label328: {
- ItemComposition var8 = FileSystem.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 11049
- boolean var9;
- int var10;
- if (Client.isItemSelected == 1) { // L: 11051
- var10 = UrlRequester.getWidgetFlags(var0); // L: 11053
- var9 = (var10 >> 30 & 1) != 0; // L: 11055
- if (var9) { // L: 11057
- if (var0.id != class20.selectedItemWidget || var19 != PcmPlayer.selectedItemSlot) { // L: 11058
- Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 11059
+ if (Client.isItemSelected == 1) { // L: 9933
+ class4.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class122.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 9934
+ } else if (Client.isSpellSelected) { // L: 9937
+ if ((HealthBar.selectedSpellFlags & 2) == 2) { // L: 9938
+ class4.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class122.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 9939
+ }
+ } else {
+ var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9944
+ String[] var7 = var4.actions; // L: 9945
+ int var11;
+ if (var7 != null) { // L: 9946
+ for (var11 = 4; var11 >= 0; --var11) { // L: 9947
+ if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 9948
+ var9 = 0; // L: 9949
+ if (var11 == 0) { // L: 9950
+ var9 = var6 + 9;
}
- break label328;
- }
- }
- if (Client.isSpellSelected) { // L: 11066
- var10 = UrlRequester.getWidgetFlags(var0); // L: 11068
- var9 = (var10 >> 30 & 1) != 0; // L: 11070
- if (var9) { // L: 11072
- if ((class113.selectedSpellFlags & 16) == 16) { // L: 11073
- Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 11074
+ if (var11 == 1) { // L: 9951
+ var9 = var6 + 10;
}
- break label328;
+
+ if (var11 == 2) { // L: 9952
+ var9 = var6 + 11;
+ }
+
+ if (var11 == 3) { // L: 9953
+ var9 = var6 + 12;
+ }
+
+ if (var11 == 4) { // L: 9954
+ var9 = var6 + 13;
+ }
+
+ class4.insertMenuItemNoShift(var7[var11], class122.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9955
}
}
+ }
- String[] var22 = var8.inventoryActions; // L: 11080
- var10 = -1; // L: 11081
- boolean var11;
- if (Client.shiftClickDrop) { // L: 11082
- var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 11085
- if (var11) { // L: 11087
- var10 = var8.getShiftClickIndex(); // L: 11088
- }
- }
+ if (var7 != null) { // L: 9960
+ for (var11 = 4; var11 >= 0; --var11) { // L: 9961
+ if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 9962
+ short var12 = 0; // L: 9963
+ if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9964
+ if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > class101.localPlayer.combatLevel) { // L: 9965
+ var12 = 2000; // L: 9966
+ }
- int var12 = UrlRequester.getWidgetFlags(var0); // L: 11092
- var11 = (var12 >> 30 & 1) != 0; // L: 11094
- if (var11) { // L: 11096
- for (int var13 = 4; var13 >= 3; --var13) { // L: 11097
- if (var10 != var13) { // L: 11098
- class321.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 11099
+ var9 = 0; // L: 9968
+ if (var11 == 0) { // L: 9969
+ var9 = var12 + 9;
+ }
+
+ if (var11 == 1) { // L: 9970
+ var9 = var12 + 10;
+ }
+
+ if (var11 == 2) { // L: 9971
+ var9 = var12 + 11;
+ }
+
+ if (var11 == 3) { // L: 9972
+ var9 = var12 + 12;
+ }
+
+ if (var11 == 4) { // L: 9973
+ var9 = var12 + 13;
+ }
+
+ class4.insertMenuItemNoShift(var7[var11], class122.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9974
}
}
}
+ }
- int var14 = UrlRequester.getWidgetFlags(var0); // L: 11103
- boolean var24 = (var14 >> 31 & 1) != 0; // L: 11105
- if (var24) { // L: 11107
- Projectile.insertMenuItemNoShift("Use", class166.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 11108
- }
-
- int var16 = UrlRequester.getWidgetFlags(var0); // L: 11112
- boolean var15 = (var16 >> 30 & 1) != 0; // L: 11114
- int var17;
- if (var15) { // L: 11116
- for (var17 = 2; var17 >= 0; --var17) { // L: 11117
- if (var17 != var10) { // L: 11118
- class321.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 11119
- }
- }
-
- if (var10 >= 0) { // L: 11121
- class321.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 11122
- }
- }
-
- var22 = var0.itemActions; // L: 11125
- if (var22 != null) { // L: 11126
- for (var17 = 4; var17 >= 0; --var17) { // L: 11127
- if (var22[var17] != null) { // L: 11128
- byte var18 = 0; // L: 11129
- if (var17 == 0) { // L: 11130
- var18 = 39;
- }
-
- if (var17 == 1) { // L: 11131
- var18 = 40;
- }
-
- if (var17 == 2) { // L: 11132
- var18 = 41;
- }
-
- if (var17 == 3) { // L: 11133
- var18 = 42;
- }
-
- if (var17 == 4) { // L: 11134
- var18 = 43;
- }
-
- Projectile.insertMenuItemNoShift(var22[var17], class166.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 11135
- }
- }
- }
-
- Projectile.insertMenuItemNoShift("Examine", class166.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 11140
+ if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 9979
+ class4.insertMenuItemNoShift("Examine", class122.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9980
}
}
- }
- ++var19; // L: 11146
+ }
}
}
}
-
- if (var0.isIf3) { // L: 11150
- if (Client.isSpellSelected) { // L: 11151
- var4 = UrlRequester.getWidgetFlags(var0); // L: 11153
- boolean var25 = (var4 >> 21 & 1) != 0; // L: 11155
- if (var25 && (class113.selectedSpellFlags & 32) == 32) { // L: 11157
- Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11158
- }
- } else {
- for (var19 = 9; var19 >= 5; --var19) { // L: 11163
- String var21 = class193.method3801(var0, var19); // L: 11164
- if (var21 != null) { // L: 11165
- Projectile.insertMenuItemNoShift(var21, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 11166
- }
- }
-
- var3 = TriBool.Widget_getSpellActionName(var0); // L: 11170
- if (var3 != null) { // L: 11171
- Projectile.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11172
- }
-
- for (var4 = 4; var4 >= 0; --var4) { // L: 11175
- String var20 = class193.method3801(var0, var4); // L: 11176
- if (var20 != null) { // L: 11177
- class175.insertMenuItem(var20, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11178
- }
- }
-
- var5 = UrlRequester.getWidgetFlags(var0); // L: 11183
- boolean var23 = (var5 & 1) != 0; // L: 11185
- if (var23) { // L: 11187
- Projectile.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11188
- }
- }
- }
-
- } // L: 11193
+ } // L: 9984
}
diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java
new file mode 100644
index 0000000000..d573bc949d
--- /dev/null
+++ b/runescape-client/src/main/java/class161.java
@@ -0,0 +1,115 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("fn")
+public class class161 {
+ @ObfuscatedName("le")
+ @ObfuscatedSignature(
+ descriptor = "Lkb;"
+ )
+ @Export("hoveredItemContainer")
+ static Widget hoveredItemContainer;
+ @ObfuscatedName("f")
+ public String field1775;
+ @ObfuscatedName("j")
+ public float[] field1776;
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = 1972368239
+ )
+ public int field1773;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = -1667706695
+ )
+ public int field1777;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = -7571905
+ )
+ public int field1779;
+ // $FF: synthetic field
+ @ObfuscatedSignature(
+ descriptor = "Les;"
+ )
+ final class155 this$0;
+
+ @ObfuscatedSignature(
+ descriptor = "(Les;)V"
+ )
+ class161(class155 var1) {
+ this.this$0 = var1;
+ this.field1776 = new float[4]; // L: 336
+ this.field1773 = 1; // L: 337
+ this.field1777 = 1; // L: 338
+ this.field1779 = 0; // L: 339
+ } // L: 341
+
+ @ObfuscatedName("jb")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Z",
+ garbageValue = "-68"
+ )
+ static boolean method3289(int var0) {
+ for (int var1 = 0; var1 < Client.field719; ++var1) { // L: 11574
+ if (Client.field721[var1] == var0) { // L: 11575
+ return true;
+ }
+ }
+
+ return false; // L: 11577
+ }
+
+ @ObfuscatedName("js")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;III)V",
+ garbageValue = "1253772800"
+ )
+ @Export("clickWidget")
+ static final void clickWidget(Widget var0, int var1, int var2) {
+ if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11616
+ if (var0 != null) { // L: 11618
+ Widget var4 = UserComparator10.method2610(var0); // L: 11621
+ if (var4 == null) { // L: 11622
+ var4 = var0.parent;
+ }
+
+ if (var4 != null) { // L: 11625
+ Client.clickedWidget = var0; // L: 11629
+ var4 = UserComparator10.method2610(var0); // L: 11632
+ if (var4 == null) { // L: 11633
+ var4 = var0.parent;
+ }
+
+ Client.clickedWidgetParent = var4; // L: 11636
+ Client.widgetClickX = var1; // L: 11637
+ Client.widgetClickY = var2; // L: 11638
+ Timer.widgetDragDuration = 0; // L: 11639
+ Client.isDraggingWidget = false; // L: 11640
+ int var5 = class240.method5005(); // L: 11641
+ if (var5 != -1) { // L: 11642
+ WorldMapLabelSize.method4566(var5);
+ }
+
+ return; // L: 11643
+ }
+ }
+
+ }
+ } // L: 11627
+
+ @ObfuscatedName("ky")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-21"
+ )
+ static final void method3287() {
+ for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12208
+ Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12209
+ var1.clearIsInFriendsChat(); // L: 12210
+ }
+
+ } // L: 12212
+}
diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java
index 47a07c8285..3567252ce2 100644
--- a/runescape-client/src/main/java/class162.java
+++ b/runescape-client/src/main/java/class162.java
@@ -1,142 +1,111 @@
+import java.awt.Image;
+import java.lang.management.GarbageCollectorMXBean;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("fv")
-public class class162 {
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("Widget_modelsArchive")
- static AbstractArchive Widget_modelsArchive;
- @ObfuscatedName("pt")
+@ObfuscatedName("fl")
+public class class162 extends class165 {
+ @ObfuscatedName("aj")
+ static Image field1781;
+ @ObfuscatedName("av")
+ @Export("garbageCollector")
+ static GarbageCollectorMXBean garbageCollector;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = 415868235
+ intValue = -454332877
)
- static int field1810;
- @ObfuscatedName("k")
- public String field1803;
- @ObfuscatedName("a")
- public float[] field1804;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = -1916139913
- )
- public int field1811;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 311501729
- )
- public int field1806;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = 1324402861
- )
- public int field1807;
+ int field1784;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Leq;"
+ descriptor = "Les;"
)
final class155 this$0;
@ObfuscatedSignature(
- descriptor = "(Leq;)V"
+ descriptor = "(Les;Ljava/lang/String;I)V"
)
- class162(class155 var1) {
- this.this$0 = var1;
- this.field1804 = new float[4]; // L: 318
- this.field1811 = 1; // L: 319
- this.field1806 = 1; // L: 320
- this.field1807 = 0; // L: 321
- } // L: 323
+ class162(class155 var1, String var2, int var3) {
+ super(var1, var2); // L: 372
+ this.this$0 = var1; // L: 371
+ this.field1784 = var3; // L: 373
+ } // L: 374
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-734766672"
+ descriptor = "(B)I",
+ garbageValue = "-118"
)
- public static void method3209() {
- if (KeyHandler.KeyHandler_instance != null) { // L: 124
- synchronized(KeyHandler.KeyHandler_instance) { // L: 125
- KeyHandler.KeyHandler_instance = null; // L: 126
- } // L: 127
- }
-
- } // L: 129
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(B)Ljm;",
- garbageValue = "124"
- )
- public static PacketBufferNode method3208() {
- PacketBufferNode var0 = FloorOverlayDefinition.method3700();
- var0.clientPacket = null;
- var0.clientPacketLength = 0;
- var0.packetBuffer = new PacketBuffer(5000);
- return var0;
+ public int vmethod3314() {
+ return 0; // L: 377
}
- @ObfuscatedName("l")
+ @ObfuscatedName("g")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;IZB)Z",
- garbageValue = "-8"
+ descriptor = "(I)I",
+ garbageValue = "16777215"
)
- static boolean method3207(CharSequence var0, int var1, boolean var2) {
- if (var1 >= 2 && var1 <= 36) { // L: 39
- boolean var3 = false; // L: 40
- boolean var4 = false; // L: 41
- int var5 = 0; // L: 42
- int var6 = var0.length(); // L: 43
+ public int vmethod3318() {
+ return this.field1784; // L: 382
+ }
- for (int var7 = 0; var7 < var6; ++var7) { // L: 44
- char var8 = var0.charAt(var7); // L: 45
- if (var7 == 0) { // L: 46
- if (var8 == '-') { // L: 47
- var3 = true; // L: 48
- continue;
- }
-
- if (var8 == '+') { // L: 51
- continue;
- }
- }
-
- int var10;
- if (var8 >= '0' && var8 <= '9') { // L: 53
- var10 = var8 - '0';
- } else if (var8 >= 'A' && var8 <= 'Z') { // L: 54
- var10 = var8 - '7';
- } else {
- if (var8 < 'a' || var8 > 'z') { // L: 55
- return false; // L: 56
- }
-
- var10 = var8 - 'W';
- }
-
- if (var10 >= var1) { // L: 57
- return false;
- }
-
- if (var3) { // L: 58
- var10 = -var10;
- }
-
- int var9 = var10 + var5 * var1; // L: 59
- if (var9 / var1 != var5) { // L: 60
- return false;
- }
-
- var5 = var9; // L: 61
- var4 = true; // L: 62
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lgk;",
+ garbageValue = "540611824"
+ )
+ @Export("getObjectDefinition")
+ public static ObjectComposition getObjectDefinition(int var0) {
+ ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79
+ if (var1 != null) { // L: 80
+ return var1;
+ } else {
+ byte[] var2 = class328.ObjectDefinition_archive.takeFile(6, var0); // L: 81
+ var1 = new ObjectComposition(); // L: 82
+ var1.id = var0; // L: 83
+ if (var2 != null) { // L: 84
+ var1.decode(new Buffer(var2));
}
- return var4; // L: 64
+ var1.postDecode(); // L: 85
+ if (var1.isSolid) { // L: 86
+ var1.interactType = 0; // L: 87
+ var1.boolean1 = false; // L: 88
+ }
+
+ ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90
+ return var1; // L: 91
+ }
+ }
+
+ @ObfuscatedName("az")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1499243899"
+ )
+ static int method3298(int var0, Script var1, boolean var2) {
+ if (var0 == 6800) { // L: 4521
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4522
+ return 1; // L: 4523
+ } else if (var0 != 6801 && var0 != 6802) { // L: 4525
+ if (var0 == 6850) { // L: 4529
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4530
+ return 1; // L: 4531
+ } else if (var0 != 6851 && var0 != 6852) { // L: 4533
+ if (var0 == 6853) { // L: 4537
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 4538
+ return 1; // L: 4539
+ } else {
+ return 2; // L: 4541
+ }
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4534
+ return 1; // L: 4535
+ }
} else {
- throw new IllegalArgumentException("" + var1);
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 4526
+ return 1; // L: 4527
}
}
}
diff --git a/runescape-client/src/main/java/class163.java b/runescape-client/src/main/java/class163.java
deleted file mode 100644
index 27f8c32a03..0000000000
--- a/runescape-client/src/main/java/class163.java
+++ /dev/null
@@ -1,44 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ff")
-public class class163 extends class166 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 604155557
- )
- int field1812;
- // $FF: synthetic field
- @ObfuscatedSignature(
- descriptor = "Leq;"
- )
- final class155 this$0;
-
- @ObfuscatedSignature(
- descriptor = "(Leq;Ljava/lang/String;I)V"
- )
- class163(class155 var1, String var2, int var3) {
- super(var1, var2); // L: 354
- this.this$0 = var1; // L: 353
- this.field1812 = var3; // L: 355
- } // L: 356
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1005057629"
- )
- public int vmethod3227() {
- return 0; // L: 359
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1932276755"
- )
- public int vmethod3228() {
- return this.field1812; // L: 364
- }
-}
diff --git a/runescape-client/src/main/java/class165.java b/runescape-client/src/main/java/class165.java
new file mode 100644
index 0000000000..4740e2601d
--- /dev/null
+++ b/runescape-client/src/main/java/class165.java
@@ -0,0 +1,137 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("fo")
+public abstract class class165 {
+ @ObfuscatedName("tf")
+ @ObfuscatedGetter(
+ intValue = 602051603
+ )
+ static int field1809;
+ @ObfuscatedName("f")
+ String field1805;
+ // $FF: synthetic field
+ @ObfuscatedSignature(
+ descriptor = "Les;"
+ )
+ final class155 this$0;
+
+ @ObfuscatedSignature(
+ descriptor = "(Les;Ljava/lang/String;)V"
+ )
+ class165(class155 var1, String var2) {
+ this.this$0 = var1; // L: 349
+ this.field1805 = var2; // L: 350
+ } // L: 351
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-118"
+ )
+ public abstract int vmethod3314();
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(B)Ljava/lang/String;",
+ garbageValue = "11"
+ )
+ public String vmethod3320() {
+ return null; // L: 360
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "16777215"
+ )
+ public int vmethod3318() {
+ return -1; // L: 364
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-1817569519"
+ )
+ public String method3315() {
+ return this.field1805; // L: 354
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;II[BII)I",
+ garbageValue = "-944677500"
+ )
+ @Export("encodeStringCp1252")
+ public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
+ int var5 = var2 - var1; // L: 77
+
+ for (int var6 = 0; var6 < var5; ++var6) { // L: 78
+ char var7 = var0.charAt(var6 + var1); // L: 79
+ if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 80
+ var3[var6 + var4] = (byte)var7;
+ } else if (var7 == 8364) { // L: 81
+ var3[var6 + var4] = -128;
+ } else if (var7 == 8218) { // L: 82
+ var3[var6 + var4] = -126;
+ } else if (var7 == 402) { // L: 83
+ var3[var6 + var4] = -125;
+ } else if (var7 == 8222) { // L: 84
+ var3[var6 + var4] = -124;
+ } else if (var7 == 8230) { // L: 85
+ var3[var6 + var4] = -123;
+ } else if (var7 == 8224) { // L: 86
+ var3[var6 + var4] = -122;
+ } else if (var7 == 8225) { // L: 87
+ var3[var6 + var4] = -121;
+ } else if (var7 == 710) {
+ var3[var6 + var4] = -120; // L: 88
+ } else if (var7 == 8240) { // L: 89
+ var3[var6 + var4] = -119;
+ } else if (var7 == 352) { // L: 90
+ var3[var6 + var4] = -118;
+ } else if (var7 == 8249) { // L: 91
+ var3[var6 + var4] = -117;
+ } else if (var7 == 338) { // L: 92
+ var3[var6 + var4] = -116;
+ } else if (var7 == 381) { // L: 93
+ var3[var6 + var4] = -114;
+ } else if (var7 == 8216) { // L: 94
+ var3[var6 + var4] = -111;
+ } else if (var7 == 8217) { // L: 95
+ var3[var6 + var4] = -110;
+ } else if (var7 == 8220) { // L: 96
+ var3[var6 + var4] = -109;
+ } else if (var7 == 8221) { // L: 97
+ var3[var6 + var4] = -108;
+ } else if (var7 == 8226) { // L: 98
+ var3[var6 + var4] = -107;
+ } else if (var7 == 8211) {
+ var3[var6 + var4] = -106; // L: 99
+ } else if (var7 == 8212) { // L: 100
+ var3[var6 + var4] = -105;
+ } else if (var7 == 732) { // L: 101
+ var3[var6 + var4] = -104;
+ } else if (var7 == 8482) { // L: 102
+ var3[var6 + var4] = -103;
+ } else if (var7 == 353) { // L: 103
+ var3[var6 + var4] = -102;
+ } else if (var7 == 8250) { // L: 104
+ var3[var6 + var4] = -101;
+ } else if (var7 == 339) { // L: 105
+ var3[var6 + var4] = -100;
+ } else if (var7 == 382) { // L: 106
+ var3[var6 + var4] = -98;
+ } else if (var7 == 376) { // L: 107
+ var3[var6 + var4] = -97;
+ } else {
+ var3[var6 + var4] = 63; // L: 108
+ }
+ }
+
+ return var5; // L: 110
+ }
+}
diff --git a/runescape-client/src/main/java/class166.java b/runescape-client/src/main/java/class166.java
deleted file mode 100644
index ed5759f095..0000000000
--- a/runescape-client/src/main/java/class166.java
+++ /dev/null
@@ -1,66 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fq")
-public abstract class class166 {
- @ObfuscatedName("k")
- String field1830;
- // $FF: synthetic field
- @ObfuscatedSignature(
- descriptor = "Leq;"
- )
- final class155 this$0;
-
- @ObfuscatedSignature(
- descriptor = "(Leq;Ljava/lang/String;)V"
- )
- class166(class155 var1, String var2) {
- this.this$0 = var1; // L: 331
- this.field1830 = var2; // L: 332
- } // L: 333
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1005057629"
- )
- public abstract int vmethod3227();
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "59"
- )
- public String vmethod3238() {
- return null; // L: 342
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1932276755"
- )
- public int vmethod3228() {
- return -1; // L: 346
- }
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "-1796730209"
- )
- public String method3226() {
- return this.field1830; // L: 336
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(IB)Ljava/lang/String;",
- garbageValue = "32"
- )
- @Export("colorStartTag")
- static String colorStartTag(int var0) {
- return ""; // L: 22
- }
-}
diff --git a/runescape-client/src/main/java/class167.java b/runescape-client/src/main/java/class167.java
new file mode 100644
index 0000000000..5279cc490f
--- /dev/null
+++ b/runescape-client/src/main/java/class167.java
@@ -0,0 +1,23 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("fy")
+public class class167 {
+ @ObfuscatedName("q")
+ public short[] field1814;
+ @ObfuscatedName("f")
+ public short[] field1815;
+
+ class167(int var1) {
+ ItemComposition var2 = EnumComposition.ItemDefinition_get(var1); // L: 12
+ if (var2.method3737()) { // L: 13
+ this.field1814 = new short[var2.recolorTo.length]; // L: 14
+ System.arraycopy(var2.recolorTo, 0, this.field1814, 0, this.field1814.length); // L: 15
+ }
+
+ if (var2.method3728()) { // L: 17
+ this.field1815 = new short[var2.retextureTo.length]; // L: 18
+ System.arraycopy(var2.retextureTo, 0, this.field1815, 0, this.field1815.length); // L: 19
+ }
+
+ } // L: 21
+}
diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java
deleted file mode 100644
index a265ee0365..0000000000
--- a/runescape-client/src/main/java/class168.java
+++ /dev/null
@@ -1,98 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fn")
-public class class168 {
- @ObfuscatedName("l")
- public short[] field1847;
- @ObfuscatedName("k")
- public short[] field1844;
-
- class168(int var1) {
- ItemComposition var2 = FileSystem.ItemDefinition_get(var1); // L: 12
- if (var2.method3636()) { // L: 13
- this.field1847 = new short[var2.recolorTo.length]; // L: 14
- System.arraycopy(var2.recolorTo, 0, this.field1847, 0, this.field1847.length); // L: 15
- }
-
- if (var2.method3637()) { // L: 17
- this.field1844 = new short[var2.retextureTo.length]; // L: 18
- System.arraycopy(var2.retextureTo, 0, this.field1844, 0, this.field1844.length); // L: 19
- }
-
- } // L: 21
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "1006940319"
- )
- static String method3253() {
- String var0;
- if (class12.clientPreferences.method2257()) { // L: 268
- String var2 = Login.Login_username; // L: 270
- int var4 = var2.length(); // L: 273
- char[] var5 = new char[var4]; // L: 275
-
- for (int var6 = 0; var6 < var4; ++var6) { // L: 276
- var5[var6] = '*';
- }
-
- String var3 = new String(var5); // L: 277
- var0 = var3; // L: 281
- } else {
- var0 = Login.Login_username; // L: 283
- }
-
- return var0; // L: 284
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "([BB)V",
- garbageValue = "24"
- )
- @Export("ByteArrayPool_release")
- public static synchronized void ByteArrayPool_release(byte[] var0) {
- if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4210) { // L: 116
- ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 117
- } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4219) { // L: 120
- ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 121
- } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4220) { // L: 124
- ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 125
- } else if (var0.length == 30000 && ByteArrayPool.field4217 < ByteArrayPool.field4221) { // L: 128
- ByteArrayPool.field4225[++ByteArrayPool.field4217 - 1] = var0; // L: 129
- } else {
- if (class131.ByteArrayPool_arrays != null) { // L: 132
- for (int var1 = 0; var1 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 133
- if (var0.length == FileSystem.ByteArrayPool_alternativeSizes[var1] && GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var1] < class131.ByteArrayPool_arrays[var1].length) { // L: 134
- class131.ByteArrayPool_arrays[var1][GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 135
- return; // L: 136
- }
- }
- }
-
- }
- } // L: 118 122 126 130 140
-
- @ObfuscatedName("lp")
- @ObfuscatedSignature(
- descriptor = "(IIZI)V",
- garbageValue = "-1667178418"
- )
- static final void method3251(int var0, int var1, boolean var2) {
- if (Client.currentClanChannels[var0] != null) { // L: 12490
- if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3005()) { // L: 12491
- ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12492
- PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2993, Client.packetWriter.isaacCipher); // L: 12493
- var4.packetBuffer.writeByte(4 + class392.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12494
- var4.packetBuffer.writeByte(var0); // L: 12495
- var4.packetBuffer.writeShort(var1); // L: 12496
- var4.packetBuffer.writeBoolean(var2); // L: 12497
- var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12498
- Client.packetWriter.addNode(var4); // L: 12499
- }
- }
- } // L: 12500
-}
diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java
index cc52945ff9..a02c60598e 100644
--- a/runescape-client/src/main/java/class17.java
+++ b/runescape-client/src/main/java/class17.java
@@ -1,8 +1,5 @@
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
import java.security.Principal;
import java.security.cert.Certificate;
-import java.util.Iterator;
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSessionContext;
@@ -12,165 +9,143 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("n")
+@ObfuscatedName("x")
class class17 implements SSLSession {
- @ObfuscatedName("ta")
+ @ObfuscatedName("x")
+ @Export("ByteArrayPool_altSizeArrayCounts")
+ public static int[] ByteArrayPool_altSizeArrayCounts;
+ @ObfuscatedName("bt")
@ObfuscatedGetter(
- intValue = 1306614653
+ intValue = 1069442965
)
- static int field88;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("NpcDefinition_modelArchive")
- public static AbstractArchive NpcDefinition_modelArchive;
- @ObfuscatedName("ai")
- static String field89;
- @ObfuscatedName("hh")
- @Export("regionLandArchiveIds")
- static int[] regionLandArchiveIds;
+ static int field99;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lw;"
+ descriptor = "Lz;"
)
final class12 this$1;
@ObfuscatedSignature(
- descriptor = "(Lw;)V"
+ descriptor = "(Lz;)V"
)
class17(class12 var1) {
- this.this$1 = var1; // L: 131
+ this.this$1 = var1; // L: 134
}
public int getApplicationBufferSize() {
- return 0; // L: 134
- }
-
- public String getPeerHost() {
- throw new UnsupportedOperationException(); // L: 184
- }
-
- public long getCreationTime() {
- throw new UnsupportedOperationException(); // L: 144
- }
-
- public String getCipherSuite() {
- throw new UnsupportedOperationException(); // L: 139
- }
-
- public long getLastAccessedTime() {
- throw new UnsupportedOperationException(); // L: 154
- }
-
- public void removeValue(String var1) {
- throw new UnsupportedOperationException(); // L: 234
- }
-
- public int getPacketBufferSize() {
- throw new UnsupportedOperationException(); // L: 169
- }
-
- public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException {
- return null; // L: 174
- }
-
- public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException {
- return this.this$1.field63; // L: 179
- }
-
- public int getPeerPort() {
- return 0; // L: 189
+ return 0; // L: 137
}
public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
- return null; // L: 194
+ return null; // L: 197
}
public byte[] getId() {
- throw new UnsupportedOperationException(); // L: 149
+ throw new UnsupportedOperationException(); // L: 152
}
- public String[] getValueNames() {
- throw new UnsupportedOperationException(); // L: 214
- }
-
- public void invalidate() {
- throw new UnsupportedOperationException(); // L: 219
- }
-
- public boolean isValid() {
- throw new UnsupportedOperationException(); // L: 224
- }
-
- public SSLSessionContext getSessionContext() {
- throw new UnsupportedOperationException(); // L: 204
- }
-
- public Principal getLocalPrincipal() {
- throw new UnsupportedOperationException(); // L: 164
- }
-
- public Object getValue(String var1) {
- throw new UnsupportedOperationException(); // L: 209
- }
-
- public String getProtocol() {
- throw new UnsupportedOperationException(); // L: 199
- }
-
- public void putValue(String var1, Object var2) {
- throw new UnsupportedOperationException(); // L: 229
+ public long getLastAccessedTime() {
+ throw new UnsupportedOperationException(); // L: 157
}
public Certificate[] getLocalCertificates() {
- throw new UnsupportedOperationException(); // L: 159
+ throw new UnsupportedOperationException(); // L: 162
}
- @ObfuscatedName("a")
- public static int method236(long var0) {
- return (int)(var0 >>> 0 & 127L); // L: 60
+ public int getPacketBufferSize() {
+ throw new UnsupportedOperationException(); // L: 172
}
- @ObfuscatedName("as")
+ public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException {
+ return this.this$1.field63; // L: 182
+ }
+
+ public String getPeerHost() {
+ throw new UnsupportedOperationException(); // L: 187
+ }
+
+ public int getPeerPort() {
+ return 0; // L: 192
+ }
+
+ public String getProtocol() {
+ throw new UnsupportedOperationException(); // L: 202
+ }
+
+ public Object getValue(String var1) {
+ throw new UnsupportedOperationException(); // L: 212
+ }
+
+ public void invalidate() {
+ throw new UnsupportedOperationException(); // L: 222
+ }
+
+ public boolean isValid() {
+ throw new UnsupportedOperationException(); // L: 227
+ }
+
+ public void putValue(String var1, Object var2) {
+ throw new UnsupportedOperationException(); // L: 232
+ }
+
+ public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException {
+ return null; // L: 177
+ }
+
+ public SSLSessionContext getSessionContext() {
+ throw new UnsupportedOperationException(); // L: 207
+ }
+
+ public long getCreationTime() {
+ throw new UnsupportedOperationException(); // L: 147
+ }
+
+ public void removeValue(String var1) {
+ throw new UnsupportedOperationException(); // L: 237
+ }
+
+ public Principal getLocalPrincipal() {
+ throw new UnsupportedOperationException(); // L: 167
+ }
+
+ public String[] getValueNames() {
+ throw new UnsupportedOperationException(); // L: 217
+ }
+
+ public String getCipherSuite() {
+ throw new UnsupportedOperationException(); // L: 142
+ }
+
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1814027423"
+ descriptor = "(IIII)I",
+ garbageValue = "1793849187"
)
- @Export("getGcDuration")
- protected static int getGcDuration() {
- int var0 = 0; // L: 602
- if (WorldMapData_1.garbageCollector == null || !WorldMapData_1.garbageCollector.isValid()) { // L: 603
- try {
- Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 605
-
- while (var1.hasNext()) {
- GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 606
- if (var2.isValid()) { // L: 608
- WorldMapData_1.garbageCollector = var2; // L: 609
- GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 610
- GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 611
- }
- }
- } catch (Throwable var11) { // L: 616
- }
- }
-
- if (WorldMapData_1.garbageCollector != null) { // L: 618
- long var9 = class113.method2624(); // L: 619
- long var3 = WorldMapData_1.garbageCollector.getCollectionTime(); // L: 620
- if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 621
- long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 622
- long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 623
- if (0L != var7) { // L: 624
- var0 = (int)(var5 * 100L / var7);
- }
- }
-
- GameEngine.garbageCollectorLastCollectionTime = var3; // L: 626
- GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 627
- }
-
- return var0; // L: 629
+ public static int method232(int var0, int var1, int var2) {
+ int var3 = VarpDefinition.method3374(var2 - var1 + 1); // L: 43
+ var3 <<= var1; // L: 44
+ var0 |= var3; // L: 45
+ return var0; // L: 46
}
+
+ @ObfuscatedName("kt")
+ @ObfuscatedSignature(
+ descriptor = "(IB)V",
+ garbageValue = "113"
+ )
+ @Export("Widget_resetModelFrames")
+ static final void Widget_resetModelFrames(int var0) {
+ if (WorldMapSection2.loadInterface(var0)) { // L: 11760
+ Widget[] var1 = SoundCache.Widget_interfaceComponents[var0]; // L: 11761
+
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11762
+ Widget var3 = var1[var2]; // L: 11763
+ if (var3 != null) { // L: 11764
+ var3.modelFrame = 0; // L: 11765
+ var3.modelFrameCycle = 0; // L: 11766
+ }
+ }
+
+ }
+ } // L: 11768
}
diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java
new file mode 100644
index 0000000000..012d1d423f
--- /dev/null
+++ b/runescape-client/src/main/java/class174.java
@@ -0,0 +1,51 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("fu")
+public class class174 {
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "Lct;"
+ )
+ @Export("World_request")
+ static UrlRequest World_request;
+ @ObfuscatedName("br")
+ @ObfuscatedGetter(
+ intValue = 1359206661
+ )
+ static int field1891;
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lgf;",
+ garbageValue = "-64"
+ )
+ @Export("getParamDefinition")
+ public static ParamComposition getParamDefinition(int var0) {
+ ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 21
+ if (var1 != null) { // L: 22
+ return var1;
+ } else {
+ byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 23
+ var1 = new ParamComposition(); // L: 24
+ if (var2 != null) { // L: 25
+ var1.decode(new Buffer(var2));
+ }
+
+ var1.postDecode(); // L: 26
+ ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27
+ return var1; // L: 28
+ }
+ }
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(B)Z",
+ garbageValue = "16"
+ )
+ static final boolean method3458() {
+ return ViewportMouse.ViewportMouse_isInViewport; // L: 99
+ }
+}
diff --git a/runescape-client/src/main/java/class175.java b/runescape-client/src/main/java/class175.java
deleted file mode 100644
index 0a80a04d9f..0000000000
--- a/runescape-client/src/main/java/class175.java
+++ /dev/null
@@ -1,108 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fu")
-public class class175 {
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("SpotAnimationDefinition_modelArchive")
- public static AbstractArchive SpotAnimationDefinition_modelArchive;
- @ObfuscatedName("ib")
- @ObfuscatedSignature(
- descriptor = "Lgm;"
- )
- @Export("scene")
- static Scene scene;
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2044568477"
- )
- public static void method3380() {
- WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 47
- } // L: 48
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(III)Lbo;",
- garbageValue = "-586854513"
- )
- @Export("Messages_getByChannelAndID")
- static Message Messages_getByChannelAndID(int var0, int var1) {
- ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35
- return var2.getMessage(var1); // L: 36
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-482569171"
- )
- public static void method3379() {
- HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 77
- HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 78
- } // L: 79
-
- @ObfuscatedName("iu")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
- garbageValue = "1857595187"
- )
- @Export("insertMenuItem")
- static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
- if (!Client.isMenuOpen) { // L: 9911
- if (Client.menuOptionsCount < 500) { // L: 9912
- Client.menuActions[Client.menuOptionsCount] = var0; // L: 9913
- Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9914
- Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9915
- Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9916
- Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9917
- Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9918
- Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9919
- ++Client.menuOptionsCount; // L: 9920
- }
-
- }
- } // L: 9922
-
- @ObfuscatedName("im")
- @ObfuscatedSignature(
- descriptor = "(IIIIIIIIB)V",
- garbageValue = "0"
- )
- @Export("drawWidgets")
- static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
- if (WorldMapDecoration.loadInterface(var0)) { // L: 10200
- BuddyRankComparator.field1408 = null; // L: 10207
- ViewportMouse.drawInterface(NetSocket.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10208
- if (BuddyRankComparator.field1408 != null) { // L: 10209
- ViewportMouse.drawInterface(BuddyRankComparator.field1408, -1412584499, var1, var2, var3, var4, class151.field1729, class162.field1810, var7); // L: 10210
- BuddyRankComparator.field1408 = null; // L: 10211
- }
-
- } else {
- if (var7 != -1) { // L: 10201
- Client.field652[var7] = true;
- } else {
- for (int var8 = 0; var8 < 100; ++var8) { // L: 10203
- Client.field652[var8] = true;
- }
- }
-
- }
- } // L: 10205 10213
-
- @ObfuscatedName("km")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1703551260"
- )
- static final void method3373() {
- Client.field691 = Client.cycleCntr; // L: 12434
- Tiles.field997 = true; // L: 12435
- } // L: 12436
-}
diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java
index 3b3de4626a..1154a15408 100644
--- a/runescape-client/src/main/java/class18.java
+++ b/runescape-client/src/main/java/class18.java
@@ -1,127 +1,90 @@
import java.util.Comparator;
import java.util.Map.Entry;
import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("e")
+@ObfuscatedName("l")
class class18 implements Comparator {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Llp;"
+ @ObfuscatedName("fm")
+ @ObfuscatedGetter(
+ intValue = 872496551
)
- @Export("KitDefinition_archive")
- static AbstractArchive KitDefinition_archive;
+ @Export("js5Port")
+ static int js5Port;
+ @ObfuscatedName("jt")
+ @ObfuscatedGetter(
+ intValue = 437863053
+ )
+ @Export("cameraX")
+ static int cameraX;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Ly;"
+ descriptor = "Ls;"
)
final class10 this$0;
@ObfuscatedSignature(
- descriptor = "(Ly;)V"
+ descriptor = "(Ls;)V"
)
class18(class10 var1) {
- this.this$0 = var1; // L: 40
+ this.this$0 = var1; // L: 50
}
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I",
- garbageValue = "105"
+ descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I",
+ garbageValue = "-175722815"
)
- int method239(Entry var1, Entry var2) {
- return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42
+ int method233(Entry var1, Entry var2) {
+ return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 52
}
public int compare(Object var1, Object var2) {
- return this.method239((Entry)var1, (Entry)var2); // L: 46
+ return this.method233((Entry)var1, (Entry)var2); // L: 56
}
public boolean equals(Object var1) {
- return super.equals(var1); // L: 50
+ return super.equals(var1); // L: 60
}
- @ObfuscatedName("o")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "-106"
+ descriptor = "(IIB)Lbr;",
+ garbageValue = "123"
)
- @Export("getVarbit")
- public static int getVarbit(int var0) {
- VarbitComposition var1 = class1.method9(var0);
- int var2 = var1.baseVar; // L: 25
- int var3 = var1.startBit;
- int var4 = var1.endBit;
- int var5 = Varps.Varps_masks[var4 - var3];
- return Varps.Varps_main[var2] >> var3 & var5;
+ @Export("Messages_getByChannelAndID")
+ static Message Messages_getByChannelAndID(int var0, int var1) {
+ ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35
+ return var2.getMessage(var1); // L: 36
}
- @ObfuscatedName("o")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(IIB)I",
- garbageValue = "87"
+ descriptor = "(B)Z",
+ garbageValue = "-80"
)
- static int method243(int var0, int var1) {
- if (var0 == -2) { // L: 15
- return 12345678;
- } else if (var0 == -1) { // L: 16
- if (var1 < 0) { // L: 17
- var1 = 0; // L: 18
- } else if (var1 > 127) { // L: 20
- var1 = 127; // L: 21
- }
-
- var1 = 127 - var1; // L: 23
- return var1; // L: 24
- } else {
- var1 = (var0 & 127) * var1 / 128; // L: 26
- if (var1 < 2) { // L: 27
- var1 = 2;
- } else if (var1 > 126) { // L: 28
- var1 = 126;
- }
-
- return (var0 & 65408) + var1; // L: 29
- }
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Lpc;I)I",
- garbageValue = "-1204366603"
- )
- static int method249(PacketBuffer var0) {
- int var1 = var0.readBits(2); // L: 187
- int var2;
- if (var1 == 0) { // L: 189
- var2 = 0;
- } else if (var1 == 1) {
- var2 = var0.readBits(5); // L: 190
- } else if (var1 == 2) { // L: 191
- var2 = var0.readBits(8);
- } else {
- var2 = var0.readBits(11); // L: 192
- }
-
- return var2; // L: 193
- }
-
- @ObfuscatedName("kt")
- @ObfuscatedSignature(
- descriptor = "(Lki;IIIB)V",
- garbageValue = "-44"
- )
- @Export("drawCompass")
- static final void drawCompass(Widget var0, int var1, int var2, int var3) {
- SpriteMask var4 = var0.getSpriteMask(false); // L: 12373
- if (var4 != null) { // L: 12374
- if (Client.minimapState < 3) { // L: 12375
- SoundSystem.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+ @Export("isKeyDown")
+ public static final boolean isKeyDown() {
+ synchronized(KeyHandler.KeyHandler_instance) { // L: 175
+ if (KeyHandler.field127 == KeyHandler.field147) { // L: 176
+ return false;
} else {
- Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12376
+ class272.field3196 = KeyHandler.field148[KeyHandler.field147]; // L: 177
+ HealthBar.field1258 = KeyHandler.field149[KeyHandler.field147]; // L: 178
+ KeyHandler.field147 = KeyHandler.field147 + 1 & 127; // L: 179
+ return true; // L: 180
}
-
}
- } // L: 12377
+ }
+
+ @ObfuscatedName("im")
+ @ObfuscatedSignature(
+ descriptor = "(B)Z",
+ garbageValue = "-15"
+ )
+ static final boolean method234() {
+ return Client.isMenuOpen; // L: 8499
+ }
}
diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java
new file mode 100644
index 0000000000..c674064054
--- /dev/null
+++ b/runescape-client/src/main/java/class181.java
@@ -0,0 +1,50 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+@ObfuscatedName("fq")
+public class class181 extends DualNode {
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "Laq;"
+ )
+ @Export("soundCache")
+ public static SoundCache soundCache;
+ @ObfuscatedName("jj")
+ @ObfuscatedGetter(
+ intValue = 261629217
+ )
+ static int field1992;
+
+ static {
+ new EvictingDualNodeHashTable(64); // L: 9
+ } // L: 10
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F",
+ garbageValue = "-1297574808"
+ )
+ static float[] method3566(JSONObject var0, String var1) throws JSONException {
+ float[] var2 = new float[4]; // L: 307
+
+ try {
+ JSONArray var3 = var0.getJSONArray(var1); // L: 309
+ var2[0] = (float)var3.optDouble(0, 0.0D); // L: 310
+ var2[1] = (float)var3.optDouble(1, 0.0D); // L: 311
+ var2[2] = (float)var3.optDouble(2, 1.0D); // L: 312
+ var2[3] = (float)var3.optDouble(3, 1.0D); // L: 313
+ } catch (JSONException var4) { // L: 315
+ var2[0] = 0.0F; // L: 316
+ var2[1] = 0.0F; // L: 317
+ var2[2] = 1.0F; // L: 318
+ var2[3] = 1.0F; // L: 319
+ }
+
+ return var2; // L: 321
+ }
+}
diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java
deleted file mode 100644
index 34e5cbc0ee..0000000000
--- a/runescape-client/src/main/java/class182.java
+++ /dev/null
@@ -1,66 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("gj")
-public class class182 extends DualNode {
- @ObfuscatedName("ud")
- @Export("foundItemIds")
- static short[] foundItemIds;
-
- static {
- new EvictingDualNodeHashTable(64); // L: 9
- } // L: 10
-
- @ObfuscatedName("ac")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1933917063"
- )
- static int method3473(int var0, Script var1, boolean var2) {
- if (var0 != 3700 && var0 != 3701) { // L: 2697
- if (var0 == 3702) { // L: 2702
- ++class12.Interpreter_intStackSize; // L: 2703
- return 1; // L: 2704
- } else {
- return 2; // L: 2706
- }
- } else {
- --class12.Interpreter_intStackSize; // L: 2698
- --class9.Interpreter_stringStackSize; // L: 2699
- return 1; // L: 2700
- }
- }
-
- @ObfuscatedName("aa")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1317447781"
- )
- static int method3472(int var0, Script var1, boolean var2) {
- if (var0 >= 7200 && var0 < 7204) { // L: 4639
- class12.Interpreter_intStackSize -= 5; // L: 4640
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4641
- return 1; // L: 4642
- } else if (var0 == 7204) { // L: 4644
- class12.Interpreter_intStackSize -= 6; // L: 4645
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4646
- return 1; // L: 4647
- } else if (var0 >= 7205 && var0 < 7209) { // L: 4649
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = -1; // L: 4650
- return 1; // L: 4651
- } else if (var0 == 7209) { // L: 4653
- class12.Interpreter_intStackSize -= 2; // L: 4654
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4655
- return 1; // L: 4656
- } else if (var0 >= 7210 && var0 < 7214) { // L: 4658
- --class12.Interpreter_intStackSize; // L: 4659
- return 1; // L: 4660
- } else if (var0 == 7214) { // L: 4662
- class12.Interpreter_intStackSize -= 2; // L: 4663
- return 1; // L: 4664
- } else {
- return 2; // L: 4666
- }
- }
-}
diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java
index 1a071fc1f3..6f64312e7c 100644
--- a/runescape-client/src/main/java/class19.java
+++ b/runescape-client/src/main/java/class19.java
@@ -3,619 +3,105 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("h")
+@ObfuscatedName("a")
public class class19 {
- @ObfuscatedName("o")
- Future field102;
- @ObfuscatedName("q")
- String field99;
+ @ObfuscatedName("up")
+ @ObfuscatedSignature(
+ descriptor = "Lcv;"
+ )
+ @Export("clientPreferences")
+ static ClientPreferences clientPreferences;
+ @ObfuscatedName("c")
+ Future field107;
+ @ObfuscatedName("v")
+ String field106;
class19(Future var1) {
- this.field102 = var1; // L: 10
+ this.field107 = var1; // L: 10
} // L: 11
class19(String var1) {
- this.method266(var1); // L: 14
+ this.method243(var1); // L: 14
} // L: 15
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "1815687689"
+ garbageValue = "1161369831"
)
- void method266(String var1) {
+ void method243(String var1) {
if (var1 == null) { // L: 18
var1 = "";
}
- this.field99 = var1; // L: 19
- if (this.field102 != null) { // L: 20
- this.field102.cancel(true); // L: 21
- this.field102 = null; // L: 22
+ this.field106 = var1; // L: 19
+ if (this.field107 != null) { // L: 20
+ this.field107.cancel(true); // L: 21
+ this.field107 = null; // L: 22
}
} // L: 24
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-688611992"
+ )
+ public final String method244() {
+ return this.field106; // L: 27
+ }
+
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "124"
+ descriptor = "(I)Z",
+ garbageValue = "731102059"
)
- public final String method251() {
- return this.field99; // L: 27
+ public boolean method251() {
+ return this.field106 != null || this.field107 == null; // L: 31
}
- @ObfuscatedName("l")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "945569393"
+ garbageValue = "1151479385"
)
- public boolean method250() {
- return this.field99 != null || this.field102 == null; // L: 31
+ public final boolean method246() {
+ return this.method251() ? true : this.field107.isDone(); // L: 35 36
}
- @ObfuscatedName("k")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-2011901158"
+ descriptor = "(S)Lb;",
+ garbageValue = "-5003"
)
- public final boolean method253() {
- return this.method250() ? true : this.field102.isDone(); // L: 35 36
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(B)Ld;",
- garbageValue = "-37"
- )
- public final class21 method254() {
- if (this.method250()) { // L: 40
- return new class21(this.field99);
- } else if (!this.method253()) {
- return null; // L: 41
+ public final class21 method249() {
+ if (this.method251()) { // L: 40
+ return new class21(this.field106);
+ } else if (!this.method246()) { // L: 41
+ return null;
} else {
try {
- return (class21)this.field102.get(); // L: 43
+ return (class21)this.field107.get(); // L: 43
} catch (Exception var3) { // L: 45
String var2 = "Error retrieving REST request reply"; // L: 46
System.err.println(var2 + "\r\n" + var3); // L: 47
- this.method266(var2); // L: 48
+ this.method243(var2); // L: 48
return new class21(var2); // L: 49
}
}
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "20278847"
+ descriptor = "(II)Ldt;",
+ garbageValue = "234177073"
)
- public static boolean method257(int var0) {
- return var0 >= 0 && var0 < 112 ? KeyHandler.field132[var0] : false; // L: 237 238
+ static class119 method254(int var0) {
+ class119 var1 = (class119)Actor.findEnumerated(UserComparator9.method2599(), var0); // L: 92
+ if (var1 == null) {
+ var1 = class119.field1497; // L: 93
+ }
+
+ return var1; // L: 94
}
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(IIIIIILgm;Lgh;B)V",
- garbageValue = "14"
- )
- @Export("addObjects")
- static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
- if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 345 346 347
- if (var0 < Tiles.Tiles_minPlane) { // L: 350
- Tiles.Tiles_minPlane = var0;
- }
-
- ObjectComposition var8 = class82.getObjectDefinition(var3); // L: 351
- int var9;
- int var10;
- if (var4 != 1 && var4 != 3) { // L: 354
- var9 = var8.sizeX; // L: 359
- var10 = var8.sizeY; // L: 360
- } else {
- var9 = var8.sizeY; // L: 355
- var10 = var8.sizeX; // L: 356
- }
-
- int var11;
- int var12;
- if (var9 + var1 <= 104) { // L: 366
- var11 = (var9 >> 1) + var1; // L: 367
- var12 = (var9 + 1 >> 1) + var1; // L: 368
- } else {
- var11 = var1; // L: 371
- var12 = var1 + 1; // L: 372
- }
-
- int var13;
- int var14;
- if (var10 + var2 <= 104) { // L: 374
- var13 = (var10 >> 1) + var2; // L: 375
- var14 = var2 + (var10 + 1 >> 1); // L: 376
- } else {
- var13 = var2; // L: 379
- var14 = var2 + 1; // L: 380
- }
-
- int[][] var15 = Tiles.Tiles_heights[var0]; // L: 382
- int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; // L: 383
- int var17 = (var1 << 7) + (var9 << 6); // L: 384
- int var18 = (var2 << 7) + (var10 << 6); // L: 385
- long var19 = VarbitComposition.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 386
- int var21 = var5 + (var4 << 6); // L: 387
- if (var8.int3 == 1) { // L: 388
- var21 += 256;
- }
-
- int var23;
- int var24;
- if (var8.hasSound()) { // L: 389
- ObjectSound var22 = new ObjectSound(); // L: 390
- var22.plane = var0; // L: 391
- var22.x = var1 * 128; // L: 392
- var22.y = var2 * 128; // L: 393
- var23 = var8.sizeX; // L: 394
- var24 = var8.sizeY; // L: 395
- if (var4 == 1 || var4 == 3) { // L: 396
- var23 = var8.sizeY; // L: 397
- var24 = var8.sizeX; // L: 398
- }
-
- var22.maxX = (var23 + var1) * 128; // L: 400
- var22.maxY = (var24 + var2) * 128; // L: 401
- var22.soundEffectId = var8.ambientSoundId; // L: 402
- var22.field817 = var8.int7 * 128; // L: 403
- var22.field813 = var8.int5; // L: 404
- var22.field808 = var8.int6; // L: 405
- var22.soundEffectIds = var8.soundEffectIds; // L: 406
- if (var8.transforms != null) { // L: 407
- var22.obj = var8; // L: 408
- var22.set(); // L: 409
- }
-
- ObjectSound.objectSounds.addFirst(var22); // L: 411
- if (var22.soundEffectIds != null) { // L: 412
- var22.field810 = var22.field813 + (int)(Math.random() * (double)(var22.field808 - var22.field813));
- }
- }
-
- Object var34;
- if (var5 == 22) { // L: 414
- if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 415
- if (var8.animationId == -1 && var8.transforms == null) { // L: 417
- var34 = var8.getEntity(22, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 418
- }
-
- var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 419
- if (var8.interactType == 1 && var7 != null) { // L: 420
- var7.setBlockedByFloorDec(var1, var2);
- }
-
- }
- } else if (var5 != 10 && var5 != 11) { // L: 423
- int[] var10000;
- if (var5 >= 12) { // L: 444
- if (var8.animationId == -1 && var8.transforms == null) { // L: 446
- var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 447
- }
-
- var6.method4176(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 448
- if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 449
- var10000 = VerticalAlignment.field1993[var0][var1];
- var10000[var2] |= 2340;
- }
-
- if (var8.interactType != 0 && var7 != null) { // L: 450
- var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
- }
-
- } else if (var5 == 0) { // L: 453
- if (var8.animationId == -1 && var8.transforms == null) { // L: 455
- var34 = var8.getEntity(0, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 456
- }
-
- var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, var19, var21); // L: 457
- if (var4 == 0) { // L: 458
- if (var8.clipped) { // L: 459
- NPC.field1259[var0][var1][var2] = 50; // L: 460
- NPC.field1259[var0][var1][var2 + 1] = 50; // L: 461
- }
-
- if (var8.modelClipped) { // L: 463
- var10000 = VerticalAlignment.field1993[var0][var1];
- var10000[var2] |= 585;
- }
- } else if (var4 == 1) { // L: 465
- if (var8.clipped) { // L: 466
- NPC.field1259[var0][var1][var2 + 1] = 50; // L: 467
- NPC.field1259[var0][var1 + 1][var2 + 1] = 50; // L: 468
- }
-
- if (var8.modelClipped) { // L: 470
- var10000 = VerticalAlignment.field1993[var0][var1];
- var10000[var2 + 1] |= 1170;
- }
- } else if (var4 == 2) { // L: 472
- if (var8.clipped) { // L: 473
- NPC.field1259[var0][var1 + 1][var2] = 50; // L: 474
- NPC.field1259[var0][var1 + 1][var2 + 1] = 50; // L: 475
- }
-
- if (var8.modelClipped) { // L: 477
- var10000 = VerticalAlignment.field1993[var0][var1 + 1];
- var10000[var2] |= 585;
- }
- } else if (var4 == 3) { // L: 479
- if (var8.clipped) { // L: 480
- NPC.field1259[var0][var1][var2] = 50; // L: 481
- NPC.field1259[var0][var1 + 1][var2] = 50; // L: 482
- }
-
- if (var8.modelClipped) { // L: 484
- var10000 = VerticalAlignment.field1993[var0][var1];
- var10000[var2] |= 1170;
- }
- }
-
- if (var8.interactType != 0 && var7 != null) { // L: 486
- var7.method3749(var1, var2, var5, var4, var8.boolean1);
- }
-
- if (var8.int2 != 16) { // L: 487
- var6.method4180(var0, var1, var2, var8.int2);
- }
-
- } else if (var5 == 1) { // L: 490
- if (var8.animationId == -1 && var8.transforms == null) { // L: 492
- var34 = var8.getEntity(1, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 493
- }
-
- var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 494
- if (var8.clipped) { // L: 495
- if (var4 == 0) { // L: 496
- NPC.field1259[var0][var1][var2 + 1] = 50;
- } else if (var4 == 1) { // L: 497
- NPC.field1259[var0][var1 + 1][var2 + 1] = 50;
- } else if (var4 == 2) { // L: 498
- NPC.field1259[var0][var1 + 1][var2] = 50;
- } else if (var4 == 3) { // L: 499
- NPC.field1259[var0][var1][var2] = 50;
- }
- }
-
- if (var8.interactType != 0 && var7 != null) { // L: 501
- var7.method3749(var1, var2, var5, var4, var8.boolean1);
- }
-
- } else {
- int var28;
- if (var5 == 2) { // L: 504
- var28 = var4 + 1 & 3; // L: 505
- Object var31;
- Object var32;
- if (var8.animationId == -1 && var8.transforms == null) { // L: 508
- var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 509
- var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 510
- } else {
- var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 513
- var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 514
- }
-
- var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field988[var4], Tiles.field988[var28], var19, var21); // L: 516
- if (var8.modelClipped) { // L: 517
- if (var4 == 0) { // L: 518
- var10000 = VerticalAlignment.field1993[var0][var1]; // L: 519
- var10000[var2] |= 585;
- var10000 = VerticalAlignment.field1993[var0][var1]; // L: 520
- var10000[1 + var2] |= 1170;
- } else if (var4 == 1) { // L: 522
- var10000 = VerticalAlignment.field1993[var0][var1]; // L: 523
- var10000[var2 + 1] |= 1170;
- var10000 = VerticalAlignment.field1993[var0][var1 + 1]; // L: 524
- var10000[var2] |= 585;
- } else if (var4 == 2) { // L: 526
- var10000 = VerticalAlignment.field1993[var0][var1 + 1]; // L: 527
- var10000[var2] |= 585;
- var10000 = VerticalAlignment.field1993[var0][var1]; // L: 528
- var10000[var2] |= 1170;
- } else if (var4 == 3) { // L: 530
- var10000 = VerticalAlignment.field1993[var0][var1]; // L: 531
- var10000[var2] |= 1170;
- var10000 = VerticalAlignment.field1993[var0][var1]; // L: 532
- var10000[var2] |= 585;
- }
- }
-
- if (var8.interactType != 0 && var7 != null) { // L: 535
- var7.method3749(var1, var2, var5, var4, var8.boolean1);
- }
-
- if (var8.int2 != 16) { // L: 536
- var6.method4180(var0, var1, var2, var8.int2);
- }
-
- } else if (var5 == 3) { // L: 539
- if (var8.animationId == -1 && var8.transforms == null) { // L: 541
- var34 = var8.getEntity(3, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 542
- }
-
- var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field989[var4], 0, var19, var21); // L: 543
- if (var8.clipped) { // L: 544
- if (var4 == 0) { // L: 545
- NPC.field1259[var0][var1][var2 + 1] = 50;
- } else if (var4 == 1) { // L: 546
- NPC.field1259[var0][var1 + 1][var2 + 1] = 50;
- } else if (var4 == 2) { // L: 547
- NPC.field1259[var0][var1 + 1][var2] = 50;
- } else if (var4 == 3) { // L: 548
- NPC.field1259[var0][var1][var2] = 50;
- }
- }
-
- if (var8.interactType != 0 && var7 != null) { // L: 550
- var7.method3749(var1, var2, var5, var4, var8.boolean1);
- }
-
- } else if (var5 == 9) { // L: 553
- if (var8.animationId == -1 && var8.transforms == null) { // L: 555
- var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 556
- }
-
- var6.method4176(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 557
- if (var8.interactType != 0 && var7 != null) { // L: 558
- var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
- }
-
- if (var8.int2 != 16) { // L: 559
- var6.method4180(var0, var1, var2, var8.int2);
- }
-
- } else if (var5 == 4) { // L: 562
- if (var8.animationId == -1 && var8.transforms == null) { // L: 564
- var34 = var8.getEntity(4, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 565
- }
-
- var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field988[var4], 0, 0, 0, var19, var21); // L: 566
- } else {
- Object var25;
- long var29;
- if (var5 == 5) { // L: 569
- var28 = 16; // L: 570
- var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 571
- if (0L != var29) { // L: 572
- var28 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var29)).int2;
- }
-
- if (var8.animationId == -1 && var8.transforms == null) { // L: 574
- var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
- } else {
- var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 575
- }
-
- var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field988[var4], 0, var28 * Tiles.field990[var4], var28 * Tiles.field991[var4], var19, var21); // L: 576
- } else if (var5 == 6) { // L: 579
- var28 = 8; // L: 580
- var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 581
- if (var29 != 0L) { // L: 582
- var28 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var29)).int2 / 2;
- }
-
- if (var8.animationId == -1 && var8.transforms == null) { // L: 584
- var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
- } else {
- var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 585
- }
-
- var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field995[var4], var28 * Tiles.field993[var4], var19, var21); // L: 586
- } else if (var5 == 7) { // L: 589
- var23 = var4 + 2 & 3; // L: 591
- if (var8.animationId == -1 && var8.transforms == null) { // L: 592
- var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 593
- }
-
- var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 594
- } else if (var5 == 8) { // L: 597
- var28 = 8; // L: 598
- var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 599
- if (0L != var29) { // L: 600
- var28 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var29)).int2 / 2;
- }
-
- int var27 = var4 + 2 & 3; // L: 603
- Object var26;
- if (var8.animationId == -1 && var8.transforms == null) { // L: 604
- var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 605
- var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 606
- } else {
- var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 609
- var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 610
- }
-
- var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field995[var4], var28 * Tiles.field993[var4], var19, var21); // L: 612
- }
- }
- }
- } else {
- if (var8.animationId == -1 && var8.transforms == null) { // L: 425
- var34 = var8.getEntity(10, var4, var15, var17, var16, var18);
- } else {
- var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 426
- }
-
- if (var34 != null && var6.method4176(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 427 428
- var23 = 15; // L: 429
- if (var34 instanceof Model) { // L: 430
- var23 = ((Model)var34).method4277() / 4; // L: 431
- if (var23 > 30) { // L: 432
- var23 = 30;
- }
- }
-
- for (var24 = 0; var24 <= var9; ++var24) { // L: 434
- for (int var33 = 0; var33 <= var10; ++var33) { // L: 435
- if (var23 > NPC.field1259[var0][var24 + var1][var33 + var2]) { // L: 436
- NPC.field1259[var0][var24 + var1][var33 + var2] = (byte)var23;
- }
- }
- }
- }
-
- if (var8.interactType != 0 && var7 != null) { // L: 441
- var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
- }
-
- }
- }
- } // L: 421 442 451 488 502 537 551 560 567 577 587 595 613 615
-
- @ObfuscatedName("kx")
- @ObfuscatedSignature(
- descriptor = "(Lki;IIIB)V",
- garbageValue = "-23"
- )
- @Export("drawMinimap")
- static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
- ArchiveLoader.playPcmPlayers(); // L: 12288
- SpriteMask var4 = var0.getSpriteMask(false); // L: 12289
- if (var4 != null) { // L: 12290
- Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12291
- if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12292
- int var5 = Client.camAngleY & 2047; // L: 12293
- int var6 = ModelData0.localPlayer.x / 32 + 48; // L: 12294
- int var7 = 464 - ModelData0.localPlayer.y / 32; // L: 12295
- InterfaceParent.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12296
-
- int var8;
- int var10;
- int var16;
- for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12297
- var16 = Client.mapIconXs[var8] * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12298
- var10 = Client.mapIconYs[var8] * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12299
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12300
- }
-
- int var11;
- int var12;
- for (var8 = 0; var8 < 104; ++var8) { // L: 12302
- for (var16 = 0; var16 < 104; ++var16) { // L: 12303
- NodeDeque var14 = Client.groundItems[class128.Client_plane][var8][var16]; // L: 12304
- if (var14 != null) { // L: 12305
- var11 = var8 * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12306
- var12 = var16 * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12307
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var11, var12, WallDecoration.mapDotSprites[0], var4); // L: 12308
- }
- }
- }
-
- for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12312
- NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12313
- if (var9 != null && var9.isVisible()) { // L: 12314
- NPCComposition var18 = var9.definition; // L: 12315
- if (var18 != null && var18.transforms != null) { // L: 12316
- var18 = var18.transform();
- }
-
- if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12317
- var11 = var9.x / 32 - ModelData0.localPlayer.x / 32; // L: 12318
- var12 = var9.y / 32 - ModelData0.localPlayer.y / 32; // L: 12319
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var11, var12, WallDecoration.mapDotSprites[1], var4); // L: 12320
- }
- }
- }
-
- var8 = Players.Players_count; // L: 12324
- int[] var17 = Players.Players_indices; // L: 12325
-
- for (var10 = 0; var10 < var8; ++var10) { // L: 12326
- Player var15 = Client.players[var17[var10]]; // L: 12327
- if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != ModelData0.localPlayer) { // L: 12328
- var12 = var15.x / 32 - ModelData0.localPlayer.x / 32; // L: 12329
- int var13 = var15.y / 32 - ModelData0.localPlayer.y / 32; // L: 12330
- if (var15.isFriend()) { // L: 12331
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[3], var4);
- } else if (ModelData0.localPlayer.team != 0 && var15.team != 0 && var15.team == ModelData0.localPlayer.team) { // L: 12332
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[4], var4);
- } else if (var15.isFriendsChatMember()) { // L: 12333
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[5], var4);
- } else if (var15.isClanMember()) { // L: 12334
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[6], var4);
- } else {
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var12, var13, WallDecoration.mapDotSprites[2], var4); // L: 12335
- }
- }
- }
-
- if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12338
- if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12339
- NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12340
- if (var19 != null) { // L: 12341
- var11 = var19.x / 32 - ModelData0.localPlayer.x / 32; // L: 12342
- var12 = var19.y / 32 - ModelData0.localPlayer.y / 32; // L: 12343
- VarcInt.worldToMinimap(var1, var2, var11, var12, class146.mapMarkerSprites[1], var4); // L: 12344
- }
- }
-
- if (Client.hintArrowType == 2) { // L: 12347
- var10 = Client.hintArrowX * 4 - SecureRandomCallable.baseX * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12348
- var11 = Client.hintArrowY * 4 - GrandExchangeOfferOwnWorldComparator.baseY * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12349
- VarcInt.worldToMinimap(var1, var2, var10, var11, class146.mapMarkerSprites[1], var4); // L: 12350
- }
-
- if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12352
- Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12353
- if (var20 != null) { // L: 12354
- var11 = var20.x / 32 - ModelData0.localPlayer.x / 32; // L: 12355
- var12 = var20.y / 32 - ModelData0.localPlayer.y / 32; // L: 12356
- VarcInt.worldToMinimap(var1, var2, var11, var12, class146.mapMarkerSprites[1], var4); // L: 12357
- }
- }
- }
-
- if (Client.destinationX != 0) { // L: 12361
- var10 = Client.destinationX * 4 + 2 - ModelData0.localPlayer.x / 32; // L: 12362
- var11 = Client.destinationY * 4 + 2 - ModelData0.localPlayer.y / 32; // L: 12363
- PcmPlayer.drawSpriteOnMinimap(var1, var2, var10, var11, class146.mapMarkerSprites[0], var4); // L: 12364
- }
-
- if (!ModelData0.localPlayer.isHidden) { // L: 12366
- Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
- }
- } else {
- Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12368
- }
-
- Client.field704[var3] = true; // L: 12369
- }
- } // L: 12370
-
- @ObfuscatedName("kg")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "1927350228"
- )
- @Export("clanKickUser")
- static final void clanKickUser(String var0) {
- if (PcmPlayer.friendsChat != null) { // L: 12439
- PacketBufferNode var1 = WallDecoration.getPacketBufferNode(ClientPacket.field2983, Client.packetWriter.isaacCipher); // L: 12440
- var1.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var0)); // L: 12441
- var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12442
- Client.packetWriter.addNode(var1); // L: 12443
- }
- } // L: 12444
}
diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java
new file mode 100644
index 0000000000..7725b64079
--- /dev/null
+++ b/runescape-client/src/main/java/class192.java
@@ -0,0 +1,47 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("gn")
+public enum class192 implements MouseWheel {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lgn;"
+ )
+ field2208((byte)-1),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lgn;"
+ )
+ field2209((byte)0),
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lgn;"
+ )
+ field2212((byte)1),
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lgn;"
+ )
+ field2211((byte)2);
+
+ @ObfuscatedName("ao")
+ @Export("fontHelvetica13")
+ static java.awt.Font fontHelvetica13;
+ @ObfuscatedName("j")
+ public byte field2210;
+
+ class192(byte var3) {
+ this.field2210 = var3; // L: 14
+ } // L: 15
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-100"
+ )
+ @Export("rsOrdinal")
+ public int rsOrdinal() {
+ return this.field2210; // L: 19
+ }
+}
diff --git a/runescape-client/src/main/java/class193.java b/runescape-client/src/main/java/class193.java
index 6b51dc0960..edeedc6a65 100644
--- a/runescape-client/src/main/java/class193.java
+++ b/runescape-client/src/main/java/class193.java
@@ -1,72 +1,69 @@
import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("gd")
-public enum class193 implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lgd;"
- )
- field2250((byte)-1),
+@ObfuscatedName("go")
+public class class193 {
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lgd;"
+ @Export("directions")
+ public static int[][] directions;
+ @ObfuscatedName("f")
+ @Export("distances")
+ public static int[][] distances;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = -1258310083
)
- field2249((byte)0),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lgd;"
- )
- field2251((byte)1),
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lgd;"
- )
- field2248((byte)2);
+ public static int field2219;
+ @ObfuscatedName("w")
+ @Export("bufferX")
+ public static int[] bufferX;
+ @ObfuscatedName("y")
+ @Export("bufferY")
+ public static int[] bufferY;
- @ObfuscatedName("x")
+ static {
+ directions = new int[128][128]; // L: 6
+ distances = new int[128][128]; // L: 7
+ bufferX = new int[4096]; // L: 11
+ bufferY = new int[4096]; // L: 12
+ }
+
+ @ObfuscatedName("ju")
@ObfuscatedSignature(
- descriptor = "Lcc;"
+ descriptor = "(IIIIIIIII)V",
+ garbageValue = "628542116"
)
- @Export("loginScreenRunesAnimation")
- static LoginScreenAnimation loginScreenRunesAnimation;
- @ObfuscatedName("a")
- public byte field2252;
+ @Export("drawWidgets")
+ static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+ if (WorldMapSection2.loadInterface(var0)) { // L: 10078
+ class12.field62 = null; // L: 10085
+ class14.drawInterface(SoundCache.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10086
+ if (class12.field62 != null) { // L: 10087
+ class14.drawInterface(class12.field62, -1412584499, var1, var2, var3, var4, UserComparator5.field1389, SecureRandomFuture.field960, var7); // L: 10088
+ class12.field62 = null; // L: 10089
+ }
- class193(byte var3) {
- this.field2252 = var3; // L: 14
- } // L: 15
+ } else {
+ if (var7 != -1) { // L: 10079
+ Client.field703[var7] = true;
+ } else {
+ for (int var8 = 0; var8 < 100; ++var8) { // L: 10081
+ Client.field703[var8] = true;
+ }
+ }
- @ObfuscatedName("o")
+ }
+ } // L: 10083 10091
+
+ @ObfuscatedName("ke")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "98"
)
- @Export("rsOrdinal")
- public int rsOrdinal() {
- return this.field2252; // L: 19
+ static final int method3919() {
+ float var0 = 200.0F * ((float)class19.clientPreferences.method2254() - 0.5F); // L: 11835
+ return 100 - Math.round(var0); // L: 11836
}
-
- @ObfuscatedName("ld")
- @ObfuscatedSignature(
- descriptor = "(Lki;II)Ljava/lang/String;",
- garbageValue = "-1588715753"
- )
- static String method3801(Widget var0, int var1) {
- if (!MenuAction.method1880(UrlRequester.getWidgetFlags(var0), var1) && var0.onOp == null) { // L: 12513
- return null;
- } else {
- return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; // L: 12514 12515 12517
- }
- }
-
- @ObfuscatedName("ls")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-540726719"
- )
- static void method3800(int var0) {
- Client.oculusOrbState = var0; // L: 12665
- } // L: 12666
}
diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java
deleted file mode 100644
index 9fe5563465..0000000000
--- a/runescape-client/src/main/java/class194.java
+++ /dev/null
@@ -1,132 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("gc")
-public class class194 {
- @ObfuscatedName("l")
- @Export("directions")
- public static int[][] directions;
- @ObfuscatedName("k")
- @Export("distances")
- public static int[][] distances;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = -1497652731
- )
- public static int field2255;
- @ObfuscatedName("s")
- @Export("bufferX")
- public static int[] bufferX;
- @ObfuscatedName("r")
- @Export("bufferY")
- public static int[] bufferY;
- @ObfuscatedName("er")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive3")
- static Archive archive3;
-
- static {
- directions = new int[128][128]; // L: 6
- distances = new int[128][128]; // L: 7
- bufferX = new int[4096]; // L: 11
- bufferY = new int[4096]; // L: 12
- }
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)[Lja;",
- garbageValue = "-67"
- )
- public static class263[] method3807() {
- return new class263[]{class263.field3071, class263.field3058, class263.field3060, class263.field3062, class263.field3068, class263.field3063, class263.field3059, class263.field3064, class263.field3066, class263.field3067}; // L: 17
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;II[BII)I",
- garbageValue = "-1426013528"
- )
- @Export("encodeStringCp1252")
- public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
- int var5 = var2 - var1; // L: 45
-
- for (int var6 = 0; var6 < var5; ++var6) { // L: 46
- char var7 = var0.charAt(var6 + var1); // L: 47
- if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 48
- var3[var6 + var4] = (byte)var7;
- } else if (var7 == 8364) { // L: 49
- var3[var6 + var4] = -128;
- } else if (var7 == 8218) { // L: 50
- var3[var6 + var4] = -126;
- } else if (var7 == 402) { // L: 51
- var3[var6 + var4] = -125;
- } else if (var7 == 8222) { // L: 52
- var3[var6 + var4] = -124;
- } else if (var7 == 8230) { // L: 53
- var3[var6 + var4] = -123;
- } else if (var7 == 8224) { // L: 54
- var3[var6 + var4] = -122;
- } else if (var7 == 8225) { // L: 55
- var3[var6 + var4] = -121;
- } else if (var7 == 710) {
- var3[var6 + var4] = -120; // L: 56
- } else if (var7 == 8240) { // L: 57
- var3[var6 + var4] = -119;
- } else if (var7 == 352) { // L: 58
- var3[var6 + var4] = -118;
- } else if (var7 == 8249) { // L: 59
- var3[var6 + var4] = -117;
- } else if (var7 == 338) { // L: 60
- var3[var6 + var4] = -116;
- } else if (var7 == 381) { // L: 61
- var3[var6 + var4] = -114;
- } else if (var7 == 8216) { // L: 62
- var3[var6 + var4] = -111;
- } else if (var7 == 8217) { // L: 63
- var3[var6 + var4] = -110;
- } else if (var7 == 8220) { // L: 64
- var3[var6 + var4] = -109;
- } else if (var7 == 8221) { // L: 65
- var3[var6 + var4] = -108;
- } else if (var7 == 8226) { // L: 66
- var3[var6 + var4] = -107;
- } else if (var7 == 8211) { // L: 67
- var3[var6 + var4] = -106;
- } else if (var7 == 8212) {
- var3[var6 + var4] = -105; // L: 68
- } else if (var7 == 732) { // L: 69
- var3[var6 + var4] = -104;
- } else if (var7 == 8482) { // L: 70
- var3[var6 + var4] = -103;
- } else if (var7 == 353) { // L: 71
- var3[var6 + var4] = -102;
- } else if (var7 == 8250) { // L: 72
- var3[var6 + var4] = -101;
- } else if (var7 == 339) { // L: 73
- var3[var6 + var4] = -100;
- } else if (var7 == 382) { // L: 74
- var3[var6 + var4] = -98;
- } else if (var7 == 376) { // L: 75
- var3[var6 + var4] = -97;
- } else {
- var3[var6 + var4] = 63; // L: 76
- }
- }
-
- return var5; // L: 78
- }
-
- @ObfuscatedName("kq")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-114"
- )
- static final void method3804() {
- Client.field690 = Client.cycleCntr; // L: 12429
- Decimator.ClanChat_inClanChat = true; // L: 12430
- } // L: 12431
-}
diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java
index f3cfc60052..5dd37576af 100644
--- a/runescape-client/src/main/java/class2.java
+++ b/runescape-client/src/main/java/class2.java
@@ -1,5 +1,5 @@
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("l")
+@ObfuscatedName("q")
public interface class2 {
}
diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java
index 4c906d8e39..5324ef4ddb 100644
--- a/runescape-client/src/main/java/class20.java
+++ b/runescape-client/src/main/java/class20.java
@@ -5,73 +5,57 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("f")
+@ObfuscatedName("p")
public class class20 implements Callable {
- @ObfuscatedName("ix")
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -1111023185
+ intValue = -1119374455
)
- @Export("selectedItemWidget")
- static int selectedItemWidget;
- @ObfuscatedName("o")
+ @Export("clientType")
+ public static int clientType;
+ @ObfuscatedName("nb")
@ObfuscatedSignature(
- descriptor = "Ly;"
+ descriptor = "Lbk;"
)
- final class10 field106;
+ @Export("tempMenuAction")
+ static MenuAction tempMenuAction;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Ls;"
+ )
+ final class10 field109;
// $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lt;"
+ descriptor = "Lu;"
)
final class14 this$0;
@ObfuscatedSignature(
- descriptor = "(Lt;Ly;)V"
+ descriptor = "(Lu;Ls;)V"
)
class20(class14 var1, class10 var2) {
this.this$0 = var1; // L: 46
- this.field106 = var2; // L: 47
+ this.field109 = var2; // L: 47
} // L: 48
public Object call() throws Exception {
try {
- while (this.field106.method79()) { // L: 53
- class241.method4815(10L); // L: 54
+ while (this.field109.method78()) { // L: 53
+ DynamicObject.method1991(10L); // L: 54
}
} catch (IOException var2) { // L: 57
return new class21("Error servicing REST query: " + var2.getMessage()); // L: 58
}
- return this.field106.method82(); // L: 60
+ return this.field109.method90(); // L: 60
}
- @ObfuscatedName("x")
+ @ObfuscatedName("ar")
@ObfuscatedSignature(
- descriptor = "(Lki;B)I",
- garbageValue = "-14"
+ descriptor = "(II)I",
+ garbageValue = "-2092046767"
)
- static int method269(Widget var0) {
- if (var0.type != 11) { // L: 1238
- Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize - 1] = ""; // L: 1239
- return 1; // L: 1240
- } else {
- String var1 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1242
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var0.method5523(var1); // L: 1243
- return 1; // L: 1244
- }
+ static int method255(int var0) {
+ return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3847
}
-
- @ObfuscatedName("iy")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1249445157"
- )
- @Export("addCancelMenuEntry")
- static void addCancelMenuEntry() {
- HealthBar.method2336(); // L: 8702
- Client.menuActions[0] = "Cancel"; // L: 8703
- Client.menuTargets[0] = ""; // L: 8704
- Client.menuOpcodes[0] = 1006; // L: 8705
- Client.menuShiftClick[0] = false; // L: 8706
- Client.menuOptionsCount = 1; // L: 8707
- } // L: 8708
}
diff --git a/runescape-client/src/main/java/class201.java b/runescape-client/src/main/java/class201.java
new file mode 100644
index 0000000000..f2d3a908af
--- /dev/null
+++ b/runescape-client/src/main/java/class201.java
@@ -0,0 +1,226 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("gq")
+public class class201 {
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "[Ldc;"
+ )
+ class115[] field2365;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -77062685
+ )
+ int field2366;
+
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)V"
+ )
+ class201(Buffer var1, int var2) {
+ this.field2365 = new class115[var2]; // L: 13
+ this.field2366 = var1.readUnsignedByte(); // L: 14
+
+ for (int var3 = 0; var3 < this.field2365.length; ++var3) { // L: 15
+ class115 var4 = new class115(this.field2366, var1, false); // L: 16
+ this.field2365[var3] = var4; // L: 17
+ }
+
+ this.method4131(); // L: 19
+ } // L: 20
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1005826580"
+ )
+ void method4131() {
+ class115[] var1 = this.field2365; // L: 24
+
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25
+ class115 var3 = var1[var2]; // L: 26
+ if (var3.field1448 >= 0) { // L: 28
+ var3.field1440 = this.field2365[var3.field1448]; // L: 29
+ }
+ }
+
+ } // L: 34
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "3"
+ )
+ public int method4130() {
+ return this.field2365.length; // L: 37
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Ldc;",
+ garbageValue = "-62"
+ )
+ class115 method4123(int var1) {
+ return this.field2365[var1]; // L: 41
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)[Ldc;",
+ garbageValue = "1269137329"
+ )
+ class115[] method4124() {
+ return this.field2365; // L: 45
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Lda;II)V",
+ garbageValue = "-1587521432"
+ )
+ void method4146(class122 var1, int var2) {
+ this.method4126(var1, var2, (boolean[])null, false); // L: 49
+ } // L: 50
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(Lda;I[ZZI)V",
+ garbageValue = "-482543177"
+ )
+ void method4126(class122 var1, int var2, boolean[] var3, boolean var4) {
+ int var5 = var1.method2766(); // L: 53
+ int var6 = 0; // L: 54
+ class115[] var7 = this.method4124(); // L: 56
+
+ for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57
+ class115 var9 = var7[var8]; // L: 58
+ if (var3 == null || var4 == var3[var6]) { // L: 60
+ var1.method2790(var2, var9, var6, var5); // L: 61
+ }
+
+ ++var6; // L: 63
+ }
+
+ } // L: 67
+
+ @ObfuscatedName("gg")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIZI)V",
+ garbageValue = "-102591137"
+ )
+ @Export("setViewportShape")
+ static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+ if (var2 < 1) { // L: 4718
+ var2 = 1;
+ }
+
+ if (var3 < 1) { // L: 4719
+ var3 = 1;
+ }
+
+ int var5 = var3 - 334; // L: 4720
+ int var6;
+ if (var5 < 0) { // L: 4722
+ var6 = Client.field748;
+ } else if (var5 >= 100) { // L: 4723
+ var6 = Client.field749;
+ } else {
+ var6 = (Client.field749 - Client.field748) * var5 / 100 + Client.field748; // L: 4724
+ }
+
+ int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4725
+ int var8;
+ int var9;
+ short var17;
+ if (var7 < Client.field754) { // L: 4726
+ var17 = Client.field754; // L: 4727
+ var6 = var17 * var2 * 334 / (var3 * 512); // L: 4728
+ if (var6 > Client.field753) { // L: 4729
+ var6 = Client.field753; // L: 4730
+ var8 = var3 * var6 * 512 / (var17 * 334); // L: 4731
+ var9 = (var2 - var8) / 2; // L: 4732
+ if (var4) { // L: 4733
+ Rasterizer2D.Rasterizer2D_resetClip(); // L: 4734
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4735
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4736
+ }
+
+ var0 += var9; // L: 4738
+ var2 -= var9 * 2; // L: 4739
+ }
+ } else if (var7 > Client.field755) { // L: 4742
+ var17 = Client.field755; // L: 4743
+ var6 = var17 * var2 * 334 / (var3 * 512); // L: 4744
+ if (var6 < Client.field752) { // L: 4745
+ var6 = Client.field752; // L: 4746
+ var8 = var17 * var2 * 334 / (var6 * 512); // L: 4747
+ var9 = (var3 - var8) / 2; // L: 4748
+ if (var4) { // L: 4749
+ Rasterizer2D.Rasterizer2D_resetClip(); // L: 4750
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4751
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4752
+ }
+
+ var1 += var9; // L: 4754
+ var3 -= var9 * 2; // L: 4755
+ }
+ }
+
+ Client.viewportZoom = var3 * var6 / 334; // L: 4758
+ if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4759
+ int[] var16 = new int[9]; // L: 4761
+
+ for (var9 = 0; var9 < var16.length; ++var9) { // L: 4762
+ int var10 = var9 * 32 + 15 + 128; // L: 4763
+ int var11 = GZipDecompressor.method8314(var10); // L: 4764
+ int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4765
+ int var14 = var3 - 334; // L: 4768
+ if (var14 < 0) { // L: 4769
+ var14 = 0;
+ } else if (var14 > 100) { // L: 4770
+ var14 = 100;
+ }
+
+ int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 4771
+ int var13 = var15 * var11 / 256; // L: 4772
+ var16[var9] = var13 * var12 >> 16; // L: 4775
+ }
+
+ Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 4777
+ }
+
+ Client.viewportOffsetX = var0; // L: 4780
+ Client.viewportOffsetY = var1; // L: 4781
+ Client.viewportWidth = var2; // L: 4782
+ Client.viewportHeight = var3; // L: 4783
+ } // L: 4784
+
+ @ObfuscatedName("jp")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIII)V",
+ garbageValue = "868430801"
+ )
+ @Export("drawScrollBar")
+ static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+ class126.scrollBarSprites[0].drawAt(var0, var1); // L: 10751
+ class126.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10752
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field556); // L: 10753
+ int var5 = var3 * (var3 - 32) / var4; // L: 10754
+ if (var5 < 8) { // L: 10755
+ var5 = 8;
+ }
+
+ int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10756
+ Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field653); // L: 10757
+ Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field553); // L: 10758
+ Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field553); // L: 10759
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field553); // L: 10760
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field553); // L: 10761
+ Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field558); // L: 10762
+ Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field558); // L: 10763
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field558); // L: 10764
+ Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field558); // L: 10765
+ } // L: 10766
+}
diff --git a/runescape-client/src/main/java/class202.java b/runescape-client/src/main/java/class202.java
deleted file mode 100644
index 0541c868f5..0000000000
--- a/runescape-client/src/main/java/class202.java
+++ /dev/null
@@ -1,197 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("gb")
-public class class202 {
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "[Ldb;"
- )
- class115[] field2406;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = -1286404393
- )
- int field2405;
-
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)V"
- )
- class202(Buffer var1, int var2) {
- this.field2406 = new class115[var2]; // L: 13
- this.field2405 = var1.readUnsignedByte(); // L: 14
-
- for (int var3 = 0; var3 < this.field2406.length; ++var3) { // L: 15
- class115 var4 = new class115(this.field2405, var1, false); // L: 16
- this.field2406[var3] = var4; // L: 17
- }
-
- this.method3998(); // L: 19
- } // L: 20
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-95"
- )
- void method3998() {
- class115[] var1 = this.field2406; // L: 24
-
- for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25
- class115 var3 = var1[var2]; // L: 26
- if (var3.field1455 >= 0) { // L: 28
- var3.field1447 = this.field2406[var3.field1455]; // L: 29
- }
- }
-
- } // L: 34
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-911804190"
- )
- public int method4003() {
- return this.field2406.length; // L: 37
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(II)Ldb;",
- garbageValue = "518391824"
- )
- class115 method3997(int var1) {
- return this.field2406[var1]; // L: 41
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)[Ldb;",
- garbageValue = "-2127910453"
- )
- class115[] method3999() {
- return this.field2406; // L: 45
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(Lds;II)V",
- garbageValue = "1007899177"
- )
- void method4000(class122 var1, int var2) {
- this.method4014(var1, var2, (boolean[])null, false); // L: 49
- } // L: 50
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Lds;I[ZZS)V",
- garbageValue = "30105"
- )
- void method4014(class122 var1, int var2, boolean[] var3, boolean var4) {
- int var5 = var1.method2753(); // L: 53
- int var6 = 0; // L: 54
- class115[] var7 = this.method3999(); // L: 56
-
- for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57
- class115 var9 = var7[var8]; // L: 58
- if (var3 == null || var4 == var3[var6]) { // L: 60
- var1.method2756(var2, var9, var6, var5); // L: 61
- }
-
- ++var6; // L: 63
- }
-
- } // L: 67
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;IZI)I",
- garbageValue = "1525310482"
- )
- static int method4016(CharSequence var0, int var1, boolean var2) {
- if (var1 >= 2 && var1 <= 36) { // L: 76
- boolean var3 = false; // L: 77
- boolean var4 = false; // L: 78
- int var5 = 0; // L: 79
- int var6 = var0.length(); // L: 80
-
- for (int var7 = 0; var7 < var6; ++var7) { // L: 81
- char var8 = var0.charAt(var7); // L: 82
- if (var7 == 0) { // L: 83
- if (var8 == '-') { // L: 84
- var3 = true; // L: 85
- continue;
- }
-
- if (var8 == '+') { // L: 88
- continue;
- }
- }
-
- int var10;
- if (var8 >= '0' && var8 <= '9') { // L: 90
- var10 = var8 - '0';
- } else if (var8 >= 'A' && var8 <= 'Z') { // L: 91
- var10 = var8 - '7';
- } else {
- if (var8 < 'a' || var8 > 'z') { // L: 92
- throw new NumberFormatException(); // L: 93
- }
-
- var10 = var8 - 'W';
- }
-
- if (var10 >= var1) { // L: 94
- throw new NumberFormatException();
- }
-
- if (var3) { // L: 95
- var10 = -var10;
- }
-
- int var9 = var10 + var5 * var1; // L: 96
- if (var9 / var1 != var5) { // L: 97
- throw new NumberFormatException();
- }
-
- var5 = var9; // L: 98
- var4 = true; // L: 99
- }
-
- if (!var4) { // L: 101
- throw new NumberFormatException();
- } else {
- return var5; // L: 102
- }
- } else {
- throw new IllegalArgumentException("" + var1);
- }
- }
-
- @ObfuscatedName("hr")
- @ObfuscatedSignature(
- descriptor = "(IIII)I",
- garbageValue = "1406158008"
- )
- @Export("getTileHeight")
- static final int getTileHeight(int var0, int var1, int var2) {
- int var3 = var0 >> 7; // L: 5490
- int var4 = var1 >> 7; // L: 5491
- if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5492
- int var5 = var2; // L: 5493
- if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5494
- var5 = var2 + 1;
- }
-
- int var6 = var0 & 127; // L: 5495
- int var7 = var1 & 127; // L: 5496
- int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5497
- int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5498
- return var8 * (128 - var7) + var9 * var7 >> 7; // L: 5499
- } else {
- return 0;
- }
- }
-}
diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java
index e3918ee40c..2396d60bbb 100644
--- a/runescape-client/src/main/java/class21.java
+++ b/runescape-client/src/main/java/class21.java
@@ -2,195 +2,127 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("d")
+@ObfuscatedName("b")
public class class21 {
- @ObfuscatedName("rv")
+ @ObfuscatedName("sr")
@ObfuscatedSignature(
- descriptor = "Lqb;"
+ descriptor = "Lam;"
)
- @Export("privateChatMode")
- static PrivateChatMode privateChatMode;
- @ObfuscatedName("k")
- @Export("Interpreter_intLocals")
- static int[] Interpreter_intLocals;
- @ObfuscatedName("if")
+ @Export("pcmStreamMixer")
+ static PcmStreamMixer pcmStreamMixer;
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "[Lqr;"
+ descriptor = "Liy;"
)
- @Export("headIconHintSprites")
- static SpritePixels[] headIconHintSprites;
- @ObfuscatedName("o")
+ @Export("worldMapEvent")
+ static WorldMapEvent worldMapEvent;
+ @ObfuscatedName("fa")
+ static String field122;
+ @ObfuscatedName("c")
@ObfuscatedGetter(
- intValue = -2092446837
+ intValue = -1937379027
)
- final int field114;
- @ObfuscatedName("q")
- final String field115;
+ final int field117;
+ @ObfuscatedName("v")
+ final String field116;
class21(String var1) {
- this.field114 = 400; // L: 32
- this.field115 = ""; // L: 33
+ this.field117 = 400; // L: 32
+ this.field116 = ""; // L: 33
} // L: 34
class21(HttpURLConnection var1) throws IOException {
- this.field114 = var1.getResponseCode(); // L: 14
+ this.field117 = var1.getResponseCode(); // L: 14
var1.getResponseMessage(); // L: 15
var1.getHeaderFields(); // L: 16
StringBuilder var2 = new StringBuilder(); // L: 17
- InputStream var3 = this.field114 >= 300 ? var1.getErrorStream() : var1.getInputStream();
- if (var3 != null) {
- InputStreamReader var4 = new InputStreamReader(var3);
- BufferedReader var5 = new BufferedReader(var4);
+ InputStream var3 = this.field117 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18
+ if (var3 != null) { // L: 19
+ InputStreamReader var4 = new InputStreamReader(var3); // L: 20
+ BufferedReader var5 = new BufferedReader(var4); // L: 21
String var6;
- while ((var6 = var5.readLine()) != null) {
- var2.append(var6);
+ while ((var6 = var5.readLine()) != null) { // L: 23
+ var2.append(var6); // L: 24
}
var3.close(); // L: 26
}
- this.field115 = var2.toString(); // L: 28
+ this.field116 = var2.toString(); // L: 28
} // L: 29
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "7"
+ garbageValue = "115"
)
- public int method271() {
- return this.field114; // L: 37
+ public int method258() {
+ return this.field117; // L: 37
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "-11"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-1470500279"
)
- public String method276() {
- return this.field115; // L: 41
+ public String method262() {
+ return this.field116; // L: 41
}
- @ObfuscatedName("o")
+ @ObfuscatedName("p")
@ObfuscatedSignature(
- descriptor = "(II)Lfi;",
- garbageValue = "2110417878"
+ descriptor = "(IIII)I",
+ garbageValue = "2085250923"
)
- @Export("VarpDefinition_get")
- public static VarpDefinition VarpDefinition_get(int var0) {
- VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18
- if (var1 != null) { // L: 19
- return var1;
- } else {
- byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20
- var1 = new VarpDefinition(); // L: 21
- if (var2 != null) { // L: 22
- var1.decode(new Buffer(var2));
- }
-
- VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23
- return var1; // L: 24
+ @Export("hslToRgb")
+ static final int hslToRgb(int var0, int var1, int var2) {
+ if (var2 > 179) { // L: 940
+ var1 /= 2;
}
+
+ if (var2 > 192) { // L: 941
+ var1 /= 2;
+ }
+
+ if (var2 > 217) { // L: 942
+ var1 /= 2;
+ }
+
+ if (var2 > 243) { // L: 943
+ var1 /= 2;
+ }
+
+ int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 944
+ return var3; // L: 945
}
- @ObfuscatedName("y")
+ @ObfuscatedName("ax")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1346094411"
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "1464198346"
)
- static void method280() {
- Login.Login_username = Login.Login_username.trim(); // L: 1107
- if (Login.Login_username.length() == 0) { // L: 1108
- class345.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1109
- } else {
- long var1;
- try {
- URL var3 = new URL(WorldMapData_1.method4707("services", false) + "m=accountappeal/login.ws"); // L: 1116
- URLConnection var4 = var3.openConnection(); // L: 1117
- var4.setRequestProperty("connection", "close"); // L: 1118
- var4.setDoInput(true); // L: 1119
- var4.setDoOutput(true); // L: 1120
- var4.setConnectTimeout(5000); // L: 1121
- OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 1122
- var5.write("data1=req"); // L: 1123
- var5.flush(); // L: 1124
- InputStream var6 = var4.getInputStream(); // L: 1125
- Buffer var7 = new Buffer(new byte[1000]); // L: 1126
-
- while (true) {
- int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 1128
- if (var8 == -1) { // L: 1129
- var7.offset = 0; // L: 1136
- long var10 = var7.readLong(); // L: 1137
- var1 = var10; // L: 1138
- break;
- }
-
- var7.offset += var8; // L: 1130
- if (var7.offset >= 1000) { // L: 1131
- var1 = 0L; // L: 1132
- break;
- }
- }
- } catch (Exception var14) { // L: 1140
- var1 = 0L; // L: 1141
- }
-
- int var0;
- if (var1 == 0L) { // L: 1145
- var0 = 5;
+ static int method264(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.LOGOUT) { // L: 3831
+ Client.logoutTimer = 250; // L: 3832
+ return 1; // L: 3833
+ } else if (var0 != 5631 && var0 != 5633) { // L: 3835
+ if (var0 == 5632) { // L: 3839
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 26; // L: 3840
+ return 1; // L: 3841
} else {
- var0 = class143.method2972(var1, Login.Login_username); // L: 1146
+ return 2; // L: 3843
}
-
- switch(var0) { // L: 1147
- case 2:
- class345.setLoginResponseString(Strings.field3712, Strings.field3929, Strings.field3706); // L: 1164
- class126.method2799(6); // L: 1165
- break;
- case 3:
- class345.setLoginResponseString("", "Error connecting to server.", ""); // L: 1158
- break; // L: 1159
- case 4:
- class345.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1155
- break; // L: 1156
- case 5:
- class345.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1152
- break; // L: 1153
- case 6:
- class345.setLoginResponseString("", "Error connecting to server.", ""); // L: 1149
- break; // L: 1150
- case 7:
- class345.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 1161
- }
-
+ } else {
+ Interpreter.Interpreter_stringStackSize -= 2; // L: 3836
+ return 1; // L: 3837
}
- } // L: 1110 1168
-
- @ObfuscatedName("aq")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "1312519782"
- )
- static int method278(int var0) {
- return (int)((Math.log((double)var0) / Interpreter.field837 - 7.0D) * 256.0D); // L: 3841
- }
-
- @ObfuscatedName("hy")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "322943268"
- )
- static boolean method274() {
- return (Client.drawPlayerNames & 8) != 0; // L: 5016
}
}
diff --git a/runescape-client/src/main/java/class220.java b/runescape-client/src/main/java/class220.java
new file mode 100644
index 0000000000..0ec76b83f6
--- /dev/null
+++ b/runescape-client/src/main/java/class220.java
@@ -0,0 +1,73 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ha")
+public class class220 {
+ @ObfuscatedName("cm")
+ @ObfuscatedSignature(
+ descriptor = "[Lqu;"
+ )
+ @Export("worldSelectStars")
+ static IndexedSprite[] worldSelectStars;
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "1440657841"
+ )
+ @Export("savePreferences")
+ static void savePreferences() {
+ AccessFile var0 = null; // L: 134
+
+ try {
+ var0 = class67.getPreferencesFile("", class285.field3313.name, true); // L: 136
+ Buffer var1 = class19.clientPreferences.toBuffer(); // L: 137
+ var0.write(var1.array, 0, var1.offset); // L: 138
+ } catch (Exception var3) { // L: 140
+ }
+
+ try {
+ if (var0 != null) { // L: 142
+ var0.closeSync(true); // L: 143
+ }
+ } catch (Exception var2) { // L: 146
+ }
+
+ } // L: 147
+
+ @ObfuscatedName("hl")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)V",
+ garbageValue = "1567739451"
+ )
+ @Export("worldToScreen")
+ static final void worldToScreen(int var0, int var1, int var2) {
+ if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5432
+ int var3 = SceneTilePaint.getTileHeight(var0, var1, PacketWriter.Client_plane) - var2; // L: 5437
+ var0 -= class18.cameraX; // L: 5438
+ var3 -= class16.cameraY; // L: 5439
+ var1 -= class228.cameraZ; // L: 5440
+ int var4 = Rasterizer3D.Rasterizer3D_sine[ViewportMouse.cameraPitch]; // L: 5441
+ int var5 = Rasterizer3D.Rasterizer3D_cosine[ViewportMouse.cameraPitch]; // L: 5442
+ int var6 = Rasterizer3D.Rasterizer3D_sine[SoundCache.cameraYaw]; // L: 5443
+ int var7 = Rasterizer3D.Rasterizer3D_cosine[SoundCache.cameraYaw]; // L: 5444
+ int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5445
+ var1 = var7 * var1 - var0 * var6 >> 16; // L: 5446
+ var0 = var8; // L: 5447
+ var8 = var5 * var3 - var4 * var1 >> 16; // L: 5448
+ var1 = var5 * var1 + var4 * var3 >> 16; // L: 5449
+ if (var1 >= 50) { // L: 5451
+ Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5452
+ Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 5453
+ } else {
+ Client.viewportTempX = -1; // L: 5456
+ Client.viewportTempY = -1; // L: 5457
+ }
+
+ } else {
+ Client.viewportTempX = -1; // L: 5433
+ Client.viewportTempY = -1; // L: 5434
+ }
+ } // L: 5435 5459
+}
diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java
deleted file mode 100644
index 4a05281898..0000000000
--- a/runescape-client/src/main/java/class221.java
+++ /dev/null
@@ -1,59 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("hg")
-public class class221 {
- @ObfuscatedName("ph")
- @ObfuscatedSignature(
- descriptor = "Lpd;"
- )
- @Export("HitSplatDefinition_cached")
- static class428 HitSplatDefinition_cached;
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(I)Lfo;",
- garbageValue = "290100921"
- )
- public static Clock method4408() {
- try {
- return new NanoClock(); // L: 8
- } catch (Throwable var1) { // L: 10
- return new MilliClock(); // L: 11
- }
- }
-
- @ObfuscatedName("ho")
- @ObfuscatedSignature(
- descriptor = "(IIIIIIIIIB)V",
- garbageValue = "1"
- )
- @Export("updatePendingSpawn")
- static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
- PendingSpawn var9 = null; // L: 7815
-
- for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7816 7817 7822
- if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7818
- var9 = var10; // L: 7819
- break;
- }
- }
-
- if (var9 == null) { // L: 7824
- var9 = new PendingSpawn(); // L: 7825
- var9.plane = var0; // L: 7826
- var9.type = var3; // L: 7827
- var9.x = var1; // L: 7828
- var9.y = var2; // L: 7829
- UrlRequester.method2536(var9); // L: 7830
- Client.pendingSpawns.addFirst(var9); // L: 7831
- }
-
- var9.id = var4; // L: 7833
- var9.field1126 = var5; // L: 7834
- var9.orientation = var6; // L: 7835
- var9.delay = var7; // L: 7836
- var9.hitpoints = var8; // L: 7837
- } // L: 7838
-}
diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java
new file mode 100644
index 0000000000..61aaebde69
--- /dev/null
+++ b/runescape-client/src/main/java/class228.java
@@ -0,0 +1,197 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hf")
+public class class228 implements WorldMapSection {
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "Lqu;"
+ )
+ @Export("options_buttons_2Sprite")
+ static IndexedSprite options_buttons_2Sprite;
+ @ObfuscatedName("p")
+ @Export("Widget_loadedInterfaces")
+ public static boolean[] Widget_loadedInterfaces;
+ @ObfuscatedName("jx")
+ @ObfuscatedGetter(
+ intValue = 1330507417
+ )
+ @Export("cameraZ")
+ static int cameraZ;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 1982168145
+ )
+ int field2762;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = -1382928615
+ )
+ int field2761;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -1115080965
+ )
+ int field2751;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = -77835473
+ )
+ int field2752;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1160542303
+ )
+ int field2749;
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = 87628571
+ )
+ int field2754;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = 1743482041
+ )
+ int field2750;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = 1244830889
+ )
+ int field2756;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = -421589215
+ )
+ int field2757;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = 1159344129
+ )
+ int field2758;
+
+ class228() {
+ } // L: 18
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lhg;I)V",
+ garbageValue = "1585435431"
+ )
+ @Export("expandBounds")
+ public void expandBounds(WorldMapArea var1) {
+ if (var1.regionLowX > this.field2749) { // L: 22
+ var1.regionLowX = this.field2749;
+ }
+
+ if (var1.regionHighX < this.field2749) {
+ var1.regionHighX = this.field2749; // L: 23
+ }
+
+ if (var1.regionLowY > this.field2754) { // L: 24
+ var1.regionLowY = this.field2754;
+ }
+
+ if (var1.regionHighY < this.field2754) { // L: 25
+ var1.regionHighY = this.field2754;
+ }
+
+ } // L: 26
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)Z",
+ garbageValue = "-929111713"
+ )
+ @Export("containsCoord")
+ public boolean containsCoord(int var1, int var2, int var3) {
+ if (var1 >= this.field2762 && var1 < this.field2761 + this.field2762) { // L: 30
+ return var2 >= (this.field2751 << 6) + (this.field2750 << 3) && var2 <= (this.field2751 << 6) + (this.field2750 << 3) + 7 && var3 >= (this.field2752 << 6) + (this.field2756 << 3) && var3 <= (this.field2752 << 6) + (this.field2756 << 3) + 7; // L: 33
+ } else {
+ return false; // L: 31
+ }
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(III)Z",
+ garbageValue = "-47549823"
+ )
+ @Export("containsPosition")
+ public boolean containsPosition(int var1, int var2) {
+ return var1 >= (this.field2749 << 6) + (this.field2757 << 3) && var1 <= (this.field2749 << 6) + (this.field2757 << 3) + 7 && var2 >= (this.field2754 << 6) + (this.field2758 << 3) && var2 <= (this.field2754 << 6) + (this.field2758 << 3) + 7; // L: 38
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)[I",
+ garbageValue = "-561571792"
+ )
+ @Export("getBorderTileLengths")
+ public int[] getBorderTileLengths(int var1, int var2, int var3) {
+ if (!this.containsCoord(var1, var2, var3)) {
+ return null;
+ } else {
+ int[] var4 = new int[]{var2 + (this.field2749 * 64 - this.field2751 * 64) + (this.field2757 * 8 - this.field2750 * 8), var3 + (this.field2754 * 64 - this.field2752 * 64) + (this.field2758 * 8 - this.field2756 * 8)};
+ return var4; // L: 49
+ }
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(III)Lkd;",
+ garbageValue = "531454030"
+ )
+ @Export("coord")
+ public Coord coord(int var1, int var2) {
+ if (!this.containsPosition(var1, var2)) { // L: 54
+ return null; // L: 55
+ } else {
+ int var3 = this.field2751 * 64 - this.field2749 * 64 + (this.field2750 * 8 - this.field2757 * 8) + var1; // L: 57
+ int var4 = var2 + (this.field2752 * 64 - this.field2754 * 64) + (this.field2756 * 8 - this.field2758 * 8); // L: 58
+ return new Coord(this.field2762, var3, var4); // L: 59
+ }
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;B)V",
+ garbageValue = "-27"
+ )
+ @Export("read")
+ public void read(Buffer var1) {
+ this.field2762 = var1.readUnsignedByte(); // L: 64
+ this.field2761 = var1.readUnsignedByte(); // L: 65
+ this.field2751 = var1.readUnsignedShort(); // L: 66
+ this.field2750 = var1.readUnsignedByte(); // L: 67
+ this.field2752 = var1.readUnsignedShort(); // L: 68
+ this.field2756 = var1.readUnsignedByte(); // L: 69
+ this.field2749 = var1.readUnsignedShort(); // L: 70
+ this.field2757 = var1.readUnsignedByte(); // L: 71
+ this.field2754 = var1.readUnsignedShort(); // L: 72
+ this.field2758 = var1.readUnsignedByte(); // L: 73
+ this.method4882(); // L: 74
+ } // L: 75
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-91"
+ )
+ void method4882() {
+ } // L: 77
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-101"
+ )
+ public static void method4899() {
+ ByteArrayPool.field4202.clear(); // L: 43
+ ByteArrayPool.field4202.add(100); // L: 44
+ ByteArrayPool.field4202.add(5000); // L: 45
+ ByteArrayPool.field4202.add(10000); // L: 46
+ ByteArrayPool.field4202.add(30000); // L: 47
+ } // L: 48
+}
diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java
index 6b8eb99a79..a8fb791cb8 100644
--- a/runescape-client/src/main/java/class229.java
+++ b/runescape-client/src/main/java/class229.java
@@ -1,183 +1,53 @@
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("he")
-public class class229 implements WorldMapSection {
- @ObfuscatedName("tl")
- @ObfuscatedGetter(
- intValue = -833135371
- )
- static int field2805;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 158678861
- )
- int field2803;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = -1742479059
- )
- int field2798;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 301118417
- )
- int field2795;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -308738369
- )
- int field2793;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = 1763199169
- )
- int field2797;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 582544923
- )
- int field2794;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 1808550713
- )
- int field2799;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = -109258069
- )
- int field2800;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = 801571503
- )
- int field2801;
+@ObfuscatedName("hw")
+public class class229 {
@ObfuscatedName("v")
- @ObfuscatedGetter(
- intValue = -298293387
- )
- int field2802;
+ @Export("base37DecodeLong")
+ public static String base37DecodeLong(long var0) {
+ if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31
+ if (var0 % 37L == 0L) { // L: 32
+ return null;
+ } else {
+ int var2 = 0; // L: 33
- class229() {
- } // L: 18
+ for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37
+ ++var2; // L: 36
+ }
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lhm;I)V",
- garbageValue = "-1792723155"
- )
- @Export("expandBounds")
- public void expandBounds(WorldMapArea var1) {
- if (var1.regionLowX > this.field2797) { // L: 22
- var1.regionLowX = this.field2797;
- }
+ StringBuilder var5;
+ char var8;
+ for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 39 40 49
+ long var6 = var0; // L: 41
+ var0 /= 37L; // L: 42
+ var8 = class344.base37Table[(int)(var6 - var0 * 37L)]; // L: 43
+ if (var8 == '_') { // L: 44
+ int var9 = var5.length() - 1; // L: 45
+ var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 46
+ var8 = 160; // L: 47
+ }
+ }
- if (var1.regionHighX < this.field2797) {
- var1.regionHighX = this.field2797; // L: 23
- }
-
- if (var1.regionLowY > this.field2794) { // L: 24
- var1.regionLowY = this.field2794;
- }
-
- if (var1.regionHighY < this.field2794) { // L: 25
- var1.regionHighY = this.field2794;
- }
-
- } // L: 26
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(IIIB)Z",
- garbageValue = "1"
- )
- @Export("containsCoord")
- public boolean containsCoord(int var1, int var2, int var3) {
- if (var1 >= this.field2803 && var1 < this.field2798 + this.field2803) { // L: 30
- return var2 >= (this.field2795 << 6) + (this.field2799 << 3) && var2 <= (this.field2795 << 6) + (this.field2799 << 3) + 7 && var3 >= (this.field2793 << 6) + (this.field2800 << 3) && var3 <= (this.field2793 << 6) + (this.field2800 << 3) + 7; // L: 33
+ var5.reverse(); // L: 51
+ var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 52
+ return var5.toString(); // L: 53
+ }
} else {
- return false; // L: 31
+ return null;
}
}
- @ObfuscatedName("l")
+ @ObfuscatedName("ik")
@ObfuscatedSignature(
- descriptor = "(IIB)Z",
- garbageValue = "2"
+ descriptor = "(Lbk;III)V",
+ garbageValue = "444042633"
)
- @Export("containsPosition")
- public boolean containsPosition(int var1, int var2) {
- return var1 >= (this.field2797 << 6) + (this.field2801 << 3) && var1 <= (this.field2797 << 6) + (this.field2801 << 3) + 7 && var2 >= (this.field2794 << 6) + (this.field2802 << 3) && var2 <= (this.field2794 << 6) + (this.field2802 << 3) + 7; // L: 38
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(IIII)[I",
- garbageValue = "-41287528"
- )
- @Export("getBorderTileLengths")
- public int[] getBorderTileLengths(int var1, int var2, int var3) {
- if (!this.containsCoord(var1, var2, var3)) { // L: 43
- return null; // L: 44
- } else {
- int[] var4 = new int[]{var2 + (this.field2797 * 64 - this.field2795 * 64) + (this.field2801 * 8 - this.field2799 * 8), var3 + (this.field2794 * 64 - this.field2793 * 64) + (this.field2802 * 8 - this.field2800 * 8)}; // L: 46 47 48
- return var4; // L: 49
+ static final void method4904(MenuAction var0, int var1, int var2) {
+ if (var0 != null) { // L: 8703
+ FriendsList.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 8704
}
- }
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(III)Lkd;",
- garbageValue = "289851355"
- )
- @Export("coord")
- public Coord coord(int var1, int var2) {
- if (!this.containsPosition(var1, var2)) { // L: 54
- return null; // L: 55
- } else {
- int var3 = this.field2795 * 64 - this.field2797 * 64 + (this.field2799 * 8 - this.field2801 * 8) + var1; // L: 57
- int var4 = var2 + (this.field2793 * 64 - this.field2794 * 64) + (this.field2800 * 8 - this.field2802 * 8); // L: 58
- return new Coord(this.field2803, var3, var4); // L: 59
- }
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "-113194936"
- )
- @Export("read")
- public void read(Buffer var1) {
- this.field2803 = var1.readUnsignedByte(); // L: 64
- this.field2798 = var1.readUnsignedByte(); // L: 65
- this.field2795 = var1.readUnsignedShort(); // L: 66
- this.field2799 = var1.readUnsignedByte(); // L: 67
- this.field2793 = var1.readUnsignedShort(); // L: 68
- this.field2800 = var1.readUnsignedByte(); // L: 69
- this.field2797 = var1.readUnsignedShort(); // L: 70
- this.field2801 = var1.readUnsignedByte(); // L: 71
- this.field2794 = var1.readUnsignedShort(); // L: 72
- this.field2802 = var1.readUnsignedByte(); // L: 73
- this.method4713(); // L: 74
- } // L: 75
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "26"
- )
- void method4713() {
- } // L: 77
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(II)Z",
- garbageValue = "404905484"
- )
- public static boolean method4727(int var0) {
- return (var0 >> 20 & 1) != 0; // L: 17
- }
+ } // L: 8706
}
diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java
deleted file mode 100644
index 39eeb7fe6d..0000000000
--- a/runescape-client/src/main/java/class230.java
+++ /dev/null
@@ -1,229 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("hh")
-public class class230 {
- @ObfuscatedName("be")
- @ObfuscatedGetter(
- intValue = 2086809951
- )
- static int field2807;
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Lpc;II)V",
- garbageValue = "1853715963"
- )
- @Export("readPlayerUpdate")
- static void readPlayerUpdate(PacketBuffer var0, int var1) {
- boolean var2 = var0.readBits(1) == 1; // L: 197
- if (var2) { // L: 198
- Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
- }
-
- int var3 = var0.readBits(2); // L: 199
- Player var4 = Client.players[var1]; // L: 200
- if (var3 == 0) { // L: 201
- if (var2) { // L: 202
- var4.field1095 = false; // L: 203
- } else if (Client.localPlayerIndex == var1) { // L: 206
- throw new RuntimeException();
- } else {
- Players.Players_regions[var1] = (var4.plane << 28) + (SecureRandomCallable.baseX + var4.pathX[0] >> 13 << 14) + (GrandExchangeOfferOwnWorldComparator.baseY + var4.pathY[0] >> 13); // L: 207
- if (var4.field1172 != -1) { // L: 208
- Players.Players_orientations[var1] = var4.field1172;
- } else {
- Players.Players_orientations[var1] = var4.orientation; // L: 209
- }
-
- Players.Players_targetIndices[var1] = var4.targetIndex; // L: 210
- Client.players[var1] = null; // L: 211
- if (var0.readBits(1) != 0) { // L: 212
- FloorUnderlayDefinition.updateExternalPlayer(var0, var1);
- }
-
- }
- } else {
- int var5;
- int var6;
- int var7;
- if (var3 == 1) { // L: 215
- var5 = var0.readBits(3); // L: 216
- var6 = var4.pathX[0]; // L: 217
- var7 = var4.pathY[0]; // L: 218
- if (var5 == 0) { // L: 219
- --var6; // L: 220
- --var7; // L: 221
- } else if (var5 == 1) { // L: 223
- --var7;
- } else if (var5 == 2) { // L: 224
- ++var6; // L: 225
- --var7; // L: 226
- } else if (var5 == 3) { // L: 228
- --var6;
- } else if (var5 == 4) { // L: 229
- ++var6;
- } else if (var5 == 5) { // L: 230
- --var6; // L: 231
- ++var7; // L: 232
- } else if (var5 == 6) { // L: 234
- ++var7;
- } else if (var5 == 7) { // L: 235
- ++var6; // L: 236
- ++var7; // L: 237
- }
-
- if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 239
- var4.resetPath(var6, var7); // L: 240
- var4.field1095 = false; // L: 241
- } else if (var2) { // L: 243
- var4.field1095 = true; // L: 244
- var4.tileX = var6; // L: 245
- var4.tileY = var7; // L: 246
- } else {
- var4.field1095 = false; // L: 249
- var4.method2117(var6, var7, Players.field1302[var1]); // L: 250
- }
-
- } else if (var3 == 2) { // L: 254
- var5 = var0.readBits(4); // L: 255
- var6 = var4.pathX[0]; // L: 256
- var7 = var4.pathY[0]; // L: 257
- if (var5 == 0) { // L: 258
- var6 -= 2; // L: 259
- var7 -= 2; // L: 260
- } else if (var5 == 1) { // L: 262
- --var6; // L: 263
- var7 -= 2; // L: 264
- } else if (var5 == 2) { // L: 266
- var7 -= 2;
- } else if (var5 == 3) { // L: 267
- ++var6; // L: 268
- var7 -= 2; // L: 269
- } else if (var5 == 4) { // L: 271
- var6 += 2; // L: 272
- var7 -= 2; // L: 273
- } else if (var5 == 5) { // L: 275
- var6 -= 2; // L: 276
- --var7; // L: 277
- } else if (var5 == 6) { // L: 279
- var6 += 2; // L: 280
- --var7; // L: 281
- } else if (var5 == 7) { // L: 283
- var6 -= 2;
- } else if (var5 == 8) { // L: 284
- var6 += 2;
- } else if (var5 == 9) { // L: 285
- var6 -= 2; // L: 286
- ++var7; // L: 287
- } else if (var5 == 10) { // L: 289
- var6 += 2; // L: 290
- ++var7; // L: 291
- } else if (var5 == 11) { // L: 293
- var6 -= 2; // L: 294
- var7 += 2; // L: 295
- } else if (var5 == 12) { // L: 297
- --var6; // L: 298
- var7 += 2; // L: 299
- } else if (var5 == 13) { // L: 301
- var7 += 2;
- } else if (var5 == 14) { // L: 302
- ++var6; // L: 303
- var7 += 2; // L: 304
- } else if (var5 == 15) { // L: 306
- var6 += 2; // L: 307
- var7 += 2; // L: 308
- }
-
- if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 310
- var4.resetPath(var6, var7); // L: 311
- var4.field1095 = false; // L: 312
- } else if (var2) { // L: 314
- var4.field1095 = true; // L: 315
- var4.tileX = var6; // L: 316
- var4.tileY = var7; // L: 317
- } else {
- var4.field1095 = false; // L: 320
- var4.method2117(var6, var7, Players.field1302[var1]); // L: 321
- }
-
- } else {
- var5 = var0.readBits(1); // L: 325
- int var8;
- int var9;
- int var10;
- int var11;
- if (var5 == 0) { // L: 326
- var6 = var0.readBits(12); // L: 327
- var7 = var6 >> 10; // L: 328
- var8 = var6 >> 5 & 31; // L: 329
- if (var8 > 15) { // L: 330
- var8 -= 32;
- }
-
- var9 = var6 & 31; // L: 331
- if (var9 > 15) { // L: 332
- var9 -= 32;
- }
-
- var10 = var8 + var4.pathX[0]; // L: 333
- var11 = var9 + var4.pathY[0]; // L: 334
- if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 335
- if (var2) { // L: 339
- var4.field1095 = true; // L: 340
- var4.tileX = var10; // L: 341
- var4.tileY = var11; // L: 342
- } else {
- var4.field1095 = false; // L: 345
- var4.method2117(var10, var11, Players.field1302[var1]); // L: 346
- }
- } else {
- var4.resetPath(var10, var11); // L: 336
- var4.field1095 = false; // L: 337
- }
-
- var4.plane = (byte)(var7 + var4.plane & 3); // L: 348
- if (Client.localPlayerIndex == var1) { // L: 349
- class128.Client_plane = var4.plane;
- }
-
- } else {
- var6 = var0.readBits(30); // L: 352
- var7 = var6 >> 28; // L: 353
- var8 = var6 >> 14 & 16383; // L: 354
- var9 = var6 & 16383; // L: 355
- var10 = (var8 + SecureRandomCallable.baseX + var4.pathX[0] & 16383) - SecureRandomCallable.baseX; // L: 356
- var11 = (var9 + GrandExchangeOfferOwnWorldComparator.baseY + var4.pathY[0] & 16383) - GrandExchangeOfferOwnWorldComparator.baseY; // L: 357
- if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 358
- var4.resetPath(var10, var11); // L: 359
- var4.field1095 = false; // L: 360
- } else if (var2) { // L: 362
- var4.field1095 = true; // L: 363
- var4.tileX = var10; // L: 364
- var4.tileY = var11; // L: 365
- } else {
- var4.field1095 = false; // L: 368
- var4.method2117(var10, var11, Players.field1302[var1]); // L: 369
- }
-
- var4.plane = (byte)(var7 + var4.plane & 3); // L: 371
- if (Client.localPlayerIndex == var1) { // L: 372
- class128.Client_plane = var4.plane;
- }
-
- }
- }
- }
- } // L: 204 213 252 323 350 373
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)V",
- garbageValue = "-1056029355"
- )
- static final void method4731(String var0) {
- InterfaceParent.method2067(var0 + " is already on your ignore list"); // L: 174
- } // L: 175
-}
diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java
new file mode 100644
index 0000000000..c56ff0bfb8
--- /dev/null
+++ b/runescape-client/src/main/java/class238.java
@@ -0,0 +1,75 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("ie")
+public class class238 {
+ @ObfuscatedName("sz")
+ @ObfuscatedSignature(
+ descriptor = "Lar;"
+ )
+ @Export("pcmPlayer1")
+ static PcmPlayer pcmPlayer1;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lie;"
+ )
+ static final class238 field2837;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lie;"
+ )
+ static final class238 field2836;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = 406167623
+ )
+ @Export("value")
+ final int value;
+
+ static {
+ field2837 = new class238(0); // L: 4
+ field2836 = new class238(1); // L: 5
+ }
+
+ class238(int var1) {
+ this.value = var1; // L: 9
+ } // L: 10
+
+ @ObfuscatedName("n")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZB)I",
+ garbageValue = "-43"
+ )
+ static int method5001(int var0, Script var1, boolean var2) {
+ Widget var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1459
+ if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1460
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(class124.getWidgetFlags(var3)); // L: 1461
+ return 1; // L: 1462
+ } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1464
+ if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1471
+ if (var3.dataText == null) { // L: 1472
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1473
+ }
+
+ return 1; // L: 1474
+ } else {
+ return 2; // L: 1476
+ }
+ } else {
+ int var4 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1465
+ --var4; // L: 1466
+ if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1467
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1468
+ } else {
+ Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+ }
+
+ return 1; // L: 1469
+ }
+ }
+}
diff --git a/runescape-client/src/main/java/class239.java b/runescape-client/src/main/java/class239.java
deleted file mode 100644
index 36d386e903..0000000000
--- a/runescape-client/src/main/java/class239.java
+++ /dev/null
@@ -1,49 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("iz")
-public class class239 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Liz;"
- )
- static final class239 field2875;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Liz;"
- )
- static final class239 field2872;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 2125298345
- )
- @Export("value")
- final int value;
-
- static {
- field2875 = new class239(0); // L: 4
- field2872 = new class239(1); // L: 5
- }
-
- class239(int var1) {
- this.value = var1; // L: 9
- } // L: 10
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;I)I",
- garbageValue = "-299459182"
- )
- public static int method4810(CharSequence var0) {
- int var1 = var0.length(); // L: 139
- int var2 = 0; // L: 140
-
- for (int var3 = 0; var3 < var1; ++var3) { // L: 141
- var2 = (var2 << 5) - var2 + var0.charAt(var3);
- }
-
- return var2; // L: 142
- }
-}
diff --git a/runescape-client/src/main/java/class240.java b/runescape-client/src/main/java/class240.java
new file mode 100644
index 0000000000..e677d9071f
--- /dev/null
+++ b/runescape-client/src/main/java/class240.java
@@ -0,0 +1,59 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("iv")
+public class class240 {
+ @ObfuscatedName("bo")
+ @ObfuscatedGetter(
+ intValue = 1497426191
+ )
+ static int field2846;
+
+ @ObfuscatedName("ip")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1536934514"
+ )
+ static final int method5005() {
+ return Client.menuOptionsCount - 1; // L: 9718
+ }
+
+ @ObfuscatedName("jv")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;III)V",
+ garbageValue = "1978456423"
+ )
+ @Export("alignWidgetPosition")
+ static void alignWidgetPosition(Widget var0, int var1, int var2) {
+ if (var0.xAlignment == 0) { // L: 10704
+ var0.x = var0.rawX;
+ } else if (var0.xAlignment == 1) { // L: 10705
+ var0.x = var0.rawX + (var1 - var0.width) / 2;
+ } else if (var0.xAlignment == 2) { // L: 10706
+ var0.x = var1 - var0.width - var0.rawX;
+ } else if (var0.xAlignment == 3) { // L: 10707
+ var0.x = var0.rawX * var1 >> 14;
+ } else if (var0.xAlignment == 4) { // L: 10708
+ var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2;
+ } else {
+ var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10709
+ }
+
+ if (var0.yAlignment == 0) { // L: 10710
+ var0.y = var0.rawY;
+ } else if (var0.yAlignment == 1) { // L: 10711
+ var0.y = (var2 - var0.height) / 2 + var0.rawY;
+ } else if (var0.yAlignment == 2) { // L: 10712
+ var0.y = var2 - var0.height - var0.rawY;
+ } else if (var0.yAlignment == 3) {
+ var0.y = var2 * var0.rawY >> 14; // L: 10713
+ } else if (var0.yAlignment == 4) { // L: 10714
+ var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2;
+ } else {
+ var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10715
+ }
+
+ } // L: 10716
+}
diff --git a/runescape-client/src/main/java/class241.java b/runescape-client/src/main/java/class241.java
deleted file mode 100644
index 785a16ce89..0000000000
--- a/runescape-client/src/main/java/class241.java
+++ /dev/null
@@ -1,124 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ih")
-public class class241 {
- @ObfuscatedName("hj")
- @Export("regions")
- static int[] regions;
-
- @ObfuscatedName("o")
- public static final void method4815(long var0) {
- if (var0 > 0L) { // L: 9
- if (var0 % 10L == 0L) { // L: 10
- long var2 = var0 - 1L; // L: 11
-
- try {
- Thread.sleep(var2); // L: 14
- } catch (InterruptedException var8) { // L: 16
- }
-
- try {
- Thread.sleep(1L); // L: 20
- } catch (InterruptedException var7) { // L: 22
- }
- } else {
- try {
- Thread.sleep(var0); // L: 27
- } catch (InterruptedException var6) { // L: 29
- }
- }
-
- }
- } // L: 31
-
- @ObfuscatedName("gi")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-973583928"
- )
- static final void method4813(int var0, int var1) {
- if (var0 < 128) { // L: 3949
- var0 = 128;
- }
-
- if (var0 > 383) { // L: 3950
- var0 = 383;
- }
-
- if (GameEngine.cameraPitch < var0) { // L: 3951
- GameEngine.cameraPitch = (var0 - GameEngine.cameraPitch) * PacketBufferNode.field3083 / 1000 + GameEngine.cameraPitch + class17.field88; // L: 3952
- if (GameEngine.cameraPitch > var0) { // L: 3953
- GameEngine.cameraPitch = var0;
- }
- }
-
- if (GameEngine.cameraPitch > var0) { // L: 3955
- GameEngine.cameraPitch -= (GameEngine.cameraPitch - var0) * PacketBufferNode.field3083 / 1000 + class17.field88; // L: 3956
- if (GameEngine.cameraPitch < var0) { // L: 3957
- GameEngine.cameraPitch = var0;
- }
- }
-
- int var2 = var1 - StudioGame.cameraYaw; // L: 3959
- if (var2 > 1024) { // L: 3960
- var2 -= 2048;
- }
-
- if (var2 < -1024) { // L: 3961
- var2 += 2048;
- }
-
- if (var2 > 0) { // L: 3962
- StudioGame.cameraYaw = StudioGame.cameraYaw + class17.field88 + var2 * PacketBufferNode.field3083 / 1000; // L: 3963
- StudioGame.cameraYaw &= 2047; // L: 3964
- }
-
- if (var2 < 0) { // L: 3966
- StudioGame.cameraYaw -= class17.field88 + -var2 * PacketBufferNode.field3083 / 1000; // L: 3967
- StudioGame.cameraYaw &= 2047; // L: 3968
- }
-
- int var3 = var1 - StudioGame.cameraYaw; // L: 3970
- if (var3 > 1024) { // L: 3971
- var3 -= 2048;
- }
-
- if (var3 < -1024) {
- var3 += 2048; // L: 3972
- }
-
- if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 3973
- StudioGame.cameraYaw = var1;
- }
-
- } // L: 3974
-
- @ObfuscatedName("kb")
- @ObfuscatedSignature(
- descriptor = "(IIIB)Lck;",
- garbageValue = "52"
- )
- static final InterfaceParent method4812(int var0, int var1, int var2) {
- InterfaceParent var3 = new InterfaceParent(); // L: 12211
- var3.group = var1; // L: 12212
- var3.type = var2; // L: 12213
- Client.interfaceParents.put(var3, (long)var0); // L: 12214
- GraphicsDefaults.Widget_resetModelFrames(var1); // L: 12215
- Widget var4 = class92.getWidget(var0); // L: 12216
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 12217
- if (Client.meslayerContinueWidget != null) { // L: 12218
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 12219
- Client.meslayerContinueWidget = null; // L: 12220
- }
-
- UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12222
- AbstractWorldMapData.runWidgetOnLoadListener(var1); // L: 12223
- if (Client.rootInterface != -1) { // L: 12224
- WorldMapLabelSize.runIntfCloseListeners(Client.rootInterface, 1);
- }
-
- return var3; // L: 12225
- }
-}
diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java
new file mode 100644
index 0000000000..dae8bba008
--- /dev/null
+++ b/runescape-client/src/main/java/class248.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ik")
+public interface class248 extends class250 {
+}
diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java
index 38708ebb67..9a23109fa3 100644
--- a/runescape-client/src/main/java/class249.java
+++ b/runescape-client/src/main/java/class249.java
@@ -1,5 +1,70 @@
+import java.io.DataInputStream;
+import java.net.URL;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("if")
-public interface class249 extends class251 {
+@ObfuscatedName("iw")
+public abstract class class249 implements class251 {
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = -1471785879
+ )
+ protected int field2884;
+
+ @ObfuscatedSignature(
+ descriptor = "(Lkx;Llb;I)V"
+ )
+ protected class249(StudioGame var1, Language var2, int var3) {
+ this.field2884 = var3; // L: 10
+ } // L: 11
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V",
+ garbageValue = "41"
+ )
+ @Export("RunException_sendStackTrace")
+ public static void RunException_sendStackTrace(String var0, Throwable var1) {
+ if (var1 != null) {
+ var1.printStackTrace();
+ } else {
+ try {
+ String var2 = ""; // L: 34
+ if (var1 != null) { // L: 35
+ var2 = class301.method5755(var1);
+ }
+
+ if (var0 != null) { // L: 36
+ if (var1 != null) { // L: 37
+ var2 = var2 + " | ";
+ }
+
+ var2 = var2 + var0; // L: 38
+ }
+
+ System.out.println("Error: " + var2); // L: 40
+ var2 = var2.replace(':', '.'); // L: 41
+ var2 = var2.replace('@', '_'); // L: 42
+ var2 = var2.replace('&', '_'); // L: 43
+ var2 = var2.replace('#', '_'); // L: 44
+ if (RunException.RunException_applet == null) { // L: 45
+ return;
+ }
+
+ URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?cv=" + RunException.field4838 + "&cs=" + RunException.field4839 + "&u=" + RunException.localPlayerName + "&v1=" + class360.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class20.clientType + "&e=" + var2); // L: 46
+ DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 47
+ var4.read(); // L: 48
+ var4.close(); // L: 49
+ } catch (Exception var5) { // L: 51
+ }
+
+ }
+ } // L: 52
+
+ @ObfuscatedName("i")
+ static final void method5123(long var0) {
+ ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 95
+ } // L: 96
}
diff --git a/runescape-client/src/main/java/class250.java b/runescape-client/src/main/java/class250.java
index 779d58df69..6a7aaa598a 100644
--- a/runescape-client/src/main/java/class250.java
+++ b/runescape-client/src/main/java/class250.java
@@ -1,76 +1,5 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("iv")
-public abstract class class250 implements class252 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 659631733
- )
- protected int field2926;
-
- @ObfuscatedSignature(
- descriptor = "(Lke;Llq;I)V"
- )
- protected class250(StudioGame var1, Language var2, int var3) {
- this.field2926 = var3; // L: 10
- } // L: 11
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Lle;IIIBZI)V",
- garbageValue = "185954668"
- )
- @Export("requestNetFile")
- static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
- long var6 = (long)((var1 << 16) + var2); // L: 122
- NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 123
- if (var8 == null) { // L: 124
- var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 125
- if (var8 == null) { // L: 126
- var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 127
- if (var8 != null) { // L: 128
- if (var5) { // L: 129
- var8.removeDual(); // L: 130
- NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 131
- --NetCache.NetCache_pendingWritesCount; // L: 132
- ++NetCache.NetCache_pendingPriorityWritesCount; // L: 133
- }
-
- } else {
- if (!var5) { // L: 137
- var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 138
- if (var8 != null) { // L: 139
- return;
- }
- }
-
- var8 = new NetFileRequest(); // L: 141
- var8.archive = var0; // L: 142
- var8.crc = var3; // L: 143
- var8.padding = var4; // L: 144
- if (var5) { // L: 145
- NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 146
- ++NetCache.NetCache_pendingPriorityWritesCount; // L: 147
- } else {
- NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 150
- NetCache.NetCache_pendingWrites.put(var8, var6); // L: 151
- ++NetCache.NetCache_pendingWritesCount; // L: 152
- }
-
- }
- }
- }
- } // L: 135 154
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-2017847021"
- )
- public static void method4933() {
- StructComposition.StructDefinition_cached.clear(); // L: 57
- } // L: 58
+@ObfuscatedName("in")
+public interface class250 {
}
diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java
index 8e365573d1..ffd31c02e5 100644
--- a/runescape-client/src/main/java/class251.java
+++ b/runescape-client/src/main/java/class251.java
@@ -1,5 +1,5 @@
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("is")
-public interface class251 {
+@ObfuscatedName("iq")
+public interface class251 extends Iterable {
}
diff --git a/runescape-client/src/main/java/class252.java b/runescape-client/src/main/java/class252.java
index dc79997550..3133d41a16 100644
--- a/runescape-client/src/main/java/class252.java
+++ b/runescape-client/src/main/java/class252.java
@@ -1,5 +1,7 @@
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("ia")
-public interface class252 extends Iterable {
+@ObfuscatedName("ig")
+public interface class252 {
+ @ObfuscatedName("c")
+ void method5124(Object var1);
}
diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java
deleted file mode 100644
index 7dd50ce7e6..0000000000
--- a/runescape-client/src/main/java/class253.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("iu")
-public interface class253 {
- @ObfuscatedName("o")
- void method4937(Object var1);
-}
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
new file mode 100644
index 0000000000..f2a80b2b37
--- /dev/null
+++ b/runescape-client/src/main/java/class258.java
@@ -0,0 +1,16 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("it")
+public class class258 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;ZZI)V",
+ garbageValue = "1865423313"
+ )
+ @Export("openURL")
+ public static void openURL(String var0, boolean var1, boolean var2) {
+ AbstractWorldMapData.method4987(var0, var1, "openjs", var2); // L: 22
+ } // L: 23
+}
diff --git a/runescape-client/src/main/java/class259.java b/runescape-client/src/main/java/class259.java
index 92a4e10060..2dd1153f88 100644
--- a/runescape-client/src/main/java/class259.java
+++ b/runescape-client/src/main/java/class259.java
@@ -1,39 +1,36 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("io")
+@ObfuscatedName("id")
public class class259 {
- @ObfuscatedName("dk")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lfl;"
+ descriptor = "(I)V",
+ garbageValue = "2045687167"
)
- @Export("js5SocketTask")
- static Task js5SocketTask;
+ static void method5188() {
+ Tiles.Tiles_minPlane = 99; // L: 48
+ Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49
+ Tiles.Tiles_overlays = new byte[4][104][104]; // L: 50
+ Tiles.Tiles_shapes = new byte[4][104][104]; // L: 51
+ Tiles.field996 = new byte[4][104][104]; // L: 52
+ class1.field2 = new int[4][105][105]; // L: 53
+ UserComparator6.field1415 = new byte[4][105][105]; // L: 54
+ class430.field4651 = new int[105][105]; // L: 55
+ MusicPatchNode2.Tiles_hue = new int[104]; // L: 56
+ Tiles.Tiles_saturation = new int[104]; // L: 57
+ Varcs.Tiles_lightness = new int[104]; // L: 58
+ class465.Tiles_hueMultiplier = new int[104]; // L: 59
+ WorldMapScaleHandler.field2877 = new int[104]; // L: 60
+ } // L: 61
- @ObfuscatedName("gu")
+ @ObfuscatedName("kv")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;ZI)V",
- garbageValue = "-2064241274"
+ descriptor = "(I)V",
+ garbageValue = "-387349075"
)
- @Export("drawLoadingMessage")
- static final void drawLoadingMessage(String var0, boolean var1) {
- if (Client.showLoadingMessages) { // L: 4565
- byte var2 = 4; // L: 4566
- int var3 = var2 + 6; // L: 4567
- int var4 = var2 + 6; // L: 4568
- int var5 = class149.fontPlain12.lineWidth(var0, 250); // L: 4569
- int var6 = class149.fontPlain12.lineCount(var0, 250) * 13; // L: 4570
- Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); // L: 4571
- Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); // L: 4572
- class149.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4573
- class132.method2836(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); // L: 4574
- if (var1) { // L: 4575
- DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); // L: 4576
- } else {
- ItemContainer.method2061(var3, var4, var5, var6); // L: 4579
- }
-
- }
- } // L: 4581
+ static final void method5189() {
+ Client.field690 = Client.cycleCntr; // L: 12215
+ Projectile.ClanChat_inClanChat = true; // L: 12216
+ } // L: 12217
}
diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java
index e771de8da7..39cf4ad5ce 100644
--- a/runescape-client/src/main/java/class260.java
+++ b/runescape-client/src/main/java/class260.java
@@ -1,13 +1,5 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jq")
-public class class260 {
- @ObfuscatedName("cv")
- @ObfuscatedSignature(
- descriptor = "[Lqd;"
- )
- @Export("worldSelectFlagSprites")
- static IndexedSprite[] worldSelectFlagSprites;
+@ObfuscatedName("ja")
+public interface class260 {
}
diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java
deleted file mode 100644
index a968a85852..0000000000
--- a/runescape-client/src/main/java/class261.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("jd")
-public interface class261 {
-}
diff --git a/runescape-client/src/main/java/class262.java b/runescape-client/src/main/java/class262.java
new file mode 100644
index 0000000000..0cebeb6ba3
--- /dev/null
+++ b/runescape-client/src/main/java/class262.java
@@ -0,0 +1,76 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("jw")
+public class class262 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3020;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3017;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3019;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3018;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3015;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3016;
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3021;
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3022;
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3023;
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "Ljw;"
+ )
+ public static final class262 field3024;
+
+ static {
+ field3020 = new class262(5); // L: 5
+ field3017 = new class262(7); // L: 6
+ field3019 = new class262(5); // L: 7
+ field3018 = new class262(4); // L: 8
+ field3015 = new class262(4); // L: 9
+ field3016 = new class262(3); // L: 10
+ field3021 = new class262(15); // L: 11
+ field3022 = new class262(6); // L: 12
+ field3023 = new class262(2); // L: 13
+ field3024 = new class262(14); // L: 14
+ }
+
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "5"
+ )
+ class262(int var1) {
+ } // L: 20
+}
diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java
deleted file mode 100644
index 7533a2dc9e..0000000000
--- a/runescape-client/src/main/java/class263.java
+++ /dev/null
@@ -1,164 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ja")
-public class class263 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3071;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3058;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3060;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3062;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3068;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3063;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3059;
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3064;
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3066;
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "Lja;"
- )
- public static final class263 field3067;
- @ObfuscatedName("bx")
- @ObfuscatedSignature(
- descriptor = "Llq;"
- )
- @Export("clientLanguage")
- static Language clientLanguage;
- @ObfuscatedName("fq")
- @ObfuscatedGetter(
- intValue = 1922609665
- )
- static int field3070;
-
- static {
- field3071 = new class263(6); // L: 5
- field3058 = new class263(7); // L: 6
- field3060 = new class263(15); // L: 7
- field3062 = new class263(14); // L: 8
- field3068 = new class263(4); // L: 9
- field3063 = new class263(3); // L: 10
- field3059 = new class263(2); // L: 11
- field3064 = new class263(5); // L: 12
- field3066 = new class263(5); // L: 13
- field3067 = new class263(4); // L: 14
- }
-
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "6"
- )
- class263(int var1) {
- } // L: 20
-
- @ObfuscatedName("l")
- @Export("base37DecodeLong")
- public static String base37DecodeLong(long var0) {
- if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49
- if (var0 % 37L == 0L) { // L: 50
- return null;
- } else {
- int var2 = 0; // L: 51
-
- for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 52 53 55
- ++var2; // L: 54
- }
-
- StringBuilder var5;
- char var8;
- for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 57 58 67
- long var6 = var0; // L: 59
- var0 /= 37L; // L: 60
- var8 = class345.base37Table[(int)(var6 - var0 * 37L)]; // L: 61
- if (var8 == '_') { // L: 62
- int var9 = var5.length() - 1; // L: 63
- var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 64
- var8 = 160; // L: 65
- }
- }
-
- var5.reverse(); // L: 69
- var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70
- return var5.toString(); // L: 71
- }
- } else {
- return null;
- }
- }
-
- @ObfuscatedName("gf")
- @ObfuscatedSignature(
- descriptor = "(Lca;ZB)V",
- garbageValue = "-125"
- )
- @Export("addPlayerToScene")
- static void addPlayerToScene(Player var0, boolean var1) {
- if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4953
- var0.isUnanimated = false; // L: 4954
- if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4955 4956
- var0.isUnanimated = true;
- }
-
- int var2 = var0.x >> 7; // L: 4958
- int var3 = var0.y >> 7; // L: 4959
- if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4960
- long var4 = VarbitComposition.calculateTag(0, 0, 0, false, var0.index); // L: 4961
- if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4962
- var0.isUnanimated = false; // L: 4963
- var0.tileHeight = class202.getTileHeight(var0.x, var0.y, class128.Client_plane); // L: 4964
- var0.playerCycle = Client.cycle; // L: 4965
- class175.scene.addNullableObject(class128.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4966
- } else {
- if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4969
- if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4970
- return;
- }
-
- Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4971
- }
-
- var0.tileHeight = class202.getTileHeight(var0.x, var0.y, class128.Client_plane); // L: 4973
- var0.playerCycle = Client.cycle; // L: 4974
- class175.scene.drawEntity(class128.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4975
- }
- }
- }
-
- } // L: 4979
-}
diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java
new file mode 100644
index 0000000000..ad0573a8c3
--- /dev/null
+++ b/runescape-client/src/main/java/class266.java
@@ -0,0 +1,42 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("jc")
+public class class266 {
+ @ObfuscatedName("cg")
+ @ObfuscatedSignature(
+ descriptor = "Lqu;"
+ )
+ @Export("worldSelectLeftSprite")
+ static IndexedSprite worldSelectLeftSprite;
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(B)[Lqe;",
+ garbageValue = "22"
+ )
+ static SpritePixels[] method5212() {
+ SpritePixels[] var0 = new SpritePixels[class456.SpriteBuffer_spriteCount]; // L: 157
+
+ for (int var1 = 0; var1 < class456.SpriteBuffer_spriteCount; ++var1) { // L: 158
+ SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 159
+ var2.width = ModelData0.SpriteBuffer_spriteWidth; // L: 160
+ var2.height = class456.SpriteBuffer_spriteHeight; // L: 161
+ var2.xOffset = class426.SpriteBuffer_xOffsets[var1]; // L: 162
+ var2.yOffset = class142.SpriteBuffer_yOffsets[var1]; // L: 163
+ var2.subWidth = class359.SpriteBuffer_spriteWidths[var1]; // L: 164
+ var2.subHeight = class456.SpriteBuffer_spriteHeights[var1]; // L: 165
+ int var3 = var2.subHeight * var2.subWidth; // L: 166
+ byte[] var4 = class421.SpriteBuffer_pixels[var1]; // L: 167
+ var2.pixels = new int[var3]; // L: 168
+
+ for (int var5 = 0; var5 < var3; ++var5) { // L: 169
+ var2.pixels[var5] = class13.SpriteBuffer_spritePalette[var4[var5] & 255];
+ }
+ }
+
+ SoundCache.method766(); // L: 171
+ return var0; // L: 172
+ }
+}
diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java
index c0bd11f7e9..b7889ba35c 100644
--- a/runescape-client/src/main/java/class267.java
+++ b/runescape-client/src/main/java/class267.java
@@ -1,200 +1,43 @@
-import java.util.Date;
+import java.io.File;
+import java.util.HashMap;
+import java.util.TimeZone;
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("jb")
-public class class267 {
- @ObfuscatedName("ts")
- @ObfuscatedGetter(
- intValue = -1597128389
- )
- static int field3206;
- @ObfuscatedName("cm")
+@ObfuscatedName("jl")
+public final class class267 {
+ @ObfuscatedName("q")
+ static final HashMap field3162;
+ @ObfuscatedName("f")
+ @Export("JagexCache_locationFile")
+ static File JagexCache_locationFile;
+ @ObfuscatedName("eu")
@ObfuscatedSignature(
- descriptor = "[Lqd;"
+ descriptor = "Llc;"
)
- @Export("worldSelectStars")
- static IndexedSprite[] worldSelectStars;
-
- @ObfuscatedName("az")
+ @Export("archive12")
+ static Archive archive12;
+ @ObfuscatedName("io")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-1967428813"
+ descriptor = "Lqe;"
)
- static int method5027(int var0, Script var1, boolean var2) {
- String var3;
- int var9;
- if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3267
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3268
- var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3269
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3270
- return 1; // L: 3271
- } else {
- String var4;
- if (var0 == ScriptOpcodes.APPEND) { // L: 3273
- class9.Interpreter_stringStackSize -= 2; // L: 3274
- var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3275
- var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3276
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3277
- return 1; // L: 3278
- } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3280
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3281
- var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3282
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + Message.intToString(var9, true); // L: 3283
- return 1; // L: 3284
- } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3286
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3287
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3288
- return 1; // L: 3289
- } else {
- int var6;
- int var10;
- if (var0 == ScriptOpcodes.FROMDATE) { // L: 3291
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3292
- long var13 = ((long)var10 + 11745L) * 86400000L; // L: 3293
- Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3294
- var6 = Interpreter.Interpreter_calendar.get(5); // L: 3295
- int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3296
- int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3297
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3298
- return 1; // L: 3299
- } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3301
- if (var0 == ScriptOpcodes.TOSTRING) { // L: 3309
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3310
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3311
- return 1; // L: 3312
- } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3314
- class9.Interpreter_stringStackSize -= 2; // L: 3315
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ItemContainer.method2059(HealthBarDefinition.compareStrings(Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1], class263.clientLanguage)); // L: 3316
- return 1; // L: 3317
- } else {
- int var5;
- byte[] var11;
- Font var12;
- if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3319
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3320
- class12.Interpreter_intStackSize -= 2; // L: 3321
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3322
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3323
- var11 = class16.archive13.takeFile(var5, 0); // L: 3324
- var12 = new Font(var11); // L: 3325
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3326
- return 1; // L: 3327
- } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3329
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3330
- class12.Interpreter_intStackSize -= 2; // L: 3331
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3332
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3333
- var11 = class16.archive13.takeFile(var5, 0); // L: 3334
- var12 = new Font(var11); // L: 3335
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3336
- return 1; // L: 3337
- } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3339
- class9.Interpreter_stringStackSize -= 2; // L: 3340
- var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3341
- var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3342
- if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 3343
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3;
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4; // L: 3344
- }
+ @Export("compass")
+ static SpritePixels compass;
- return 1; // L: 3345
- } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3347
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3348
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3349
- return 1; // L: 3350
- } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3352
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3353
- var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3354
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3355
- return 1; // L: 3356
- } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3358
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3359
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class6.isCharPrintable((char)var10) ? 1 : 0; // L: 3360
- return 1; // L: 3361
- } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3363
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3364
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class78.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3365
- return 1; // L: 3366
- } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3368
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3369
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator5.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3370
- return 1; // L: 3371
- } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3373
- var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3374
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Coord.isDigit((char)var10) ? 1 : 0; // L: 3375
- return 1; // L: 3376
- } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3378
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3379
- if (var3 != null) { // L: 3380
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.length();
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3381
- }
-
- return 1; // L: 3382
- } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3384
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3385
- class12.Interpreter_intStackSize -= 2; // L: 3386
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3387
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3388
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3389
- return 1; // L: 3390
- } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3392
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3393
- StringBuilder var15 = new StringBuilder(var3.length()); // L: 3394
- boolean var16 = false; // L: 3395
-
- for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3396
- char var7 = var3.charAt(var6); // L: 3397
- if (var7 == '<') { // L: 3398
- var16 = true;
- } else if (var7 == '>') { // L: 3399
- var16 = false;
- } else if (!var16) { // L: 3400
- var15.append(var7);
- }
- }
-
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3402
- return 1; // L: 3403
- } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3405
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3406
- var9 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3407
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3408
- return 1; // L: 3409
- } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3411
- class9.Interpreter_stringStackSize -= 2; // L: 3412
- var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3413
- var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3414
- var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3415
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3416
- return 1; // L: 3417
- } else if (var0 == 4122) { // L: 3419
- var3 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3420
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3421
- return 1; // L: 3422
- } else {
- return 2; // L: 3424
- }
- }
- } else {
- class9.Interpreter_stringStackSize -= 2; // L: 3302
- var3 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3303
- var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3304
- if (ModelData0.localPlayer.appearance != null && ModelData0.localPlayer.appearance.isFemale) { // L: 3305
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4;
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3; // L: 3306
- }
-
- return 1; // L: 3307
- }
+ static {
+ field3162 = new HashMap(); // L: 11
+ TimeZone var0;
+ synchronized(field3162) { // L: 16
+ TimeZone var2 = (TimeZone)field3162.get("Europe/London"); // L: 17
+ if (var2 == null) { // L: 18
+ var2 = TimeZone.getTimeZone("Europe/London"); // L: 19
+ field3162.put("Europe/London", var2); // L: 20
}
+
+ var0 = var2; // L: 22
}
- }
+
+ java.util.Calendar.getInstance(var0); // L: 25
+ } // L: 26
}
diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java
index 20138f9a23..94d1fe4157 100644
--- a/runescape-client/src/main/java/class268.java
+++ b/runescape-client/src/main/java/class268.java
@@ -1,539 +1,400 @@
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.TimeZone;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ju")
+@ObfuscatedName("jh")
public final class class268 {
- @ObfuscatedName("l")
- static final HashMap field3208;
- @ObfuscatedName("a")
- @Export("Interpreter_stringLocals")
- static String[] Interpreter_stringLocals;
- @ObfuscatedName("bq")
- @ObfuscatedGetter(
- intValue = 685628771
- )
- static int field3212;
-
- static {
- field3208 = new HashMap(); // L: 11
- TimeZone var0;
- synchronized(field3208) { // L: 16
- TimeZone var2 = (TimeZone)field3208.get("Europe/London"); // L: 17
- if (var2 == null) { // L: 18
- var2 = TimeZone.getTimeZone("Europe/London"); // L: 19
- field3208.put("Europe/London", var2); // L: 20
- }
-
- var0 = var2; // L: 22
- }
-
- java.util.Calendar.getInstance(var0); // L: 25
- } // L: 26
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Ljava/io/File;Ljava/io/File;I)V",
- garbageValue = "-1479426402"
- )
- static void method5030(File var0, File var1) {
- try {
- AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 270
- Buffer var3 = new Buffer(500); // L: 271
- var3.writeByte(3); // L: 272
- var3.writeByte(var1 != null ? 1 : 0); // L: 273
- var3.writeCESU8(var0.getPath()); // L: 274
- if (var1 != null) {
- var3.writeCESU8(""); // L: 275
- }
-
- var2.write(var3.array, 0, var3.offset); // L: 276
- var2.close(); // L: 277
- } catch (IOException var4) { // L: 279
- var4.printStackTrace(); // L: 280
- }
-
- } // L: 282
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Ljava/util/Date;I)Z",
- garbageValue = "1429154223"
- )
- static boolean method5028(Date var0) {
- java.util.Calendar var1 = java.util.Calendar.getInstance(); // L: 999
- var1.set(1, var1.get(1) - 13); // L: 1000
- var1.set(5, var1.get(5) + 1); // L: 1001
- var1.set(11, 0); // L: 1002
- var1.set(12, 0); // L: 1003
- var1.set(13, 0); // L: 1004
- var1.set(14, 0); // L: 1005
- Date var2 = var1.getTime(); // L: 1006
- return var0.before(var2); // L: 1007
- }
-
@ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(Lgm;[Lgh;B)V",
- garbageValue = "61"
+ @ObfuscatedGetter(
+ longValue = -2565136781786077807L
)
- static final void method5029(Scene var0, CollisionMap[] var1) {
- int var2;
- int var3;
- int var4;
- int var5;
- for (var2 = 0; var2 < 4; ++var2) { // L: 618
- for (var3 = 0; var3 < 104; ++var3) { // L: 619
- for (var4 = 0; var4 < 104; ++var4) { // L: 620
- if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 621
- var5 = var2; // L: 622
- if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 623
- var5 = var2 - 1;
- }
+ static long field3170;
- if (var5 >= 0) { // L: 624
- var1[var5].setBlockedByFloor(var3, var4);
- }
- }
- }
- }
- }
-
- Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 629
- if (Tiles.rndHue < -8) { // L: 630
- Tiles.rndHue = -8;
- }
-
- if (Tiles.rndHue > 8) { // L: 631
- Tiles.rndHue = 8;
- }
-
- Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 632
- if (Tiles.rndLightness < -16) { // L: 633
- Tiles.rndLightness = -16;
- }
-
- if (Tiles.rndLightness > 16) { // L: 634
- Tiles.rndLightness = 16;
- }
-
- int var9;
- int var10;
- int var11;
- int var12;
- int var13;
- int var14;
- int var15;
- int var16;
- int[] var10000;
- int var17;
- int var18;
- for (var2 = 0; var2 < 4; ++var2) { // L: 635
- byte[][] var42 = NPC.field1259[var2]; // L: 636
- boolean var45 = true; // L: 637
- boolean var46 = true; // L: 638
- boolean var6 = true; // L: 639
- boolean var7 = true; // L: 640
- boolean var8 = true; // L: 641
- var9 = (int)Math.sqrt(5100.0D); // L: 642
- var10 = var9 * 768 >> 8; // L: 643
-
- int var19;
- int var20;
- for (var11 = 1; var11 < 103; ++var11) { // L: 644
- for (var12 = 1; var12 < 103; ++var12) { // L: 645
- var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 646
- var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 647
- var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 648
- var16 = (var13 << 8) / var15; // L: 649
- var17 = 65536 / var15; // L: 650
- var18 = (var14 << 8) / var15; // L: 651
- var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 652
- var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 653
- Interpreter.field839[var12][var11] = var19 - var20; // L: 654
- }
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIILgg;Lgv;B)V",
+ garbageValue = "78"
+ )
+ @Export("addObjects")
+ static final void addObjects(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
+ if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 294 295 296
+ if (var0 < Tiles.Tiles_minPlane) { // L: 299
+ Tiles.Tiles_minPlane = var0;
}
- for (var11 = 0; var11 < 104; ++var11) { // L: 657
- class154.Tiles_hue[var11] = 0; // L: 658
- MusicPatch.Tiles_saturation[var11] = 0; // L: 659
- WallDecoration.Tiles_lightness[var11] = 0; // L: 660
- Tiles.Tiles_hueMultiplier[var11] = 0; // L: 661
- MenuAction.field866[var11] = 0; // L: 662
+ ObjectComposition var8 = class162.getObjectDefinition(var3); // L: 300
+ int var9;
+ int var10;
+ if (var4 != 1 && var4 != 3) { // L: 303
+ var9 = var8.sizeX; // L: 308
+ var10 = var8.sizeY; // L: 309
+ } else {
+ var9 = var8.sizeY; // L: 304
+ var10 = var8.sizeX; // L: 305
}
- for (var11 = -5; var11 < 109; ++var11) { // L: 664
- for (var12 = 0; var12 < 104; ++var12) { // L: 665
- var13 = var11 + 5; // L: 666
- int var10002;
- if (var13 >= 0 && var13 < 104) { // L: 667
- var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 668
- if (var14 > 0) { // L: 669
- FloorUnderlayDefinition var43 = class160.method3171(var14 - 1); // L: 670
- var10000 = class154.Tiles_hue; // L: 671
- var10000[var12] += var43.hue;
- var10000 = MusicPatch.Tiles_saturation; // L: 672
- var10000[var12] += var43.saturation;
- var10000 = WallDecoration.Tiles_lightness; // L: 673
- var10000[var12] += var43.lightness;
- var10000 = Tiles.Tiles_hueMultiplier; // L: 674
- var10000[var12] += var43.hueMultiplier;
- var10002 = MenuAction.field866[var12]++; // L: 675
- }
+ int var11;
+ int var12;
+ if (var9 + var1 <= 104) { // L: 315
+ var11 = (var9 >> 1) + var1; // L: 316
+ var12 = (var9 + 1 >> 1) + var1; // L: 317
+ } else {
+ var11 = var1; // L: 320
+ var12 = var1 + 1; // L: 321
+ }
+
+ int var13;
+ int var14;
+ if (var10 + var2 <= 104) { // L: 323
+ var13 = (var10 >> 1) + var2; // L: 324
+ var14 = var2 + (var10 + 1 >> 1); // L: 325
+ } else {
+ var13 = var2; // L: 328
+ var14 = var2 + 1; // L: 329
+ }
+
+ int[][] var15 = Tiles.Tiles_heights[var0]; // L: 331
+ int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; // L: 332
+ int var17 = (var1 << 7) + (var9 << 6); // L: 333
+ int var18 = (var2 << 7) + (var10 << 6); // L: 334
+ long var19 = TaskHandler.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 335
+ int var21 = var5 + (var4 << 6); // L: 336
+ if (var8.int3 == 1) { // L: 337
+ var21 += 256;
+ }
+
+ if (var8.hasSound()) { // L: 338
+ class6.method38(var0, var1, var2, var8, var4);
+ }
+
+ Object var29;
+ if (var5 == 22) { // L: 339
+ if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 340
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 342
+ var29 = var8.getEntity(22, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 343
}
- var14 = var11 - 5; // L: 678
- if (var14 >= 0 && var14 < 104) { // L: 679
- var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 680
- if (var15 > 0) { // L: 681
- FloorUnderlayDefinition var44 = class160.method3171(var15 - 1); // L: 682
- var10000 = class154.Tiles_hue; // L: 683
- var10000[var12] -= var44.hue;
- var10000 = MusicPatch.Tiles_saturation; // L: 684
- var10000[var12] -= var44.saturation;
- var10000 = WallDecoration.Tiles_lightness; // L: 685
- var10000[var12] -= var44.lightness;
- var10000 = Tiles.Tiles_hueMultiplier; // L: 686
- var10000[var12] -= var44.hueMultiplier;
- var10002 = MenuAction.field866[var12]--; // L: 687
- }
+ var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 344
+ if (var8.interactType == 1 && var7 != null) { // L: 345
+ var7.setBlockedByFloorDec(var1, var2);
}
+
}
-
- if (var11 >= 1 && var11 < 103) { // L: 691
- var12 = 0; // L: 692
- var13 = 0; // L: 693
- var14 = 0; // L: 694
- var15 = 0; // L: 695
- var16 = 0; // L: 696
-
- for (var17 = -5; var17 < 109; ++var17) { // L: 697
- var18 = var17 + 5; // L: 698
- if (var18 >= 0 && var18 < 104) { // L: 699
- var12 += class154.Tiles_hue[var18]; // L: 700
- var13 += MusicPatch.Tiles_saturation[var18]; // L: 701
- var14 += WallDecoration.Tiles_lightness[var18]; // L: 702
- var15 += Tiles.Tiles_hueMultiplier[var18]; // L: 703
- var16 += MenuAction.field866[var18]; // L: 704
+ } else {
+ int var28;
+ if (var5 != 10 && var5 != 11) { // L: 348
+ int[] var10000;
+ if (var5 >= 12) { // L: 369
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 371
+ var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 372
}
- var19 = var17 - 5; // L: 706
- if (var19 >= 0 && var19 < 104) { // L: 707
- var12 -= class154.Tiles_hue[var19]; // L: 708
- var13 -= MusicPatch.Tiles_saturation[var19]; // L: 709
- var14 -= WallDecoration.Tiles_lightness[var19]; // L: 710
- var15 -= Tiles.Tiles_hueMultiplier[var19]; // L: 711
- var16 -= MenuAction.field866[var19]; // L: 712
+ var6.method4188(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 373
+ if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 374
+ var10000 = class1.field2[var0][var1];
+ var10000[var2] |= 2340;
}
- if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 714 715 716 717
- if (var2 < Tiles.Tiles_minPlane) { // L: 720
- Tiles.Tiles_minPlane = var2;
+ if (var8.interactType != 0 && var7 != null) { // L: 375
+ var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+ }
+
+ } else if (var5 == 0) { // L: 378
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 380
+ var29 = var8.getEntity(0, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 381
+ }
+
+ var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1007[var4], 0, var19, var21); // L: 382
+ if (var4 == 0) { // L: 383
+ if (var8.clipped) { // L: 384
+ UserComparator6.field1415[var0][var1][var2] = 50; // L: 385
+ UserComparator6.field1415[var0][var1][var2 + 1] = 50; // L: 386
}
- var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 721
- int var21 = Tiles.Tiles_overlays[var2][var11][var17] & 255; // L: 722
- if (var20 > 0 || var21 > 0) { // L: 723
- int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 724
- int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 725
- int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 726
- int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 727
- int var26 = Interpreter.field839[var11][var17]; // L: 728
- int var27 = Interpreter.field839[var11 + 1][var17]; // L: 729
- int var28 = Interpreter.field839[var11 + 1][var17 + 1]; // L: 730
- int var29 = Interpreter.field839[var11][var17 + 1]; // L: 731
- int var30 = -1; // L: 732
- int var31 = -1; // L: 733
- int var32;
- int var33;
- if (var20 > 0) { // L: 734
- var32 = var12 * 256 / var15; // L: 735
- var33 = var13 / var16; // L: 736
- int var34 = var14 / var16; // L: 737
- var30 = ArchiveLoader.hslToRgb(var32, var33, var34); // L: 738
- var32 = var32 + Tiles.rndHue & 255; // L: 739
- var34 += Tiles.rndLightness; // L: 740
- if (var34 < 0) { // L: 741
- var34 = 0;
- } else if (var34 > 255) { // L: 742
- var34 = 255;
- }
+ if (var8.modelClipped) { // L: 388
+ var10000 = class1.field2[var0][var1];
+ var10000[var2] |= 585;
+ }
+ } else if (var4 == 1) { // L: 390
+ if (var8.clipped) { // L: 391
+ UserComparator6.field1415[var0][var1][var2 + 1] = 50; // L: 392
+ UserComparator6.field1415[var0][var1 + 1][var2 + 1] = 50; // L: 393
+ }
- var31 = ArchiveLoader.hslToRgb(var32, var33, var34); // L: 743
+ if (var8.modelClipped) { // L: 395
+ var10000 = class1.field2[var0][var1];
+ var10000[1 + var2] |= 1170;
+ }
+ } else if (var4 == 2) { // L: 397
+ if (var8.clipped) { // L: 398
+ UserComparator6.field1415[var0][var1 + 1][var2] = 50; // L: 399
+ UserComparator6.field1415[var0][var1 + 1][var2 + 1] = 50; // L: 400
+ }
+
+ if (var8.modelClipped) { // L: 402
+ var10000 = class1.field2[var0][var1 + 1];
+ var10000[var2] |= 585;
+ }
+ } else if (var4 == 3) { // L: 404
+ if (var8.clipped) { // L: 405
+ UserComparator6.field1415[var0][var1][var2] = 50; // L: 406
+ UserComparator6.field1415[var0][var1 + 1][var2] = 50; // L: 407
+ }
+
+ if (var8.modelClipped) { // L: 409
+ var10000 = class1.field2[var0][var1];
+ var10000[var2] |= 1170;
+ }
+ }
+
+ if (var8.interactType != 0 && var7 != null) { // L: 411
+ var7.method3878(var1, var2, var5, var4, var8.boolean1);
+ }
+
+ if (var8.int2 != 16) { // L: 412
+ var6.method4171(var0, var1, var2, var8.int2);
+ }
+
+ } else if (var5 == 1) { // L: 415
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 417
+ var29 = var8.getEntity(1, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 418
+ }
+
+ var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1011[var4], 0, var19, var21); // L: 419
+ if (var8.clipped) { // L: 420
+ if (var4 == 0) { // L: 421
+ UserComparator6.field1415[var0][var1][var2 + 1] = 50;
+ } else if (var4 == 1) { // L: 422
+ UserComparator6.field1415[var0][var1 + 1][var2 + 1] = 50;
+ } else if (var4 == 2) { // L: 423
+ UserComparator6.field1415[var0][var1 + 1][var2] = 50;
+ } else if (var4 == 3) { // L: 424
+ UserComparator6.field1415[var0][var1][var2] = 50;
+ }
+ }
+
+ if (var8.interactType != 0 && var7 != null) { // L: 426
+ var7.method3878(var1, var2, var5, var4, var8.boolean1);
+ }
+
+ } else {
+ int var22;
+ if (var5 == 2) { // L: 429
+ var22 = var4 + 1 & 3; // L: 430
+ Object var24;
+ Object var30;
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 433
+ var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 434
+ var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 435
+ } else {
+ var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 438
+ var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 439
+ }
+
+ var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field1007[var4], Tiles.field1007[var22], var19, var21); // L: 441
+ if (var8.modelClipped) { // L: 442
+ if (var4 == 0) { // L: 443
+ var10000 = class1.field2[var0][var1]; // L: 444
+ var10000[var2] |= 585;
+ var10000 = class1.field2[var0][var1]; // L: 445
+ var10000[var2 + 1] |= 1170;
+ } else if (var4 == 1) { // L: 447
+ var10000 = class1.field2[var0][var1]; // L: 448
+ var10000[var2 + 1] |= 1170;
+ var10000 = class1.field2[var0][var1 + 1]; // L: 449
+ var10000[var2] |= 585;
+ } else if (var4 == 2) { // L: 451
+ var10000 = class1.field2[var0][var1 + 1]; // L: 452
+ var10000[var2] |= 585;
+ var10000 = class1.field2[var0][var1]; // L: 453
+ var10000[var2] |= 1170;
+ } else if (var4 == 3) { // L: 455
+ var10000 = class1.field2[var0][var1]; // L: 456
+ var10000[var2] |= 1170;
+ var10000 = class1.field2[var0][var1]; // L: 457
+ var10000[var2] |= 585;
+ }
+ }
+
+ if (var8.interactType != 0 && var7 != null) { // L: 460
+ var7.method3878(var1, var2, var5, var4, var8.boolean1);
+ }
+
+ if (var8.int2 != 16) { // L: 461
+ var6.method4171(var0, var1, var2, var8.int2);
+ }
+
+ } else if (var5 == 3) { // L: 464
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 466
+ var29 = var8.getEntity(3, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 467
+ }
+
+ var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1011[var4], 0, var19, var21); // L: 468
+ if (var8.clipped) { // L: 469
+ if (var4 == 0) { // L: 470
+ UserComparator6.field1415[var0][var1][var2 + 1] = 50;
+ } else if (var4 == 1) { // L: 471
+ UserComparator6.field1415[var0][var1 + 1][var2 + 1] = 50;
+ } else if (var4 == 2) { // L: 472
+ UserComparator6.field1415[var0][var1 + 1][var2] = 50;
+ } else if (var4 == 3) { // L: 473
+ UserComparator6.field1415[var0][var1][var2] = 50;
+ }
+ }
+
+ if (var8.interactType != 0 && var7 != null) { // L: 475
+ var7.method3878(var1, var2, var5, var4, var8.boolean1);
+ }
+
+ } else if (var5 == 9) { // L: 478
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 480
+ var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 481
+ }
+
+ var6.method4188(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 482
+ if (var8.interactType != 0 && var7 != null) { // L: 483
+ var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+ }
+
+ if (var8.int2 != 16) { // L: 484
+ var6.method4171(var0, var1, var2, var8.int2);
+ }
+
+ } else if (var5 == 4) { // L: 487
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 489
+ var29 = var8.getEntity(4, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 490
+ }
+
+ var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1007[var4], 0, 0, 0, var19, var21); // L: 491
+ } else {
+ long var23;
+ Object var25;
+ if (var5 == 5) { // L: 494
+ var22 = 16; // L: 495
+ var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 496
+ if (var23 != 0L) { // L: 497
+ var22 = class162.getObjectDefinition(Decimator.Entity_unpackID(var23)).int2;
}
- if (var2 > 0) { // L: 745
- boolean var51 = true; // L: 746
- if (var20 == 0 && Tiles.Tiles_shapes[var2][var11][var17] != 0) { // L: 747
- var51 = false;
- }
-
- if (var21 > 0 && !Message.method1098(var21 - 1).hideUnderlay) { // L: 748
- var51 = false;
- }
-
- if (var51 && var23 == var22 && var24 == var22 && var25 == var22) { // L: 749 750
- var10000 = VerticalAlignment.field1993[var2][var11];
- var10000[var17] |= 2340;
- }
- }
-
- var32 = 0; // L: 753
- if (var31 != -1) { // L: 754
- var32 = Rasterizer3D.Rasterizer3D_colorPalette[DevicePcmPlayerProvider.method340(var31, 96)];
- }
-
- if (var21 == 0) { // L: 755
- var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, DevicePcmPlayerProvider.method340(var30, var26), DevicePcmPlayerProvider.method340(var30, var27), DevicePcmPlayerProvider.method340(var30, var28), DevicePcmPlayerProvider.method340(var30, var29), 0, 0, 0, 0, var32, 0); // L: 756
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 499
+ var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
} else {
- var33 = Tiles.Tiles_shapes[var2][var11][var17] + 1; // L: 759
- byte var52 = RunException.field4812[var2][var11][var17]; // L: 760
- FloorOverlayDefinition var35 = Message.method1098(var21 - 1); // L: 761
- int var36 = var35.texture; // L: 762
- int var37;
- int var38;
- int var39;
- int var40;
- if (var36 >= 0) { // L: 765
- var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 766
- var37 = -1; // L: 767
- } else if (var35.primaryRgb == 16711935) { // L: 770
- var37 = -2; // L: 771
- var36 = -1; // L: 772
- var38 = -2; // L: 773
- } else {
- var37 = ArchiveLoader.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 776
- var39 = var35.hue + Tiles.rndHue & 255; // L: 777
- var40 = var35.lightness + Tiles.rndLightness; // L: 778
- if (var40 < 0) { // L: 779
- var40 = 0;
- } else if (var40 > 255) { // L: 780
- var40 = 255;
- }
+ var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 500
+ }
- var38 = ArchiveLoader.hslToRgb(var39, var35.saturation, var40); // L: 781
- }
+ var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1007[var4], 0, var22 * Tiles.field1003[var4], var22 * Tiles.field1005[var4], var19, var21); // L: 501
+ } else if (var5 == 6) { // L: 504
+ var22 = 8; // L: 505
+ var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 506
+ if (0L != var23) { // L: 507
+ var22 = class162.getObjectDefinition(Decimator.Entity_unpackID(var23)).int2 / 2;
+ }
- var39 = 0; // L: 784
- if (var38 != -2) { // L: 785
- var39 = Rasterizer3D.Rasterizer3D_colorPalette[ParamComposition.method3505(var38, 96)];
- }
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 509
+ var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
+ } else {
+ var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 510
+ }
- if (var35.secondaryRgb != -1) { // L: 786
- var40 = var35.secondaryHue + Tiles.rndHue & 255; // L: 787
- int var41 = var35.secondaryLightness + Tiles.rndLightness; // L: 788
- if (var41 < 0) { // L: 789
- var41 = 0;
- } else if (var41 > 255) { // L: 790
- var41 = 255;
- }
+ var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field1006[var4], var22 * Tiles.field1002[var4], var19, var21); // L: 511
+ } else if (var5 == 7) { // L: 514
+ var28 = var4 + 2 & 3; // L: 516
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 517
+ var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 518
+ }
- var38 = ArchiveLoader.hslToRgb(var40, var35.secondarySaturation, var41); // L: 791
- var39 = Rasterizer3D.Rasterizer3D_colorPalette[ParamComposition.method3505(var38, 96)]; // L: 792
- }
+ var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 519
+ } else if (var5 == 8) { // L: 522
+ var22 = 8; // L: 523
+ var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 524
+ if (0L != var23) { // L: 525
+ var22 = class162.getObjectDefinition(Decimator.Entity_unpackID(var23)).int2 / 2;
+ }
- var0.addTile(var2, var11, var17, var33, var52, var36, var22, var23, var24, var25, DevicePcmPlayerProvider.method340(var30, var26), DevicePcmPlayerProvider.method340(var30, var27), DevicePcmPlayerProvider.method340(var30, var28), DevicePcmPlayerProvider.method340(var30, var29), ParamComposition.method3505(var37, var26), ParamComposition.method3505(var37, var27), ParamComposition.method3505(var37, var28), ParamComposition.method3505(var37, var29), var32, var39); // L: 794
+ int var27 = var4 + 2 & 3; // L: 528
+ Object var26;
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 529
+ var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 530
+ var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 531
+ } else {
+ var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 534
+ var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 535
+ }
+
+ var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field1006[var4], var22 * Tiles.field1002[var4], var19, var21); // L: 537
+ }
+ }
+ }
+ } else {
+ if (var8.animationId == -1 && var8.transforms == null) { // L: 350
+ var29 = var8.getEntity(10, var4, var15, var17, var16, var18);
+ } else {
+ var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 351
+ }
+
+ if (var29 != null && var6.method4188(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 352 353
+ var28 = 15; // L: 354
+ if (var29 instanceof Model) { // L: 355
+ var28 = ((Model)var29).method4456() / 4; // L: 356
+ if (var28 > 30) { // L: 357
+ var28 = 30;
+ }
+ }
+
+ for (int var31 = 0; var31 <= var9; ++var31) { // L: 359
+ for (int var32 = 0; var32 <= var10; ++var32) { // L: 360
+ if (var28 > UserComparator6.field1415[var0][var31 + var1][var32 + var2]) { // L: 361
+ UserComparator6.field1415[var0][var31 + var1][var32 + var2] = (byte)var28;
}
}
}
}
- }
- }
- for (var11 = 1; var11 < 103; ++var11) { // L: 801
- for (var12 = 1; var12 < 103; ++var12) { // L: 802
- var0.setTileMinPlane(var2, var12, var11, VarbitComposition.method3489(var2, var12, var11)); // L: 803
- }
- }
-
- Tiles.Tiles_underlays[var2] = null; // L: 806
- Tiles.Tiles_overlays[var2] = null; // L: 807
- Tiles.Tiles_shapes[var2] = null; // L: 808
- RunException.field4812[var2] = null; // L: 809
- NPC.field1259[var2] = null; // L: 810
- }
-
- var0.method4057(-50, -10, -50); // L: 812
-
- for (var2 = 0; var2 < 104; ++var2) { // L: 813
- for (var3 = 0; var3 < 104; ++var3) { // L: 814
- if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 815
- var0.setLinkBelow(var2, var3);
- }
- }
- }
-
- var2 = 1; // L: 818
- var3 = 2; // L: 819
- var4 = 4; // L: 820
-
- for (var5 = 0; var5 < 4; ++var5) { // L: 821
- if (var5 > 0) { // L: 822
- var2 <<= 3; // L: 823
- var3 <<= 3; // L: 824
- var4 <<= 3; // L: 825
- }
-
- for (int var47 = 0; var47 <= var5; ++var47) { // L: 827
- for (int var48 = 0; var48 <= 104; ++var48) { // L: 828
- for (int var49 = 0; var49 <= 104; ++var49) { // L: 829
- short var50;
- if ((VerticalAlignment.field1993[var47][var49][var48] & var2) != 0) { // L: 830
- var9 = var48; // L: 831
- var10 = var48; // L: 832
- var11 = var47; // L: 833
-
- for (var12 = var47; var9 > 0 && (VerticalAlignment.field1993[var47][var49][var9 - 1] & var2) != 0; --var9) { // L: 834 835
- }
-
- while (var10 < 104 && (VerticalAlignment.field1993[var47][var49][var10 + 1] & var2) != 0) { // L: 836
- ++var10;
- }
-
- label422:
- while (var11 > 0) { // L: 837
- for (var13 = var9; var13 <= var10; ++var13) { // L: 838
- if ((VerticalAlignment.field1993[var11 - 1][var49][var13] & var2) == 0) {
- break label422;
- }
- }
-
- --var11; // L: 839
- }
-
- label411:
- while (var12 < var5) { // L: 841
- for (var13 = var9; var13 <= var10; ++var13) { // L: 842
- if ((VerticalAlignment.field1993[var12 + 1][var49][var13] & var2) == 0) {
- break label411;
- }
- }
-
- ++var12; // L: 843
- }
-
- var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 845
- if (var13 >= 8) { // L: 846
- var50 = 240; // L: 847
- var15 = Tiles.Tiles_heights[var12][var49][var9] - var50; // L: 848
- var16 = Tiles.Tiles_heights[var11][var49][var9]; // L: 849
- Scene.Scene_addOccluder(var5, 1, var49 * 128, var49 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 850
-
- for (var17 = var11; var17 <= var12; ++var17) { // L: 851
- for (var18 = var9; var18 <= var10; ++var18) { // L: 852
- var10000 = VerticalAlignment.field1993[var17][var49];
- var10000[var18] &= ~var2;
- }
- }
- }
- }
-
- if ((VerticalAlignment.field1993[var47][var49][var48] & var3) != 0) { // L: 856
- var9 = var49; // L: 857
- var10 = var49; // L: 858
- var11 = var47; // L: 859
-
- for (var12 = var47; var9 > 0 && (VerticalAlignment.field1993[var47][var9 - 1][var48] & var3) != 0; --var9) { // L: 860 861
- }
-
- while (var10 < 104 && (VerticalAlignment.field1993[var47][var10 + 1][var48] & var3) != 0) { // L: 862
- ++var10;
- }
-
- label475:
- while (var11 > 0) { // L: 863
- for (var13 = var9; var13 <= var10; ++var13) { // L: 864
- if ((VerticalAlignment.field1993[var11 - 1][var13][var48] & var3) == 0) {
- break label475;
- }
- }
-
- --var11; // L: 865
- }
-
- label464:
- while (var12 < var5) { // L: 867
- for (var13 = var9; var13 <= var10; ++var13) { // L: 868
- if ((VerticalAlignment.field1993[var12 + 1][var13][var48] & var3) == 0) {
- break label464;
- }
- }
-
- ++var12; // L: 869
- }
-
- var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 871
- if (var13 >= 8) { // L: 872
- var50 = 240; // L: 873
- var15 = Tiles.Tiles_heights[var12][var9][var48] - var50; // L: 874
- var16 = Tiles.Tiles_heights[var11][var9][var48]; // L: 875
- Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var48 * 128, var48 * 128, var15, var16); // L: 876
-
- for (var17 = var11; var17 <= var12; ++var17) { // L: 877
- for (var18 = var9; var18 <= var10; ++var18) { // L: 878
- var10000 = VerticalAlignment.field1993[var17][var18];
- var10000[var48] &= ~var3;
- }
- }
- }
- }
-
- if ((VerticalAlignment.field1993[var47][var49][var48] & var4) != 0) { // L: 882
- var9 = var49; // L: 883
- var10 = var49; // L: 884
- var11 = var48; // L: 885
-
- for (var12 = var48; var11 > 0 && (VerticalAlignment.field1993[var47][var49][var11 - 1] & var4) != 0; --var11) { // L: 886 887
- }
-
- while (var12 < 104 && (VerticalAlignment.field1993[var47][var49][var12 + 1] & var4) != 0) { // L: 888
- ++var12;
- }
-
- label528:
- while (var9 > 0) { // L: 889
- for (var13 = var11; var13 <= var12; ++var13) { // L: 890
- if ((VerticalAlignment.field1993[var47][var9 - 1][var13] & var4) == 0) {
- break label528;
- }
- }
-
- --var9; // L: 891
- }
-
- label517:
- while (var10 < 104) { // L: 893
- for (var13 = var11; var13 <= var12; ++var13) { // L: 894
- if ((VerticalAlignment.field1993[var47][var10 + 1][var13] & var4) == 0) {
- break label517;
- }
- }
-
- ++var10; // L: 895
- }
-
- if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { // L: 897
- var13 = Tiles.Tiles_heights[var47][var9][var11]; // L: 898
- Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 899
-
- for (var14 = var9; var14 <= var10; ++var14) { // L: 900
- for (var15 = var11; var15 <= var12; ++var15) { // L: 901
- var10000 = VerticalAlignment.field1993[var47][var14];
- var10000[var15] &= ~var4;
- }
- }
- }
- }
+ if (var8.interactType != 0 && var7 != null) { // L: 366
+ var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
}
+
}
}
}
+ } // L: 346 367 376 413 427 462 476 485 492 502 512 520 538 540
- } // L: 909
+ @ObfuscatedName("ib")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+ garbageValue = "-349041943"
+ )
+ @Export("insertMenuItem")
+ static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+ if (!Client.isMenuOpen) { // L: 9704
+ if (Client.menuOptionsCount < 500) { // L: 9705
+ Client.menuActions[Client.menuOptionsCount] = var0; // L: 9706
+ Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9707
+ Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9708
+ Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9709
+ Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9710
+ Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9711
+ Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9712
+ ++Client.menuOptionsCount; // L: 9713
+ }
+
+ }
+ } // L: 9715
}
diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java
index e08fcb67e5..aed64316b6 100644
--- a/runescape-client/src/main/java/class269.java
+++ b/runescape-client/src/main/java/class269.java
@@ -1,16 +1,64 @@
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("jf")
-public final class class269 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- longValue = 1779677286756303947L
+@ObfuscatedName("jz")
+public class class269 {
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-2064845934"
)
- static long field3215;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- longValue = 189198080238779441L
+ public static int method5223(int var0) {
+ var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 28
+ var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 29
+ var0 = var0 + (var0 >>> 4) & 252645135; // L: 30
+ var0 += var0 >>> 8; // L: 31
+ var0 += var0 >>> 16; // L: 32
+ return var0 & 255; // L: 33
+ }
+
+ @ObfuscatedName("jd")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IIIIIII)V",
+ garbageValue = "-54726370"
)
- static long field3217;
+ static final void method5224(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ if (Client.field560) { // L: 10719
+ Client.alternativeScrollbarWidth = 32;
+ } else {
+ Client.alternativeScrollbarWidth = 0; // L: 10720
+ }
+
+ Client.field560 = false; // L: 10721
+ int var7;
+ if (MouseHandler.MouseHandler_currentButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10722
+ if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10723
+ var0.scrollY -= 4; // L: 10724
+ ChatChannel.invalidateWidget(var0); // L: 10725
+ } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10727
+ var0.scrollY += 4; // L: 10728
+ ChatChannel.invalidateWidget(var0); // L: 10729
+ } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10731
+ var7 = var3 * (var3 - 32) / var4; // L: 10732
+ if (var7 < 8) { // L: 10733
+ var7 = 8;
+ }
+
+ int var8 = var6 - var2 - 16 - var7 / 2; // L: 10734
+ int var9 = var3 - 32 - var7; // L: 10735
+ var0.scrollY = var8 * (var4 - var3) / var9; // L: 10736
+ ChatChannel.invalidateWidget(var0); // L: 10737
+ Client.field560 = true; // L: 10738
+ }
+ }
+
+ if (Client.mouseWheelRotation != 0) { // L: 10741
+ var7 = var0.width; // L: 10742
+ if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10743
+ var0.scrollY += Client.mouseWheelRotation * 45; // L: 10744
+ ChatChannel.invalidateWidget(var0); // L: 10745
+ }
+ }
+
+ } // L: 10748
}
diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java
index f499b70811..2a24720e60 100644
--- a/runescape-client/src/main/java/class27.java
+++ b/runescape-client/src/main/java/class27.java
@@ -3,14 +3,14 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import netscape.javascript.JSObject;
-@ObfuscatedName("ar")
+@ObfuscatedName("ak")
public class class27 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;",
- garbageValue = "527172307"
+ descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;",
+ garbageValue = "87"
)
- public static Object method370(Applet var0, String var1) throws Throwable {
+ public static Object method346(Applet var0, String var1) throws Throwable {
return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 13
}
}
diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java
index 19d45d0a56..89f6ee8c3e 100644
--- a/runescape-client/src/main/java/class270.java
+++ b/runescape-client/src/main/java/class270.java
@@ -1,66 +1,26 @@
-import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("jr")
+@ObfuscatedName("jq")
public class class270 {
- @ObfuscatedName("w")
- public static boolean field3218;
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2072054162"
+ @ObfuscatedName("uz")
+ @ObfuscatedGetter(
+ longValue = 7367865405897213441L
)
- @Export("savePreferences")
- static void savePreferences() {
- AccessFile var0 = null; // L: 112
+ static long field3177;
+ @ObfuscatedName("c")
+ static int[] field3179;
- try {
- var0 = UserComparator3.getPreferencesFile("", ApproximateRouteStrategy.field473.name, true); // L: 114
- Buffer var1 = class12.clientPreferences.toBuffer(); // L: 115
- var0.write(var1.array, 0, var1.offset); // L: 116
- } catch (Exception var3) { // L: 118
+ static {
+ new Object();
+ field3179 = new int[33]; // L: 8
+ field3179[0] = 0; // L: 11
+ int var0 = 2; // L: 12
+
+ for (int var1 = 1; var1 < 33; ++var1) { // L: 13
+ field3179[var1] = var0 - 1; // L: 14
+ var0 += var0; // L: 15
}
- try {
- if (var0 != null) { // L: 120
- var0.closeSync(true); // L: 121
- }
- } catch (Exception var2) { // L: 124
- }
-
- } // L: 125
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "416370156"
- )
- static int method5036(int var0, Script var1, boolean var2) {
- Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1199
- if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1200
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemId; // L: 1201
- return 1; // L: 1202
- } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1204
- if (var3.itemId != -1) { // L: 1205
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.itemQuantity;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1206
- }
-
- return 1; // L: 1207
- } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1209
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1210
- return 1; // L: 1211
- } else if (var0 == 1707) { // L: 1213
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.method5498() ? 1 : 0; // L: 1214
- return 1; // L: 1215
- } else if (var0 == 1708) { // L: 1217
- return class293.method5430(var3); // L: 1218
- } else {
- return var0 == 1708 ? class20.method269(var3) : 2; // L: 1220 1221 1223
- }
- }
+ } // L: 17
}
diff --git a/runescape-client/src/main/java/class271.java b/runescape-client/src/main/java/class271.java
deleted file mode 100644
index 967fea49d2..0000000000
--- a/runescape-client/src/main/java/class271.java
+++ /dev/null
@@ -1,76 +0,0 @@
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jo")
-public class class271 {
- @ObfuscatedName("tr")
- @ObfuscatedGetter(
- intValue = -2079311097
- )
- static int field3221;
- @ObfuscatedName("o")
- static int[] field3220;
-
- static {
- new Object();
- field3220 = new int[33]; // L: 8
- field3220[0] = 0; // L: 11
- int var0 = 2; // L: 12
-
- for (int var1 = 1; var1 < 33; ++var1) { // L: 13
- field3220[var1] = var0 - 1; // L: 14
- var0 += var0; // L: 15
- }
-
- } // L: 17
-
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "(Lfs;IIB)Lal;",
- garbageValue = "-29"
- )
- public static final PcmPlayer method5045(TaskHandler var0, int var1, int var2) {
- if (PcmPlayer.field300 == 0) { // L: 52
- throw new IllegalStateException();
- } else if (var1 >= 0 && var1 < 2) { // L: 53
- if (var2 < 256) { // L: 54
- var2 = 256;
- }
-
- try {
- PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player(); // L: 56
- var3.samples = new int[(ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 57
- var3.field287 = var2; // L: 58
- var3.init(); // L: 59
- var3.capacity = (var2 & -1024) + 1024; // L: 60
- if (var3.capacity > 16384) { // L: 61
- var3.capacity = 16384;
- }
-
- var3.open(var3.capacity); // L: 62
- if (class29.field172 > 0 && MusicPatchPcmStream.soundSystem == null) { // L: 63
- MusicPatchPcmStream.soundSystem = new SoundSystem(); // L: 64
- InterfaceParent.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65
- InterfaceParent.soundSystemExecutor.scheduleAtFixedRate(MusicPatchPcmStream.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66
- }
-
- if (MusicPatchPcmStream.soundSystem != null) { // L: 68
- if (MusicPatchPcmStream.soundSystem.players[var1] != null) { // L: 69
- throw new IllegalArgumentException();
- }
-
- MusicPatchPcmStream.soundSystem.players[var1] = var3; // L: 70
- }
-
- return var3; // L: 72
- } catch (Throwable var4) { // L: 74
- return new PcmPlayer(); // L: 75
- }
- } else {
- throw new IllegalArgumentException();
- }
- }
-}
diff --git a/runescape-client/src/main/java/class272.java b/runescape-client/src/main/java/class272.java
new file mode 100644
index 0000000000..03adc3606f
--- /dev/null
+++ b/runescape-client/src/main/java/class272.java
@@ -0,0 +1,71 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("jd")
+public class class272 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("musicPatchesArchive")
+ public static AbstractArchive musicPatchesArchive;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("musicSamplesArchive")
+ public static AbstractArchive musicSamplesArchive;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Ljp;"
+ )
+ @Export("midiPcmStream")
+ public static MidiPcmStream midiPcmStream;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = -759925957
+ )
+ @Export("musicPlayerStatus")
+ public static int musicPlayerStatus;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("musicTrackArchive")
+ public static AbstractArchive musicTrackArchive;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = -551405229
+ )
+ @Export("musicTrackGroupId")
+ public static int musicTrackGroupId;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = -1837276653
+ )
+ @Export("musicTrackVolume")
+ public static int musicTrackVolume;
+ @ObfuscatedName("i")
+ @ObfuscatedGetter(
+ intValue = -1550491905
+ )
+ @Export("pcmSampleLength")
+ public static int pcmSampleLength;
+ @ObfuscatedName("co")
+ @ObfuscatedGetter(
+ intValue = 208157847
+ )
+ public static int field3196;
+ @ObfuscatedName("hj")
+ @ObfuscatedSignature(
+ descriptor = "Loy;"
+ )
+ @Export("WorldMapElement_fonts")
+ static Fonts WorldMapElement_fonts;
+
+ static {
+ musicPlayerStatus = 0; // L: 11
+ }
+}
diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java
deleted file mode 100644
index 221f0612dd..0000000000
--- a/runescape-client/src/main/java/class273.java
+++ /dev/null
@@ -1,64 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jk")
-public class class273 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("musicPatchesArchive")
- public static AbstractArchive musicPatchesArchive;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("soundEffectsArchive")
- public static AbstractArchive soundEffectsArchive;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Ljw;"
- )
- @Export("midiPcmStream")
- public static MidiPcmStream midiPcmStream;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = 1844825549
- )
- @Export("musicPlayerStatus")
- public static int musicPlayerStatus;
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "Ljy;"
- )
- @Export("musicTrack")
- public static MusicTrack musicTrack;
-
- static {
- musicPlayerStatus = 0; // L: 11
- }
-
- @ObfuscatedName("az")
- @ObfuscatedSignature(
- descriptor = "(ILki;IIIII[FB)Lki;",
- garbageValue = "-124"
- )
- static Widget method5077(int var0, Widget var1, int var2, int var3, int var4, int var5, int var6, float[] var7) {
- Widget var8 = new Widget(); // L: 900
- var8.type = var0; // L: 901
- var8.parentId = var1.id; // L: 902
- var8.childIndex = var2; // L: 903
- var8.isIf3 = true; // L: 904
- var8.xAlignment = var3; // L: 905
- var8.yAlignment = var4; // L: 906
- var8.widthAlignment = var5; // L: 907
- var8.heightAlignment = var6; // L: 908
- var8.rawX = (int)(var7[0] * (float)var1.width); // L: 909
- var8.rawY = (int)(var7[1] * (float)var1.height); // L: 910
- var8.rawWidth = (int)((float)var1.width * var7[2]); // L: 911
- var8.rawHeight = (int)(var7[3] * (float)var1.height); // L: 912
- return var8; // L: 913
- }
-}
diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java
index 30ada00b00..e7e8c4131e 100644
--- a/runescape-client/src/main/java/class28.java
+++ b/runescape-client/src/main/java/class28.java
@@ -4,84 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("am")
+@ObfuscatedName("al")
public class class28 {
- @ObfuscatedName("ez")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lnu;"
+ descriptor = "Llh;"
)
- @Export("spriteIds")
- static GraphicsDefaults spriteIds;
- @ObfuscatedName("jy")
+ @Export("soundEffectsArchive")
+ public static AbstractArchive soundEffectsArchive;
+ @ObfuscatedName("hh")
@ObfuscatedGetter(
- intValue = -428607811
+ intValue = -140156033
)
- @Export("oculusOrbFocalPointY")
- static int oculusOrbFocalPointY;
+ @Export("baseX")
+ static int baseX;
+ @ObfuscatedName("iy")
+ @ObfuscatedSignature(
+ descriptor = "[Lqe;"
+ )
+ @Export("headIconPrayerSprites")
+ static SpritePixels[] headIconPrayerSprites;
static {
ImageIO.setUseCache(false); // L: 12
} // L: 13
- @ObfuscatedName("y")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(Llp;IS)Z",
- garbageValue = "6502"
+ descriptor = "(IIII)V",
+ garbageValue = "181658487"
)
- static boolean method374(AbstractArchive var0, int var1) {
- byte[] var2 = var0.takeFileFlat(var1); // L: 172
- if (var2 == null) { // L: 173
- return false;
- } else {
- RouteStrategy.SpriteBuffer_decode(var2); // L: 174
- return true; // L: 175
- }
- }
-
- @ObfuscatedName("lj")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;ZB)V",
- garbageValue = "-55"
- )
- @Export("findItemDefinitions")
- static void findItemDefinitions(String var0, boolean var1) {
- var0 = var0.toLowerCase(); // L: 12576
- short[] var2 = new short[16]; // L: 12577
- int var3 = 0; // L: 12578
-
- for (int var4 = 0; var4 < ItemContainer.ItemDefinition_fileCount; ++var4) { // L: 12579
- ItemComposition var9 = FileSystem.ItemDefinition_get(var4); // L: 12580
- if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12581 12582 12583
- if (var3 >= 250) { // L: 12584
- UserComparator9.foundItemIdCount = -1; // L: 12585
- class182.foundItemIds = null; // L: 12586
- return; // L: 12587
- }
-
- if (var3 >= var2.length) { // L: 12589
- short[] var6 = new short[var2.length * 2]; // L: 12590
-
- for (int var7 = 0; var7 < var3; ++var7) { // L: 12591
- var6[var7] = var2[var7];
- }
-
- var2 = var6; // L: 12592
- }
-
- var2[var3++] = (short)var4; // L: 12594
+ static final void method352(int var0, int var1, int var2) {
+ int var3;
+ for (var3 = 0; var3 < 8; ++var3) { // L: 130
+ for (int var4 = 0; var4 < 8; ++var4) { // L: 131
+ Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0;
}
}
- class182.foundItemIds = var2; // L: 12596
- Coord.foundItemIndex = 0; // L: 12597
- UserComparator9.foundItemIdCount = var3; // L: 12598
- String[] var8 = new String[UserComparator9.foundItemIdCount]; // L: 12599
-
- for (int var5 = 0; var5 < UserComparator9.foundItemIdCount; ++var5) { // L: 12600
- var8[var5] = FileSystem.ItemDefinition_get(var2[var5]).name;
+ if (var1 > 0) { // L: 133
+ for (var3 = 1; var3 < 8; ++var3) { // L: 134
+ Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2];
+ }
}
- short[] var10 = class182.foundItemIds; // L: 12601
- Occluder.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 12603
- } // L: 12605
+ if (var2 > 0) { // L: 136
+ for (var3 = 1; var3 < 8; ++var3) { // L: 137
+ Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1];
+ }
+ }
+
+ if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 139
+ Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2];
+ } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 140
+ Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1];
+ } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 141
+ Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1];
+ }
+
+ } // L: 142
}
diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java
new file mode 100644
index 0000000000..3aa5c17e36
--- /dev/null
+++ b/runescape-client/src/main/java/class281.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("jo")
+public class class281 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lji;"
+ )
+ @Export("huffman")
+ public static Huffman huffman;
+}
diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java
deleted file mode 100644
index c72202e7e3..0000000000
--- a/runescape-client/src/main/java/class282.java
+++ /dev/null
@@ -1,69 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("jh")
-public class class282 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Ljx;"
- )
- @Export("huffman")
- static Huffman huffman;
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(CLlq;B)I",
- garbageValue = "1"
- )
- @Export("lowercaseChar")
- static int lowercaseChar(char var0, Language var1) {
- int var2 = var0 << 4; // L: 104
- if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105
- var0 = Character.toLowerCase(var0); // L: 106
- var2 = (var0 << 4) + 1; // L: 107
- }
-
- if (var0 == 241 && var1 == Language.Language_ES) { // L: 109
- var2 = 1762;
- }
-
- return var2; // L: 110
- }
-
- @ObfuscatedName("j")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1978275561"
- )
- static int method5334(int var0, Script var1, boolean var2) {
- Widget var3 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1449
- if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1450
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var3)); // L: 1451
- return 1; // L: 1452
- } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1454
- if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1461
- if (var3.dataText == null) { // L: 1462
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "";
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1463
- }
-
- return 1; // L: 1464
- } else {
- return 2; // L: 1466
- }
- } else {
- int var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1455
- --var4; // L: 1456
- if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1457
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1458
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "";
- }
-
- return 1; // L: 1459
- }
- }
-}
diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java
new file mode 100644
index 0000000000..b27d17bfa5
--- /dev/null
+++ b/runescape-client/src/main/java/class285.java
@@ -0,0 +1,288 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("js")
+public class class285 {
+ @ObfuscatedName("bg")
+ @ObfuscatedSignature(
+ descriptor = "Lkx;"
+ )
+ static StudioGame field3313;
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-739713756"
+ )
+ public static int method5516(int var0) {
+ return var0 >>> 12; // L: 18
+ }
+
+ @ObfuscatedName("gv")
+ @ObfuscatedSignature(
+ descriptor = "(Lcj;II)V",
+ garbageValue = "-2146563022"
+ )
+ @Export("updateActorSequence")
+ static final void updateActorSequence(Actor var0, int var1) {
+ int var2;
+ int var3;
+ int var4;
+ if (var0.field1184 >= Client.cycle) { // L: 4009
+ GrandExchangeOfferTotalQuantityComparator.method5970(var0);
+ } else if (var0.field1194 >= Client.cycle) { // L: 4010
+ if (var0.field1194 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ScriptFrame.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4011
+ var2 = var0.field1194 - var0.field1184; // L: 4012
+ var3 = Client.cycle - var0.field1184; // L: 4013
+ var4 = var0.field1205 * 64 + var0.field1140 * 128; // L: 4014
+ int var5 = var0.field1205 * 64 + var0.field1182 * 128; // L: 4015
+ int var6 = var0.field1205 * 64 + var0.field1181 * 128; // L: 4016
+ int var7 = var0.field1205 * 64 + var0.field1183 * 128; // L: 4017
+ var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; // L: 4018
+ var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; // L: 4019
+ }
+
+ var0.field1202 = 0; // L: 4021
+ var0.orientation = var0.field1186; // L: 4022
+ var0.rotation = var0.orientation; // L: 4023
+ } else {
+ KitDefinition.method3439(var0); // L: 4025
+ }
+
+ if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4026
+ var0.sequence = -1; // L: 4027
+ var0.spotAnimation = -1; // L: 4028
+ var0.field1184 = 0; // L: 4029
+ var0.field1194 = 0; // L: 4030
+ var0.x = var0.pathX[0] * 128 + var0.field1205 * 64; // L: 4031
+ var0.y = var0.pathY[0] * 128 + var0.field1205 * 64; // L: 4032
+ var0.method2182(); // L: 4033
+ }
+
+ if (class101.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4035 4036
+ var0.sequence = -1; // L: 4037
+ var0.spotAnimation = -1; // L: 4038
+ var0.field1184 = 0; // L: 4039
+ var0.field1194 = 0; // L: 4040
+ var0.x = var0.field1205 * 64 + var0.pathX[0] * 128; // L: 4041
+ var0.y = var0.field1205 * 64 + var0.pathY[0] * 128; // L: 4042
+ var0.method2182(); // L: 4043
+ }
+
+ Script.method1977(var0); // L: 4046
+ var0.isWalking = false; // L: 4048
+ SequenceDefinition var8;
+ if (var0.movementSequence != -1) { // L: 4049
+ var8 = ScriptFrame.SequenceDefinition_get(var0.movementSequence); // L: 4050
+ if (var8 != null) { // L: 4051
+ if (!var8.isCachedModelIdSet() && var8.frameIds != null) { // L: 4052
+ ++var0.movementFrameCycle; // L: 4053
+ if (var0.movementFrame < var8.frameIds.length && var0.movementFrameCycle > var8.frameLengths[var0.movementFrame]) { // L: 4054
+ var0.movementFrameCycle = 1; // L: 4055
+ ++var0.movementFrame; // L: 4056
+ class120.method2761(var8, var0.movementFrame, var0.x, var0.y); // L: 4057
+ }
+
+ if (var0.movementFrame >= var8.frameIds.length) { // L: 4059
+ var0.movementFrameCycle = 0; // L: 4060
+ var0.movementFrame = 0; // L: 4061
+ class120.method2761(var8, var0.movementFrame, var0.x, var0.y); // L: 4062
+ }
+ } else if (var8.isCachedModelIdSet()) { // L: 4065
+ ++var0.movementFrame; // L: 4066
+ var3 = var8.method3835(); // L: 4067
+ if (var0.movementFrame < var3) { // L: 4068
+ GrandExchangeOfferWorldComparator.method5997(var8, var0.movementFrame, var0.x, var0.y); // L: 4069
+ } else {
+ var0.movementFrameCycle = 0; // L: 4072
+ var0.movementFrame = 0; // L: 4073
+ GrandExchangeOfferWorldComparator.method5997(var8, var0.movementFrame, var0.x, var0.y); // L: 4074
+ }
+ } else {
+ var0.movementSequence = -1; // L: 4077
+ }
+ } else {
+ var0.movementSequence = -1; // L: 4079
+ }
+ }
+
+ if (var0.spotAnimation != -1 && Client.cycle >= var0.field1178) { // L: 4081
+ if (var0.spotAnimationFrame < 0) { // L: 4082
+ var0.spotAnimationFrame = 0;
+ }
+
+ var2 = ObjectSound.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4083
+ if (var2 != -1) { // L: 4084
+ SequenceDefinition var9 = ScriptFrame.SequenceDefinition_get(var2); // L: 4085
+ if (var9 != null && var9.frameIds != null) { // L: 4086
+ ++var0.spotAnimationFrameCycle; // L: 4087
+ if (var0.spotAnimationFrame < var9.frameIds.length && var0.spotAnimationFrameCycle > var9.frameLengths[var0.spotAnimationFrame]) { // L: 4088
+ var0.spotAnimationFrameCycle = 1; // L: 4089
+ ++var0.spotAnimationFrame; // L: 4090
+ class120.method2761(var9, var0.spotAnimationFrame, var0.x, var0.y); // L: 4091
+ }
+
+ if (var0.spotAnimationFrame >= var9.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var9.frameIds.length)) { // L: 4093 4094
+ var0.spotAnimation = -1;
+ }
+ } else if (var9.isCachedModelIdSet()) { // L: 4097
+ ++var0.spotAnimationFrame; // L: 4098
+ var4 = var9.method3835(); // L: 4099
+ if (var0.spotAnimationFrame < var4) { // L: 4100
+ GrandExchangeOfferWorldComparator.method5997(var9, var0.spotAnimationFrame, var0.x, var0.y); // L: 4101
+ } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var4) { // L: 4104
+ var0.spotAnimation = -1;
+ }
+ } else {
+ var0.spotAnimation = -1; // L: 4107
+ }
+ } else {
+ var0.spotAnimation = -1; // L: 4109
+ }
+ }
+
+ if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4111
+ var8 = ScriptFrame.SequenceDefinition_get(var0.sequence); // L: 4112
+ if (var8.field2187 == 1 && var0.field1203 > 0 && var0.field1184 <= Client.cycle && var0.field1194 < Client.cycle) { // L: 4113 4114
+ var0.sequenceDelay = 1; // L: 4115
+ return; // L: 4159
+ }
+ }
+
+ if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4120
+ var8 = ScriptFrame.SequenceDefinition_get(var0.sequence); // L: 4121
+ if (var8 == null) { // L: 4122
+ var0.sequence = -1; // L: 4155
+ } else if (!var8.isCachedModelIdSet() && var8.frameIds != null) { // L: 4123
+ ++var0.sequenceFrameCycle; // L: 4124
+ if (var0.sequenceFrame < var8.frameIds.length && var0.sequenceFrameCycle > var8.frameLengths[var0.sequenceFrame]) { // L: 4125
+ var0.sequenceFrameCycle = 1; // L: 4126
+ ++var0.sequenceFrame; // L: 4127
+ class120.method2761(var8, var0.sequenceFrame, var0.x, var0.y); // L: 4128
+ }
+
+ if (var0.sequenceFrame >= var8.frameIds.length) { // L: 4130
+ var0.sequenceFrame -= var8.frameCount; // L: 4131
+ ++var0.field1190; // L: 4132
+ if (var0.field1190 >= var8.field2186) { // L: 4133
+ var0.sequence = -1;
+ } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var8.frameIds.length) { // L: 4134
+ class120.method2761(var8, var0.sequenceFrame, var0.x, var0.y); // L: 4135
+ } else {
+ var0.sequence = -1;
+ }
+ }
+
+ var0.isWalking = var8.field2182; // L: 4137
+ } else if (var8.isCachedModelIdSet()) { // L: 4139
+ ++var0.sequenceFrame; // L: 4140
+ var3 = var8.method3836().method2767(); // L: 4141
+ if (var0.sequenceFrame < var3) { // L: 4142
+ GrandExchangeOfferWorldComparator.method5997(var8, var0.sequenceFrame, var0.x, var0.y); // L: 4143
+ } else {
+ var0.sequenceFrame -= var8.frameCount; // L: 4146
+ ++var0.field1190; // L: 4147
+ if (var0.field1190 >= var8.field2186) { // L: 4148
+ var0.sequence = -1;
+ } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var3) { // L: 4149
+ GrandExchangeOfferWorldComparator.method5997(var8, var0.sequenceFrame, var0.x, var0.y); // L: 4150
+ } else {
+ var0.sequence = -1;
+ }
+ }
+ } else {
+ var0.sequence = -1; // L: 4153
+ }
+ }
+
+ if (var0.sequenceDelay > 0) { // L: 4157
+ --var0.sequenceDelay;
+ }
+
+ }
+
+ @ObfuscatedName("hc")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIIII)V",
+ garbageValue = "1607228102"
+ )
+ @Export("addPendingSpawnToScene")
+ static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+ if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7815
+ if (Client.isLowDetail && var0 != PacketWriter.Client_plane) { // L: 7816
+ return;
+ }
+
+ long var7 = 0L; // L: 7817
+ boolean var9 = true; // L: 7818
+ boolean var10 = false; // L: 7819
+ boolean var11 = false; // L: 7820
+ if (var1 == 0) { // L: 7821
+ var7 = class356.scene.getBoundaryObjectTag(var0, var2, var3);
+ }
+
+ if (var1 == 1) { // L: 7822
+ var7 = class356.scene.getWallDecorationTag(var0, var2, var3);
+ }
+
+ if (var1 == 2) { // L: 7823
+ var7 = class356.scene.getGameObjectTag(var0, var2, var3);
+ }
+
+ if (var1 == 3) { // L: 7824
+ var7 = class356.scene.getFloorDecorationTag(var0, var2, var3);
+ }
+
+ int var12;
+ if (var7 != 0L) { // L: 7825
+ var12 = class356.scene.getObjectFlags(var0, var2, var3, var7); // L: 7826
+ int var14 = Decimator.Entity_unpackID(var7); // L: 7827
+ int var15 = var12 & 31; // L: 7828
+ int var16 = var12 >> 6 & 3; // L: 7829
+ ObjectComposition var13;
+ if (var1 == 0) { // L: 7830
+ class356.scene.removeBoundaryObject(var0, var2, var3); // L: 7831
+ var13 = class162.getObjectDefinition(var14); // L: 7832
+ if (var13.interactType != 0) { // L: 7833
+ Client.collisionMaps[var0].method3883(var2, var3, var15, var16, var13.boolean1);
+ }
+ }
+
+ if (var1 == 1) { // L: 7835
+ class356.scene.removeWallDecoration(var0, var2, var3);
+ }
+
+ if (var1 == 2) { // L: 7836
+ class356.scene.removeGameObject(var0, var2, var3); // L: 7837
+ var13 = class162.getObjectDefinition(var14); // L: 7838
+ if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7839
+ return;
+ }
+
+ if (var13.interactType != 0) { // L: 7840
+ Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1);
+ }
+ }
+
+ if (var1 == 3) { // L: 7842
+ class356.scene.removeFloorDecoration(var0, var2, var3); // L: 7843
+ var13 = class162.getObjectDefinition(var14); // L: 7844
+ if (var13.interactType == 1) { // L: 7845
+ Client.collisionMaps[var0].method3886(var2, var3);
+ }
+ }
+ }
+
+ if (var4 >= 0) { // L: 7848
+ var12 = var0; // L: 7849
+ if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7850
+ var12 = var0 + 1;
+ }
+
+ class142.method3050(var0, var12, var2, var3, var4, var5, var6, class356.scene, Client.collisionMaps[var0]); // L: 7851
+ }
+ }
+
+ } // L: 7854
+}
diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java
deleted file mode 100644
index 6e022fdad5..0000000000
--- a/runescape-client/src/main/java/class286.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("kf")
-public class class286 {
-}
diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java
new file mode 100644
index 0000000000..e59bf744df
--- /dev/null
+++ b/runescape-client/src/main/java/class289.java
@@ -0,0 +1,28 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kf")
+public class class289 {
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(BS)C",
+ garbageValue = "3465"
+ )
+ public static char method5560(byte var0) {
+ int var1 = var0 & 255; // L: 66
+ if (var1 == 0) { // L: 67
+ throw new IllegalArgumentException("" + Integer.toString(var1, 16));
+ } else {
+ if (var1 >= 128 && var1 < 160) { // L: 68
+ char var2 = class340.cp1252AsciiExtension[var1 - 128]; // L: 69
+ if (var2 == 0) { // L: 70
+ var2 = '?';
+ }
+
+ var1 = var2; // L: 71
+ }
+
+ return (char)var1; // L: 73
+ }
+ }
+}
diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java
index f3dbf78609..8bdac806ba 100644
--- a/runescape-client/src/main/java/class29.java
+++ b/runescape-client/src/main/java/class29.java
@@ -1,46 +1,674 @@
import java.applet.Applet;
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ac")
+@ObfuscatedName("ao")
public class class29 {
- @ObfuscatedName("o")
- static Applet field170;
- @ObfuscatedName("q")
- static String field168;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -1437756653
- )
- static int field172;
- @ObfuscatedName("ie")
- @ObfuscatedSignature(
- descriptor = "[Lqd;"
- )
- @Export("mapSceneSprites")
- static IndexedSprite[] mapSceneSprites;
+ @ObfuscatedName("c")
+ public static Applet field172;
+ @ObfuscatedName("v")
+ public static String field169;
static {
- field170 = null; // L: 10
- field168 = ""; // L: 11
+ field172 = null; // L: 10
+ field169 = ""; // L: 11
}
- @ObfuscatedName("a")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "11"
+ descriptor = "(B)V",
+ garbageValue = "-17"
)
- @Export("clearItemContainer")
- static void clearItemContainer(int var0) {
- ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
- if (var1 != null) { // L: 64
- for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
- var1.ids[var2] = -1; // L: 66
- var1.quantities[var2] = 0; // L: 67
- }
-
+ static void method357() {
+ if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 298
+ Login.currentLoginField = 1; // L: 299
+ } else {
+ Login.currentLoginField = 0; // L: 302
}
- } // L: 69
+
+ } // L: 304
+
+ @ObfuscatedName("k")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I)I",
+ garbageValue = "1519469620"
+ )
+ static int method363(Widget var0) {
+ if (var0.type != 11) { // L: 1237
+ --Interpreter.Interpreter_stringStackSize; // L: 1238
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 1239
+ return 1; // L: 1240
+ } else {
+ String var1 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1242
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var0.method5625(var1); // L: 1243
+ return 1; // L: 1244
+ }
+ }
+
+ @ObfuscatedName("jo")
+ @ObfuscatedSignature(
+ descriptor = "([Lkb;IIIIIIIB)V",
+ garbageValue = "0"
+ )
+ @Export("updateInterface")
+ static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+ for (int var8 = 0; var8 < var0.length; ++var8) { // L: 11050
+ Widget var9 = var0[var8]; // L: 11051
+ if (var9 != null && var9.parentId == var1 && (var9.method5618() || class124.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent)) { // L: 11052 11053 11054
+ if (var9.isIf3) { // L: 11055
+ if (Frames.isComponentHidden(var9)) { // L: 11056
+ continue;
+ }
+ } else if (var9.type == 0 && var9 != Language.mousedOverWidgetIf1 && Frames.isComponentHidden(var9)) { // L: 11059
+ continue;
+ }
+
+ if (var9.type == 11 && var9.method5628(class138.urlRequester)) { // L: 11061 11062
+ if (var9.method5680()) { // L: 11063
+ ChatChannel.invalidateWidget(var9); // L: 11064
+ BufferedNetSocket.revalidateWidgetScroll(var9.children, var9, true); // L: 11065
+ }
+
+ if (var9.field3495 != null) { // L: 11067
+ ScriptEvent var10 = new ScriptEvent(); // L: 11068
+ var10.widget = var9; // L: 11069
+ var10.args = var9.field3495; // L: 11070
+ Client.scriptEvents.addFirst(var10); // L: 11071
+ }
+ }
+
+ int var26 = var9.x + var6; // L: 11075
+ int var11 = var7 + var9.y; // L: 11076
+ int var12;
+ int var13;
+ int var14;
+ int var15;
+ int var17;
+ int var18;
+ if (var9.type == 2) { // L: 11081
+ var12 = var2; // L: 11082
+ var13 = var3; // L: 11083
+ var14 = var4; // L: 11084
+ var15 = var5; // L: 11085
+ } else {
+ int var16;
+ if (var9.type == 9) { // L: 11087
+ var16 = var26; // L: 11088
+ var17 = var11; // L: 11089
+ var18 = var26 + var9.width; // L: 11090
+ int var19 = var11 + var9.height; // L: 11091
+ if (var18 < var26) { // L: 11092
+ var16 = var18; // L: 11094
+ var18 = var26; // L: 11095
+ }
+
+ if (var19 < var11) { // L: 11097
+ var17 = var19; // L: 11099
+ var19 = var11; // L: 11100
+ }
+
+ ++var18; // L: 11102
+ ++var19; // L: 11103
+ var12 = var16 > var2 ? var16 : var2; // L: 11104
+ var13 = var17 > var3 ? var17 : var3; // L: 11105
+ var14 = var18 < var4 ? var18 : var4; // L: 11106
+ var15 = var19 < var5 ? var19 : var5; // L: 11107
+ } else {
+ var16 = var26 + var9.width; // L: 11110
+ var17 = var11 + var9.height; // L: 11111
+ var12 = var26 > var2 ? var26 : var2; // L: 11112
+ var13 = var11 > var3 ? var11 : var3; // L: 11113
+ var14 = var16 < var4 ? var16 : var4; // L: 11114
+ var15 = var17 < var5 ? var17 : var5; // L: 11115
+ }
+ }
+
+ if (var9 == Client.clickedWidget) { // L: 11117
+ Client.field675 = true; // L: 11118
+ Client.field775 = var26; // L: 11119
+ Client.field677 = var11; // L: 11120
+ }
+
+ boolean var34 = false; // L: 11122
+ if (var9.field3498) { // L: 11123
+ switch(Client.field656) { // L: 11124
+ case 0:
+ var34 = true; // L: 11126
+ case 1:
+ default:
+ break;
+ case 2:
+ if (Client.field657 == var9.id >>> 16) { // L: 11134
+ var34 = true; // L: 11135
+ }
+ break;
+ case 3:
+ if (var9.id == Client.field657) { // L: 11129
+ var34 = true; // L: 11130
+ }
+ }
+ }
+
+ if (var34 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11140
+ if (var9.isIf3) { // L: 11141
+ ScriptEvent var27;
+ if (var9.noClickThrough) { // L: 11142
+ if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11143
+ for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11144
+ if (var27.isMouseInputEvent) { // L: 11145
+ var27.remove(); // L: 11146
+ var27.widget.containsMouse = false; // L: 11147
+ }
+ }
+
+ if (Timer.widgetDragDuration == 0) { // L: 11150
+ Client.clickedWidget = null; // L: 11151
+ Client.clickedWidgetParent = null; // L: 11152
+ }
+
+ if (!Client.isMenuOpen) { // L: 11154
+ InterfaceParent.addCancelMenuEntry(); // L: 11155
+ }
+ }
+ } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11159 11160
+ for (var27 = (ScriptEvent)Client.scriptEvents.last(); var27 != null; var27 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11161
+ if (var27.isMouseInputEvent && var27.widget.onScroll == var27.args) { // L: 11162
+ var27.remove(); // L: 11163
+ }
+ }
+ }
+ }
+
+ var17 = MouseHandler.MouseHandler_x; // L: 11169
+ var18 = MouseHandler.MouseHandler_y; // L: 11170
+ if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11171
+ var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11172
+ var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11173
+ }
+
+ boolean var35 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11175
+ if (var9.contentType == 1337) { // L: 11176
+ if (!Client.isLoading && !Client.isMenuOpen && var35) { // L: 11177
+ class82.addSceneMenuOptions(var17, var18, var12, var13);
+ }
+ } else if (var9.contentType == 1338) { // L: 11180
+ MenuAction.checkIfMinimapClicked(var9, var26, var11); // L: 11181
+ } else {
+ if (var9.contentType == 1400) { // L: 11184
+ class121.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var35, var26, var11, var9.width, var9.height); // L: 11185
+ }
+
+ if (!Client.isMenuOpen && var35) { // L: 11187
+ if (var9.contentType == 1400) { // L: 11188
+ class121.worldMap.addElementMenuOptions(var26, var11, var9.width, var9.height, var17, var18); // L: 11189
+ } else {
+ class9.Widget_addToMenu(var9, var17 - var26, var18 - var11); // L: 11192
+ }
+ }
+
+ boolean var21;
+ int var29;
+ if (var34) { // L: 11195
+ for (int var20 = 0; var20 < var9.field3448.length; ++var20) { // L: 11196
+ var21 = false; // L: 11197
+ boolean var28 = false; // L: 11198
+ if (!var21 && var9.field3448[var20] != null) { // L: 11199
+ for (var29 = 0; var29 < var9.field3448[var20].length; ++var29) { // L: 11200
+ boolean var24 = false; // L: 11201
+ if (var9.field3517 != null) { // L: 11202
+ var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3448[var20][var29]]; // L: 11203
+ }
+
+ if (class161.method3289(var9.field3448[var20][var29]) || var24) { // L: 11205
+ var21 = true; // L: 11206
+ if (var9.field3517 != null && var9.field3517[var20] > Client.cycle) { // L: 11207
+ break;
+ }
+
+ byte var33 = var9.field3406[var20][var29]; // L: 11208
+ if (var33 == 0 || ((var33 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var33 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var33 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var33 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11209 11210 11211 11212 11213
+ var28 = true; // L: 11215
+ break;
+ }
+ }
+ }
+ }
+
+ if (var28) { // L: 11221
+ if (var20 < 10) { // L: 11222
+ TextureProvider.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
+ } else if (var20 == 10) { // L: 11223
+ WorldMapDecoration.Widget_runOnTargetLeave(); // L: 11224
+ GrandExchangeOfferAgeComparator.selectSpell(var9.id, var9.childIndex, WorldMapID.Widget_unpackTargetMask(class124.getWidgetFlags(var9)), var9.itemId); // L: 11225
+ Client.selectedSpellActionName = WorldMapIcon_0.Widget_getSpellActionName(var9); // L: 11226
+ if (Client.selectedSpellActionName == null) { // L: 11227
+ Client.selectedSpellActionName = "null";
+ }
+
+ Client.selectedSpellName = var9.dataText + class122.colorStartTag(16777215); // L: 11228
+ }
+
+ var29 = var9.field3450[var20]; // L: 11230
+ if (var9.field3517 == null) { // L: 11231
+ var9.field3517 = new int[var9.field3448.length];
+ }
+
+ if (var9.field3451 == null) { // L: 11232
+ var9.field3451 = new int[var9.field3448.length];
+ }
+
+ if (var29 != 0) { // L: 11233
+ if (var9.field3517[var20] == 0) { // L: 11234
+ var9.field3517[var20] = var29 + Client.cycle + var9.field3451[var20];
+ } else {
+ var9.field3517[var20] = var29 + Client.cycle; // L: 11235
+ }
+ } else {
+ var9.field3517[var20] = Integer.MAX_VALUE; // L: 11237
+ }
+ }
+
+ if (!var21 && var9.field3517 != null) { // L: 11239 11240
+ var9.field3517[var20] = 0;
+ }
+ }
+ }
+
+ if (var9.isIf3) { // L: 11244
+ if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11245
+ var35 = true;
+ } else {
+ var35 = false; // L: 11246
+ }
+
+ boolean var36 = false; // L: 11247
+ if ((MouseHandler.MouseHandler_currentButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var35) { // L: 11248
+ var36 = true;
+ }
+
+ var21 = false; // L: 11249
+ if ((MouseHandler.MouseHandler_lastButton == 1 || !class122.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11250
+ var21 = true;
+ }
+
+ int[] var22;
+ if (var21) { // L: 11251
+ class161.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var26, MouseHandler.MouseHandler_lastPressedY - var11); // L: 11252
+ if (var9.type == 11 && var9.method5623(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY, var6, var7)) { // L: 11253
+ switch(var9.method5627()) { // L: 11254
+ case 0:
+ class258.openURL(var9.method5629(), true, false); // L: 11256
+ break;
+ case 1:
+ if (WallDecoration.method4551(class124.getWidgetFlags(var9))) { // L: 11259
+ var22 = var9.method5630(); // L: 11260
+ if (var22 != null) { // L: 11261
+ PacketBufferNode var23 = EnumComposition.getPacketBufferNode(ClientPacket.field3012, Client.packetWriter.isaacCipher); // L: 11262
+ var23.packetBuffer.method7783(var22[0]); // L: 11263
+ var23.packetBuffer.writeInt(var9.method5709()); // L: 11264
+ var23.packetBuffer.method7929(var9.childIndex); // L: 11265
+ var23.packetBuffer.writeInt(var22[1]); // L: 11266
+ var23.packetBuffer.method7783(var22[2]); // L: 11267
+ var23.packetBuffer.method7784(var9.id); // L: 11268
+ Client.packetWriter.addNode(var23); // L: 11269
+ }
+ }
+ }
+ }
+ }
+
+ if (var9.contentType == 1400) { // L: 11276
+ class121.worldMap.method7307(var17, var18, var35 & var36, var35 & var21); // L: 11277
+ }
+
+ if (Client.clickedWidget != null && var9 != Client.clickedWidget && var35 && WorldMapID.method5003(class124.getWidgetFlags(var9))) { // L: 11279
+ Client.draggedOnWidget = var9;
+ }
+
+ if (var9 == Client.clickedWidgetParent) { // L: 11280
+ Client.field767 = true; // L: 11281
+ Client.field664 = var26; // L: 11282
+ Client.field550 = var11; // L: 11283
+ }
+
+ if (var9.hasListener) { // L: 11285
+ ScriptEvent var37;
+ if (var35 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11286
+ var37 = new ScriptEvent(); // L: 11287
+ var37.isMouseInputEvent = true; // L: 11288
+ var37.widget = var9; // L: 11289
+ var37.mouseY = Client.mouseWheelRotation; // L: 11290
+ var37.args = var9.onScroll; // L: 11291
+ Client.scriptEvents.addFirst(var37); // L: 11292
+ }
+
+ if (Client.clickedWidget != null || Interpreter.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11294
+ var21 = false; // L: 11295
+ var36 = false; // L: 11296
+ var35 = false; // L: 11297
+ }
+
+ if (!var9.isClicked && var21) { // L: 11299
+ var9.isClicked = true; // L: 11300
+ if (var9.onClick != null) { // L: 11301
+ var37 = new ScriptEvent(); // L: 11302
+ var37.isMouseInputEvent = true; // L: 11303
+ var37.widget = var9; // L: 11304
+ var37.mouseX = MouseHandler.MouseHandler_lastPressedX - var26; // L: 11305
+ var37.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11306
+ var37.args = var9.onClick; // L: 11307
+ Client.scriptEvents.addFirst(var37); // L: 11308
+ }
+ }
+
+ if (var9.isClicked && var36 && var9.onClickRepeat != null) { // L: 11311 11312
+ var37 = new ScriptEvent(); // L: 11313
+ var37.isMouseInputEvent = true; // L: 11314
+ var37.widget = var9; // L: 11315
+ var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11316
+ var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11317
+ var37.args = var9.onClickRepeat; // L: 11318
+ Client.scriptEvents.addFirst(var37); // L: 11319
+ }
+
+ if (var9.isClicked && !var36) { // L: 11322
+ var9.isClicked = false; // L: 11323
+ if (var9.onRelease != null) { // L: 11324
+ var37 = new ScriptEvent(); // L: 11325
+ var37.isMouseInputEvent = true; // L: 11326
+ var37.widget = var9; // L: 11327
+ var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11328
+ var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11329
+ var37.args = var9.onRelease; // L: 11330
+ Client.field699.addFirst(var37); // L: 11331
+ }
+ }
+
+ if (var36 && var9.onHold != null) { // L: 11334 11335
+ var37 = new ScriptEvent(); // L: 11336
+ var37.isMouseInputEvent = true; // L: 11337
+ var37.widget = var9; // L: 11338
+ var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11339
+ var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11340
+ var37.args = var9.onHold; // L: 11341
+ Client.scriptEvents.addFirst(var37); // L: 11342
+ }
+
+ if (!var9.containsMouse && var35) { // L: 11345
+ var9.containsMouse = true; // L: 11346
+ if (var9.onMouseOver != null) { // L: 11347
+ var37 = new ScriptEvent(); // L: 11348
+ var37.isMouseInputEvent = true; // L: 11349
+ var37.widget = var9; // L: 11350
+ var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11351
+ var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11352
+ var37.args = var9.onMouseOver; // L: 11353
+ Client.scriptEvents.addFirst(var37); // L: 11354
+ }
+ }
+
+ if (var9.containsMouse && var35 && var9.onMouseRepeat != null) { // L: 11357 11358
+ var37 = new ScriptEvent(); // L: 11359
+ var37.isMouseInputEvent = true; // L: 11360
+ var37.widget = var9; // L: 11361
+ var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11362
+ var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11363
+ var37.args = var9.onMouseRepeat; // L: 11364
+ Client.scriptEvents.addFirst(var37); // L: 11365
+ }
+
+ if (var9.containsMouse && !var35) { // L: 11368
+ var9.containsMouse = false; // L: 11369
+ if (var9.onMouseLeave != null) { // L: 11370
+ var37 = new ScriptEvent(); // L: 11371
+ var37.isMouseInputEvent = true; // L: 11372
+ var37.widget = var9; // L: 11373
+ var37.mouseX = MouseHandler.MouseHandler_x - var26; // L: 11374
+ var37.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11375
+ var37.args = var9.onMouseLeave; // L: 11376
+ Client.field699.addFirst(var37); // L: 11377
+ }
+ }
+
+ if (var9.onTimer != null) { // L: 11380
+ var37 = new ScriptEvent(); // L: 11381
+ var37.widget = var9; // L: 11382
+ var37.args = var9.onTimer; // L: 11383
+ Client.field698.addFirst(var37); // L: 11384
+ }
+
+ ScriptEvent var25;
+ int var39;
+ int var40;
+ if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3512) { // L: 11386
+ if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3512 <= 32) { // L: 11387
+ label824:
+ for (var40 = var9.field3512; var40 < Client.changedVarpCount; ++var40) { // L: 11394
+ var29 = Client.changedVarps[var40 & 31]; // L: 11395
+
+ for (var39 = 0; var39 < var9.varTransmitTriggers.length; ++var39) { // L: 11396
+ if (var29 == var9.varTransmitTriggers[var39]) { // L: 11397
+ var25 = new ScriptEvent(); // L: 11398
+ var25.widget = var9; // L: 11399
+ var25.args = var9.onVarTransmit; // L: 11400
+ Client.scriptEvents.addFirst(var25); // L: 11401
+ break label824; // L: 11402
+ }
+ }
+ }
+ } else {
+ var37 = new ScriptEvent(); // L: 11388
+ var37.widget = var9; // L: 11389
+ var37.args = var9.onVarTransmit; // L: 11390
+ Client.scriptEvents.addFirst(var37); // L: 11391
+ }
+
+ var9.field3512 = Client.changedVarpCount; // L: 11407
+ }
+
+ if (var9.onInvTransmit != null && Client.field683 > var9.field3367) { // L: 11409
+ if (var9.invTransmitTriggers != null && Client.field683 - var9.field3367 <= 32) { // L: 11410
+ label800:
+ for (var40 = var9.field3367; var40 < Client.field683; ++var40) { // L: 11417
+ var29 = Client.changedItemContainers[var40 & 31]; // L: 11418
+
+ for (var39 = 0; var39 < var9.invTransmitTriggers.length; ++var39) { // L: 11419
+ if (var29 == var9.invTransmitTriggers[var39]) { // L: 11420
+ var25 = new ScriptEvent(); // L: 11421
+ var25.widget = var9; // L: 11422
+ var25.args = var9.onInvTransmit; // L: 11423
+ Client.scriptEvents.addFirst(var25); // L: 11424
+ break label800; // L: 11425
+ }
+ }
+ }
+ } else {
+ var37 = new ScriptEvent(); // L: 11411
+ var37.widget = var9; // L: 11412
+ var37.args = var9.onInvTransmit; // L: 11413
+ Client.scriptEvents.addFirst(var37); // L: 11414
+ }
+
+ var9.field3367 = Client.field683; // L: 11430
+ }
+
+ if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3514) { // L: 11432
+ if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3514 <= 32) { // L: 11433
+ label776:
+ for (var40 = var9.field3514; var40 < Client.changedSkillsCount; ++var40) { // L: 11440
+ var29 = Client.changedSkills[var40 & 31]; // L: 11441
+
+ for (var39 = 0; var39 < var9.statTransmitTriggers.length; ++var39) { // L: 11442
+ if (var29 == var9.statTransmitTriggers[var39]) { // L: 11443
+ var25 = new ScriptEvent(); // L: 11444
+ var25.widget = var9; // L: 11445
+ var25.args = var9.onStatTransmit; // L: 11446
+ Client.scriptEvents.addFirst(var25); // L: 11447
+ break label776; // L: 11448
+ }
+ }
+ }
+ } else {
+ var37 = new ScriptEvent(); // L: 11434
+ var37.widget = var9; // L: 11435
+ var37.args = var9.onStatTransmit; // L: 11436
+ Client.scriptEvents.addFirst(var37); // L: 11437
+ }
+
+ var9.field3514 = Client.changedSkillsCount; // L: 11453
+ }
+
+ if (Client.chatCycle > var9.field3426 && var9.onChatTransmit != null) { // L: 11455
+ var37 = new ScriptEvent(); // L: 11456
+ var37.widget = var9; // L: 11457
+ var37.args = var9.onChatTransmit; // L: 11458
+ Client.scriptEvents.addFirst(var37); // L: 11459
+ }
+
+ if (Client.field689 > var9.field3426 && var9.onFriendTransmit != null) { // L: 11461
+ var37 = new ScriptEvent(); // L: 11462
+ var37.widget = var9; // L: 11463
+ var37.args = var9.onFriendTransmit; // L: 11464
+ Client.scriptEvents.addFirst(var37); // L: 11465
+ }
+
+ if (Client.field690 > var9.field3426 && var9.onClanTransmit != null) { // L: 11467
+ var37 = new ScriptEvent(); // L: 11468
+ var37.widget = var9; // L: 11469
+ var37.args = var9.onClanTransmit; // L: 11470
+ Client.scriptEvents.addFirst(var37); // L: 11471
+ }
+
+ if (Client.field525 > var9.field3426 && var9.field3365 != null) { // L: 11473
+ var37 = new ScriptEvent(); // L: 11474
+ var37.widget = var9; // L: 11475
+ var37.args = var9.field3365; // L: 11476
+ Client.scriptEvents.addFirst(var37); // L: 11477
+ }
+
+ if (Client.field692 > var9.field3426 && var9.field3353 != null) { // L: 11479
+ var37 = new ScriptEvent(); // L: 11480
+ var37.widget = var9; // L: 11481
+ var37.args = var9.field3353; // L: 11482
+ Client.scriptEvents.addFirst(var37); // L: 11483
+ }
+
+ if (Client.field480 > var9.field3426 && var9.onStockTransmit != null) { // L: 11485
+ var37 = new ScriptEvent(); // L: 11486
+ var37.widget = var9; // L: 11487
+ var37.args = var9.onStockTransmit; // L: 11488
+ Client.scriptEvents.addFirst(var37); // L: 11489
+ }
+
+ if (Client.field661 > var9.field3426 && var9.field3494 != null) { // L: 11491
+ var37 = new ScriptEvent(); // L: 11492
+ var37.widget = var9; // L: 11493
+ var37.args = var9.field3494; // L: 11494
+ Client.scriptEvents.addFirst(var37); // L: 11495
+ }
+
+ if (Client.field695 > var9.field3426 && var9.onMiscTransmit != null) { // L: 11497
+ var37 = new ScriptEvent(); // L: 11498
+ var37.widget = var9; // L: 11499
+ var37.args = var9.onMiscTransmit; // L: 11500
+ Client.scriptEvents.addFirst(var37); // L: 11501
+ }
+
+ var9.field3426 = Client.cycleCntr; // L: 11503
+ if (var9.onKey != null) { // L: 11504
+ for (var40 = 0; var40 < Client.field719; ++var40) { // L: 11505
+ ScriptEvent var38 = new ScriptEvent(); // L: 11506
+ var38.widget = var9; // L: 11507
+ var38.keyTyped = Client.field721[var40]; // L: 11508
+ var38.keyPressed = Client.field720[var40]; // L: 11509
+ var38.args = var9.onKey; // L: 11510
+ Client.scriptEvents.addFirst(var38); // L: 11511
+ }
+ }
+
+ ScriptEvent var32;
+ if (var9.field3516 != null) { // L: 11514
+ var22 = SpriteMask.method5523(); // L: 11515
+
+ for (var29 = 0; var29 < var22.length; ++var29) { // L: 11516
+ var32 = new ScriptEvent(); // L: 11517
+ var32.widget = var9; // L: 11518
+ var32.keyTyped = var22[var29]; // L: 11519
+ var32.args = var9.field3516; // L: 11520
+ Client.scriptEvents.addFirst(var32); // L: 11521
+ }
+ }
+
+ if (var9.field3513 != null) { // L: 11524
+ var22 = class160.method3285(); // L: 11525
+
+ for (var29 = 0; var29 < var22.length; ++var29) { // L: 11526
+ var32 = new ScriptEvent(); // L: 11527
+ var32.widget = var9; // L: 11528
+ var32.keyTyped = var22[var29]; // L: 11529
+ var32.args = var9.field3513; // L: 11530
+ Client.scriptEvents.addFirst(var32); // L: 11531
+ }
+ }
+ }
+ }
+
+ if (!var9.isIf3) { // L: 11536
+ if (Client.clickedWidget != null || Interpreter.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11537
+ continue;
+ }
+
+ if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11538
+ if (var9.mouseOverRedirect >= 0) { // L: 11539
+ Language.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+ } else {
+ Language.mousedOverWidgetIf1 = var9; // L: 11540
+ }
+ }
+
+ if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11542
+ SoundSystem.field313 = var9; // L: 11543
+ }
+
+ if (var9.scrollHeight > var9.height) { // L: 11545
+ class269.method5224(var9, var26 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+ }
+ }
+
+ if (var9.type == 0) { // L: 11547
+ updateInterface(var0, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY); // L: 11548
+ if (var9.children != null) { // L: 11549
+ updateInterface(var9.children, var9.id, var12, var13, var14, var15, var26 - var9.scrollX, var11 - var9.scrollY);
+ }
+
+ InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11550
+ if (var30 != null) { // L: 11551
+ if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11552
+ for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11553
+ if (var31.isMouseInputEvent) { // L: 11554
+ var31.remove(); // L: 11555
+ var31.widget.containsMouse = false; // L: 11556
+ }
+ }
+
+ if (Timer.widgetDragDuration == 0) { // L: 11559
+ Client.clickedWidget = null; // L: 11560
+ Client.clickedWidgetParent = null; // L: 11561
+ }
+
+ if (!Client.isMenuOpen) { // L: 11563
+ InterfaceParent.addCancelMenuEntry(); // L: 11564
+ }
+ }
+
+ class16.updateRootInterface(var30.group, var12, var13, var14, var15, var26, var11); // L: 11567
+ }
+ }
+ }
+ }
+ }
+ }
+
+ } // L: 11571
}
diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java
index d6d05360f8..b2803717f6 100644
--- a/runescape-client/src/main/java/class290.java
+++ b/runescape-client/src/main/java/class290.java
@@ -1,44 +1,65 @@
+import java.net.MalformedURLException;
+import java.net.URL;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("kh")
+@ObfuscatedName("ki")
public class class290 {
- @ObfuscatedName("q")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1384321322"
+ descriptor = "Lct;"
)
- @Export("ItemContainer_getCount")
- static int ItemContainer_getCount(int var0, int var1) {
- ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21
- if (var2 == null) { // L: 22
- return 0;
- } else {
- return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24
+ UrlRequest field3331;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lqe;"
+ )
+ SpritePixels field3332;
+
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;Lcd;)V"
+ )
+ class290(String var1, UrlRequester var2) {
+ try {
+ this.field3331 = var2.request(new URL(var1)); // L: 16
+ } catch (MalformedURLException var4) { // L: 18
+ this.field3331 = null;
}
+
+ } // L: 21
+
+ @ObfuscatedSignature(
+ descriptor = "(Lct;)V"
+ )
+ class290(UrlRequest var1) {
+ this.field3331 = var1; // L: 24
+ } // L: 25
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)Lqe;",
+ garbageValue = "47"
+ )
+ SpritePixels method5562() {
+ if (this.field3332 == null && this.field3331 != null && this.field3331.isDone()) { // L: 28
+ if (this.field3331.getResponse() != null) { // L: 29
+ this.field3332 = ItemLayer.method3920(this.field3331.getResponse()); // L: 30
+ }
+
+ this.field3331 = null; // L: 32
+ }
+
+ return this.field3332; // L: 34
}
- @ObfuscatedName("af")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-1624974891"
+ descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V",
+ garbageValue = "21073206"
)
- static int method5389(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821
- Client.logoutTimer = 250; // L: 3822
- return 1; // L: 3823
- } else if (var0 != 5631 && var0 != 5633) { // L: 3825
- if (var0 == 5632) { // L: 3829
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 26; // L: 3830
- return 1; // L: 3831
- } else {
- return 2; // L: 3833
- }
- } else {
- class9.Interpreter_stringStackSize -= 2; // L: 3826
- return 1; // L: 3827
- }
- }
+ @Export("addGameMessage")
+ static void addGameMessage(int var0, String var1, String var2) {
+ SecureRandomFuture.addChatMessage(var0, var1, var2, (String)null); // L: 19
+ } // L: 20
}
diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java
deleted file mode 100644
index 2dc99bcc0d..0000000000
--- a/runescape-client/src/main/java/class291.java
+++ /dev/null
@@ -1,99 +0,0 @@
-import java.net.MalformedURLException;
-import java.net.URL;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kk")
-public class class291 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lcb;"
- )
- UrlRequest field3356;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lqr;"
- )
- SpritePixels field3357;
-
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lce;)V"
- )
- class291(String var1, UrlRequester var2) {
- try {
- this.field3356 = var2.request(new URL(var1)); // L: 16
- } catch (MalformedURLException var4) {
- this.field3356 = null;
- }
-
- }
-
- @ObfuscatedSignature(
- descriptor = "(Lcb;)V"
- )
- class291(UrlRequest var1) {
- this.field3356 = var1; // L: 24
- }
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)Lqr;",
- garbageValue = "1905006321"
- )
- SpritePixels method5391() {
- if (this.field3357 == null && this.field3356 != null && this.field3356.isDone()) { // L: 28
- if (this.field3356.getResponse() != null) { // L: 29
- this.field3357 = Frames.method4217(this.field3356.getResponse()); // L: 30
- }
-
- this.field3356 = null; // L: 32
- }
-
- return this.field3357; // L: 34
- }
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "([Llk;II)Llk;",
- garbageValue = "-1552191752"
- )
- @Export("findEnumerated")
- public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) {
- MouseWheel[] var2 = var0; // L: 17
-
- for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
- MouseWheel var4 = var2[var3]; // L: 19
- if (var1 == var4.rsOrdinal()) {
- return var4; // L: 21
- }
- }
-
- return null; // L: 25
- }
-
- @ObfuscatedName("kl")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "16"
- )
- static final void method5390(int var0) {
- var0 = Math.min(Math.max(var0, 0), 255); // L: 12054
- if (var0 != class12.clientPreferences.method2248()) { // L: 12055
- if (class12.clientPreferences.method2248() == 0 && Client.currentTrackGroupId != -1) { // L: 12056
- UserComparator8.method2574(AbstractUserComparator.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 12057
- Client.playingJingle = false; // L: 12058
- } else if (var0 == 0) { // L: 12060
- ApproximateRouteStrategy.method1110(); // L: 12061
- Client.playingJingle = false; // L: 12062
- } else if (class273.musicPlayerStatus != 0) { // L: 12065
- Clock.musicTrackVolume = var0;
- } else {
- class273.midiPcmStream.setPcmStreamVolume(var0); // L: 12066
- }
-
- class12.clientPreferences.method2234(var0); // L: 12068
- }
-
- } // L: 12070
-}
diff --git a/runescape-client/src/main/java/class292.java b/runescape-client/src/main/java/class292.java
new file mode 100644
index 0000000000..d6c3fadb5e
--- /dev/null
+++ b/runescape-client/src/main/java/class292.java
@@ -0,0 +1,32 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kk")
+public class class292 {
+ @ObfuscatedName("c")
+ public static final short[] field3351;
+ @ObfuscatedName("v")
+ public static final short[][] field3349;
+ @ObfuscatedName("q")
+ public static final short[] field3350;
+ @ObfuscatedName("f")
+ public static final short[][] field3352;
+
+ static {
+ field3351 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4
+ field3349 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5
+ field3350 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12
+ field3352 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(II)[B",
+ garbageValue = "-682770392"
+ )
+ @Export("ByteArrayPool_getArray")
+ public static synchronized byte[] ByteArrayPool_getArray(int var0) {
+ return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 94
+ }
+}
diff --git a/runescape-client/src/main/java/class293.java b/runescape-client/src/main/java/class293.java
deleted file mode 100644
index 11541c32f4..0000000000
--- a/runescape-client/src/main/java/class293.java
+++ /dev/null
@@ -1,74 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kl")
-public class class293 {
- @ObfuscatedName("o")
- public static final short[] field3375;
- @ObfuscatedName("q")
- public static final short[][] field3371;
- @ObfuscatedName("l")
- public static final short[] field3376;
- @ObfuscatedName("k")
- public static final short[][] field3374;
-
- static {
- field3375 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4
- field3371 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5
- field3376 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12
- field3374 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13
- }
-
- @ObfuscatedName("q")
- public static String method5431(long var0) {
- if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31
- if (var0 % 37L == 0L) { // L: 32
- return null;
- } else {
- int var2 = 0; // L: 33
-
- for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37
- ++var2; // L: 36
- }
-
- StringBuilder var5 = new StringBuilder(var2); // L: 39
-
- while (var0 != 0L) { // L: 40
- long var6 = var0; // L: 41
- var0 /= 37L; // L: 42
- var5.append(class345.base37Table[(int)(var6 - 37L * var0)]); // L: 43
- }
-
- return var5.reverse().toString(); // L: 45
- }
- } else {
- return null;
- }
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "1650429787"
- )
- public static int method5429() {
- return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 64
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(Lki;I)I",
- garbageValue = "619797497"
- )
- static int method5430(Widget var0) {
- if (var0.type != 11) { // L: 1227
- --class9.Interpreter_stringStackSize; // L: 1228
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 1229
- return 1; // L: 1230
- } else {
- String var1 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1232
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var0.method5455(var1); // L: 1233
- return 1; // L: 1234
- }
- }
-}
diff --git a/runescape-client/src/main/java/class294.java b/runescape-client/src/main/java/class294.java
new file mode 100644
index 0000000000..b914f4fe6c
--- /dev/null
+++ b/runescape-client/src/main/java/class294.java
@@ -0,0 +1,185 @@
+import java.applet.Applet;
+import java.net.URL;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import netscape.javascript.JSObject;
+
+@ObfuscatedName("ke")
+public class class294 {
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z",
+ garbageValue = "-1442442974"
+ )
+ static boolean method5736(String var0, int var1, String var2) {
+ if (var1 == 0) { // L: 58
+ try {
+ if (!class29.field169.startsWith("win")) { // L: 60
+ throw new Exception();
+ } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 61
+ throw new Exception();
+ } else {
+ String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 62
+
+ for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 63
+ if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 64
+ throw new Exception();
+ }
+ }
+
+ Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 66
+ return true; // L: 67
+ }
+ } catch (Throwable var8) { // L: 69
+ return false; // L: 70
+ }
+ } else if (var1 == 1) { // L: 73
+ try {
+ Applet var7 = class29.field172; // L: 76
+ Object[] var5 = new Object[]{(new URL(class29.field172.getCodeBase(), var0)).toString()}; // L: 77
+ Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 80
+ return var3 != null; // L: 83
+ } catch (Throwable var9) { // L: 85
+ return false; // L: 86
+ }
+ } else if (var1 == 2) { // L: 89
+ try {
+ class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_blank"); // L: 91
+ return true; // L: 92
+ } catch (Exception var10) { // L: 94
+ return false; // L: 95
+ }
+ } else if (var1 == 3) { // L: 98
+ try {
+ class27.method346(class29.field172, "loggedout"); // L: 100
+ } catch (Throwable var12) { // L: 102
+ }
+
+ try {
+ class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_top"); // L: 104
+ return true; // L: 105
+ } catch (Exception var11) { // L: 107
+ return false; // L: 108
+ }
+ } else {
+ throw new IllegalArgumentException(); // L: 111
+ }
+ }
+
+ @ObfuscatedName("hh")
+ @ObfuscatedSignature(
+ descriptor = "(ZLpq;I)V",
+ garbageValue = "409985565"
+ )
+ @Export("loadRegions")
+ static final void loadRegions(boolean var0, PacketBuffer var1) {
+ Client.isInInstance = var0; // L: 5536
+ int var2;
+ int var4;
+ int var5;
+ int var6;
+ int var7;
+ if (!Client.isInInstance) { // L: 5537
+ var2 = var1.readUnsignedShort(); // L: 5538
+ int var3 = var1.readUnsignedShort(); // L: 5539
+ var4 = var1.readUnsignedShort(); // L: 5540
+ WorldMapRegion.xteaKeys = new int[var4][4]; // L: 5541
+
+ for (var5 = 0; var5 < var4; ++var5) { // L: 5542
+ for (var6 = 0; var6 < 4; ++var6) { // L: 5543
+ WorldMapRegion.xteaKeys[var5][var6] = var1.readInt(); // L: 5544
+ }
+ }
+
+ Client.regions = new int[var4]; // L: 5547
+ PcmPlayer.regionMapArchiveIds = new int[var4]; // L: 5548
+ ObjectSound.regionLandArchiveIds = new int[var4]; // L: 5549
+ Actor.regionLandArchives = new byte[var4][]; // L: 5550
+ class145.regionMapArchives = new byte[var4][]; // L: 5551
+ var4 = 0; // L: 5552
+
+ for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) { // L: 5553
+ for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5554
+ var7 = var6 + (var5 << 8); // L: 5555
+ Client.regions[var4] = var7; // L: 5556
+ PcmPlayer.regionMapArchiveIds[var4] = WorldMapSectionType.archive9.getGroupId("m" + var5 + "_" + var6); // L: 5557
+ ObjectSound.regionLandArchiveIds[var4] = WorldMapSectionType.archive9.getGroupId("l" + var5 + "_" + var6); // L: 5558
+ ++var4; // L: 5559
+ }
+ }
+
+ WorldMap.method7377(var3, var2, true); // L: 5562
+ } else {
+ var2 = var1.readUnsignedShort(); // L: 5565
+ boolean var15 = var1.readUnsignedByte() == 1; // L: 5566
+ var4 = var1.readUnsignedShort(); // L: 5567
+ var5 = var1.readUnsignedShort(); // L: 5568
+ var1.importIndex(); // L: 5569
+
+ int var8;
+ int var9;
+ for (var6 = 0; var6 < 4; ++var6) { // L: 5570
+ for (var7 = 0; var7 < 13; ++var7) { // L: 5571
+ for (var8 = 0; var8 < 13; ++var8) { // L: 5572
+ var9 = var1.readBits(1); // L: 5573
+ if (var9 == 1) {
+ Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5574
+ } else {
+ Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5575
+ }
+ }
+ }
+ }
+
+ var1.exportIndex(); // L: 5579
+ WorldMapRegion.xteaKeys = new int[var5][4]; // L: 5580
+
+ for (var6 = 0; var6 < var5; ++var6) { // L: 5581
+ for (var7 = 0; var7 < 4; ++var7) { // L: 5582
+ WorldMapRegion.xteaKeys[var6][var7] = var1.readInt(); // L: 5583
+ }
+ }
+
+ Client.regions = new int[var5]; // L: 5586
+ PcmPlayer.regionMapArchiveIds = new int[var5]; // L: 5587
+ ObjectSound.regionLandArchiveIds = new int[var5]; // L: 5588
+ Actor.regionLandArchives = new byte[var5][]; // L: 5589
+ class145.regionMapArchives = new byte[var5][]; // L: 5590
+ var5 = 0; // L: 5591
+
+ for (var6 = 0; var6 < 4; ++var6) { // L: 5592
+ for (var7 = 0; var7 < 13; ++var7) { // L: 5593
+ for (var8 = 0; var8 < 13; ++var8) { // L: 5594
+ var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5595
+ if (var9 != -1) { // L: 5596
+ int var10 = var9 >> 14 & 1023; // L: 5597
+ int var11 = var9 >> 3 & 2047; // L: 5598
+ int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5599
+
+ int var13;
+ for (var13 = 0; var13 < var5; ++var13) { // L: 5600
+ if (Client.regions[var13] == var12) {
+ var12 = -1; // L: 5601
+ break; // L: 5602
+ }
+ }
+
+ if (var12 != -1) { // L: 5604
+ Client.regions[var5] = var12; // L: 5605
+ var13 = var12 >> 8 & 255; // L: 5606
+ int var14 = var12 & 255; // L: 5607
+ PcmPlayer.regionMapArchiveIds[var5] = WorldMapSectionType.archive9.getGroupId("m" + var13 + "_" + var14); // L: 5608
+ ObjectSound.regionLandArchiveIds[var5] = WorldMapSectionType.archive9.getGroupId("l" + var13 + "_" + var14); // L: 5609
+ ++var5; // L: 5610
+ }
+ }
+ }
+ }
+ }
+
+ WorldMap.method7377(var4, var2, !var15); // L: 5616
+ }
+
+ } // L: 5618
+}
diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java
index 3954816ec6..714d00ad15 100644
--- a/runescape-client/src/main/java/class295.java
+++ b/runescape-client/src/main/java/class295.java
@@ -3,27 +3,146 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kv")
-public class class295 {
- @ObfuscatedName("jm")
- @ObfuscatedGetter(
- intValue = 595148927
- )
- @Export("cameraY")
- static int cameraY;
-
- @ObfuscatedName("k")
+@ObfuscatedName("kh")
+public enum class295 implements MouseWheel {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Ldt;",
- garbageValue = "1680740460"
+ descriptor = "Lkh;"
)
- static class123 method5560(int var0) {
- class123[] var1 = new class123[]{class123.field1550, class123.field1545, class123.field1540, class123.field1542, class123.field1543, class123.field1539, class123.field1541, class123.field1546, class123.field1547}; // L: 118
- class123 var2 = (class123)class291.findEnumerated(var1, var0); // L: 120
- if (var2 == null) { // L: 121
- var2 = class123.field1547;
+ field3529(0),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lkh;"
+ )
+ field3526(1),
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lkh;"
+ )
+ field3527(2),
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lkh;"
+ )
+ field3528(3),
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Lkh;"
+ )
+ field3530(4);
+
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = 1099242609
+ )
+ final int field3525;
+
+ class295(int var3) {
+ this.field3525 = var3;
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-100"
+ )
+ @Export("rsOrdinal")
+ public int rsOrdinal() {
+ return this.field3525;
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(CI)B",
+ garbageValue = "-328191535"
+ )
+ @Export("charToByteCp1252")
+ public static byte charToByteCp1252(char var0) {
+ byte var1;
+ if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12
+ var1 = (byte)var0;
+ } else if (var0 == 8364) { // L: 13
+ var1 = -128;
+ } else if (var0 == 8218) { // L: 14
+ var1 = -126;
+ } else if (var0 == 402) { // L: 15
+ var1 = -125;
+ } else if (var0 == 8222) { // L: 16
+ var1 = -124;
+ } else if (var0 == 8230) { // L: 17
+ var1 = -123;
+ } else if (var0 == 8224) { // L: 18
+ var1 = -122;
+ } else if (var0 == 8225) { // L: 19
+ var1 = -121;
+ } else if (var0 == 710) { // L: 20
+ var1 = -120;
+ } else if (var0 == 8240) { // L: 21
+ var1 = -119;
+ } else if (var0 == 352) { // L: 22
+ var1 = -118;
+ } else if (var0 == 8249) { // L: 23
+ var1 = -117;
+ } else if (var0 == 338) { // L: 24
+ var1 = -116;
+ } else if (var0 == 381) { // L: 25
+ var1 = -114;
+ } else if (var0 == 8216) { // L: 26
+ var1 = -111;
+ } else if (var0 == 8217) {
+ var1 = -110; // L: 27
+ } else if (var0 == 8220) { // L: 28
+ var1 = -109;
+ } else if (var0 == 8221) { // L: 29
+ var1 = -108;
+ } else if (var0 == 8226) { // L: 30
+ var1 = -107;
+ } else if (var0 == 8211) { // L: 31
+ var1 = -106;
+ } else if (var0 == 8212) { // L: 32
+ var1 = -105;
+ } else if (var0 == 732) { // L: 33
+ var1 = -104;
+ } else if (var0 == 8482) { // L: 34
+ var1 = -103;
+ } else if (var0 == 353) { // L: 35
+ var1 = -102;
+ } else if (var0 == 8250) { // L: 36
+ var1 = -101;
+ } else if (var0 == 339) { // L: 37
+ var1 = -100;
+ } else if (var0 == 382) { // L: 38
+ var1 = -98;
+ } else if (var0 == 376) { // L: 39
+ var1 = -97;
+ } else {
+ var1 = 63; // L: 40
}
- return var2; // L: 122
+ return var1; // L: 41
}
+
+ @ObfuscatedName("x")
+ @ObfuscatedSignature(
+ descriptor = "(Lbc;I)V",
+ garbageValue = "1904209787"
+ )
+ @Export("changeWorld")
+ static void changeWorld(World var0) {
+ if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1908
+ Client.isMembersWorld = var0.isMembersOnly(); // L: 1909
+ GrandExchangeOfferOwnWorldComparator.method1096(var0.isMembersOnly()); // L: 1910
+ }
+
+ if (var0.properties != Client.worldProperties) { // L: 1912
+ SoundSystem.method739(class304.archive8, var0.properties); // L: 1913
+ }
+
+ StructComposition.worldHost = var0.host; // L: 1915
+ Client.worldId = var0.id; // L: 1916
+ Client.worldProperties = var0.properties; // L: 1917
+ FloorDecoration.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1918
+ class18.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1919
+ Client.currentPort = FloorDecoration.worldPort; // L: 1920
+ } // L: 1921
}
diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java
deleted file mode 100644
index d4e73fd466..0000000000
--- a/runescape-client/src/main/java/class296.java
+++ /dev/null
@@ -1,53 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ks")
-public enum class296 implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lks;"
- )
- field3550(0),
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lks;"
- )
- field3554(1),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lks;"
- )
- field3551(2),
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lks;"
- )
- field3552(3),
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lks;"
- )
- field3553(4);
-
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = 228576199
- )
- final int field3549;
-
- class296(int var3) {
- this.field3549 = var3; // L: 14
- } // L: 15
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "30"
- )
- @Export("rsOrdinal")
- public int rsOrdinal() {
- return this.field3549; // L: 19
- }
-}
diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java
new file mode 100644
index 0000000000..96e7069caa
--- /dev/null
+++ b/runescape-client/src/main/java/class298.java
@@ -0,0 +1,30 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kw")
+public class class298 {
+ @ObfuscatedName("ir")
+ @ObfuscatedGetter(
+ intValue = -672435189
+ )
+ static int field3558;
+
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "(III)Z",
+ garbageValue = "1392015477"
+ )
+ static final boolean method5753(int var0, int var1) {
+ ObjectComposition var2 = class162.getObjectDefinition(var0); // L: 949
+ if (var1 == 11) { // L: 950
+ var1 = 10;
+ }
+
+ if (var1 >= 5 && var1 <= 8) {
+ var1 = 4; // L: 951
+ }
+
+ return var2.method3658(var1); // L: 952
+ }
+}
diff --git a/runescape-client/src/main/java/class299.java b/runescape-client/src/main/java/class299.java
new file mode 100644
index 0000000000..b0e6d4e631
--- /dev/null
+++ b/runescape-client/src/main/java/class299.java
@@ -0,0 +1,41 @@
+import java.io.IOException;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kq")
+public final class class299 {
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lcv;",
+ garbageValue = "268550387"
+ )
+ static ClientPreferences method5754() {
+ AccessFile var0 = null; // L: 112
+ ClientPreferences var1 = new ClientPreferences(); // L: 113
+
+ try {
+ var0 = class67.getPreferencesFile("", class285.field3313.name, false); // L: 115
+ byte[] var2 = new byte[(int)var0.length()]; // L: 116
+
+ int var4;
+ for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 117 118 121
+ var4 = var0.read(var2, var3, var2.length - var3); // L: 119
+ if (var4 == -1) {
+ throw new IOException(); // L: 120
+ }
+ }
+
+ var1 = new ClientPreferences(new Buffer(var2)); // L: 123
+ } catch (Exception var6) { // L: 125
+ }
+
+ try {
+ if (var0 != null) { // L: 127
+ var0.close();
+ }
+ } catch (Exception var5) { // L: 129
+ }
+
+ return var1; // L: 130
+ }
+}
diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java
index 727e22c135..49ed0bc25a 100644
--- a/runescape-client/src/main/java/class3.java
+++ b/runescape-client/src/main/java/class3.java
@@ -1,11 +1,11 @@
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("k")
+@ObfuscatedName("f")
public interface class3 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpx;)Lpx;"
+ descriptor = "(Lqt;)Lqt;"
)
- Buffer vmethod19(Buffer var1);
+ Buffer vmethod10(Buffer var1);
}
diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java
index b6e2ce347f..c47a26bdcf 100644
--- a/runescape-client/src/main/java/class300.java
+++ b/runescape-client/src/main/java/class300.java
@@ -1,13 +1,8 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("kc")
-public final class class300 {
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "Lpx;"
- )
- @Export("NetCache_reference")
- public static Buffer NetCache_reference;
+public class class300 {
+ static {
+ Math.sqrt(8192.0D); // L: 9
+ } // L: 10
}
diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java
index 584e6dc000..8c00833acc 100644
--- a/runescape-client/src/main/java/class301.java
+++ b/runescape-client/src/main/java/class301.java
@@ -1,556 +1,95 @@
-import net.runelite.mapping.Export;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("kr")
+@ObfuscatedName("kg")
public class class301 {
- static {
- Math.sqrt(8192.0D); // L: 9
- } // L: 10
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(IB)Lbb;",
- garbageValue = "1"
- )
- @Export("getScript")
- static Script getScript(int var0) {
- Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26
- if (var1 != null) { // L: 27
- return var1;
- } else {
- byte[] var2 = class115.archive12.takeFile(var0, 0); // L: 28
- if (var2 == null) { // L: 29
- return null; // L: 30
- } else {
- var1 = PcmPlayer.newScript(var2); // L: 32
- Script.Script_cached.put(var1, (long)var0); // L: 33
- return var1; // L: 34
- }
- }
- }
-
@ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/String;",
- garbageValue = "2143337015"
+ descriptor = "Lkg;"
)
- static final String method5583(int var0) {
- if (var0 < 100000) { // L: 425
- return "" + var0 + "";
- } else {
- return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 426 427
- }
+ static final class301 field3575;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lkg;"
+ )
+ static final class301 field3576;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = 1219700947
+ )
+ final int field3580;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = 1464012369
+ )
+ final int field3578;
+
+ static {
+ field3575 = new class301(51, 27, 800, 0, 16, 16); // L: 33
+ field3576 = new class301(25, 28, 800, 656, 40, 40); // L: 34
}
- @ObfuscatedName("gh")
+ class301(int var1, int var2, int var3, int var4, int var5, int var6) {
+ this.field3580 = var5; // L: 39
+ this.field3578 = var6; // L: 40
+ } // L: 41
+
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lcx;II)V",
- garbageValue = "-1751178883"
+ descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;",
+ garbageValue = "2142234614"
)
- @Export("updateActorSequence")
- static final void updateActorSequence(Actor var0, int var1) {
- int var2;
- int var3;
- int var4;
- if (var0.field1191 >= Client.cycle) { // L: 3994
- var2 = Math.max(1, var0.field1191 - Client.cycle); // L: 3995
- var3 = var0.field1167 * 64 + var0.field1187 * 128; // L: 3996
- var4 = var0.field1167 * 64 + var0.field1189 * 128; // L: 3997
- var0.x += (var3 - var0.x) / var2; // L: 3998
- var0.y += (var4 - var0.y) / var2; // L: 3999
- var0.field1194 = 0; // L: 4000
- var0.orientation = var0.field1139; // L: 4001
- } else if (var0.field1192 >= Client.cycle) { // L: 4003
- if (var0.field1192 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class114.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4004
- var2 = var0.field1192 - var0.field1191; // L: 4005
- var3 = Client.cycle - var0.field1191; // L: 4006
- var4 = var0.field1167 * 64 + var0.field1187 * 128; // L: 4007
- int var5 = var0.field1167 * 64 + var0.field1189 * 128; // L: 4008
- int var6 = var0.field1167 * 64 + var0.field1188 * 128; // L: 4009
- int var7 = var0.field1167 * 64 + var0.field1190 * 128; // L: 4010
- var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; // L: 4011
- var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; // L: 4012
- }
-
- var0.field1194 = 0; // L: 4014
- var0.orientation = var0.field1139; // L: 4015
- var0.rotation = var0.orientation; // L: 4016
+ static String method5755(Throwable var0) throws IOException {
+ String var1;
+ if (var0 instanceof RunException) { // L: 68
+ RunException var2 = (RunException)var0; // L: 69
+ var1 = var2.message + " | "; // L: 70
+ var0 = var2.throwable; // L: 71
} else {
- class115.method2680(var0); // L: 4018
+ var1 = ""; // L: 73
}
- if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4019
- var0.sequence = -1; // L: 4020
- var0.spotAnimation = -1; // L: 4021
- var0.field1191 = 0; // L: 4022
- var0.field1192 = 0; // L: 4023
- var0.x = var0.field1167 * 64 + var0.pathX[0] * 128; // L: 4024
- var0.y = var0.pathY[0] * 128 + var0.field1167 * 64; // L: 4025
- var0.method2180(); // L: 4026
- }
+ StringWriter var12 = new StringWriter(); // L: 74
+ PrintWriter var3 = new PrintWriter(var12); // L: 75
+ var0.printStackTrace(var3); // L: 76
+ var3.close(); // L: 77
+ String var4 = var12.toString(); // L: 78
+ BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 79
+ String var6 = var5.readLine(); // L: 80
- if (ModelData0.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4028 4029
- var0.sequence = -1; // L: 4030
- var0.spotAnimation = -1; // L: 4031
- var0.field1191 = 0; // L: 4032
- var0.field1192 = 0; // L: 4033
- var0.x = var0.field1167 * 64 + var0.pathX[0] * 128; // L: 4034
- var0.y = var0.pathY[0] * 128 + var0.field1167 * 64; // L: 4035
- var0.method2180(); // L: 4036
- }
-
- if (var0.field1204 != 0) { // L: 4040
- if (var0.targetIndex != -1) { // L: 4041
- Object var8 = null; // L: 4042
- if (var0.targetIndex < 32768) { // L: 4043
- var8 = Client.npcs[var0.targetIndex];
- } else if (var0.targetIndex >= 32768) { // L: 4044
- var8 = Client.players[var0.targetIndex - 32768];
+ while (true) {
+ while (true) {
+ String var7 = var5.readLine(); // L: 82
+ if (var7 == null) { // L: 83
+ var1 = var1 + "| " + var6; // L: 101
+ return var1; // L: 102
}
- if (var8 != null) { // L: 4045
- var3 = var0.x - ((Actor)var8).x; // L: 4046
- var4 = var0.y - ((Actor)var8).y; // L: 4047
- if (var3 != 0 || var4 != 0) { // L: 4048
- var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047;
- }
- } else if (var0.false0) { // L: 4050
- var0.targetIndex = -1; // L: 4051
- var0.false0 = false; // L: 4052
- }
- }
-
- if (var0.field1172 != -1 && (var0.pathLength == 0 || var0.field1194 > 0)) { // L: 4055
- var0.orientation = var0.field1172; // L: 4056
- var0.field1172 = -1; // L: 4057
- }
-
- var2 = var0.orientation - var0.rotation & 2047; // L: 4059
- if (var2 == 0 && var0.false0) { // L: 4060
- var0.targetIndex = -1; // L: 4061
- var0.false0 = false; // L: 4062
- }
-
- if (var2 != 0) { // L: 4064
- ++var0.field1203; // L: 4065
- boolean var10;
- if (var2 > 1024) { // L: 4066
- var0.rotation -= var0.field1173 ? var2 : var0.field1204 * 1818380337 * -1019211567; // L: 4067
- var10 = true; // L: 4068
- if (var2 < var0.field1204 || var2 > 2048 - var0.field1204) { // L: 4069
- var0.rotation = var0.orientation; // L: 4070
- var10 = false; // L: 4071
+ int var8 = var7.indexOf(40); // L: 84
+ int var9 = var7.indexOf(41, var8 + 1); // L: 85
+ if (var8 >= 0 && var9 >= 0) { // L: 86
+ String var10 = var7.substring(var8 + 1, var9); // L: 87
+ int var11 = var10.indexOf(".java:"); // L: 88
+ if (var11 >= 0) { // L: 89
+ var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 90
+ var1 = var1 + var10 + ' '; // L: 91
+ continue; // L: 92
}
- if (!var0.field1173 && var0.movementSequence == var0.idleSequence && (var0.field1203 > 25 || var10)) { // L: 4073
- if (var0.turnLeftSequence != -1) { // L: 4074
- var0.movementSequence = var0.turnLeftSequence;
- } else {
- var0.movementSequence = var0.walkSequence; // L: 4075
- }
- }
- } else {
- var0.rotation += var0.field1173 ? var2 : 1818380337 * var0.field1204 * -1019211567; // L: 4079
- var10 = true; // L: 4080
- if (var2 < var0.field1204 || var2 > 2048 - var0.field1204) { // L: 4081
- var0.rotation = var0.orientation; // L: 4082
- var10 = false; // L: 4083
- }
-
- if (!var0.field1173 && var0.idleSequence == var0.movementSequence && (var0.field1203 > 25 || var10)) { // L: 4085
- if (var0.turnRightSequence != -1) { // L: 4086
- var0.movementSequence = var0.turnRightSequence;
- } else {
- var0.movementSequence = var0.walkSequence; // L: 4087
- }
- }
+ var7 = var7.substring(0, var8); // L: 94
}
- var0.rotation &= 2047; // L: 4091
- var0.field1173 = false; // L: 4092
- } else {
- var0.field1203 = 0; // L: 4094
+ var7 = var7.trim(); // L: 96
+ var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 97
+ var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 98
+ var1 = var1 + var7 + ' '; // L: 99
}
}
-
- var0.isWalking = false; // L: 4097
- SequenceDefinition var11;
- if (var0.movementSequence != -1) { // L: 4098
- var11 = class114.SequenceDefinition_get(var0.movementSequence); // L: 4099
- if (var11 != null) { // L: 4100
- if (!var11.isCachedModelIdSet() && var11.frameIds != null) { // L: 4101
- ++var0.movementFrameCycle; // L: 4102
- if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { // L: 4103
- var0.movementFrameCycle = 1; // L: 4104
- ++var0.movementFrame; // L: 4105
- class16.method182(var11, var0.movementFrame, var0.x, var0.y); // L: 4106
- }
-
- if (var0.movementFrame >= var11.frameIds.length) { // L: 4108
- var0.movementFrameCycle = 0; // L: 4109
- var0.movementFrame = 0; // L: 4110
- class16.method182(var11, var0.movementFrame, var0.x, var0.y); // L: 4111
- }
- } else if (var11.isCachedModelIdSet()) { // L: 4114
- ++var0.movementFrame; // L: 4115
- var3 = var11.method3729(); // L: 4116
- if (var0.movementFrame < var3) { // L: 4117
- TileItem.method2407(var11, var0.movementFrame, var0.x, var0.y); // L: 4118
- } else {
- var0.movementFrameCycle = 0; // L: 4121
- var0.movementFrame = 0; // L: 4122
- TileItem.method2407(var11, var0.movementFrame, var0.x, var0.y); // L: 4123
- }
- } else {
- var0.movementSequence = -1; // L: 4126
- }
- } else {
- var0.movementSequence = -1; // L: 4128
- }
- }
-
- if (var0.spotAnimation != -1 && Client.cycle >= var0.field1185) { // L: 4130
- if (var0.spotAnimationFrame < 0) { // L: 4131
- var0.spotAnimationFrame = 0;
- }
-
- var2 = class136.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4132
- if (var2 != -1) { // L: 4133
- SequenceDefinition var9 = class114.SequenceDefinition_get(var2); // L: 4134
- if (var9 != null && var9.frameIds != null) { // L: 4135
- ++var0.spotAnimationFrameCycle; // L: 4136
- if (var0.spotAnimationFrame < var9.frameIds.length && var0.spotAnimationFrameCycle > var9.frameLengths[var0.spotAnimationFrame]) { // L: 4137
- var0.spotAnimationFrameCycle = 1; // L: 4138
- ++var0.spotAnimationFrame; // L: 4139
- class16.method182(var9, var0.spotAnimationFrame, var0.x, var0.y); // L: 4140
- }
-
- if (var0.spotAnimationFrame >= var9.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var9.frameIds.length)) { // L: 4142 4143
- var0.spotAnimation = -1;
- }
- } else if (var9.isCachedModelIdSet()) { // L: 4146
- ++var0.spotAnimationFrame; // L: 4147
- var4 = var9.method3729(); // L: 4148
- if (var0.spotAnimationFrame < var4) { // L: 4149
- TileItem.method2407(var9, var0.spotAnimationFrame, var0.x, var0.y); // L: 4150
- } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var4) { // L: 4153
- var0.spotAnimation = -1;
- }
- } else {
- var0.spotAnimation = -1; // L: 4156
- }
- } else {
- var0.spotAnimation = -1; // L: 4158
- }
- }
-
- if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4160
- var11 = class114.SequenceDefinition_get(var0.sequence); // L: 4161
- if (var11.field2224 == 1 && var0.field1200 > 0 && var0.field1191 <= Client.cycle && var0.field1192 < Client.cycle) { // L: 4162 4163
- var0.sequenceDelay = 1; // L: 4164
- return; // L: 4208
- }
- }
-
- if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4169
- var11 = class114.SequenceDefinition_get(var0.sequence); // L: 4170
- if (var11 == null) { // L: 4171
- var0.sequence = -1; // L: 4204
- } else if (!var11.isCachedModelIdSet() && var11.frameIds != null) { // L: 4172
- ++var0.sequenceFrameCycle; // L: 4173
- if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) { // L: 4174
- var0.sequenceFrameCycle = 1; // L: 4175
- ++var0.sequenceFrame; // L: 4176
- class16.method182(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4177
- }
-
- if (var0.sequenceFrame >= var11.frameIds.length) { // L: 4179
- var0.sequenceFrame -= var11.frameCount; // L: 4180
- ++var0.field1186; // L: 4181
- if (var0.field1186 >= var11.field2223) { // L: 4182
- var0.sequence = -1;
- } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) { // L: 4183
- class16.method182(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4184
- } else {
- var0.sequence = -1;
- }
- }
-
- var0.isWalking = var11.field2201; // L: 4186
- } else if (var11.isCachedModelIdSet()) { // L: 4188
- ++var0.sequenceFrame; // L: 4189
- var3 = var11.method3735().method2754(); // L: 4190
- if (var0.sequenceFrame < var3) { // L: 4191
- TileItem.method2407(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4192
- } else {
- var0.sequenceFrame -= var11.frameCount; // L: 4195
- ++var0.field1186; // L: 4196
- if (var0.field1186 >= var11.field2223) { // L: 4197
- var0.sequence = -1;
- } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var3) { // L: 4198
- TileItem.method2407(var11, var0.sequenceFrame, var0.x, var0.y); // L: 4199
- } else {
- var0.sequence = -1;
- }
- }
- } else {
- var0.sequence = -1; // L: 4202
- }
- }
-
- if (var0.sequenceDelay > 0) { // L: 4206
- --var0.sequenceDelay;
- }
-
}
-
- @ObfuscatedName("hx")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1223845461"
- )
- static final void method5580() {
- InvDefinition.method3268(false); // L: 5753
- Client.field545 = 0; // L: 5754
- boolean var0 = true; // L: 5755
-
- int var1;
- for (var1 = 0; var1 < InterfaceParent.regionLandArchives.length; ++var1) { // L: 5756
- if (class83.regionMapArchiveIds[var1] != -1 && InterfaceParent.regionLandArchives[var1] == null) { // L: 5757 5758
- InterfaceParent.regionLandArchives[var1] = Message.archive5.takeFile(class83.regionMapArchiveIds[var1], 0); // L: 5759
- if (InterfaceParent.regionLandArchives[var1] == null) { // L: 5760
- var0 = false; // L: 5761
- ++Client.field545; // L: 5762
- }
- }
-
- if (class17.regionLandArchiveIds[var1] != -1 && FloorUnderlayDefinition.regionMapArchives[var1] == null) { // L: 5766 5767
- FloorUnderlayDefinition.regionMapArchives[var1] = Message.archive5.takeFileEncrypted(class17.regionLandArchiveIds[var1], 0, class138.xteaKeys[var1]); // L: 5768
- if (FloorUnderlayDefinition.regionMapArchives[var1] == null) { // L: 5769
- var0 = false; // L: 5770
- ++Client.field545; // L: 5771
- }
- }
- }
-
- if (!var0) { // L: 5776
- Client.field597 = 1; // L: 5777
- } else {
- Client.field570 = 0; // L: 5780
- var0 = true; // L: 5781
-
- int var3;
- int var4;
- for (var1 = 0; var1 < InterfaceParent.regionLandArchives.length; ++var1) { // L: 5782
- byte[] var15 = FloorUnderlayDefinition.regionMapArchives[var1]; // L: 5783
- if (var15 != null) { // L: 5784
- var3 = (class241.regions[var1] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5785
- var4 = (class241.regions[var1] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5786
- if (Client.isInInstance) { // L: 5787
- var3 = 10; // L: 5788
- var4 = 10; // L: 5789
- }
-
- var0 &= class132.method2834(var15, var3, var4); // L: 5791
- }
- }
-
- if (!var0) { // L: 5794
- Client.field597 = 2; // L: 5795
- } else {
- if (Client.field597 != 0) { // L: 5798
- class259.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true);
- }
-
- ArchiveLoader.playPcmPlayers(); // L: 5799
- class175.scene.clear(); // L: 5800
-
- for (var1 = 0; var1 < 4; ++var1) { // L: 5801
- Client.collisionMaps[var1].clear();
- }
-
- int var2;
- for (var1 = 0; var1 < 4; ++var1) { // L: 5802
- for (var2 = 0; var2 < 104; ++var2) { // L: 5803
- for (var3 = 0; var3 < 104; ++var3) { // L: 5804
- Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5805
- }
- }
- }
-
- ArchiveLoader.playPcmPlayers(); // L: 5809
- class149.method3024(); // L: 5810
- var1 = InterfaceParent.regionLandArchives.length; // L: 5811
- Varcs.method2466(); // L: 5812
- InvDefinition.method3268(true); // L: 5813
- int var5;
- if (!Client.isInInstance) { // L: 5814
- byte[] var14;
- for (var2 = 0; var2 < var1; ++var2) { // L: 5815
- var3 = (class241.regions[var2] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5816
- var4 = (class241.regions[var2] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5817
- var14 = InterfaceParent.regionLandArchives[var2]; // L: 5818
- if (var14 != null) { // L: 5819
- ArchiveLoader.playPcmPlayers(); // L: 5820
- PacketBufferNode.method5009(var14, var3, var4, WorldMapSectionType.field2828 * 8 - 48, class433.field4657 * 8 - 48, Client.collisionMaps); // L: 5821
- }
- }
-
- for (var2 = 0; var2 < var1; ++var2) { // L: 5824
- var3 = (class241.regions[var2] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5825
- var4 = (class241.regions[var2] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5826
- var14 = InterfaceParent.regionLandArchives[var2]; // L: 5827
- if (var14 == null && class433.field4657 < 800) { // L: 5828
- ArchiveLoader.playPcmPlayers(); // L: 5829
- PlayerComposition.method5408(var3, var4, 64, 64); // L: 5830
- }
- }
-
- InvDefinition.method3268(true); // L: 5833
-
- for (var2 = 0; var2 < var1; ++var2) { // L: 5834
- byte[] var13 = FloorUnderlayDefinition.regionMapArchives[var2]; // L: 5835
- if (var13 != null) { // L: 5836
- var4 = (class241.regions[var2] >> 8) * 64 - SecureRandomCallable.baseX; // L: 5837
- var5 = (class241.regions[var2] & 255) * 64 - GrandExchangeOfferOwnWorldComparator.baseY; // L: 5838
- ArchiveLoader.playPcmPlayers(); // L: 5839
- VertexNormal.method4376(var13, var4, var5, class175.scene, Client.collisionMaps); // L: 5840
- }
- }
- }
-
- int var6;
- int var7;
- int var8;
- if (Client.isInInstance) { // L: 5844
- int var9;
- int var10;
- int var11;
- for (var2 = 0; var2 < 4; ++var2) { // L: 5845
- ArchiveLoader.playPcmPlayers(); // L: 5846
-
- for (var3 = 0; var3 < 13; ++var3) { // L: 5847
- for (var4 = 0; var4 < 13; ++var4) { // L: 5848
- boolean var16 = false; // L: 5849
- var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5850
- if (var6 != -1) { // L: 5851
- var7 = var6 >> 24 & 3; // L: 5852
- var8 = var6 >> 1 & 3; // L: 5853
- var9 = var6 >> 14 & 1023; // L: 5854
- var10 = var6 >> 3 & 2047; // L: 5855
- var11 = (var9 / 8 << 8) + var10 / 8; // L: 5856
-
- for (int var12 = 0; var12 < class241.regions.length; ++var12) { // L: 5857
- if (class241.regions[var12] == var11 && InterfaceParent.regionLandArchives[var12] != null) { // L: 5858
- class125.method2794(InterfaceParent.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5859
- var16 = true; // L: 5860
- break;
- }
- }
- }
-
- if (!var16) { // L: 5865
- World.method1661(var2, var3 * 8, var4 * 8); // L: 5866
- }
- }
- }
- }
-
- for (var2 = 0; var2 < 13; ++var2) { // L: 5871
- for (var3 = 0; var3 < 13; ++var3) { // L: 5872
- var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5873
- if (var4 == -1) { // L: 5874
- PlayerComposition.method5408(var2 * 8, var3 * 8, 8, 8); // L: 5875
- }
- }
- }
-
- InvDefinition.method3268(true); // L: 5879
-
- for (var2 = 0; var2 < 4; ++var2) { // L: 5880
- ArchiveLoader.playPcmPlayers(); // L: 5881
-
- for (var3 = 0; var3 < 13; ++var3) { // L: 5882
- for (var4 = 0; var4 < 13; ++var4) { // L: 5883
- var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5884
- if (var5 != -1) { // L: 5885
- var6 = var5 >> 24 & 3; // L: 5886
- var7 = var5 >> 1 & 3; // L: 5887
- var8 = var5 >> 14 & 1023; // L: 5888
- var9 = var5 >> 3 & 2047; // L: 5889
- var10 = (var8 / 8 << 8) + var9 / 8; // L: 5890
-
- for (var11 = 0; var11 < class241.regions.length; ++var11) { // L: 5891
- if (class241.regions[var11] == var10 && FloorUnderlayDefinition.regionMapArchives[var11] != null) { // L: 5892
- Tiles.method2033(FloorUnderlayDefinition.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, class175.scene, Client.collisionMaps); // L: 5893
- break; // L: 5894
- }
- }
- }
- }
- }
- }
- }
-
- InvDefinition.method3268(true); // L: 5902
- ArchiveLoader.playPcmPlayers(); // L: 5903
- class268.method5029(class175.scene, Client.collisionMaps); // L: 5904
- InvDefinition.method3268(true); // L: 5905
- var2 = Tiles.Tiles_minPlane; // L: 5906
- if (var2 > class128.Client_plane) { // L: 5907
- var2 = class128.Client_plane;
- }
-
- if (var2 < class128.Client_plane - 1) { // L: 5908
- var2 = class128.Client_plane - 1;
- }
-
- if (Client.isLowDetail) { // L: 5909
- class175.scene.init(Tiles.Tiles_minPlane);
- } else {
- class175.scene.init(0); // L: 5910
- }
-
- for (var3 = 0; var3 < 104; ++var3) { // L: 5911
- for (var4 = 0; var4 < 104; ++var4) { // L: 5912
- Frames.updateItemPile(var3, var4); // L: 5913
- }
- }
-
- ArchiveLoader.playPcmPlayers(); // L: 5916
- ReflectionCheck.method600(); // L: 5917
- ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5918
- PacketBufferNode var17;
- if (class82.client.hasFrame()) { // L: 5919
- var17 = WallDecoration.getPacketBufferNode(ClientPacket.field2948, Client.packetWriter.isaacCipher); // L: 5921
- var17.packetBuffer.writeInt(1057001181); // L: 5922
- Client.packetWriter.addNode(var17); // L: 5923
- }
-
- if (!Client.isInInstance) { // L: 5925
- var3 = (WorldMapSectionType.field2828 - 6) / 8; // L: 5926
- var4 = (WorldMapSectionType.field2828 + 6) / 8; // L: 5927
- var5 = (class433.field4657 - 6) / 8; // L: 5928
- var6 = (class433.field4657 + 6) / 8; // L: 5929
-
- for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5930
- for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5931
- if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5932
- Message.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5933
- Message.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5934
- }
- }
- }
- }
-
- PendingSpawn.updateGameState(30); // L: 5938
- ArchiveLoader.playPcmPlayers(); // L: 5939
- PcmPlayer.method753(); // L: 5940
- var17 = WallDecoration.getPacketBufferNode(ClientPacket.field3031, Client.packetWriter.isaacCipher); // L: 5941
- Client.packetWriter.addNode(var17); // L: 5942
- WorldMap.method7222(); // L: 5943
- }
- }
- } // L: 5778 5796 5944
}
diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java
deleted file mode 100644
index c5ae59fd4e..0000000000
--- a/runescape-client/src/main/java/class302.java
+++ /dev/null
@@ -1,249 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("kx")
-public class class302 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lkx;"
- )
- static final class302 field3612;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lkx;"
- )
- static final class302 field3611;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = -928384515
- )
- final int field3613;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = 381472807
- )
- final int field3610;
-
- static {
- field3612 = new class302(51, 27, 800, 0, 16, 16); // L: 33
- field3611 = new class302(25, 28, 800, 656, 40, 40); // L: 34
- }
-
- class302(int var1, int var2, int var3, int var4, int var5, int var6) {
- this.field3613 = var5; // L: 39
- this.field3610 = var6; // L: 40
- } // L: 41
-
- @ObfuscatedName("ae")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "-1771352209"
- )
- static int method5584(int var0, Script var1, boolean var2) {
- int var3;
- int var4;
- if (var0 == ScriptOpcodes.ADD) { // L: 3039
- class12.Interpreter_intStackSize -= 2; // L: 3040
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3041
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3042
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 + var4; // L: 3043
- return 1; // L: 3044
- } else if (var0 == ScriptOpcodes.SUB) { // L: 3046
- class12.Interpreter_intStackSize -= 2; // L: 3047
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3048
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3049
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 - var4; // L: 3050
- return 1; // L: 3051
- } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 3053
- class12.Interpreter_intStackSize -= 2; // L: 3054
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3055
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3056
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4 * var3; // L: 3057
- return 1; // L: 3058
- } else if (var0 == ScriptOpcodes.DIV) { // L: 3060
- class12.Interpreter_intStackSize -= 2; // L: 3061
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3062
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3063
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 / var4; // L: 3064
- return 1; // L: 3065
- } else if (var0 == ScriptOpcodes.RANDOM) { // L: 3067
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3068
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 3069
- return 1; // L: 3070
- } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 3072
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3073
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 3074
- return 1; // L: 3075
- } else {
- int var5;
- int var6;
- int var7;
- if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 3077
- class12.Interpreter_intStackSize -= 5; // L: 3078
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3079
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3080
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3081
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 3082
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 4]; // L: 3083
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 3084
- return 1; // L: 3085
- } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 3087
- class12.Interpreter_intStackSize -= 2; // L: 3088
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3089
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3090
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 3091
- return 1; // L: 3092
- } else if (var0 == ScriptOpcodes.SETBIT) { // L: 3094
- class12.Interpreter_intStackSize -= 2; // L: 3095
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3096
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3097
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 3098
- return 1; // L: 3099
- } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 3101
- class12.Interpreter_intStackSize -= 2; // L: 3102
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3103
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3104
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 3105
- return 1; // L: 3106
- } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 3108
- class12.Interpreter_intStackSize -= 2; // L: 3109
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3110
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3111
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 3112
- return 1; // L: 3113
- } else if (var0 == ScriptOpcodes.MOD) { // L: 3115
- class12.Interpreter_intStackSize -= 2; // L: 3116
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3117
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3118
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 % var4; // L: 3119
- return 1; // L: 3120
- } else if (var0 == ScriptOpcodes.POW) { // L: 3122
- class12.Interpreter_intStackSize -= 2; // L: 3123
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3124
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3125
- if (var3 == 0) { // L: 3126
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 3127
- }
-
- return 1; // L: 3128
- } else if (var0 == ScriptOpcodes.INVPOW) { // L: 3130
- class12.Interpreter_intStackSize -= 2; // L: 3131
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3132
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3133
- if (var3 == 0) { // L: 3134
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3135
- return 1; // L: 3136
- } else {
- switch(var4) { // L: 3138
- case 0:
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 3166
- break;
- case 1:
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3156
- break; // L: 3157
- case 2:
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 3141
- break;
- case 3:
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 3151
- break; // L: 3152
- case 4:
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 3146
- break; // L: 3147
- default:
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 3161
- }
-
- return 1; // L: 3170
- }
- } else if (var0 == ScriptOpcodes.AND) { // L: 3172
- class12.Interpreter_intStackSize -= 2; // L: 3173
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3174
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3175
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 & var4; // L: 3176
- return 1; // L: 3177
- } else if (var0 == ScriptOpcodes.OR) { // L: 3179
- class12.Interpreter_intStackSize -= 2; // L: 3180
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3181
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3182
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 | var4; // L: 3183
- return 1; // L: 3184
- } else if (var0 == ScriptOpcodes.SCALE) { // L: 3186
- class12.Interpreter_intStackSize -= 3; // L: 3187
- long var9 = (long)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3188
- long var11 = (long)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3189
- long var13 = (long)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3190
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 3191
- return 1; // L: 3192
- } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 3194
- var3 = VarcInt.method3324(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 3195
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3196
- return 1; // L: 3197
- } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 3199
- class12.Interpreter_intStackSize -= 2; // L: 3200
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3201
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3202
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 3203
- return 1; // L: 3204
- } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 3206
- class12.Interpreter_intStackSize -= 3; // L: 3207
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3208
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3209
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3210
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class92.method2376(var3, var4, var5); // L: 3211
- return 1; // L: 3212
- } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3214
- class12.Interpreter_intStackSize -= 3; // L: 3215
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3216
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3217
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3218
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = DynamicObject.method1957(var3, var4, var5); // L: 3219
- return 1; // L: 3220
- } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3222
- class12.Interpreter_intStackSize -= 3; // L: 3223
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3224
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3225
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3226
- var6 = 31 - var5; // L: 3227
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3228
- return 1; // L: 3229
- } else if (var0 == 4030) { // L: 3231
- class12.Interpreter_intStackSize -= 4; // L: 3232
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3233
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3234
- var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3235
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 3236
- var3 = DynamicObject.method1957(var3, var5, var6); // L: 3237
- var7 = class147.method3000(var6 - var5 + 1); // L: 3238
- if (var4 > var7) { // L: 3239
- var4 = var7;
- }
-
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3240
- return 1; // L: 3241
- } else if (var0 == 4032) { // L: 3243
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = GameEngine.method555(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]); // L: 3244
- return 1; // L: 3245
- } else if (var0 == 4033) { // L: 3247
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = Occluder.method4220(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]); // L: 3248
- return 1; // L: 3249
- } else if (var0 == 4034) { // L: 3251
- class12.Interpreter_intStackSize -= 2; // L: 3252
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3253
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3254
- var5 = class1.method12(var3, var4); // L: 3255
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5; // L: 3256
- return 1; // L: 3257
- } else if (var0 == 4035) { // L: 3259
- Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize - 1]); // L: 3260
- return 1; // L: 3261
- } else {
- return 2; // L: 3263
- }
- }
- }
-}
diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java
new file mode 100644
index 0000000000..b2957697e1
--- /dev/null
+++ b/runescape-client/src/main/java/class304.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ko")
+public class class304 {
+ @ObfuscatedName("ec")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive8")
+ static Archive archive8;
+}
diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java
index f913a4f26b..b99c2460b0 100644
--- a/runescape-client/src/main/java/class305.java
+++ b/runescape-client/src/main/java/class305.java
@@ -1,384 +1,42 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("kz")
public class class305 {
- @ObfuscatedName("ew")
- @ObfuscatedSignature(
- descriptor = "Lle;"
- )
- @Export("archive8")
- static Archive archive8;
+ static {
+ int var0 = 0; // L: 9
+ int var1 = 0; // L: 10
+ class301[] var2 = new class301[]{class301.field3575, class301.field3576}; // L: 14
+ class301[] var3 = var2; // L: 16
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Llp;I)V",
- garbageValue = "1856967280"
- )
- public static void method5592(AbstractArchive var0) {
- ParamComposition.ParamDefinition_archive = var0; // L: 21
- } // L: 22
-
- @ObfuscatedName("am")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "286394891"
- )
- static int method5591(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341
- if (BufferedSource.friendSystem.field803 == 0) { // L: 2342
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -2;
- } else if (BufferedSource.friendSystem.field803 == 1) { // L: 2343
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.friendsList.getSize(); // L: 2344
+ for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17
+ class301 var5 = var3[var4]; // L: 18
+ if (var5.field3580 > var0) { // L: 20
+ var0 = var5.field3580;
}
- return 1; // L: 2345
- } else {
- int var3;
- if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2348
- if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.friendsList.getSize()) { // L: 2349
- Friend var8 = (Friend)BufferedSource.friendSystem.friendsList.get(var3); // L: 2350
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2355
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2356
- }
-
- return 1; // L: 2358
- } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2361
- if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.friendsList.getSize()) { // L: 2362
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)BufferedSource.friendSystem.friendsList.get(var3)).world; // L: 2363
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2365
- }
-
- return 1; // L: 2366
- } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2369
- if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.friendsList.getSize()) { // L: 2370
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)BufferedSource.friendSystem.friendsList.get(var3)).rank; // L: 2371
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2373
- }
-
- return 1; // L: 2374
- } else {
- String var5;
- if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2377
- int var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2378
- WallDecoration.method4392(var5, var6); // L: 2379
- return 1; // L: 2380
- } else if (var0 == ScriptOpcodes.FRIEND_ADD) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2383
- BufferedSource.friendSystem.addFriend(var5); // L: 2384
- return 1; // L: 2385
- } else if (var0 == ScriptOpcodes.FRIEND_DEL) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2388
- BufferedSource.friendSystem.removeFriend(var5); // L: 2389
- return 1; // L: 2390
- } else if (var0 == ScriptOpcodes.IGNORE_ADD) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2393
- BufferedSource.friendSystem.addIgnore(var5); // L: 2394
- return 1; // L: 2395
- } else if (var0 == ScriptOpcodes.IGNORE_DEL) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2398
- BufferedSource.friendSystem.removeIgnore(var5); // L: 2399
- return 1; // L: 2400
- } else if (var0 == ScriptOpcodes.FRIEND_TEST) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2403
- var5 = class150.method3026(var5); // L: 2404
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.isFriended(new Username(var5, class391.loginType), false) ? 1 : 0; // L: 2405
- return 1; // L: 2406
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
- if (PcmPlayer.friendsChat != null) { // L: 2409
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = PcmPlayer.friendsChat.name; // L: 2410
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2412
- }
-
- return 1; // L: 2413
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
- if (PcmPlayer.friendsChat != null) { // L: 2416
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PcmPlayer.friendsChat.getSize(); // L: 2417
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2419
- }
-
- return 1; // L: 2420
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2423
- if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize()) { // L: 2424
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = PcmPlayer.friendsChat.get(var3).getUsername().getName(); // L: 2425
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2427
- }
-
- return 1; // L: 2428
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2431
- if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize()) { // L: 2432
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)PcmPlayer.friendsChat.get(var3)).getWorld(); // L: 2433
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2435
- }
-
- return 1; // L: 2436
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2439
- if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize()) { // L: 2440
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ((Buddy)PcmPlayer.friendsChat.get(var3)).rank; // L: 2441
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2443
- }
-
- return 1; // L: 2444
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PcmPlayer.friendsChat != null ? PcmPlayer.friendsChat.minKick : 0; // L: 2447
- return 1; // L: 2448
- } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2451
- class19.clanKickUser(var5); // L: 2452
- return 1; // L: 2453
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PcmPlayer.friendsChat != null ? PcmPlayer.friendsChat.rank * -546532963 * 284785845 : 0; // L: 2456
- return 1; // L: 2457
- } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2460
- Skills.Clan_joinChat(var5); // L: 2461
- return 1; // L: 2462
- } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
- class78.Clan_leaveChat(); // L: 2465
- return 1; // L: 2466
- } else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
- if (!BufferedSource.friendSystem.method1666()) { // L: 2469
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.ignoreList.getSize(); // L: 2470
- }
-
- return 1; // L: 2471
- } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2474
- if (BufferedSource.friendSystem.method1666() && var3 >= 0 && var3 < BufferedSource.friendSystem.ignoreList.getSize()) { // L: 2475
- Ignored var4 = (Ignored)BufferedSource.friendSystem.ignoreList.get(var3); // L: 2476
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2481
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2482
- }
-
- return 1; // L: 2484
- } else if (var0 == ScriptOpcodes.IGNORE_TEST) {
- var5 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 2487
- var5 = class150.method3026(var5); // L: 2488
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = BufferedSource.friendSystem.isIgnored(new Username(var5, class391.loginType)) ? 1 : 0; // L: 2489
- return 1; // L: 2490
- } else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2493
- if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize() && PcmPlayer.friendsChat.get(var3).getUsername().equals(ModelData0.localPlayer.username)) { // L: 2494
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2495
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2497
- }
-
- return 1; // L: 2498
- } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
- if (PcmPlayer.friendsChat != null && PcmPlayer.friendsChat.owner != null) { // L: 2501
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = PcmPlayer.friendsChat.owner; // L: 2502
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 2504
- }
-
- return 1; // L: 2505
- } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2508
- if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize() && ((ClanMate)PcmPlayer.friendsChat.get(var3)).isFriend()) { // L: 2509
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2510
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2512
- }
-
- return 1; // L: 2513
- } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
- if (var0 == 3628) {
- BufferedSource.friendSystem.friendsList.removeComparator(); // L: 2524
- return 1; // L: 2525
- } else {
- boolean var7;
- if (var0 == 3629) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2528
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529
- return 1; // L: 2530
- } else if (var0 == 3630) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2533
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534
- return 1; // L: 2535
- } else if (var0 == 3631) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2538
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539
- return 1; // L: 2540
- } else if (var0 == 3632) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2543
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544
- return 1; // L: 2545
- } else if (var0 == 3633) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2548
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549
- return 1; // L: 2550
- } else if (var0 == 3634) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2553
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554
- return 1; // L: 2555
- } else if (var0 == 3635) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2558
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559
- return 1; // L: 2560
- } else if (var0 == 3636) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2563
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564
- return 1; // L: 2565
- } else if (var0 == 3637) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2568
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569
- return 1; // L: 2570
- } else if (var0 == 3638) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2573
- BufferedSource.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574
- return 1; // L: 2575
- } else if (var0 == 3639) {
- BufferedSource.friendSystem.friendsList.sort(); // L: 2578
- return 1; // L: 2579
- } else if (var0 == 3640) {
- BufferedSource.friendSystem.ignoreList.removeComparator(); // L: 2582
- return 1; // L: 2583
- } else if (var0 == 3641) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2586
- BufferedSource.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587
- return 1; // L: 2588
- } else if (var0 == 3642) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2591
- BufferedSource.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592
- return 1; // L: 2593
- } else if (var0 == 3643) {
- BufferedSource.friendSystem.ignoreList.sort(); // L: 2596
- return 1; // L: 2597
- } else if (var0 == 3644) {
- if (PcmPlayer.friendsChat != null) { // L: 2600
- PcmPlayer.friendsChat.removeComparator(); // L: 2601
- }
-
- return 1; // L: 2603
- } else if (var0 == 3645) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2606
- if (PcmPlayer.friendsChat != null) { // L: 2607
- PcmPlayer.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608
- }
-
- return 1; // L: 2610
- } else if (var0 == 3646) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2613
- if (PcmPlayer.friendsChat != null) { // L: 2614
- PcmPlayer.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615
- }
-
- return 1; // L: 2617
- } else if (var0 == 3647) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2620
- if (PcmPlayer.friendsChat != null) { // L: 2621
- PcmPlayer.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622
- }
-
- return 1; // L: 2624
- } else if (var0 == 3648) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2627
- if (PcmPlayer.friendsChat != null) { // L: 2628
- PcmPlayer.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629
- }
-
- return 1; // L: 2631
- } else if (var0 == 3649) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2634
- if (PcmPlayer.friendsChat != null) { // L: 2635
- PcmPlayer.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636
- }
-
- return 1; // L: 2638
- } else if (var0 == 3650) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2641
- if (PcmPlayer.friendsChat != null) { // L: 2642
- PcmPlayer.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643
- }
-
- return 1; // L: 2645
- } else if (var0 == 3651) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2648
- if (PcmPlayer.friendsChat != null) { // L: 2649
- PcmPlayer.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650
- }
-
- return 1; // L: 2652
- } else if (var0 == 3652) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2655
- if (PcmPlayer.friendsChat != null) { // L: 2656
- PcmPlayer.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657
- }
-
- return 1; // L: 2659
- } else if (var0 == 3653) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2662
- if (PcmPlayer.friendsChat != null) { // L: 2663
- PcmPlayer.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664
- }
-
- return 1; // L: 2666
- } else if (var0 == 3654) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2669
- if (PcmPlayer.friendsChat != null) { // L: 2670
- PcmPlayer.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671
- }
-
- return 1; // L: 2673
- } else if (var0 == 3655) {
- if (PcmPlayer.friendsChat != null) { // L: 2676
- PcmPlayer.friendsChat.sort(); // L: 2677
- }
-
- return 1; // L: 2679
- } else if (var0 == 3656) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2682
- BufferedSource.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683
- return 1; // L: 2684
- } else if (var0 == 3657) {
- var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 2687
- if (PcmPlayer.friendsChat != null) { // L: 2688
- PcmPlayer.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689
- }
-
- return 1; // L: 2691
- } else {
- return 2; // L: 2693
- }
- }
- } else {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2516
- if (PcmPlayer.friendsChat != null && var3 < PcmPlayer.friendsChat.getSize() && ((ClanMate)PcmPlayer.friendsChat.get(var3)).isIgnored()) { // L: 2517
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 2518
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2520
- }
-
- return 1; // L: 2521
- }
+ if (var5.field3578 > var1) { // L: 21
+ var1 = var5.field3578;
}
}
- }
+
+ } // L: 25
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(ILnd;Llc;B)V",
+ garbageValue = "82"
+ )
+ static void method5764(int var0, ArchiveDisk var1, Archive var2) {
+ ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 30
+ var3.type = 1; // L: 31
+ var3.key = (long)var0; // L: 32
+ var3.archiveDisk = var1; // L: 33
+ var3.archive = var2; // L: 34
+ synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 35
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 36
+ } // L: 37
+
+ Tiles.method2065(); // L: 38
+ } // L: 39
}
diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java
index 4a206982b9..817953dc55 100644
--- a/runescape-client/src/main/java/class306.java
+++ b/runescape-client/src/main/java/class306.java
@@ -1,82 +1,423 @@
+import java.security.SecureRandom;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ku")
+@ObfuscatedName("kj")
public class class306 {
- static {
- int var0 = 0; // L: 9
- int var1 = 0; // L: 10
- class302[] var2 = new class302[]{class302.field3612, class302.field3611}; // L: 14
- class302[] var3 = var2; // L: 16
+ @ObfuscatedName("gv")
+ @Export("secureRandom")
+ static SecureRandom secureRandom;
- for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17
- class302 var5 = var3[var4]; // L: 18
- if (var5.field3613 > var0) { // L: 20
- var0 = var5.field3613;
- }
-
- if (var5.field3610 > var1) { // L: 21
- var1 = var5.field3610;
- }
- }
-
- } // L: 25
-
- @ObfuscatedName("q")
+ @ObfuscatedName("is")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-1403614530"
+ descriptor = "(Lci;IILgn;I)V",
+ garbageValue = "-1866135565"
)
- @Export("changeWorldSelectSorting")
- static void changeWorldSelectSorting(int var0, int var1) {
- int[] var2 = new int[4]; // L: 63
- int[] var3 = new int[4]; // L: 64
- var2[0] = var0; // L: 65
- var3[0] = var1; // L: 66
- int var4 = 1; // L: 67
+ static final void method5765(Player var0, int var1, int var2, class192 var3) {
+ int var4 = var0.pathX[0]; // L: 8214
+ int var5 = var0.pathY[0]; // L: 8215
+ int var6 = var0.transformedSize(); // L: 8216
+ if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8217
+ if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8218
+ int var8 = var0.transformedSize(); // L: 8220
+ RouteStrategy var9 = VerticalAlignment.method3533(var1, var2); // L: 8221
+ CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 8222
+ int[] var11 = Client.field674; // L: 8223
+ int[] var12 = Client.field776; // L: 8224
- for (int var5 = 0; var5 < 4; ++var5) { // L: 68
- if (World.World_sortOption1[var5] != var0) { // L: 69
- var2[var4] = World.World_sortOption1[var5]; // L: 70
- var3[var4] = World.World_sortOption2[var5]; // L: 71
- ++var4; // L: 72
+ int var13;
+ int var14;
+ for (var13 = 0; var13 < 128; ++var13) { // L: 8226
+ for (var14 = 0; var14 < 128; ++var14) { // L: 8227
+ class193.directions[var13][var14] = 0; // L: 8228
+ class193.distances[var13][var14] = 99999999; // L: 8229
+ }
+ }
+
+ int var15;
+ int var16;
+ byte var18;
+ int var19;
+ int var20;
+ int var22;
+ int var24;
+ int var25;
+ int var26;
+ boolean var33;
+ int var35;
+ int var36;
+ int var38;
+ if (var8 == 1) { // L: 8233
+ var15 = var4; // L: 8236
+ var16 = var5; // L: 8237
+ byte var17 = 64; // L: 8238
+ var18 = 64; // L: 8239
+ var19 = var4 - var17; // L: 8240
+ var20 = var5 - var18; // L: 8241
+ class193.directions[var17][var18] = 99; // L: 8242
+ class193.distances[var17][var18] = 0; // L: 8243
+ byte var21 = 0; // L: 8244
+ var22 = 0; // L: 8245
+ class193.bufferX[var21] = var4; // L: 8246
+ var38 = var21 + 1;
+ class193.bufferY[var21] = var5; // L: 8247
+ int[][] var23 = var10.flags; // L: 8248
+
+ boolean var34;
+ while (true) {
+ if (var38 == var22) { // L: 8251
+ class193.field2219 = var15; // L: 8323
+ class394.field4429 = var16; // L: 8324
+ var34 = false; // L: 8325
+ break;
+ }
+
+ var15 = class193.bufferX[var22]; // L: 8252
+ var16 = class193.bufferY[var22]; // L: 8253
+ var22 = var22 + 1 & 4095; // L: 8254
+ var35 = var15 - var19; // L: 8255
+ var36 = var16 - var20; // L: 8256
+ var24 = var15 - var10.xInset; // L: 8257
+ var25 = var16 - var10.yInset; // L: 8258
+ if (var9.hasArrived(1, var15, var16, var10)) { // L: 8259
+ class193.field2219 = var15; // L: 8260
+ class394.field4429 = var16; // L: 8261
+ var34 = true; // L: 8262
+ break;
+ }
+
+ var26 = class193.distances[var35][var36] + 1; // L: 8265
+ if (var35 > 0 && class193.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136776) == 0) { // L: 8266
+ class193.bufferX[var38] = var15 - 1; // L: 8267
+ class193.bufferY[var38] = var16; // L: 8268
+ var38 = var38 + 1 & 4095; // L: 8269
+ class193.directions[var35 - 1][var36] = 2; // L: 8270
+ class193.distances[var35 - 1][var36] = var26; // L: 8271
+ }
+
+ if (var35 < 127 && class193.directions[var35 + 1][var36] == 0 && (var23[var24 + 1][var25] & 19136896) == 0) { // L: 8273
+ class193.bufferX[var38] = var15 + 1; // L: 8274
+ class193.bufferY[var38] = var16; // L: 8275
+ var38 = var38 + 1 & 4095; // L: 8276
+ class193.directions[var35 + 1][var36] = 8; // L: 8277
+ class193.distances[var35 + 1][var36] = var26; // L: 8278
+ }
+
+ if (var36 > 0 && class193.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 8280
+ class193.bufferX[var38] = var15; // L: 8281
+ class193.bufferY[var38] = var16 - 1; // L: 8282
+ var38 = var38 + 1 & 4095; // L: 8283
+ class193.directions[var35][var36 - 1] = 1; // L: 8284
+ class193.distances[var35][var36 - 1] = var26; // L: 8285
+ }
+
+ if (var36 < 127 && class193.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 8287
+ class193.bufferX[var38] = var15; // L: 8288
+ class193.bufferY[var38] = var16 + 1; // L: 8289
+ var38 = var38 + 1 & 4095; // L: 8290
+ class193.directions[var35][var36 + 1] = 4; // L: 8291
+ class193.distances[var35][var36 + 1] = var26; // L: 8292
+ }
+
+ if (var35 > 0 && var36 > 0 && class193.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 8294
+ class193.bufferX[var38] = var15 - 1; // L: 8295
+ class193.bufferY[var38] = var16 - 1; // L: 8296
+ var38 = var38 + 1 & 4095; // L: 8297
+ class193.directions[var35 - 1][var36 - 1] = 3; // L: 8298
+ class193.distances[var35 - 1][var36 - 1] = var26; // L: 8299
+ }
+
+ if (var35 < 127 && var36 > 0 && class193.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 8301
+ class193.bufferX[var38] = var15 + 1; // L: 8302
+ class193.bufferY[var38] = var16 - 1; // L: 8303
+ var38 = var38 + 1 & 4095; // L: 8304
+ class193.directions[var35 + 1][var36 - 1] = 9; // L: 8305
+ class193.distances[var35 + 1][var36 - 1] = var26; // L: 8306
+ }
+
+ if (var35 > 0 && var36 < 127 && class193.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 8308
+ class193.bufferX[var38] = var15 - 1; // L: 8309
+ class193.bufferY[var38] = var16 + 1; // L: 8310
+ var38 = var38 + 1 & 4095; // L: 8311
+ class193.directions[var35 - 1][var36 + 1] = 6; // L: 8312
+ class193.distances[var35 - 1][var36 + 1] = var26; // L: 8313
+ }
+
+ if (var35 < 127 && var36 < 127 && class193.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 1] & 19136992) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 8315
+ class193.bufferX[var38] = var15 + 1; // L: 8316
+ class193.bufferY[var38] = var16 + 1; // L: 8317
+ var38 = var38 + 1 & 4095; // L: 8318
+ class193.directions[var35 + 1][var36 + 1] = 12; // L: 8319
+ class193.distances[var35 + 1][var36 + 1] = var26; // L: 8320
+ }
+ }
+
+ var33 = var34; // L: 8327
+ } else if (var8 == 2) { // L: 8329
+ var33 = WorldMapIcon_1.method4592(var4, var5, var9, var10);
+ } else {
+ var33 = class127.method2844(var4, var5, var8, var9, var10); // L: 8330
+ }
+
+ int var7;
+ label346: {
+ var14 = var4 - 64; // L: 8331
+ var15 = var5 - 64; // L: 8332
+ var16 = class193.field2219; // L: 8333
+ var35 = class394.field4429; // L: 8334
+ if (!var33) { // L: 8335
+ var36 = Integer.MAX_VALUE; // L: 8337
+ var19 = Integer.MAX_VALUE; // L: 8338
+ byte var37 = 10; // L: 8339
+ var38 = var9.approxDestinationX; // L: 8340
+ var22 = var9.approxDestinationY; // L: 8341
+ int var32 = var9.approxDestinationSizeX; // L: 8342
+ var24 = var9.approxDestinationSizeY; // L: 8343
+
+ for (var25 = var38 - var37; var25 <= var37 + var38; ++var25) { // L: 8344
+ for (var26 = var22 - var37; var26 <= var22 + var37; ++var26) { // L: 8345
+ int var27 = var25 - var14; // L: 8346
+ int var28 = var26 - var15; // L: 8347
+ if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class193.distances[var27][var28] < 100) { // L: 8348 8349
+ int var29 = 0; // L: 8350
+ if (var25 < var38) { // L: 8351
+ var29 = var38 - var25;
+ } else if (var25 > var32 + var38 - 1) { // L: 8352
+ var29 = var25 - (var38 + var32 - 1);
+ }
+
+ int var30 = 0; // L: 8353
+ if (var26 < var22) { // L: 8354
+ var30 = var22 - var26;
+ } else if (var26 > var24 + var22 - 1) { // L: 8355
+ var30 = var26 - (var22 + var24 - 1);
+ }
+
+ int var31 = var30 * var30 + var29 * var29; // L: 8356
+ if (var31 < var36 || var36 == var31 && class193.distances[var27][var28] < var19) { // L: 8357
+ var36 = var31; // L: 8358
+ var19 = class193.distances[var27][var28]; // L: 8359
+ var16 = var25; // L: 8360
+ var35 = var26; // L: 8361
+ }
+ }
+ }
+ }
+
+ if (var36 == Integer.MAX_VALUE) { // L: 8367
+ var7 = -1; // L: 8368
+ break label346;
+ }
+ }
+
+ if (var16 == var4 && var5 == var35) { // L: 8377
+ var11[0] = var16; // L: 8378
+ var12[0] = var35; // L: 8379
+ var7 = 0; // L: 8380
+ } else {
+ var18 = 0; // L: 8383
+ class193.bufferX[var18] = var16; // L: 8386
+ var36 = var18 + 1;
+ class193.bufferY[var18] = var35; // L: 8387
+
+ for (var19 = var20 = class193.directions[var16 - var14][var35 - var15]; var4 != var16 || var35 != var5; var19 = class193.directions[var16 - var14][var35 - var15]) { // L: 8388 8389 8399
+ if (var19 != var20) { // L: 8390
+ var20 = var19; // L: 8391
+ class193.bufferX[var36] = var16; // L: 8392
+ class193.bufferY[var36++] = var35; // L: 8393
+ }
+
+ if ((var19 & 2) != 0) { // L: 8395
+ ++var16;
+ } else if ((var19 & 8) != 0) { // L: 8396
+ --var16;
+ }
+
+ if ((var19 & 1) != 0) { // L: 8397
+ ++var35;
+ } else if ((var19 & 4) != 0) { // L: 8398
+ --var35;
+ }
+ }
+
+ var38 = 0; // L: 8401
+
+ while (var36-- > 0) { // L: 8402
+ var11[var38] = class193.bufferX[var36]; // L: 8403
+ var12[var38++] = class193.bufferY[var36]; // L: 8404
+ if (var38 >= var11.length) { // L: 8405
+ break;
+ }
+ }
+
+ var7 = var38; // L: 8407
+ }
+ }
+
+ var13 = var7; // L: 8409
+ if (var7 >= 1) { // L: 8410
+ for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 8411
+ var0.method2141(Client.field674[var14], Client.field776[var14], var3);
+ }
+
+ }
+ }
+ }
+ } // L: 8412
+
+ @ObfuscatedName("kw")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "171777159"
+ )
+ @Export("changeGameOptions")
+ static final void changeGameOptions(int var0) {
+ GraphicsObject.method1870(); // L: 11866
+
+ for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11868
+ if (var1.obj != null) { // L: 11869
+ var1.set();
}
}
- World.World_sortOption1 = var2; // L: 75
- World.World_sortOption2 = var3; // L: 76
- UserComparator8.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77
- } // L: 78
+ int var3 = FloorUnderlayDefinition.VarpDefinition_get(var0).type; // L: 11872
+ if (var3 != 0) { // L: 11873
+ int var2 = Varps.Varps_main[var0]; // L: 11874
+ if (var3 == 1) { // L: 11875
+ if (var2 == 1) { // L: 11876
+ Rasterizer3D.Rasterizer3D_setBrightness(0.9D); // L: 11877
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); // L: 11878
+ Projectile.method1959(); // L: 11879
+ class19.clientPreferences.method2255(0.9D); // L: 11880
+ }
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1939050344"
- )
- static void method5595() {
- synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 48
- if (ArchiveDiskActionHandler.field3998 == 0) { // L: 49
- class131.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 50
- class131.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 51
- class131.ArchiveDiskActionHandler_thread.start(); // L: 52
- class131.ArchiveDiskActionHandler_thread.setPriority(5); // L: 53
+ if (var2 == 2) { // L: 11882
+ Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 11883
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); // L: 11884
+ Projectile.method1959(); // L: 11885
+ class19.clientPreferences.method2255(0.8D); // L: 11886
+ }
+
+ if (var2 == 3) { // L: 11888
+ Rasterizer3D.Rasterizer3D_setBrightness(0.7D); // L: 11889
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); // L: 11890
+ Projectile.method1959(); // L: 11891
+ class19.clientPreferences.method2255(0.7D); // L: 11892
+ }
+
+ if (var2 == 4) { // L: 11894
+ Rasterizer3D.Rasterizer3D_setBrightness(0.6D); // L: 11895
+ ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); // L: 11896
+ Projectile.method1959(); // L: 11897
+ class19.clientPreferences.method2255(0.6D); // L: 11898
+ }
}
- ArchiveDiskActionHandler.field3998 = 600; // L: 55
- }
- } // L: 57
+ if (var3 == 3) { // L: 11901
+ if (var2 == 0) { // L: 11902
+ PacketBufferNode.method5196(255);
+ }
- @ObfuscatedName("ge")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-341201892"
- )
- static void method5593(int var0, int var1) {
- if (class12.clientPreferences.method2248() != 0 && var0 != -1) { // L: 3820
- UserComparator8.method2574(UrlRequest.archive11, var0, 0, class12.clientPreferences.method2248(), false); // L: 3821
- Client.playingJingle = true; // L: 3822
- }
+ if (var2 == 1) { // L: 11903
+ PacketBufferNode.method5196(192);
+ }
- } // L: 3824
+ if (var2 == 2) { // L: 11904
+ PacketBufferNode.method5196(128);
+ }
+
+ if (var2 == 3) {
+ PacketBufferNode.method5196(64); // L: 11905
+ }
+
+ if (var2 == 4) { // L: 11906
+ PacketBufferNode.method5196(0);
+ }
+ }
+
+ if (var3 == 4) { // L: 11908
+ if (var2 == 0) { // L: 11909
+ WorldMapData_0.method4563(127);
+ }
+
+ if (var2 == 1) { // L: 11910
+ WorldMapData_0.method4563(96);
+ }
+
+ if (var2 == 2) { // L: 11911
+ WorldMapData_0.method4563(64);
+ }
+
+ if (var2 == 3) { // L: 11912
+ WorldMapData_0.method4563(32);
+ }
+
+ if (var2 == 4) { // L: 11913
+ WorldMapData_0.method4563(0);
+ }
+ }
+
+ if (var3 == 5) { // L: 11915
+ Client.leftClickOpensMenu = var2;
+ }
+
+ if (var3 == 6) { // L: 11916
+ Client.chatEffects = var2;
+ }
+
+ if (var3 == 9) { // L: 11917
+ Client.field676 = var2;
+ }
+
+ if (var3 == 10) { // L: 11918
+ if (var2 == 0) { // L: 11919
+ WorldMapEvent.method5121(127);
+ }
+
+ if (var2 == 1) { // L: 11920
+ WorldMapEvent.method5121(96);
+ }
+
+ if (var2 == 2) { // L: 11921
+ WorldMapEvent.method5121(64);
+ }
+
+ if (var2 == 3) { // L: 11922
+ WorldMapEvent.method5121(32);
+ }
+
+ if (var2 == 4) { // L: 11923
+ WorldMapEvent.method5121(0);
+ }
+ }
+
+ if (var3 == 17) { // L: 11925
+ Client.followerIndex = var2 & 65535; // L: 11926
+ }
+
+ if (var3 == 18) { // L: 11928
+ Client.playerAttackOption = (AttackOption)Actor.findEnumerated(class7.method52(), var2); // L: 11929
+ if (Client.playerAttackOption == null) { // L: 11930
+ Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+ }
+ }
+
+ if (var3 == 19) { // L: 11932
+ if (var2 == -1) { // L: 11933
+ Client.combatTargetPlayerIndex = -1;
+ } else {
+ Client.combatTargetPlayerIndex = var2 & 2047; // L: 11934
+ }
+ }
+
+ if (var3 == 22) { // L: 11936
+ Client.npcAttackOption = (AttackOption)Actor.findEnumerated(class7.method52(), var2); // L: 11937
+ if (Client.npcAttackOption == null) { // L: 11938
+ Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+ }
+ }
+
+ }
+ } // L: 11940
}
diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java
new file mode 100644
index 0000000000..b9f230278a
--- /dev/null
+++ b/runescape-client/src/main/java/class308.java
@@ -0,0 +1,54 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("km")
+public enum class308 implements MouseWheel {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lkm;"
+ )
+ field3939(-1),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lkm;"
+ )
+ field3938(0),
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lkm;"
+ )
+ field3940(1),
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lkm;"
+ )
+ field3941(2);
+
+ @ObfuscatedName("pi")
+ @ObfuscatedSignature(
+ descriptor = "Lck;"
+ )
+ @Export("varcs")
+ static Varcs varcs;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1827131377
+ )
+ final int field3944;
+
+ class308(int var3) {
+ this.field3944 = var3; // L: 15
+ } // L: 16
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-100"
+ )
+ @Export("rsOrdinal")
+ public int rsOrdinal() {
+ return this.field3944; // L: 20
+ }
+}
diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java
deleted file mode 100644
index 5562fd4712..0000000000
--- a/runescape-client/src/main/java/class309.java
+++ /dev/null
@@ -1,130 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("km")
-public enum class309 implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lkm;"
- )
- field3976(-1),
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lkm;"
- )
- field3973(0),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lkm;"
- )
- field3974(1),
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lkm;"
- )
- field3972(2);
-
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = -965823037
- )
- final int field3975;
-
- class309(int var3) {
- this.field3975 = var3; // L: 15
- } // L: 16
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "30"
- )
- @Export("rsOrdinal")
- public int rsOrdinal() {
- return this.field3975; // L: 20
- }
-
- @ObfuscatedName("ag")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "25"
- )
- static int method5600(int var0, Script var1, boolean var2) {
- int var3;
- int var6;
- int var9;
- if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2270
- class12.Interpreter_intStackSize -= 2; // L: 2271
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2272
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2273
- EnumComposition var10 = Calendar.getEnum(var3); // L: 2274
- if (var10.outputType != 's') { // L: 2275
- }
-
- for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2276
- if (var9 == var10.keys[var6]) { // L: 2277
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2278
- var10 = null; // L: 2279
- break;
- }
- }
-
- if (var10 != null) { // L: 2283
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var10.defaultStr;
- }
-
- return 1; // L: 2284
- } else if (var0 != ScriptOpcodes.ENUM) { // L: 2286
- if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2312
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2313
- EnumComposition var4 = Calendar.getEnum(var3); // L: 2314
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.size(); // L: 2315
- return 1; // L: 2316
- } else {
- return 2; // L: 2318
- }
- } else {
- class12.Interpreter_intStackSize -= 4; // L: 2287
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 2288
- var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 2289
- int var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 2290
- var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3]; // L: 2291
- EnumComposition var7 = Calendar.getEnum(var5); // L: 2292
- if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2293
- for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2298
- if (var6 == var7.keys[var8]) { // L: 2299
- if (var9 == 115) { // L: 2300
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.strVals[var8];
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2301
- }
-
- var7 = null; // L: 2302
- break;
- }
- }
-
- if (var7 != null) { // L: 2306
- if (var9 == 115) { // L: 2307
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.defaultStr;
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2308
- }
- }
-
- return 1; // L: 2310
- } else {
- if (var9 == 115) { // L: 2294
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "null";
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 2295
- }
-
- return 1; // L: 2296
- }
- }
- }
-}
diff --git a/runescape-client/src/main/java/class321.java b/runescape-client/src/main/java/class321.java
deleted file mode 100644
index 6f774b3f8b..0000000000
--- a/runescape-client/src/main/java/class321.java
+++ /dev/null
@@ -1,203 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("lg")
-public class class321 {
- @ObfuscatedName("ih")
- @ObfuscatedGetter(
- intValue = 1257274213
- )
- static int field4076;
-
- @ObfuscatedName("jw")
- @ObfuscatedSignature(
- descriptor = "(Lki;Lgl;IIZB)V",
- garbageValue = "1"
- )
- @Export("addWidgetItemMenuItem")
- static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
- String[] var5 = var1.inventoryActions; // L: 10985
- byte var6 = -1; // L: 10986
- String var7 = null; // L: 10987
- if (var5 != null && var5[var3] != null) { // L: 10988
- if (var3 == 0) { // L: 10989
- var6 = 33;
- } else if (var3 == 1) { // L: 10990
- var6 = 34;
- } else if (var3 == 2) {
- var6 = 35; // L: 10991
- } else if (var3 == 3) { // L: 10992
- var6 = 36;
- } else {
- var6 = 37; // L: 10993
- }
-
- var7 = var5[var3]; // L: 10994
- } else if (var3 == 4) { // L: 10997
- var6 = 37; // L: 10998
- var7 = "Drop"; // L: 10999
- }
-
- if (var6 != -1 && var7 != null) { // L: 11002
- class175.insertMenuItem(var7, class166.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 11003
- }
-
- } // L: 11005
-
- @ObfuscatedName("ks")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1133585766"
- )
- @Export("changeGameOptions")
- static final void changeGameOptions(int var0) {
- class119.method2737(); // L: 12083
-
- for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 12085
- if (var1.obj != null) { // L: 12086
- var1.set();
- }
- }
-
- int var3 = class21.VarpDefinition_get(var0).type; // L: 12089
- if (var3 != 0) { // L: 12090
- int var2 = Varps.Varps_main[var0]; // L: 12091
- if (var3 == 1) { // L: 12092
- if (var2 == 1) { // L: 12093
- Rasterizer3D.Rasterizer3D_setBrightness(0.9D); // L: 12094
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); // L: 12095
- VerticalAlignment.method3446(); // L: 12096
- class12.clientPreferences.method2232(0.9D); // L: 12097
- }
-
- if (var2 == 2) { // L: 12099
- Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 12100
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); // L: 12101
- VerticalAlignment.method3446(); // L: 12102
- class12.clientPreferences.method2232(0.8D); // L: 12103
- }
-
- if (var2 == 3) { // L: 12105
- Rasterizer3D.Rasterizer3D_setBrightness(0.7D); // L: 12106
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); // L: 12107
- VerticalAlignment.method3446(); // L: 12108
- class12.clientPreferences.method2232(0.7D); // L: 12109
- }
-
- if (var2 == 4) { // L: 12111
- Rasterizer3D.Rasterizer3D_setBrightness(0.6D); // L: 12112
- ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); // L: 12113
- VerticalAlignment.method3446(); // L: 12114
- class12.clientPreferences.method2232(0.6D); // L: 12115
- }
- }
-
- if (var3 == 3) { // L: 12118
- if (var2 == 0) { // L: 12119
- class291.method5390(255);
- }
-
- if (var2 == 1) { // L: 12120
- class291.method5390(192);
- }
-
- if (var2 == 2) { // L: 12121
- class291.method5390(128);
- }
-
- if (var2 == 3) {
- class291.method5390(64); // L: 12122
- }
-
- if (var2 == 4) { // L: 12123
- class291.method5390(0);
- }
- }
-
- if (var3 == 4) { // L: 12125
- if (var2 == 0) { // L: 12126
- class67.method1881(127);
- }
-
- if (var2 == 1) { // L: 12127
- class67.method1881(96);
- }
-
- if (var2 == 2) { // L: 12128
- class67.method1881(64);
- }
-
- if (var2 == 3) { // L: 12129
- class67.method1881(32);
- }
-
- if (var2 == 4) { // L: 12130
- class67.method1881(0);
- }
- }
-
- if (var3 == 5) { // L: 12132
- Client.leftClickOpensMenu = var2;
- }
-
- if (var3 == 6) { // L: 12133
- Client.chatEffects = var2;
- }
-
- if (var3 == 9) { // L: 12134
- Client.field480 = var2;
- }
-
- if (var3 == 10) { // L: 12135
- if (var2 == 0) { // L: 12136
- MouseHandler.method591(127);
- }
-
- if (var2 == 1) { // L: 12137
- MouseHandler.method591(96);
- }
-
- if (var2 == 2) { // L: 12138
- MouseHandler.method591(64);
- }
-
- if (var2 == 3) { // L: 12139
- MouseHandler.method591(32);
- }
-
- if (var2 == 4) { // L: 12140
- MouseHandler.method591(0);
- }
- }
-
- if (var3 == 17) { // L: 12142
- Client.followerIndex = var2 & 65535; // L: 12143
- }
-
- if (var3 == 18) { // L: 12145
- Client.playerAttackOption = (AttackOption)class291.findEnumerated(ApproximateRouteStrategy.method1108(), var2); // L: 12146
- if (Client.playerAttackOption == null) { // L: 12147
- Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
- }
- }
-
- if (var3 == 19) { // L: 12149
- if (var2 == -1) { // L: 12150
- Client.combatTargetPlayerIndex = -1;
- } else {
- Client.combatTargetPlayerIndex = var2 & 2047; // L: 12151
- }
- }
-
- if (var3 == 22) { // L: 12153
- Client.npcAttackOption = (AttackOption)class291.findEnumerated(ApproximateRouteStrategy.method1108(), var2); // L: 12154
- if (Client.npcAttackOption == null) { // L: 12155
- Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
- }
- }
-
- }
- } // L: 12157
-}
diff --git a/runescape-client/src/main/java/class325.java b/runescape-client/src/main/java/class325.java
new file mode 100644
index 0000000000..3bd2c820d9
--- /dev/null
+++ b/runescape-client/src/main/java/class325.java
@@ -0,0 +1,201 @@
+import java.util.HashMap;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ll")
+public class class325 {
+ @ObfuscatedName("c")
+ @Export("spriteMap")
+ final HashMap spriteMap;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lns;"
+ )
+ @Export("bounds")
+ Bounds bounds;
+ @ObfuscatedName("q")
+ int[] field4075;
+ @ObfuscatedName("f")
+ int[] field4074;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1023228515
+ )
+ int field4076;
+
+ public class325() {
+ this.spriteMap = new HashMap(); // L: 10
+ this.bounds = new Bounds(0, 0); // L: 11
+ this.field4075 = new int[2048]; // L: 12
+ this.field4074 = new int[2048]; // L: 13
+ this.field4076 = 0; // L: 14
+ class344.field4152 = new int[2000]; // L: 22
+ int var1 = 0; // L: 23
+ int var2 = 240; // L: 24
+
+ int var4;
+ for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25
+ var4 = StructComposition.method3616((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var1 / 16.0F)); // L: 27
+ class344.field4152[var1] = var4; // L: 28
+ ++var1; // L: 26
+ }
+
+ var2 = 48; // L: 30
+
+ for (int var6 = var2 / 6; var1 < class344.field4152.length; var2 -= var6) { // L: 31 32 38
+ var4 = var1 * 2; // L: 33
+
+ for (int var5 = StructComposition.method3616((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class344.field4152.length; ++var1) { // L: 34 35
+ class344.field4152[var1] = var5; // L: 36
+ }
+ }
+
+ } // L: 41
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "273043499"
+ )
+ void method6033(int var1) {
+ int var2 = var1 * 2 + 1; // L: 44
+ double[] var3 = WorldMapEvent.method5119(0.0D, (double)((float)var1 / 3.0F), var1); // L: 45
+ double var4 = var3[var1] * var3[var1]; // L: 46
+ int[] var6 = new int[var2 * var2]; // L: 47
+ boolean var7 = false; // L: 48
+
+ for (int var8 = 0; var8 < var2; ++var8) { // L: 49
+ for (int var9 = 0; var9 < var2; ++var9) { // L: 50
+ int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var9] * var3[var8] / var4)); // L: 51
+ if (!var7 && var10 > 0) { // L: 52
+ var7 = true; // L: 53
+ }
+ }
+ }
+
+ SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 57
+ this.spriteMap.put(var1, var11); // L: 58
+ } // L: 59
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lqe;",
+ garbageValue = "0"
+ )
+ SpritePixels method6034(int var1) {
+ if (!this.spriteMap.containsKey(var1)) { // L: 62
+ this.method6033(var1); // L: 63
+ }
+
+ return (SpritePixels)this.spriteMap.get(var1); // L: 65
+ }
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "-441809547"
+ )
+ public final void method6048(int var1, int var2) {
+ if (this.field4076 < this.field4075.length) { // L: 69
+ this.field4075[this.field4076] = var1; // L: 70
+ this.field4074[this.field4076] = var2; // L: 71
+ ++this.field4076; // L: 72
+ }
+ } // L: 73
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "2031798375"
+ )
+ public final void method6035() {
+ this.field4076 = 0; // L: 76
+ } // L: 77
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(IILqe;FI)V",
+ garbageValue = "-1870606235"
+ )
+ public final void method6046(int var1, int var2, SpritePixels var3, float var4) {
+ int var5 = (int)(18.0F * var4); // L: 80
+ SpritePixels var6 = this.method6034(var5); // L: 81
+ int var7 = var5 * 2 + 1; // L: 82
+ Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 83
+ Bounds var9 = new Bounds(0, 0); // L: 84
+ this.bounds.setHigh(var7, var7); // L: 85
+ System.nanoTime(); // L: 86
+
+ int var10;
+ int var11;
+ int var12;
+ for (var10 = 0; var10 < this.field4076; ++var10) { // L: 87
+ var11 = this.field4075[var10]; // L: 88
+ var12 = this.field4074[var10]; // L: 89
+ int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 90
+ int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 91
+ this.bounds.setLow(var13, var14); // L: 92
+ this.bounds.method6895(var8, var9); // L: 93
+ this.method6037(var6, var3, var9); // L: 94
+ }
+
+ System.nanoTime(); // L: 96
+ System.nanoTime(); // L: 97
+
+ for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 98
+ if (var3.pixels[var10] == 0) { // L: 99
+ var3.pixels[var10] = -16777216; // L: 100
+ } else {
+ var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 103
+ if (var11 <= 0) { // L: 104
+ var3.pixels[var10] = -16777216; // L: 105
+ } else {
+ if (var11 > class344.field4152.length) { // L: 108
+ var11 = class344.field4152.length;
+ }
+
+ var12 = class344.field4152[var11 - 1]; // L: 109
+ var3.pixels[var10] = -16777216 | var12; // L: 110
+ }
+ }
+ }
+
+ System.nanoTime(); // L: 112
+ } // L: 113
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(Lqe;Lqe;Lns;I)V",
+ garbageValue = "-1668982828"
+ )
+ void method6037(SpritePixels var1, SpritePixels var2, Bounds var3) {
+ if (var3.highX != 0 && var3.highY != 0) { // L: 116
+ int var4 = 0; // L: 117
+ int var5 = 0; // L: 118
+ if (var3.lowX == 0) { // L: 119
+ var4 = var1.subWidth - var3.highX;
+ }
+
+ if (var3.lowY == 0) { // L: 120
+ var5 = var1.subHeight - var3.highY;
+ }
+
+ int var6 = var4 + var5 * var1.subWidth; // L: 121
+ int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 122
+
+ for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 123
+ for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 124
+ int[] var10000 = var2.pixels; // L: 125
+ int var10001 = var7++;
+ var10000[var10001] += var1.pixels[var6++];
+ }
+
+ var6 += var1.subWidth - var3.highX; // L: 127
+ var7 += var2.subWidth - var3.highX; // L: 128
+ }
+
+ }
+ } // L: 130
+}
diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java
index fecf9a64e2..373865a511 100644
--- a/runescape-client/src/main/java/class326.java
+++ b/runescape-client/src/main/java/class326.java
@@ -1,550 +1,45 @@
-import java.util.HashMap;
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("lh")
+@ObfuscatedName("lg")
public class class326 {
- @ObfuscatedName("o")
- @Export("spriteMap")
- final HashMap spriteMap;
+ @ObfuscatedName("rz")
+ static boolean field4082;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llg;"
+ )
+ static final class326 field4079;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llg;"
+ )
+ static final class326 field4083;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lne;"
+ descriptor = "Llg;"
)
- @Export("bounds")
- Bounds bounds;
- @ObfuscatedName("l")
- int[] field4099;
- @ObfuscatedName("k")
- int[] field4102;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = 259027383
- )
- int field4103;
+ static final class326 field4080;
+ @ObfuscatedName("j")
+ @Export("Interpreter_stringLocals")
+ static String[] Interpreter_stringLocals;
- public class326() {
- this.spriteMap = new HashMap(); // L: 10
- this.bounds = new Bounds(0, 0); // L: 11
- this.field4099 = new int[2048]; // L: 12
- this.field4102 = new int[2048]; // L: 13
- this.field4103 = 0; // L: 14
- ScriptEvent.method2074(); // L: 21
- } // L: 22
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-1955100783"
- )
- void method5849(int var1) {
- int var2 = var1 * 2 + 1; // L: 46
- double var4 = (double)((float)var1 / 3.0F); // L: 48
- int var6 = var1 * 2 + 1; // L: 50
- double[] var7 = new double[var6]; // L: 51
- int var8 = -var1;
-
- for (int var9 = 0; var8 <= var1; ++var9) {
- double var20 = WorldMapID.method4811((double)(var8 - 0) / var4) / var4; // L: 57
- var7[var9] = var20; // L: 59
- ++var8; // L: 52
- }
-
- double[] var14 = var7; // L: 63
- double var15 = var7[var1] * var7[var1]; // L: 64
- int[] var17 = new int[var2 * var2]; // L: 65
- boolean var10 = false; // L: 66
-
- for (int var11 = 0; var11 < var2; ++var11) { // L: 67
- for (int var12 = 0; var12 < var2; ++var12) { // L: 68
- int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var12] * var14[var11] / var15)); // L: 69
- if (!var10 && var13 > 0) { // L: 70
- var10 = true; // L: 71
- }
- }
- }
-
- SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 75
- this.spriteMap.put(var1, var18); // L: 76
- } // L: 77
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(IB)Lqr;",
- garbageValue = "125"
- )
- SpritePixels method5866(int var1) {
- if (!this.spriteMap.containsKey(var1)) { // L: 80
- this.method5849(var1); // L: 81
- }
-
- return (SpritePixels)this.spriteMap.get(var1); // L: 83
+ static {
+ field4079 = new class326(); // L: 4
+ field4083 = new class326(); // L: 5
+ field4080 = new class326(); // L: 6
}
- @ObfuscatedName("k")
+ class326() {
+ } // L: 8
+
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-2103923209"
+ descriptor = "(CI)C",
+ garbageValue = "-408398263"
)
- public final void method5848(int var1, int var2) {
- if (this.field4103 < this.field4099.length) { // L: 87
- this.field4099[this.field4103] = var1; // L: 88
- this.field4102[this.field4103] = var2; // L: 89
- ++this.field4103; // L: 90
- }
- } // L: 91
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1637877740"
- )
- public final void method5851() {
- this.field4103 = 0; // L: 94
- } // L: 95
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(IILqr;FB)V",
- garbageValue = "5"
- )
- public final void method5852(int var1, int var2, SpritePixels var3, float var4) {
- int var5 = (int)(18.0F * var4); // L: 98
- SpritePixels var6 = this.method5866(var5); // L: 99
- int var7 = var5 * 2 + 1; // L: 100
- Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 101
- Bounds var9 = new Bounds(0, 0); // L: 102
- this.bounds.setHigh(var7, var7); // L: 103
- System.nanoTime(); // L: 104
-
- int var10;
- int var11;
- int var12;
- for (var10 = 0; var10 < this.field4103; ++var10) { // L: 105
- var11 = this.field4099[var10]; // L: 106
- var12 = this.field4102[var10]; // L: 107
- int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 108
- int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 109
- this.bounds.setLow(var13, var14); // L: 110
- this.bounds.method6758(var8, var9); // L: 111
- this.method5853(var6, var3, var9); // L: 112
- }
-
- System.nanoTime(); // L: 114
- System.nanoTime(); // L: 115
-
- for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 116
- if (var3.pixels[var10] == 0) { // L: 117
- var3.pixels[var10] = -16777216; // L: 118
- } else {
- var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 121
- if (var11 <= 0) { // L: 122
- var3.pixels[var10] = -16777216; // L: 123
- } else {
- if (var11 > class82.field1072.length) { // L: 126
- var11 = class82.field1072.length;
- }
-
- var12 = class82.field1072[var11 - 1]; // L: 127
- var3.pixels[var10] = -16777216 | var12; // L: 128
- }
- }
- }
-
- System.nanoTime(); // L: 130
- } // L: 131
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(Lqr;Lqr;Lne;B)V",
- garbageValue = "-99"
- )
- void method5853(SpritePixels var1, SpritePixels var2, Bounds var3) {
- if (var3.highX != 0 && var3.highY != 0) { // L: 134
- int var4 = 0; // L: 135
- int var5 = 0; // L: 136
- if (var3.lowX == 0) { // L: 137
- var4 = var1.subWidth - var3.highX;
- }
-
- if (var3.lowY == 0) { // L: 138
- var5 = var1.subHeight - var3.highY;
- }
-
- int var6 = var4 + var5 * var1.subWidth; // L: 139
- int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 140
-
- for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 141
- for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 142
- int[] var10000 = var2.pixels; // L: 143
- int var10001 = var7++;
- var10000[var10001] += var1.pixels[var6++];
- }
-
- var6 += var1.subWidth - var3.highX; // L: 145
- var7 += var2.subWidth - var3.highX; // L: 146
- }
-
- }
- } // L: 148
-
- @ObfuscatedName("aw")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZB)I",
- garbageValue = "-63"
- )
- static int method5868(int var0, Script var1, boolean var2) {
- int var3;
- if (var0 == 6600) { // L: 4118
- var3 = class128.Client_plane; // L: 4119
- int var15 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 4120
- int var8 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 4121
- MilliClock.getWorldMap().method7033(var3, var15, var8, true); // L: 4122
- return 1; // L: 4123
- } else {
- WorldMapArea var9;
- if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 4125
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4126
- String var16 = ""; // L: 4127
- var9 = MilliClock.getWorldMap().getMapArea(var3); // L: 4128
- if (var9 != null) { // L: 4129
- var16 = var9.getExternalName(); // L: 4130
- }
-
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var16; // L: 4132
- return 1; // L: 4133
- } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 4135
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4136
- MilliClock.getWorldMap().setCurrentMapAreaId(var3); // L: 4137
- return 1; // L: 4138
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 4140
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getZoomLevel(); // L: 4141
- return 1; // L: 4142
- } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 4144
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4145
- MilliClock.getWorldMap().setZoomPercentage(var3); // L: 4146
- return 1; // L: 4147
- } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 4149
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 4150
- return 1; // L: 4151
- } else {
- Coord var14;
- if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 4153
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4154
- MilliClock.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 4155
- return 1; // L: 4156
- } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 4158
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4159
- MilliClock.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 4160
- return 1; // L: 4161
- } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 4163
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4164
- MilliClock.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 4165
- return 1; // L: 4166
- } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 4168
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4169
- MilliClock.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 4170
- return 1; // L: 4171
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 4173
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayX(); // L: 4174
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayY(); // L: 4175
- return 1; // L: 4176
- } else {
- WorldMapArea var11;
- if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 4178
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4179
- var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4180
- if (var11 == null) { // L: 4181
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4182
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 4185
- }
-
- return 1; // L: 4187
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 4189
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4190
- var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4191
- if (var11 == null) { // L: 4192
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4193
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4194
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 4197
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 4198
- }
-
- return 1; // L: 4200
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 4202
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4203
- var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4204
- if (var11 == null) { // L: 4205
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4206
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4207
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4208
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4209
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4212
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4213
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4214
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4215
- }
-
- return 1; // L: 4217
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4219
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4220
- var11 = MilliClock.getWorldMap().getMapArea(var3); // L: 4221
- if (var11 == null) { // L: 4222
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4223
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4226
- }
-
- return 1; // L: 4228
- } else if (var0 == 6615) { // L: 4230
- var14 = MilliClock.getWorldMap().getDisplayCoord(); // L: 4231
- if (var14 == null) { // L: 4232
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4233
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4234
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var14.x; // L: 4237
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var14.y; // L: 4238
- }
-
- return 1; // L: 4240
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4242
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().currentMapAreaId(); // L: 4243
- return 1; // L: 4244
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4246
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4247
- var11 = MilliClock.getWorldMap().getCurrentMapArea(); // L: 4248
- if (var11 == null) { // L: 4249
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4250
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4251
- return 1; // L: 4252
- } else {
- int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4254
- if (var12 == null) { // L: 4255
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4256
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4257
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12[0]; // L: 4260
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var12[1]; // L: 4261
- }
-
- return 1; // L: 4263
- }
- } else {
- Coord var5;
- if (var0 == 6618) { // L: 4265
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4266
- var11 = MilliClock.getWorldMap().getCurrentMapArea(); // L: 4267
- if (var11 == null) { // L: 4268
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4269
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4270
- return 1; // L: 4271
- } else {
- var5 = var11.coord(var14.x, var14.y); // L: 4273
- if (var5 == null) { // L: 4274
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4275
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.packed(); // L: 4278
- }
-
- return 1; // L: 4280
- }
- } else {
- Coord var10;
- if (var0 == 6619) { // L: 4282
- class12.Interpreter_intStackSize -= 2; // L: 4283
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4284
- var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4285
- FriendsList.method6449(var3, var10, false); // L: 4286
- return 1; // L: 4287
- } else if (var0 == 6620) { // L: 4289
- class12.Interpreter_intStackSize -= 2; // L: 4290
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4291
- var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4292
- FriendsList.method6449(var3, var10, true); // L: 4293
- return 1; // L: 4294
- } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4296
- class12.Interpreter_intStackSize -= 2; // L: 4297
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4298
- var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4299
- var9 = MilliClock.getWorldMap().getMapArea(var3); // L: 4300
- if (var9 == null) { // L: 4301
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4302
- return 1; // L: 4303
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4305
- return 1; // L: 4306
- }
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4308
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayWith(); // L: 4309
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getDisplayHeight(); // L: 4310
- return 1; // L: 4311
- } else if (var0 == 6623) { // L: 4313
- var14 = new Coord(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4314
- var11 = MilliClock.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4315
- if (var11 == null) { // L: 4316
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4317
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var11.getId(); // L: 4320
- }
-
- return 1; // L: 4322
- } else if (var0 == 6624) { // L: 4324
- MilliClock.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4325
- return 1; // L: 4326
- } else if (var0 == 6625) { // L: 4328
- MilliClock.getWorldMap().resetMaxFlashCount(); // L: 4329
- return 1; // L: 4330
- } else if (var0 == 6626) { // L: 4332
- MilliClock.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 4333
- return 1; // L: 4334
- } else if (var0 == 6627) { // L: 4336
- MilliClock.getWorldMap().resetCyclesPerFlash(); // L: 4337
- return 1; // L: 4338
- } else {
- boolean var13;
- if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4340
- var13 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 4341
- MilliClock.getWorldMap().setPerpetualFlash(var13); // L: 4342
- return 1; // L: 4343
- } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4345
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4346
- MilliClock.getWorldMap().flashElement(var3); // L: 4347
- return 1; // L: 4348
- } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4350
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4351
- MilliClock.getWorldMap().flashCategory(var3); // L: 4352
- return 1; // L: 4353
- } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4355
- MilliClock.getWorldMap().stopCurrentFlashes(); // L: 4356
- return 1; // L: 4357
- } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4359
- var13 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 4360
- MilliClock.getWorldMap().setElementsDisabled(var13); // L: 4361
- return 1; // L: 4362
- } else {
- boolean var7;
- if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4364
- class12.Interpreter_intStackSize -= 2; // L: 4365
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4366
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 4367
- MilliClock.getWorldMap().disableElement(var3, var7); // L: 4368
- return 1; // L: 4369
- } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4371
- class12.Interpreter_intStackSize -= 2; // L: 4372
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4373
- var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 4374
- MilliClock.getWorldMap().setCategoryDisabled(var3, var7); // L: 4375
- return 1; // L: 4376
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4378
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4379
- return 1; // L: 4380
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4382
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4383
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4384
- return 1; // L: 4385
- } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4387
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4388
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = MilliClock.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4389
- return 1; // L: 4390
- } else if (var0 == 6638) { // L: 4392
- class12.Interpreter_intStackSize -= 2; // L: 4393
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4394
- var10 = new Coord(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 4395
- var5 = MilliClock.getWorldMap().method7076(var3, var10); // L: 4396
- if (var5 == null) { // L: 4397
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4398
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.packed(); // L: 4401
- }
-
- return 1; // L: 4403
- } else {
- AbstractWorldMapIcon var6;
- if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4405
- var6 = MilliClock.getWorldMap().iconStart(); // L: 4406
- if (var6 == null) { // L: 4407
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4408
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4409
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4412
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4413
- }
-
- return 1; // L: 4415
- } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4417
- var6 = MilliClock.getWorldMap().iconNext(); // L: 4418
- if (var6 == null) { // L: 4419
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4420
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4421
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4424
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4425
- }
-
- return 1; // L: 4427
- } else {
- WorldMapElement var4;
- if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4429
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4430
- var4 = class120.WorldMapElement_get(var3); // L: 4431
- if (var4.name == null) { // L: 4432
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4433
- } else {
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.name; // L: 4436
- }
-
- return 1; // L: 4438
- } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4440
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4441
- var4 = class120.WorldMapElement_get(var3); // L: 4442
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.textSize; // L: 4443
- return 1; // L: 4444
- } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4446
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4447
- var4 = class120.WorldMapElement_get(var3); // L: 4448
- if (var4 == null) { // L: 4449
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4450
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.category; // L: 4453
- }
-
- return 1; // L: 4455
- } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4457
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4458
- var4 = class120.WorldMapElement_get(var3); // L: 4459
- if (var4 == null) { // L: 4460
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4461
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4464
- }
-
- return 1; // L: 4466
- } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4468
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class9.worldMapEvent.mapElement; // L: 4469
- return 1; // L: 4470
- } else if (var0 == 6698) { // L: 4472
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class9.worldMapEvent.coord1.packed(); // L: 4473
- return 1; // L: 4474
- } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4476
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class9.worldMapEvent.coord2.packed(); // L: 4477
- return 1; // L: 4478
- } else {
- return 2; // L: 4480
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ static char method6050(char var0) {
+ return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 61 62
}
}
diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java
deleted file mode 100644
index 8188f617a1..0000000000
--- a/runescape-client/src/main/java/class327.java
+++ /dev/null
@@ -1,42 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ls")
-public class class327 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lls;"
- )
- static final class327 field4110;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lls;"
- )
- static final class327 field4108;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lls;"
- )
- static final class327 field4109;
-
- static {
- field4110 = new class327(); // L: 4
- field4108 = new class327(); // L: 5
- field4109 = new class327(); // L: 6
- }
-
- class327() {
- } // L: 8
-
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "-1970190123"
- )
- static final int method5869(int var0, int var1) {
- int var2 = var0 + var1 * 57; // L: 962
- var2 ^= var2 << 13; // L: 963
- int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 964
- return var3 >> 19 & 255; // L: 965
- }
-}
diff --git a/runescape-client/src/main/java/class328.java b/runescape-client/src/main/java/class328.java
new file mode 100644
index 0000000000..360d5e745a
--- /dev/null
+++ b/runescape-client/src/main/java/class328.java
@@ -0,0 +1,27 @@
+import java.util.HashMap;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lp")
+public class class328 {
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ @Export("ObjectDefinition_archive")
+ static AbstractArchive ObjectDefinition_archive;
+
+ static {
+ new HashMap();
+ } // L: 9
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1400532526"
+ )
+ public static void method6056(int var0) {
+ MouseHandler.MouseHandler_idleCycles = var0; // L: 45
+ } // L: 46
+}
diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java
deleted file mode 100644
index 13c021e24e..0000000000
--- a/runescape-client/src/main/java/class329.java
+++ /dev/null
@@ -1,127 +0,0 @@
-import java.util.HashMap;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("lu")
-public class class329 {
- static {
- new HashMap();
- } // L: 9
-
- @ObfuscatedName("hk")
- @ObfuscatedSignature(
- descriptor = "(IIZI)V",
- garbageValue = "-1240601508"
- )
- static final void method5875(int var0, int var1, boolean var2) {
- if (!var2 || var0 != WorldMapSectionType.field2828 || class433.field4657 != var1) { // L: 5647
- WorldMapSectionType.field2828 = var0; // L: 5650
- class433.field4657 = var1; // L: 5651
- PendingSpawn.updateGameState(25); // L: 5652
- class259.drawLoadingMessage("Loading - please wait.", true); // L: 5653
- int var3 = SecureRandomCallable.baseX; // L: 5654
- int var4 = GrandExchangeOfferOwnWorldComparator.baseY; // L: 5655
- SecureRandomCallable.baseX = (var0 - 6) * 8; // L: 5656
- GrandExchangeOfferOwnWorldComparator.baseY = (var1 - 6) * 8; // L: 5657
- int var5 = SecureRandomCallable.baseX - var3; // L: 5658
- int var6 = GrandExchangeOfferOwnWorldComparator.baseY - var4; // L: 5659
- var3 = SecureRandomCallable.baseX; // L: 5660
- var4 = GrandExchangeOfferOwnWorldComparator.baseY; // L: 5661
-
- int var7;
- int var9;
- int[] var10000;
- for (var7 = 0; var7 < 32768; ++var7) { // L: 5662
- NPC var19 = Client.npcs[var7]; // L: 5663
- if (var19 != null) { // L: 5664
- for (var9 = 0; var9 < 10; ++var9) { // L: 5665
- var10000 = var19.pathX; // L: 5666
- var10000[var9] -= var5;
- var10000 = var19.pathY; // L: 5667
- var10000[var9] -= var6;
- }
-
- var19.x -= var5 * 128; // L: 5669
- var19.y -= var6 * 128; // L: 5670
- }
- }
-
- for (var7 = 0; var7 < 2048; ++var7) { // L: 5673
- Player var22 = Client.players[var7]; // L: 5674
- if (var22 != null) { // L: 5675
- for (var9 = 0; var9 < 10; ++var9) { // L: 5676
- var10000 = var22.pathX; // L: 5677
- var10000[var9] -= var5;
- var10000 = var22.pathY; // L: 5678
- var10000[var9] -= var6;
- }
-
- var22.x -= var5 * 128; // L: 5680
- var22.y -= var6 * 128; // L: 5681
- }
- }
-
- byte var20 = 0; // L: 5684
- byte var8 = 104; // L: 5685
- byte var21 = 1; // L: 5686
- if (var5 < 0) { // L: 5687
- var20 = 103; // L: 5688
- var8 = -1; // L: 5689
- var21 = -1; // L: 5690
- }
-
- byte var10 = 0; // L: 5692
- byte var11 = 104; // L: 5693
- byte var12 = 1; // L: 5694
- if (var6 < 0) { // L: 5695
- var10 = 103; // L: 5696
- var11 = -1; // L: 5697
- var12 = -1; // L: 5698
- }
-
- int var14;
- for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5700
- for (var14 = var10; var14 != var11; var14 += var12) { // L: 5701
- int var15 = var13 + var5; // L: 5702
- int var16 = var14 + var6; // L: 5703
-
- for (int var17 = 0; var17 < 4; ++var17) { // L: 5704
- if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
- Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5705
- } else {
- Client.groundItems[var17][var13][var14] = null; // L: 5706
- }
- }
- }
- }
-
- for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5710 5711 5715
- var18.x -= var5; // L: 5712
- var18.y -= var6; // L: 5713
- if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5714
- var18.remove();
- }
- }
-
- if (Client.destinationX != 0) { // L: 5717
- Client.destinationX -= var5; // L: 5718
- Client.destinationY -= var6; // L: 5719
- }
-
- Client.soundEffectCount = 0; // L: 5721
- Client.isCameraLocked = false; // L: 5722
- class343.cameraX -= var5 << 7; // L: 5723
- FaceNormal.cameraZ -= var6 << 7; // L: 5724
- HorizontalAlignment.oculusOrbFocalPointX -= var5 << 7; // L: 5725
- class28.oculusOrbFocalPointY -= var6 << 7; // L: 5726
- Client.field515 = -1; // L: 5727
- Client.graphicsObjects.clear(); // L: 5728
- Client.projectiles.clear(); // L: 5729
-
- for (var14 = 0; var14 < 4; ++var14) { // L: 5730
- Client.collisionMaps[var14].clear();
- }
-
- }
- } // L: 5648 5731
-}
diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java
index 843552df4b..0cec8b1e25 100644
--- a/runescape-client/src/main/java/class33.java
+++ b/runescape-client/src/main/java/class33.java
@@ -1,231 +1,17 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("az")
+@ObfuscatedName("ae")
public class class33 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llo;"
+ descriptor = "Llk;"
)
@Export("reflectionChecks")
- public static IterableNodeDeque reflectionChecks;
+ static IterableNodeDeque reflectionChecks;
static {
reflectionChecks = new IterableNodeDeque(); // L: 17
}
-
- @ObfuscatedName("an")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "525584260"
- )
- static int method592(int var0, Script var1, boolean var2) {
- if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3917
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = ClientPreferences.loadWorlds() ? 1 : 0; // L: 3918
- return 1; // L: 3919
- } else {
- World var9;
- if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3921
- var9 = ClientPreferences.worldListStart(); // L: 3922
- if (var9 != null) { // L: 3923
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.id; // L: 3924
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.properties; // L: 3925
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3926
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.location; // L: 3927
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.population; // L: 3928
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.host; // L: 3929
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3932
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3933
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3934
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3935
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3936
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3937
- }
-
- return 1; // L: 3939
- } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3941
- var9 = class146.getNextWorldListWorld(); // L: 3942
- if (var9 != null) { // L: 3943
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.id; // L: 3944
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.properties; // L: 3945
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3946
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.location; // L: 3947
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var9.population; // L: 3948
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var9.host; // L: 3949
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3952
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3953
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3954
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3955
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3956
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3957
- }
-
- return 1; // L: 3959
- } else {
- int var3;
- World var7;
- int var8;
- if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3961
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3962
- var7 = null; // L: 3963
-
- for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3964
- if (var3 == World.World_worlds[var8].id) { // L: 3965
- var7 = World.World_worlds[var8]; // L: 3966
- break;
- }
- }
-
- if (var7 != null) { // L: 3970
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.id; // L: 3971
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.properties; // L: 3972
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.activity; // L: 3973
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.location; // L: 3974
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.population; // L: 3975
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.host; // L: 3976
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3979
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3980
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3981
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3982
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3983
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3984
- }
-
- return 1; // L: 3986
- } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3988
- class12.Interpreter_intStackSize -= 4; // L: 3989
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3990
- boolean var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1] == 1; // L: 3991
- var8 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3992
- boolean var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3] == 1; // L: 3993
- GraphicsDefaults.sortWorldList(var3, var10, var8, var6); // L: 3994
- return 1; // L: 3995
- } else if (var0 != 6511) { // L: 3997
- if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 4018
- Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 4019
- return 1; // L: 4020
- } else {
- int var4;
- ParamComposition var5;
- if (var0 == ScriptOpcodes.NC_PARAM) { // L: 4022
- class12.Interpreter_intStackSize -= 2; // L: 4023
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4024
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4025
- var5 = class78.getParamDefinition(var4); // L: 4026
- if (var5.isString()) { // L: 4027
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = WorldMapSectionType.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4028
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSectionType.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4031
- }
-
- return 1; // L: 4033
- } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 4035
- class12.Interpreter_intStackSize -= 2; // L: 4036
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4037
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4038
- var5 = class78.getParamDefinition(var4); // L: 4039
- if (var5.isString()) { // L: 4040
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class82.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4041
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class82.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4044
- }
-
- return 1; // L: 4046
- } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 4048
- class12.Interpreter_intStackSize -= 2; // L: 4049
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4050
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4051
- var5 = class78.getParamDefinition(var4); // L: 4052
- if (var5.isString()) { // L: 4053
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FileSystem.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 4054
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 4057
- }
-
- return 1; // L: 4059
- } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 4061
- class12.Interpreter_intStackSize -= 2; // L: 4062
- var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 4063
- var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 4064
- var5 = class78.getParamDefinition(var4); // L: 4065
- if (var5.isString()) { // L: 4066
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = class401.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 4067
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class401.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 4070
- }
-
- return 1; // L: 4072
- } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 4074
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 4075
- return 1; // L: 4076
- } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 4078
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.clientType; // L: 4079
- return 1; // L: 4080
- } else if (var0 == 6520) { // L: 4082
- return 1; // L: 4083
- } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 4085
- return 1; // L: 4086
- } else if (var0 == 6522) { // L: 4088
- --class9.Interpreter_stringStackSize; // L: 4089
- --class12.Interpreter_intStackSize; // L: 4090
- return 1; // L: 4091
- } else if (var0 == 6523) { // L: 4093
- --class9.Interpreter_stringStackSize; // L: 4094
- --class12.Interpreter_intStackSize; // L: 4095
- return 1; // L: 4096
- } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 4098
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4099
- return 1; // L: 4100
- } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 4102
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 4103
- return 1; // L: 4104
- } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 4106
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 1; // L: 4107
- return 1; // L: 4108
- } else if (var0 == 6527) { // L: 4110
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.field486; // L: 4111
- return 1; // L: 4112
- } else {
- return 2; // L: 4114
- }
- }
- } else {
- var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3998
- if (var3 >= 0 && var3 < World.World_count) { // L: 3999
- var7 = World.World_worlds[var3]; // L: 4000
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.id; // L: 4001
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.properties; // L: 4002
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.activity; // L: 4003
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.location; // L: 4004
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.population; // L: 4005
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var7.host; // L: 4006
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4009
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4010
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4011
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4012
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4013
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4014
- }
-
- return 1; // L: 4016
- }
- }
- }
- }
-
- @ObfuscatedName("jt")
- @ObfuscatedSignature(
- descriptor = "(ZI)V",
- garbageValue = "368469089"
- )
- @Export("setTapToDrop")
- static void setTapToDrop(boolean var0) {
- Client.tapToDrop = var0; // L: 11196
- } // L: 11197
}
diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java
new file mode 100644
index 0000000000..e405ab44eb
--- /dev/null
+++ b/runescape-client/src/main/java/class339.java
@@ -0,0 +1,45 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("mx")
+public final class class339 {
+ @ObfuscatedName("rx")
+ @ObfuscatedSignature(
+ descriptor = "Lqg;"
+ )
+ @Export("privateChatMode")
+ static PrivateChatMode privateChatMode;
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;I)J",
+ garbageValue = "2080916438"
+ )
+ static long method6244(CharSequence var0) {
+ long var1 = 0L; // L: 16
+ int var3 = var0.length(); // L: 17
+
+ for (int var4 = 0; var4 < var3; ++var4) { // L: 18
+ var1 *= 37L; // L: 19
+ char var5 = var0.charAt(var4); // L: 20
+ if (var5 >= 'A' && var5 <= 'Z') { // L: 21
+ var1 += (long)(var5 + 1 - 65);
+ } else if (var5 >= 'a' && var5 <= 'z') { // L: 22
+ var1 += (long)(var5 + 1 - 97);
+ } else if (var5 >= '0' && var5 <= '9') {
+ var1 += (long)(var5 + 27 - 48); // L: 23
+ }
+
+ if (var1 >= 177917621779460413L) { // L: 24
+ break;
+ }
+ }
+
+ while (var1 % 37L == 0L && 0L != var1) { // L: 26
+ var1 /= 37L;
+ }
+
+ return var1; // L: 27
+ }
+}
diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java
index 273c6123df..39a8d74e7a 100644
--- a/runescape-client/src/main/java/class340.java
+++ b/runescape-client/src/main/java/class340.java
@@ -1,7 +1,55 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("mb")
+public class class340 {
+ @ObfuscatedName("c")
+ @Export("cp1252AsciiExtension")
+ public static final char[] cp1252AsciiExtension;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = 1921739385
+ )
+ static int field4138;
+
+ static {
+ cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4
+ }
-@ObfuscatedName("mi")
-public final class class340 {
@ObfuscatedName("y")
- public static short[] field4156;
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;I[B[BB)V",
+ garbageValue = "13"
+ )
+ @Export("Widget_setKey")
+ static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+ if (var0.field3448 == null) { // L: 998
+ if (var2 == null) { // L: 999
+ return; // L: 1005
+ }
+
+ var0.field3448 = new byte[11][]; // L: 1000
+ var0.field3406 = new byte[11][]; // L: 1001
+ var0.field3450 = new int[11]; // L: 1002
+ var0.field3451 = new int[11]; // L: 1003
+ }
+
+ var0.field3448[var1] = var2; // L: 1007
+ if (var2 != null) {
+ var0.field3498 = true; // L: 1008
+ } else {
+ var0.field3498 = false; // L: 1010
+
+ for (int var4 = 0; var4 < var0.field3448.length; ++var4) { // L: 1011
+ if (var0.field3448[var4] != null) { // L: 1012
+ var0.field3498 = true; // L: 1013
+ break;
+ }
+ }
+ }
+
+ var0.field3406[var1] = var3; // L: 1018
+ } // L: 1019
}
diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java
index a80e55320a..f62c1e7ad4 100644
--- a/runescape-client/src/main/java/class341.java
+++ b/runescape-client/src/main/java/class341.java
@@ -2,29 +2,96 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ms")
+@ObfuscatedName("ml")
public class class341 {
- @ObfuscatedName("o")
- @Export("cp1252AsciiExtension")
- public static final char[] cp1252AsciiExtension;
+ @ObfuscatedName("c")
+ public static char[] field4146;
+ @ObfuscatedName("v")
+ static char[] field4143;
+ @ObfuscatedName("q")
+ static char[] field4144;
+ @ObfuscatedName("f")
+ static int[] field4145;
+ @ObfuscatedName("ed")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive7")
+ static Archive archive7;
static {
- cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4
- }
+ field4146 = new char[64]; // L: 7
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(FFFF[FB)V",
- garbageValue = "1"
- )
- static void method6090(float var0, float var1, float var2, float var3, float[] var4) {
- float var5 = var1 - var0; // L: 321
- float var6 = var2 - var1; // L: 322
- float var7 = var3 - var2; // L: 323
- float var8 = var6 - var5; // L: 324
- var4[3] = var7 - var6 - var8; // L: 325
- var4[2] = var8 + var8 + var8; // L: 326
- var4[1] = var5 + var5 + var5; // L: 327
- var4[0] = var0; // L: 328
- } // L: 329
+ int var0;
+ for (var0 = 0; var0 < 26; ++var0) { // L: 8
+ field4146[var0] = (char)(var0 + 65);
+ }
+
+ for (var0 = 26; var0 < 52; ++var0) { // L: 9
+ field4146[var0] = (char)(var0 + 97 - 26);
+ }
+
+ for (var0 = 52; var0 < 62; ++var0) { // L: 10
+ field4146[var0] = (char)(var0 + 48 - 52);
+ }
+
+ field4146[62] = '+'; // L: 11
+ field4146[63] = '/'; // L: 12
+ field4143 = new char[64]; // L: 18
+
+ for (var0 = 0; var0 < 26; ++var0) { // L: 19
+ field4143[var0] = (char)(var0 + 65);
+ }
+
+ for (var0 = 26; var0 < 52; ++var0) { // L: 20
+ field4143[var0] = (char)(var0 + 97 - 26);
+ }
+
+ for (var0 = 52; var0 < 62; ++var0) { // L: 21
+ field4143[var0] = (char)(var0 + 48 - 52);
+ }
+
+ field4143[62] = '*'; // L: 22
+ field4143[63] = '-'; // L: 23
+ field4144 = new char[64]; // L: 29
+
+ for (var0 = 0; var0 < 26; ++var0) { // L: 30
+ field4144[var0] = (char)(var0 + 65);
+ }
+
+ for (var0 = 26; var0 < 52; ++var0) { // L: 31
+ field4144[var0] = (char)(var0 + 97 - 26);
+ }
+
+ for (var0 = 52; var0 < 62; ++var0) { // L: 32
+ field4144[var0] = (char)(var0 + 48 - 52);
+ }
+
+ field4144[62] = '-'; // L: 33
+ field4144[63] = '_'; // L: 34
+ field4145 = new int[128]; // L: 40
+
+ for (var0 = 0; var0 < field4145.length; ++var0) { // L: 41
+ field4145[var0] = -1;
+ }
+
+ for (var0 = 65; var0 <= 90; ++var0) { // L: 42
+ field4145[var0] = var0 - 65;
+ }
+
+ for (var0 = 97; var0 <= 122; ++var0) { // L: 43
+ field4145[var0] = var0 - 97 + 26;
+ }
+
+ for (var0 = 48; var0 <= 57; ++var0) { // L: 44
+ field4145[var0] = var0 - 48 + 52;
+ }
+
+ int[] var2 = field4145; // L: 45
+ field4145[43] = 62; // L: 46
+ var2[42] = 62; // L: 47
+ int[] var1 = field4145; // L: 48
+ field4145[47] = 63; // L: 49
+ var1[45] = 63; // L: 50
+ } // L: 51
}
diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java
index 7e57a6192c..6928e883b6 100644
--- a/runescape-client/src/main/java/class342.java
+++ b/runescape-client/src/main/java/class342.java
@@ -1,167 +1,27 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ml")
-public class class342 {
- @ObfuscatedName("o")
- static char[] field4158;
- @ObfuscatedName("q")
- static char[] field4161;
- @ObfuscatedName("l")
- static char[] field4160;
- @ObfuscatedName("k")
- static int[] field4159;
- @ObfuscatedName("r")
- @ObfuscatedGetter(
- intValue = -1886529381
- )
- static int field4162;
-
- static {
- field4158 = new char[64]; // L: 7
-
- int var0;
- for (var0 = 0; var0 < 26; ++var0) { // L: 8
- field4158[var0] = (char)(var0 + 65);
- }
-
- for (var0 = 26; var0 < 52; ++var0) { // L: 9
- field4158[var0] = (char)(var0 + 97 - 26);
- }
-
- for (var0 = 52; var0 < 62; ++var0) { // L: 10
- field4158[var0] = (char)(var0 + 48 - 52);
- }
-
- field4158[62] = '+'; // L: 11
- field4158[63] = '/'; // L: 12
- field4161 = new char[64]; // L: 18
-
- for (var0 = 0; var0 < 26; ++var0) { // L: 19
- field4161[var0] = (char)(var0 + 65);
- }
-
- for (var0 = 26; var0 < 52; ++var0) { // L: 20
- field4161[var0] = (char)(var0 + 97 - 26);
- }
-
- for (var0 = 52; var0 < 62; ++var0) { // L: 21
- field4161[var0] = (char)(var0 + 48 - 52);
- }
-
- field4161[62] = '*'; // L: 22
- field4161[63] = '-'; // L: 23
- field4160 = new char[64]; // L: 29
-
- for (var0 = 0; var0 < 26; ++var0) { // L: 30
- field4160[var0] = (char)(var0 + 65);
- }
-
- for (var0 = 26; var0 < 52; ++var0) { // L: 31
- field4160[var0] = (char)(var0 + 97 - 26);
- }
-
- for (var0 = 52; var0 < 62; ++var0) { // L: 32
- field4160[var0] = (char)(var0 + 48 - 52);
- }
-
- field4160[62] = '-'; // L: 33
- field4160[63] = '_'; // L: 34
- field4159 = new int[128]; // L: 40
-
- for (var0 = 0; var0 < field4159.length; ++var0) { // L: 41
- field4159[var0] = -1;
- }
-
- for (var0 = 65; var0 <= 90; ++var0) { // L: 42
- field4159[var0] = var0 - 65;
- }
-
- for (var0 = 97; var0 <= 122; ++var0) { // L: 43
- field4159[var0] = var0 - 97 + 26;
- }
-
- for (var0 = 48; var0 <= 57; ++var0) { // L: 44
- field4159[var0] = var0 - 48 + 52;
- }
-
- int[] var2 = field4159; // L: 45
- field4159[43] = 62; // L: 46
- var2[42] = 62; // L: 47
- int[] var1 = field4159; // L: 48
- field4159[47] = 63; // L: 49
- var1[45] = 63; // L: 50
- } // L: 51
-
- @ObfuscatedName("kh")
+@ObfuscatedName("mr")
+public final class class342 {
+ @ObfuscatedName("fw")
@ObfuscatedSignature(
- descriptor = "([Lki;II)V",
- garbageValue = "-1118405651"
+ descriptor = "(S)Z",
+ garbageValue = "208"
)
- @Export("drawModelComponents")
- static final void drawModelComponents(Widget[] var0, int var1) {
- for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11985
- Widget var3 = var0[var2]; // L: 11986
- if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class434.isComponentHidden(var3))) { // L: 11987 11988 11989
- int var5;
- if (var3.type == 0) { // L: 11990
- if (!var3.isIf3 && class434.isComponentHidden(var3) && var3 != class144.mousedOverWidgetIf1) { // L: 11991
- continue;
- }
-
- drawModelComponents(var0, var3.id); // L: 11992
- if (var3.children != null) { // L: 11993
- drawModelComponents(var3.children, var3.id);
- }
-
- InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11994
- if (var4 != null) { // L: 11995
- var5 = var4.group; // L: 11996
- if (WorldMapDecoration.loadInterface(var5)) { // L: 11998
- drawModelComponents(NetSocket.Widget_interfaceComponents[var5], -1); // L: 11999
- }
- }
+ static boolean method6312() {
+ if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1634
+ while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1635
+ ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1636
+ if (!var0.isLoaded()) { // L: 1637
+ return false;
}
- if (var3.type == 6) { // L: 12003
- if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 12004
- boolean var7 = class401.runCs1(var3); // L: 12005
- if (var7) { // L: 12007
- var5 = var3.sequenceId2;
- } else {
- var5 = var3.sequenceId; // L: 12008
- }
-
- if (var5 != -1) { // L: 12009
- SequenceDefinition var6 = class114.SequenceDefinition_get(var5); // L: 12010
-
- for (var3.modelFrameCycle += Client.field727; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3)) { // L: 12011 12012 12019
- var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 12013
- ++var3.modelFrame; // L: 12014
- if (var3.modelFrame >= var6.frameIds.length) { // L: 12015
- var3.modelFrame -= var6.frameCount; // L: 12016
- if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 12017
- var3.modelFrame = 0;
- }
- }
- }
- }
- }
-
- if (var3.field3451 != 0 && !var3.isIf3) { // L: 12023
- int var8 = var3.field3451 >> 16; // L: 12024
- var5 = var3.field3451 << 16 >> 16; // L: 12025
- var8 *= Client.field727; // L: 12026
- var5 *= Client.field727; // L: 12027
- var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 12028
- var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 12029
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var3); // L: 12030
- }
- }
+ ++Client.archiveLoadersDone; // L: 1638
}
- }
- } // L: 12034
+ return true; // L: 1640
+ } else {
+ return true; // L: 1639
+ }
+ }
}
diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java
deleted file mode 100644
index 8c447376d2..0000000000
--- a/runescape-client/src/main/java/class343.java
+++ /dev/null
@@ -1,124 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mt")
-public final class class343 {
- @ObfuscatedName("ja")
- @ObfuscatedGetter(
- intValue = -1471582955
- )
- @Export("cameraX")
- static int cameraX;
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "1487973043"
- )
- public static int method6137(int var0, int var1) {
- int var2;
- if (var1 > var0) { // L: 35
- var2 = var0; // L: 36
- var0 = var1; // L: 37
- var1 = var2; // L: 38
- }
-
- while (var1 != 0) { // L: 40
- var2 = var0 % var1; // L: 41
- var0 = var1; // L: 42
- var1 = var2; // L: 43
- }
-
- return var0; // L: 45
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(CLlq;I)C",
- garbageValue = "-41366365"
- )
- @Export("standardizeChar")
- static char standardizeChar(char var0, Language var1) {
- if (var0 >= 192 && var0 <= 255) { // L: 69
- if (var0 >= 192 && var0 <= 198) { // L: 70
- return 'A';
- }
-
- if (var0 == 199) { // L: 71
- return 'C';
- }
-
- if (var0 >= 200 && var0 <= 203) { // L: 72
- return 'E';
- }
-
- if (var0 >= 204 && var0 <= 207) { // L: 73
- return 'I';
- }
-
- if (var0 == 209 && var1 != Language.Language_ES) { // L: 74
- return 'N';
- }
-
- if (var0 >= 210 && var0 <= 214) { // L: 75
- return 'O';
- }
-
- if (var0 >= 217 && var0 <= 220) { // L: 76
- return 'U';
- }
-
- if (var0 == 221) { // L: 77
- return 'Y';
- }
-
- if (var0 == 223) { // L: 78
- return 's';
- }
-
- if (var0 >= 224 && var0 <= 230) { // L: 79
- return 'a';
- }
-
- if (var0 == 231) { // L: 80
- return 'c';
- }
-
- if (var0 >= 232 && var0 <= 235) { // L: 81
- return 'e';
- }
-
- if (var0 >= 236 && var0 <= 239) { // L: 82
- return 'i';
- }
-
- if (var0 == 241 && var1 != Language.Language_ES) { // L: 83
- return 'n';
- }
-
- if (var0 >= 242 && var0 <= 246) { // L: 84
- return 'o';
- }
-
- if (var0 >= 249 && var0 <= 252) { // L: 85
- return 'u';
- }
-
- if (var0 == 253 || var0 == 255) { // L: 86
- return 'y';
- }
- }
-
- if (var0 == 338) { // L: 88
- return 'O';
- } else if (var0 == 339) { // L: 89
- return 'o';
- } else if (var0 == 376) { // L: 90
- return 'Y';
- } else {
- return var0; // L: 91
- }
- }
-}
diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java
index e64da6d71c..72fab4a8cb 100644
--- a/runescape-client/src/main/java/class344.java
+++ b/runescape-client/src/main/java/class344.java
@@ -2,18 +2,86 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mv")
-public class class344 {
- @ObfuscatedName("q")
+@ObfuscatedName("mk")
+public final class class344 {
+ @ObfuscatedName("c")
+ @Export("base37Table")
+ public static final char[] base37Table;
+ @ObfuscatedName("v")
+ static long[] field4153;
+ @ObfuscatedName("y")
+ static int[] field4152;
+ @ObfuscatedName("ih")
@ObfuscatedSignature(
- descriptor = "[Lfx;"
- )
- @Export("WorldMapElement_cached")
- static WorldMapElement[] WorldMapElement_cached;
- @ObfuscatedName("id")
- @ObfuscatedSignature(
- descriptor = "Lqr;"
+ descriptor = "Lqe;"
)
@Export("redHintArrowSprite")
static SpritePixels redHintArrowSprite;
+
+ static {
+ base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4
+ field4153 = new long[12]; // L: 5
+
+ for (int var0 = 0; var0 < field4153.length; ++var0) { // L: 8
+ field4153[var0] = (long)Math.pow(37.0D, (double)var0);
+ }
+
+ } // L: 9
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "([BB)Lbi;",
+ garbageValue = "8"
+ )
+ @Export("newScript")
+ static Script newScript(byte[] var0) {
+ Script var1 = new Script(); // L: 84
+ Buffer var2 = new Buffer(var0); // L: 85
+ var2.offset = var2.array.length - 2; // L: 86
+ int var3 = var2.readUnsignedShort(); // L: 87
+ int var4 = var2.array.length - 2 - var3 - 12; // L: 88
+ var2.offset = var4; // L: 89
+ int var5 = var2.readInt(); // L: 90
+ var1.localIntCount = var2.readUnsignedShort(); // L: 91
+ var1.localStringCount = var2.readUnsignedShort(); // L: 92
+ var1.intArgumentCount = var2.readUnsignedShort(); // L: 93
+ var1.stringArgumentCount = var2.readUnsignedShort(); // L: 94
+ int var6 = var2.readUnsignedByte(); // L: 95
+ int var7;
+ int var8;
+ if (var6 > 0) { // L: 96
+ var1.switches = var1.newIterableNodeHashTable(var6); // L: 97
+
+ for (var7 = 0; var7 < var6; ++var7) { // L: 98
+ var8 = var2.readUnsignedShort(); // L: 99
+ IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? class135.method2910(var8) : 1); // L: 100
+ var1.switches[var7] = var9; // L: 101
+
+ while (var8-- > 0) { // L: 102
+ int var10 = var2.readInt(); // L: 103
+ int var11 = var2.readInt(); // L: 104
+ var9.put(new IntegerNode(var11), (long)var10); // L: 105
+ }
+ }
+ }
+
+ var2.offset = 0; // L: 109
+ var1.field967 = var2.readStringCp1252NullTerminatedOrNull(); // L: 110
+ var1.opcodes = new int[var5]; // L: 111
+ var1.intOperands = new int[var5]; // L: 112
+ var1.stringOperands = new String[var5]; // L: 113
+
+ for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 114 115 120
+ var8 = var2.readUnsignedShort(); // L: 116
+ if (var8 == 3) { // L: 117
+ var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+ } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { // L: 118
+ var1.intOperands[var7] = var2.readInt();
+ } else {
+ var1.intOperands[var7] = var2.readUnsignedByte(); // L: 119
+ }
+ }
+
+ return var1; // L: 122
+ }
}
diff --git a/runescape-client/src/main/java/class345.java b/runescape-client/src/main/java/class345.java
index 490f743077..bc1edcddad 100644
--- a/runescape-client/src/main/java/class345.java
+++ b/runescape-client/src/main/java/class345.java
@@ -1,60 +1,26 @@
import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("me")
+@ObfuscatedName("mn")
public final class class345 {
- @ObfuscatedName("o")
- @Export("base37Table")
- static final char[] base37Table;
- @ObfuscatedName("q")
- static long[] field4168;
-
- static {
- base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4
- field4168 = new long[12]; // L: 5
-
- for (int var0 = 0; var0 < field4168.length; ++var0) { // L: 8
- field4168[var0] = (long)Math.pow(37.0D, (double)var0);
- }
-
- } // L: 9
-
- @ObfuscatedName("q")
+ @ObfuscatedName("z")
@ObfuscatedSignature(
- descriptor = "(IIII)I",
- garbageValue = "1009595940"
+ descriptor = "Lqu;"
)
- static int method6156(int var0, int var1, int var2) {
- if (var2 > 179) { // L: 33
- var1 /= 2;
- }
-
- if (var2 > 192) { // L: 34
- var1 /= 2;
- }
-
- if (var2 > 217) { // L: 35
- var1 /= 2;
- }
-
- if (var2 > 243) { // L: 36
- var1 /= 2;
- }
-
- int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 37
- return var3; // L: 38
- }
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
- garbageValue = "-127167673"
+ @Export("options_buttons_0Sprite")
+ static IndexedSprite options_buttons_0Sprite;
+ @ObfuscatedName("c")
+ final Object field4159;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 1922417529
)
- @Export("setLoginResponseString")
- static void setLoginResponseString(String var0, String var1, String var2) {
- Login.Login_response1 = var0; // L: 1655
- Login.Login_response2 = var1; // L: 1656
- Login.Login_response3 = var2; // L: 1657
- } // L: 1658
+ int field4158;
+
+ class345(Object var1, int var2) {
+ this.field4159 = var1; // L: 170
+ this.field4158 = var2; // L: 171
+ } // L: 172
}
diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java
index b885e41441..6ed0ba3d06 100644
--- a/runescape-client/src/main/java/class346.java
+++ b/runescape-client/src/main/java/class346.java
@@ -1,18 +1,192 @@
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mf")
-public final class class346 {
- @ObfuscatedName("o")
- final Object field4171;
+@ObfuscatedName("me")
+public class class346 implements Iterator {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lmo;"
+ )
+ class347 field4163;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = -437378707
+ )
+ int field4162;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -2109207935
+ intValue = -797289567
)
- int field4170;
+ int field4164;
- class346(Object var1, int var2) {
- this.field4171 = var1; // L: 170
- this.field4170 = var2; // L: 171
- } // L: 172
+ @ObfuscatedSignature(
+ descriptor = "(Lmo;)V"
+ )
+ class346(class347 var1) {
+ this.field4162 = 0; // L: 177
+ this.field4164 = this.field4163.field4169; // L: 178
+ this.field4163 = var1; // L: 181
+ } // L: 182
+
+ public boolean hasNext() {
+ return this.field4162 < this.field4163.field4165; // L: 186
+ }
+
+ public Object next() {
+ if (this.field4163.field4169 != this.field4164) { // L: 192
+ throw new ConcurrentModificationException();
+ } else if (this.field4162 < this.field4163.field4165) { // L: 193
+ Object var1 = this.field4163.field4166[this.field4162].field4159; // L: 194
+ ++this.field4162; // L: 195
+ return var1; // L: 196
+ } else {
+ throw new NoSuchElementException(); // L: 198
+ }
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException(); // L: 203
+ }
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;IIIS)V",
+ garbageValue = "16250"
+ )
+ @Export("Widget_setKeyRate")
+ static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+ if (var0.field3450 == null) { // L: 1022
+ throw new RuntimeException(); // L: 1023
+ } else {
+ var0.field3450[var1] = var2; // L: 1025
+ var0.field3451[var1] = var3; // L: 1026
+ }
+ } // L: 1027
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(IIIIIZI)Lqe;",
+ garbageValue = "2024735229"
+ )
+ @Export("getItemSprite")
+ public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
+ if (var1 == -1) { // L: 365
+ var4 = 0;
+ } else if (var4 == 2 && var1 != 1) { // L: 366
+ var4 = 1;
+ }
+
+ long var6 = ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16) + ((long)var3 << 42); // L: 367
+ SpritePixels var8;
+ if (!var5) { // L: 369
+ var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 370
+ if (var8 != null) { // L: 371
+ return var8;
+ }
+ }
+
+ ItemComposition var9 = EnumComposition.ItemDefinition_get(var0); // L: 373
+ if (var1 > 1 && var9.countobj != null) { // L: 374
+ int var10 = -1; // L: 375
+
+ for (int var11 = 0; var11 < 10; ++var11) { // L: 376
+ if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 377
+ var10 = var9.countobj[var11];
+ }
+ }
+
+ if (var10 != -1) { // L: 379
+ var9 = EnumComposition.ItemDefinition_get(var10);
+ }
+ }
+
+ Model var19 = var9.getModel(1); // L: 381
+ if (var19 == null) { // L: 382
+ return null;
+ } else {
+ SpritePixels var20 = null; // L: 383
+ if (var9.noteTemplate != -1) { // L: 384
+ var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 385
+ if (var20 == null) { // L: 386
+ return null;
+ }
+ } else if (var9.notedId != -1) { // L: 388
+ var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 389
+ if (var20 == null) { // L: 390
+ return null;
+ }
+ } else if (var9.placeholderTemplate != -1) { // L: 392
+ var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 393
+ if (var20 == null) { // L: 394
+ return null;
+ }
+ }
+
+ int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 396
+ int var13 = Rasterizer2D.Rasterizer2D_width; // L: 397
+ int var14 = Rasterizer2D.Rasterizer2D_height; // L: 398
+ int[] var15 = new int[4]; // L: 399
+ Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 400
+ var8 = new SpritePixels(36, 32); // L: 401
+ Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 402
+ Rasterizer2D.Rasterizer2D_clear(); // L: 403
+ Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 404
+ Rasterizer3D.method4021(16, 16); // L: 405
+ Rasterizer3D.field2340 = false; // L: 406
+ if (var9.placeholderTemplate != -1) { // L: 407
+ var20.drawTransBgAt(0, 0);
+ }
+
+ int var16 = var9.zoom2d; // L: 408
+ if (var5) { // L: 409
+ var16 = (int)((double)var16 * 1.5D);
+ } else if (var2 == 2) { // L: 410
+ var16 = (int)(1.04D * (double)var16);
+ }
+
+ int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 411
+ int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 412
+ var19.calculateBoundsCylinder(); // L: 413
+ var19.method4442(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 414
+ if (var9.notedId != -1) { // L: 415
+ var20.drawTransBgAt(0, 0);
+ }
+
+ if (var2 >= 1) { // L: 416
+ var8.outline(1);
+ }
+
+ if (var2 >= 2) { // L: 417
+ var8.outline(16777215);
+ }
+
+ if (var3 != 0) { // L: 418
+ var8.shadow(var3);
+ }
+
+ Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 419
+ if (var9.noteTemplate != -1) { // L: 420
+ var20.drawTransBgAt(0, 0);
+ }
+
+ if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 421
+ ItemComposition.ItemDefinition_fontPlain11.draw(HitSplatDefinition.method3632(var1), 0, 9, 16776960, 1); // L: 422
+ }
+
+ if (!var5) { // L: 424
+ ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
+ }
+
+ Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 425
+ Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 426
+ Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 427
+ Rasterizer3D.field2340 = true; // L: 428
+ return var8; // L: 429
+ }
+ }
}
diff --git a/runescape-client/src/main/java/class347.java b/runescape-client/src/main/java/class347.java
index e8319800fb..25522385bb 100644
--- a/runescape-client/src/main/java/class347.java
+++ b/runescape-client/src/main/java/class347.java
@@ -1,54 +1,219 @@
-import java.util.ConcurrentModificationException;
+import java.util.AbstractQueue;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
import java.util.Iterator;
-import java.util.NoSuchElementException;
+import java.util.Map;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("md")
-public class class347 implements Iterator {
- @ObfuscatedName("o")
+@ObfuscatedName("mo")
+public class class347 extends AbstractQueue {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lmr;"
+ descriptor = "[Lmn;"
)
- class348 field4175;
+ class345[] field4166;
+ @ObfuscatedName("v")
+ Map field4167;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = -1785277143
+ intValue = 1349227939
)
- int field4174;
- @ObfuscatedName("l")
+ int field4165;
+ @ObfuscatedName("f")
+ final Comparator field4168;
+ @ObfuscatedName("j")
@ObfuscatedGetter(
- intValue = -114429441
+ intValue = 500600827
)
- int field4173;
+ int field4169;
+ public class347(int var1, Comparator var2) {
+ this.field4169 = 0; // L: 10
+ this.field4166 = new class345[var1]; // L: 17
+ this.field4167 = new HashMap(); // L: 18
+ this.field4168 = var2; // L: 19
+ } // L: 20
+
+ public class347(int var1) {
+ this(var1, (Comparator)null); // L: 13
+ } // L: 14
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lmr;)V"
+ descriptor = "(B)V",
+ garbageValue = "111"
)
- class347(class348 var1) {
- this.field4174 = 0; // L: 177
- this.field4173 = this.field4175.field4182; // L: 178
- this.field4175 = var1; // L: 181
- } // L: 182
+ void method6341() {
+ int var1 = (this.field4166.length << 1) + 1; // L: 23
+ this.field4166 = (class345[])((class345[])Arrays.copyOf(this.field4166, var1)); // L: 24
+ } // L: 25
- public boolean hasNext() {
- return this.field4174 < this.field4175.field4181; // L: 186
- }
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1035999073"
+ )
+ void method6342(int var1) {
+ class345 var2;
+ int var3;
+ for (var2 = this.field4166[var1]; var1 > 0; var1 = var3) { // L: 96 97 108
+ var3 = var1 - 1 >>> 1; // L: 98
+ class345 var4 = this.field4166[var3]; // L: 99
+ if (this.field4168 != null) { // L: 100
+ if (this.field4168.compare(var2.field4159, var4.field4159) >= 0) { // L: 101
+ break;
+ }
+ } else if (((Comparable)var2.field4159).compareTo(var4.field4159) >= 0) { // L: 104
+ break;
+ }
- public Object next() {
- if (this.field4175.field4182 != this.field4173) { // L: 192
- throw new ConcurrentModificationException();
- } else if (this.field4174 < this.field4175.field4181) { // L: 193
- Object var1 = this.field4175.field4179[this.field4174].field4171; // L: 194
- ++this.field4174; // L: 195
- return var1; // L: 196
+ this.field4166[var1] = var4; // L: 106
+ this.field4166[var1].field4158 = var1; // L: 107
+ }
+
+ this.field4166[var1] = var2; // L: 110
+ this.field4166[var1].field4158 = var1; // L: 111
+ } // L: 112
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(II)V",
+ garbageValue = "1952216372"
+ )
+ void method6354(int var1) {
+ class345 var2 = this.field4166[var1]; // L: 116
+
+ int var8;
+ for (int var3 = this.field4165 >>> 1; var1 < var3; var1 = var8) { // L: 117 118 140
+ int var4 = (var1 << 1) + 1; // L: 119
+ class345 var5 = this.field4166[var4]; // L: 120
+ int var6 = (var1 << 1) + 2; // L: 121
+ class345 var7 = this.field4166[var6]; // L: 122
+ if (this.field4168 != null) { // L: 124
+ if (var6 < this.field4165 && this.field4168.compare(var5.field4159, var7.field4159) > 0) { // L: 125
+ var8 = var6;
+ } else {
+ var8 = var4; // L: 126
+ }
+ } else if (var6 < this.field4165 && ((Comparable)var5.field4159).compareTo(var7.field4159) > 0) { // L: 129
+ var8 = var6;
+ } else {
+ var8 = var4; // L: 130
+ }
+
+ if (this.field4168 != null) { // L: 132
+ if (this.field4168.compare(var2.field4159, this.field4166[var8].field4159) <= 0) { // L: 133
+ break;
+ }
+ } else if (((Comparable)var2.field4159).compareTo(this.field4166[var8].field4159) <= 0) { // L: 136
+ break;
+ }
+
+ this.field4166[var1] = this.field4166[var8]; // L: 138
+ this.field4166[var1].field4158 = var1; // L: 139
+ }
+
+ this.field4166[var1] = var2; // L: 142
+ this.field4166[var1].field4158 = var1; // L: 143
+ } // L: 144
+
+ public boolean remove(Object var1) {
+ class345 var2 = (class345)this.field4167.remove(var1); // L: 77
+ if (var2 == null) { // L: 78
+ return false;
} else {
- throw new NoSuchElementException(); // L: 198
+ ++this.field4169; // L: 79
+ --this.field4165; // L: 80
+ if (var2.field4158 == this.field4165) { // L: 81
+ this.field4166[this.field4165] = null; // L: 82
+ return true; // L: 83
+ } else {
+ class345 var3 = this.field4166[this.field4165]; // L: 85
+ this.field4166[this.field4165] = null; // L: 86
+ this.field4166[var2.field4158] = var3; // L: 87
+ this.field4166[var2.field4158].field4158 = var2.field4158; // L: 88
+ this.method6354(var2.field4158); // L: 89
+ if (var3 == this.field4166[var2.field4158]) { // L: 90
+ this.method6342(var2.field4158);
+ }
+
+ return true; // L: 91
+ }
}
}
- public void remove() {
- throw new UnsupportedOperationException(); // L: 203
+ public Object peek() {
+ return this.field4165 == 0 ? null : this.field4166[0].field4159; // L: 54 55
+ }
+
+ public int size() {
+ return this.field4165; // L: 29
+ }
+
+ public boolean offer(Object var1) {
+ if (this.field4167.containsKey(var1)) { // L: 34
+ throw new IllegalArgumentException("");
+ } else {
+ ++this.field4169; // L: 35
+ int var2 = this.field4165; // L: 36
+ if (var2 >= this.field4166.length) { // L: 37
+ this.method6341();
+ }
+
+ ++this.field4165; // L: 38
+ if (var2 == 0) { // L: 39
+ this.field4166[0] = new class345(var1, 0); // L: 40
+ this.field4167.put(var1, this.field4166[0]); // L: 41
+ } else {
+ this.field4166[var2] = new class345(var1, var2); // L: 44
+ this.field4167.put(var1, this.field4166[var2]); // L: 45
+ this.method6342(var2); // L: 46
+ }
+
+ return true; // L: 48
+ }
+ }
+
+ public Object[] toArray() {
+ Object[] var1 = super.toArray(); // L: 154
+ if (this.field4168 != null) {
+ Arrays.sort(var1, this.field4168); // L: 155
+ } else {
+ Arrays.sort(var1); // L: 156
+ }
+
+ return var1; // L: 157
+ }
+
+ public Object poll() {
+ if (this.field4165 == 0) { // L: 61
+ return null;
+ } else {
+ ++this.field4169; // L: 62
+ Object var1 = this.field4166[0].field4159; // L: 63
+ this.field4167.remove(var1); // L: 64
+ --this.field4165; // L: 65
+ if (this.field4165 == 0) {
+ this.field4166[this.field4165] = null; // L: 66
+ } else {
+ this.field4166[0] = this.field4166[this.field4165]; // L: 68
+ this.field4166[0].field4158 = 0; // L: 69
+ this.field4166[this.field4165] = null; // L: 70
+ this.method6354(0); // L: 71
+ }
+
+ return var1; // L: 73
+ }
+ }
+
+ public boolean contains(Object var1) {
+ return this.field4167.containsKey(var1); // L: 148
+ }
+
+ public Iterator iterator() {
+ return new class346(this); // L: 162
}
}
diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java
deleted file mode 100644
index 454ab9edf7..0000000000
--- a/runescape-client/src/main/java/class348.java
+++ /dev/null
@@ -1,219 +0,0 @@
-import java.util.AbstractQueue;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mr")
-public class class348 extends AbstractQueue {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "[Lmf;"
- )
- class346[] field4179;
- @ObfuscatedName("q")
- Map field4180;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = -1908884105
- )
- int field4181;
- @ObfuscatedName("k")
- final Comparator field4178;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = -633680661
- )
- int field4182;
-
- public class348(int var1, Comparator var2) {
- this.field4182 = 0; // L: 10
- this.field4179 = new class346[var1]; // L: 17
- this.field4180 = new HashMap(); // L: 18
- this.field4178 = var2; // L: 19
- } // L: 20
-
- public class348(int var1) {
- this(var1, (Comparator)null); // L: 13
- } // L: 14
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "2064028908"
- )
- void method6192() {
- int var1 = (this.field4179.length << 1) + 1; // L: 23
- this.field4179 = (class346[])((class346[])Arrays.copyOf(this.field4179, var1)); // L: 24
- } // L: 25
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "-79126724"
- )
- void method6173(int var1) {
- class346 var2;
- int var3;
- for (var2 = this.field4179[var1]; var1 > 0; var1 = var3) { // L: 96 97 108
- var3 = var1 - 1 >>> 1; // L: 98
- class346 var4 = this.field4179[var3]; // L: 99
- if (this.field4178 != null) { // L: 100
- if (this.field4178.compare(var2.field4171, var4.field4171) >= 0) { // L: 101
- break;
- }
- } else if (((Comparable)var2.field4171).compareTo(var4.field4171) >= 0) { // L: 104
- break;
- }
-
- this.field4179[var1] = var4; // L: 106
- this.field4179[var1].field4170 = var1; // L: 107
- }
-
- this.field4179[var1] = var2; // L: 110
- this.field4179[var1].field4170 = var1; // L: 111
- } // L: 112
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1826932902"
- )
- void method6181(int var1) {
- class346 var2 = this.field4179[var1]; // L: 116
-
- int var8;
- for (int var3 = this.field4181 >>> 1; var1 < var3; var1 = var8) { // L: 117 118 140
- int var4 = (var1 << 1) + 1; // L: 119
- class346 var5 = this.field4179[var4]; // L: 120
- int var6 = (var1 << 1) + 2; // L: 121
- class346 var7 = this.field4179[var6]; // L: 122
- if (this.field4178 != null) { // L: 124
- if (var6 < this.field4181 && this.field4178.compare(var5.field4171, var7.field4171) > 0) { // L: 125
- var8 = var6;
- } else {
- var8 = var4; // L: 126
- }
- } else if (var6 < this.field4181 && ((Comparable)var5.field4171).compareTo(var7.field4171) > 0) { // L: 129
- var8 = var6;
- } else {
- var8 = var4; // L: 130
- }
-
- if (this.field4178 != null) { // L: 132
- if (this.field4178.compare(var2.field4171, this.field4179[var8].field4171) <= 0) { // L: 133
- break;
- }
- } else if (((Comparable)var2.field4171).compareTo(this.field4179[var8].field4171) <= 0) { // L: 136
- break;
- }
-
- this.field4179[var1] = this.field4179[var8]; // L: 138
- this.field4179[var1].field4170 = var1; // L: 139
- }
-
- this.field4179[var1] = var2; // L: 142
- this.field4179[var1].field4170 = var1; // L: 143
- } // L: 144
-
- public boolean remove(Object var1) {
- class346 var2 = (class346)this.field4180.remove(var1); // L: 77
- if (var2 == null) { // L: 78
- return false;
- } else {
- ++this.field4182; // L: 79
- --this.field4181; // L: 80
- if (var2.field4170 == this.field4181) { // L: 81
- this.field4179[this.field4181] = null; // L: 82
- return true; // L: 83
- } else {
- class346 var3 = this.field4179[this.field4181]; // L: 85
- this.field4179[this.field4181] = null; // L: 86
- this.field4179[var2.field4170] = var3; // L: 87
- this.field4179[var2.field4170].field4170 = var2.field4170; // L: 88
- this.method6181(var2.field4170); // L: 89
- if (var3 == this.field4179[var2.field4170]) { // L: 90
- this.method6173(var2.field4170);
- }
-
- return true; // L: 91
- }
- }
- }
-
- public Object peek() {
- return this.field4181 == 0 ? null : this.field4179[0].field4171; // L: 54 55
- }
-
- public Iterator iterator() {
- return new class347(this); // L: 162
- }
-
- public boolean offer(Object var1) {
- if (this.field4180.containsKey(var1)) { // L: 34
- throw new IllegalArgumentException("");
- } else {
- ++this.field4182; // L: 35
- int var2 = this.field4181; // L: 36
- if (var2 >= this.field4179.length) { // L: 37
- this.method6192();
- }
-
- ++this.field4181; // L: 38
- if (var2 == 0) { // L: 39
- this.field4179[0] = new class346(var1, 0); // L: 40
- this.field4180.put(var1, this.field4179[0]); // L: 41
- } else {
- this.field4179[var2] = new class346(var1, var2); // L: 44
- this.field4180.put(var1, this.field4179[var2]); // L: 45
- this.method6173(var2); // L: 46
- }
-
- return true; // L: 48
- }
- }
-
- public boolean contains(Object var1) {
- return this.field4180.containsKey(var1); // L: 148
- }
-
- public Object[] toArray() {
- Object[] var1 = super.toArray(); // L: 154
- if (this.field4178 != null) {
- Arrays.sort(var1, this.field4178); // L: 155
- } else {
- Arrays.sort(var1); // L: 156
- }
-
- return var1; // L: 157
- }
-
- public Object poll() {
- if (this.field4181 == 0) { // L: 61
- return null;
- } else {
- ++this.field4182; // L: 62
- Object var1 = this.field4179[0].field4171; // L: 63
- this.field4180.remove(var1); // L: 64
- --this.field4181; // L: 65
- if (this.field4181 == 0) {
- this.field4179[this.field4181] = null; // L: 66
- } else {
- this.field4179[0] = this.field4179[this.field4181]; // L: 68
- this.field4179[0].field4170 = 0; // L: 69
- this.field4179[this.field4181] = null; // L: 70
- this.method6181(0); // L: 71
- }
-
- return var1; // L: 73
- }
- }
-
- public int size() {
- return this.field4181; // L: 29
- }
-}
diff --git a/runescape-client/src/main/java/class350.java b/runescape-client/src/main/java/class350.java
new file mode 100644
index 0000000000..2a4659db0b
--- /dev/null
+++ b/runescape-client/src/main/java/class350.java
@@ -0,0 +1,71 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("mq")
+public class class350 {
+ @ObfuscatedName("c")
+ @Export("writeRandomDat")
+ public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) {
+ if (var2 == var0) { // L: 12
+ if (var3 == var1) { // L: 13
+ return;
+ }
+
+ if (var3 > var1 && var3 < var4 + var1) { // L: 14
+ --var4; // L: 15
+ var1 += var4; // L: 16
+ var3 += var4; // L: 17
+ var4 = var1 - var4; // L: 18
+
+ for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28
+ var2[var3--] = var0[var1--]; // L: 21
+ var2[var3--] = var0[var1--]; // L: 22
+ var2[var3--] = var0[var1--]; // L: 23
+ var2[var3--] = var0[var1--]; // L: 24
+ var2[var3--] = var0[var1--]; // L: 25
+ var2[var3--] = var0[var1--]; // L: 26
+ var2[var3--] = var0[var1--]; // L: 27
+ }
+
+ for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31
+ }
+
+ return; // L: 32
+ }
+ }
+
+ var4 += var1; // L: 35
+
+ for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45
+ var2[var3++] = var0[var1++]; // L: 38
+ var2[var3++] = var0[var1++]; // L: 39
+ var2[var3++] = var0[var1++]; // L: 40
+ var2[var3++] = var0[var1++]; // L: 41
+ var2[var3++] = var0[var1++]; // L: 42
+ var2[var3++] = var0[var1++]; // L: 43
+ var2[var3++] = var0[var1++]; // L: 44
+ }
+
+ for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48
+ }
+
+ } // L: 49
+
+ @ObfuscatedName("i")
+ @Export("clearIntArray")
+ public static void clearIntArray(int[] var0, int var1, int var2) {
+ for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373
+ var0[var1++] = 0; // L: 366
+ var0[var1++] = 0; // L: 367
+ var0[var1++] = 0; // L: 368
+ var0[var1++] = 0; // L: 369
+ var0[var1++] = 0; // L: 370
+ var0[var1++] = 0; // L: 371
+ var0[var1++] = 0; // L: 372
+ }
+
+ for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376
+ }
+
+ } // L: 377
+}
diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java
index aff5244714..997530300a 100644
--- a/runescape-client/src/main/java/class351.java
+++ b/runescape-client/src/main/java/class351.java
@@ -1,71 +1,39 @@
-import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("mu")
+@ObfuscatedName("ma")
public class class351 {
- @ObfuscatedName("o")
- @Export("writeRandomDat")
- public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) {
- if (var2 == var0) { // L: 12
- if (var3 == var1) { // L: 13
- return;
- }
-
- if (var3 > var1 && var3 < var4 + var1) { // L: 14
- --var4; // L: 15
- var1 += var4; // L: 16
- var3 += var4; // L: 17
- var4 = var1 - var4; // L: 18
-
- for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28
- var2[var3--] = var0[var1--]; // L: 21
- var2[var3--] = var0[var1--]; // L: 22
- var2[var3--] = var0[var1--]; // L: 23
- var2[var3--] = var0[var1--]; // L: 24
- var2[var3--] = var0[var1--]; // L: 25
- var2[var3--] = var0[var1--]; // L: 26
- var2[var3--] = var0[var1--]; // L: 27
- }
-
- for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31
- }
-
- return; // L: 32
- }
- }
-
- var4 += var1; // L: 35
-
- for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45
- var2[var3++] = var0[var1++]; // L: 38
- var2[var3++] = var0[var1++]; // L: 39
- var2[var3++] = var0[var1++]; // L: 40
- var2[var3++] = var0[var1++]; // L: 41
- var2[var3++] = var0[var1++]; // L: 42
- var2[var3++] = var0[var1++]; // L: 43
- var2[var3++] = var0[var1++]; // L: 44
- }
-
- for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48
- }
-
- } // L: 49
-
+ @ObfuscatedName("z")
+ public static boolean field4198;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 951623757
+ )
+ int field4197;
@ObfuscatedName("v")
- @Export("clearIntArray")
- public static void clearIntArray(int[] var0, int var1, int var2) {
- for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373
- var0[var1++] = 0; // L: 366
- var0[var1++] = 0; // L: 367
- var0[var1++] = 0; // L: 368
- var0[var1++] = 0; // L: 369
- var0[var1++] = 0; // L: 370
- var0[var1++] = 0; // L: 371
- var0[var1++] = 0; // L: 372
- }
+ @ObfuscatedGetter(
+ intValue = -658455091
+ )
+ int field4193;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -1299809865
+ )
+ int field4195;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = 156042527
+ )
+ int field4196;
- for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376
- }
-
- } // L: 377
+ public String toString() {
+ boolean var1 = true; // L: 15
+ int var2 = 10 - Integer.toString(this.field4197).length(); // L: 16
+ int var3 = 10 - Integer.toString(this.field4195).length(); // L: 17
+ int var4 = 10 - Integer.toString(this.field4193).length(); // L: 18
+ String var5 = " ".substring(10 - var2); // L: 19
+ String var6 = " ".substring(10 - var3); // L: 20
+ String var7 = " ".substring(10 - var4); // L: 21
+ return " Size: " + this.field4197 + var5 + "Created: " + this.field4193 + var7 + "Total used: " + this.field4195 + var6 + "Max-In-Use: " + this.field4196; // L: 22
+ }
}
diff --git a/runescape-client/src/main/java/class352.java b/runescape-client/src/main/java/class352.java
deleted file mode 100644
index fd0c766bc5..0000000000
--- a/runescape-client/src/main/java/class352.java
+++ /dev/null
@@ -1,37 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("mp")
-public class class352 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 1906795163
- )
- int field4205;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = -154815115
- )
- int field4206;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 250970163
- )
- int field4208;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -457383541
- )
- int field4207;
-
- public String toString() {
- boolean var1 = true; // L: 15
- int var2 = 10 - Integer.toString(this.field4205).length(); // L: 16
- int var3 = 10 - Integer.toString(this.field4208).length(); // L: 17
- int var4 = 10 - Integer.toString(this.field4206).length(); // L: 18
- String var5 = " ".substring(10 - var2); // L: 19
- String var6 = " ".substring(10 - var3); // L: 20
- String var7 = " ".substring(10 - var4); // L: 21
- return " Size: " + this.field4205 + var5 + "Created: " + this.field4206 + var7 + "Total used: " + this.field4208 + var6 + "Max-In-Use: " + this.field4207; // L: 22
- }
-}
diff --git a/runescape-client/src/main/java/class353.java b/runescape-client/src/main/java/class353.java
new file mode 100644
index 0000000000..6f17785448
--- /dev/null
+++ b/runescape-client/src/main/java/class353.java
@@ -0,0 +1,108 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("mc")
+public class class353 {
+ @ObfuscatedName("ay")
+ @Export("client")
+ @ObfuscatedSignature(
+ descriptor = "Lclient;"
+ )
+ static Client client;
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "([Ljava/lang/String;[II)V",
+ garbageValue = "-221200866"
+ )
+ public static void method6507(String[] var0, int[] var1) {
+ method6505(var0, var1, 0, var0.length - 1); // L: 39
+ } // L: 40
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "([Ljava/lang/String;[IIIB)V",
+ garbageValue = "81"
+ )
+ static void method6505(String[] var0, int[] var1, int var2, int var3) {
+ if (var2 < var3) { // L: 43
+ int var4 = (var3 + var2) / 2; // L: 44
+ int var5 = var2; // L: 45
+ String var6 = var0[var4]; // L: 46
+ var0[var4] = var0[var3]; // L: 47
+ var0[var3] = var6; // L: 48
+ int var7 = var1[var4]; // L: 49
+ var1[var4] = var1[var3]; // L: 50
+ var1[var3] = var7; // L: 51
+
+ for (int var8 = var2; var8 < var3; ++var8) { // L: 52
+ if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53
+ String var9 = var0[var8]; // L: 54
+ var0[var8] = var0[var5]; // L: 55
+ var0[var5] = var9; // L: 56
+ int var10 = var1[var8]; // L: 57
+ var1[var8] = var1[var5]; // L: 58
+ var1[var5++] = var10; // L: 59
+ }
+ }
+
+ var0[var3] = var0[var5]; // L: 63
+ var0[var5] = var6; // L: 64
+ var1[var3] = var1[var5]; // L: 65
+ var1[var5] = var7; // L: 66
+ method6505(var0, var1, var2, var5 - 1); // L: 67
+ method6505(var0, var1, var5 + 1, var3); // L: 68
+ }
+
+ } // L: 70
+
+ @ObfuscatedName("b")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-2096074968"
+ )
+ static int method6506(int var0, Script var1, boolean var2) {
+ Widget var3;
+ if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1420
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1421
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.itemId; // L: 1422
+ return 1; // L: 1423
+ } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1425
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1426
+ if (var3.itemId != -1) { // L: 1427
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.itemQuantity;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1428
+ }
+
+ return 1; // L: 1429
+ } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1431
+ int var5 = Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]; // L: 1432
+ InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); // L: 1433
+ if (var4 != null) { // L: 1434
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 1;
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 1435
+ }
+
+ return 1; // L: 1436
+ } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1438
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1439
+ return 1; // L: 1440
+ } else if (var0 == 2707) { // L: 1442
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1443
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = var3.method5680() ? 1 : 0; // L: 1444
+ return 1; // L: 1445
+ } else if (var0 == 2708) { // L: 1447
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1448
+ return class29.method363(var3); // L: 1449
+ } else if (var0 == 2709) { // L: 1451
+ var3 = class140.getWidget(Interpreter.Interpreter_intStack[--class446.Interpreter_intStackSize]); // L: 1452
+ return WorldMapSection0.method4947(var3); // L: 1453
+ } else {
+ return 2; // L: 1455
+ }
+ }
+}
diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java
index 5355d96f10..db6921ea0e 100644
--- a/runescape-client/src/main/java/class356.java
+++ b/runescape-client/src/main/java/class356.java
@@ -2,12 +2,12 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mg")
+@ObfuscatedName("mu")
public class class356 {
- @ObfuscatedName("ea")
+ @ObfuscatedName("ij")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "Lgg;"
)
- @Export("archive2")
- static Archive archive2;
+ @Export("scene")
+ static Scene scene;
}
diff --git a/runescape-client/src/main/java/class357.java b/runescape-client/src/main/java/class357.java
index e78c1e27e6..cf3504b1aa 100644
--- a/runescape-client/src/main/java/class357.java
+++ b/runescape-client/src/main/java/class357.java
@@ -2,17 +2,29 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mb")
+@ObfuscatedName("mz")
public class class357 {
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "Lpx;"
- )
- @Export("NetCache_responseArchiveBuffer")
- public static Buffer NetCache_responseArchiveBuffer;
+ @ObfuscatedName("c")
+ static double method6530(double var0, double var2, double var4) {
+ double var8 = (var0 - var2) / var4; // L: 10
+ double var6 = Math.exp(var8 * -var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12
+ return var6 / var4; // L: 14
+ }
- @ObfuscatedName("r")
- static int method6392(long var0) {
- return (int)(var0 >>> 14 & 3L); // L: 76
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/CharSequence;I)I",
+ garbageValue = "-586452778"
+ )
+ @Export("hashString")
+ public static int hashString(CharSequence var0) {
+ int var1 = var0.length(); // L: 141
+ int var2 = 0; // L: 142
+
+ for (int var3 = 0; var3 < var1; ++var3) { // L: 143
+ var2 = (var2 << 5) - var2 + class295.charToByteCp1252(var0.charAt(var3));
+ }
+
+ return var2; // L: 144
}
}
diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java
deleted file mode 100644
index 7d7ac4b8b7..0000000000
--- a/runescape-client/src/main/java/class358.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mq")
-public class class358 {
- @ObfuscatedName("ra")
- @ObfuscatedSignature(
- descriptor = "Lek;"
- )
- @Export("guestClanSettings")
- static ClanSettings guestClanSettings;
- @ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "[Lqd;"
- )
- @Export("title_muteSprite")
- static IndexedSprite[] title_muteSprite;
-}
diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java
new file mode 100644
index 0000000000..23bb4c6add
--- /dev/null
+++ b/runescape-client/src/main/java/class359.java
@@ -0,0 +1,41 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("mf")
+public class class359 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lmf;"
+ )
+ public static final class359 field4260;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lmf;"
+ )
+ static final class359 field4259;
+ @ObfuscatedName("e")
+ @Export("SpriteBuffer_spriteWidths")
+ public static int[] SpriteBuffer_spriteWidths;
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "[Lpa;"
+ )
+ @Export("JagexCache_idxFiles")
+ public static BufferedFile[] JagexCache_idxFiles;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -1555727855
+ )
+ final int field4258;
+
+ static {
+ field4260 = new class359(1); // L: 5
+ field4259 = new class359(0); // L: 6
+ }
+
+ class359(int var1) {
+ this.field4258 = var1; // L: 10
+ } // L: 11
+}
diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java
index 2c2eb544e0..86dc2b5a8b 100644
--- a/runescape-client/src/main/java/class360.java
+++ b/runescape-client/src/main/java/class360.java
@@ -1,54 +1,44 @@
-import net.runelite.mapping.ObfuscatedGetter;
+import java.util.Comparator;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mc")
-public class class360 {
- @ObfuscatedName("o")
+@ObfuscatedName("mg")
+class class360 implements Comparator {
+ @ObfuscatedName("c")
+ @Export("javaVendor")
+ public static String javaVendor;
+ // $FF: synthetic field
@ObfuscatedSignature(
- descriptor = "Lmc;"
+ descriptor = "Lmy;"
)
- public static final class360 field4274;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lmc;"
- )
- static final class360 field4272;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = -1759688503
- )
- final int field4273;
+ final class361 this$0;
- static {
- field4274 = new class360(0); // L: 5
- field4272 = new class360(1); // L: 6
+ @ObfuscatedSignature(
+ descriptor = "(Lmy;)V"
+ )
+ class360(class361 var1) {
+ this.this$0 = var1; // L: 7
}
- class360(int var1) {
- this.field4273 = var1; // L: 10
- } // L: 11
-
- @ObfuscatedName("hv")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "732758346"
+ descriptor = "(Lmv;Lmv;I)I",
+ garbageValue = "796004144"
)
- static final void method6393() {
- Client.field606 = 0; // L: 5447
- int var0 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 5448
- int var1 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 5449
- if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5450
- Client.field606 = 1;
+ int method6532(class362 var1, class362 var2) {
+ if (var1.field4277 > var2.field4277) {
+ return 1; // L: 9
+ } else {
+ return var1.field4277 < var2.field4277 ? -1 : 0; // L: 10 11
}
+ }
- if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5451
- Client.field606 = 1;
- }
+ public int compare(Object var1, Object var2) {
+ return this.method6532((class362)var1, (class362)var2); // L: 15
+ }
- if (Client.field606 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5452
- Client.field606 = 0;
- }
-
- } // L: 5453
+ public boolean equals(Object var1) {
+ return super.equals(var1); // L: 19
+ }
}
diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java
index 8e096ec650..13f6bc76b2 100644
--- a/runescape-client/src/main/java/class361.java
+++ b/runescape-client/src/main/java/class361.java
@@ -1,47 +1,209 @@
import java.util.Comparator;
-import net.runelite.mapping.Export;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mz")
-class class361 implements Comparator {
+@ObfuscatedName("my")
+public final class class361 {
+ @ObfuscatedName("c")
+ final Comparator field4269;
+ @ObfuscatedName("v")
+ final Map field4274;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "Lmo;"
)
- @Export("KitDefinition_modelsArchive")
- static AbstractArchive KitDefinition_modelsArchive;
- // $FF: synthetic field
+ final class347 field4270;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lmh;"
+ descriptor = "Lmo;"
)
- final class362 this$0;
+ final class347 field4268;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ longValue = 1981115018933761779L
+ )
+ final long field4272;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Lmf;"
+ )
+ final class359 field4273;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = 1259093157
+ )
+ final int field4271;
@ObfuscatedSignature(
- descriptor = "(Lmh;)V"
+ descriptor = "(JILmf;)V"
)
- class361(class362 var1) {
- this.this$0 = var1; // L: 7
+ class361(long var1, int var3, class359 var4) {
+ this.field4269 = new class360(this); // L: 7
+ this.field4272 = var1; // L: 34
+ this.field4271 = var3; // L: 35
+ this.field4273 = var4; // L: 36
+ if (this.field4271 == -1) { // L: 37
+ this.field4274 = new HashMap(64); // L: 38
+ this.field4270 = new class347(64, this.field4269); // L: 39
+ this.field4268 = null; // L: 40
+ } else {
+ if (this.field4273 == null) { // L: 43
+ throw new IllegalArgumentException("");
+ }
+
+ this.field4274 = new HashMap(this.field4271); // L: 44
+ this.field4270 = new class347(this.field4271, this.field4269); // L: 45
+ this.field4268 = new class347(this.field4271); // L: 46
+ }
+
+ } // L: 48
+
+ @ObfuscatedSignature(
+ descriptor = "(ILmf;)V"
+ )
+ public class361(int var1, class359 var2) {
+ this(-1L, var1, var2); // L: 30
+ } // L: 31
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "1742172857"
+ )
+ boolean method6549() {
+ return this.field4271 != -1; // L: 51
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lmw;Lmw;I)I",
- garbageValue = "-1192417518"
+ descriptor = "(Ljava/lang/Object;B)Ljava/lang/Object;",
+ garbageValue = "13"
)
- int method6395(class363 var1, class363 var2) {
- if (var1.field4290 > var2.field4290) { // L: 9
- return 1;
- } else {
- return var1.field4290 < var2.field4290 ? -1 : 0; // L: 10 11
+ public Object method6538(Object var1) {
+ synchronized(this) { // L: 55
+ if (this.field4272 != -1L) { // L: 56
+ this.method6541();
+ }
+
+ class362 var3 = (class362)this.field4274.get(var1); // L: 57
+ if (var3 == null) { // L: 58
+ return null;
+ } else {
+ this.method6540(var3, false); // L: 59
+ return var3.field4276; // L: 60
+ }
}
}
- public boolean equals(Object var1) {
- return super.equals(var1); // L: 19
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;",
+ garbageValue = "870552901"
+ )
+ public Object method6539(Object var1, Object var2) {
+ synchronized(this) {
+ if (this.field4272 != -1L) {
+ this.method6541();
+ }
+
+ class362 var4 = (class362)this.field4274.get(var1);
+ if (var4 != null) {
+ Object var8 = var4.field4276;
+ var4.field4276 = var2;
+ this.method6540(var4, false);
+ return var8;
+ } else {
+ class362 var5;
+ if (this.method6549() && this.field4274.size() == this.field4271) {
+ var5 = (class362)this.field4268.remove();
+ this.field4274.remove(var5.field4275);
+ this.field4270.remove(var5); // L: 77
+ }
+
+ var5 = new class362(var2, var1); // L: 79
+ this.field4274.put(var1, var5); // L: 80
+ this.method6540(var5, true); // L: 81
+ return null; // L: 82
+ }
+ }
}
- public int compare(Object var1, Object var2) {
- return this.method6395((class363)var1, (class363)var2); // L: 15
- }
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Lmv;ZI)V",
+ garbageValue = "-1864574048"
+ )
+ void method6540(class362 var1, boolean var2) {
+ if (!var2) { // L: 88
+ this.field4270.remove(var1); // L: 89
+ if (this.method6549() && !this.field4268.remove(var1)) { // L: 90 91
+ throw new IllegalStateException("");
+ }
+ }
+
+ var1.field4277 = System.currentTimeMillis(); // L: 94
+ if (this.method6549()) { // L: 95
+ switch(this.field4273.field4258) { // L: 96
+ case 0:
+ ++var1.field4278; // L: 101
+ break;
+ case 1:
+ var1.field4278 = var1.field4277; // L: 98
+ }
+
+ this.field4268.add(var1); // L: 104
+ }
+
+ this.field4270.add(var1); // L: 106
+ } // L: 107
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1118070755"
+ )
+ void method6541() {
+ if (-1L == this.field4272) { // L: 111
+ throw new IllegalStateException("");
+ } else {
+ long var1 = System.currentTimeMillis() - this.field4272; // L: 112
+
+ while (!this.field4270.isEmpty()) { // L: 113
+ class362 var3 = (class362)this.field4270.peek(); // L: 114
+ if (var3.field4277 >= var1) { // L: 115
+ return; // L: 120
+ }
+
+ this.field4274.remove(var3.field4275); // L: 116
+ this.field4270.remove(var3); // L: 117
+ if (this.method6549()) { // L: 118
+ this.field4268.remove(var3);
+ }
+ }
+
+ }
+ } // L: 122
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-77"
+ )
+ static void method6552() {
+ Tiles.Tiles_underlays = null; // L: 64
+ Tiles.Tiles_overlays = null; // L: 65
+ Tiles.Tiles_shapes = null; // L: 66
+ Tiles.field996 = null; // L: 67
+ class1.field2 = null; // L: 68
+ UserComparator6.field1415 = null; // L: 69
+ class430.field4651 = null; // L: 70
+ MusicPatchNode2.Tiles_hue = null; // L: 71
+ Tiles.Tiles_saturation = null; // L: 72
+ Varcs.Tiles_lightness = null; // L: 73
+ class465.Tiles_hueMultiplier = null; // L: 74
+ WorldMapScaleHandler.field2877 = null; // L: 75
+ } // L: 76
}
diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java
index e25c99c227..bebf4ab8e6 100644
--- a/runescape-client/src/main/java/class362.java
+++ b/runescape-client/src/main/java/class362.java
@@ -1,189 +1,75 @@
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("mh")
-public final class class362 {
- @ObfuscatedName("o")
- final Comparator field4283;
+@ObfuscatedName("mv")
+public final class class362 implements Comparable {
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "[Lbc;"
+ )
+ @Export("World_worlds")
+ static World[] World_worlds;
+ @ObfuscatedName("c")
+ Object field4276;
+ @ObfuscatedName("v")
+ Object field4275;
@ObfuscatedName("q")
- final Map field4287;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lmr;"
- )
- final class348 field4282;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lmr;"
- )
- final class348 field4281;
- @ObfuscatedName("a")
@ObfuscatedGetter(
- longValue = -5862348301303990459L
+ longValue = 9010980018461630201L
)
- final long field4280;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lmc;"
- )
- final class360 field4285;
- @ObfuscatedName("p")
+ long field4277;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = 410246549
+ longValue = 5118343004498114985L
)
- final int field4286;
+ long field4278;
+ class362(Object var1, Object var2) {
+ this.field4276 = var1; // L: 10
+ this.field4275 = var2; // L: 11
+ } // L: 12
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(JILmc;)V"
+ descriptor = "(Lmv;I)I",
+ garbageValue = "-1596161732"
)
- class362(long var1, int var3, class360 var4) {
- this.field4283 = new class361(this); // L: 7
- this.field4280 = var1; // L: 34
- this.field4286 = var3; // L: 35
- this.field4285 = var4; // L: 36
- if (this.field4286 == -1) { // L: 37
- this.field4287 = new HashMap(64); // L: 38
- this.field4282 = new class348(64, this.field4283); // L: 39
- this.field4281 = null; // L: 40
+ int method6553(class362 var1) {
+ if (this.field4278 < var1.field4278) {
+ return -1; // L: 15
} else {
- if (this.field4285 == null) { // L: 43
- throw new IllegalArgumentException("");
- }
-
- this.field4287 = new HashMap(this.field4286); // L: 44
- this.field4282 = new class348(this.field4286, this.field4283); // L: 45
- this.field4281 = new class348(this.field4286); // L: 46
- }
-
- } // L: 48
-
- @ObfuscatedSignature(
- descriptor = "(ILmc;)V"
- )
- public class362(int var1, class360 var2) {
- this(-1L, var1, var2); // L: 30
- } // L: 31
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "1327719952"
- )
- boolean method6401() {
- return this.field4286 != -1; // L: 51
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;B)Ljava/lang/Object;",
- garbageValue = "23"
- )
- public Object method6413(Object var1) {
- synchronized(this) { // L: 55
- if (this.field4280 != -1L) { // L: 56
- this.method6404();
- }
-
- class363 var3 = (class363)this.field4287.get(var1); // L: 57
- if (var3 == null) { // L: 58
- return null;
- } else {
- this.method6403(var3, false); // L: 59
- return var3.field4289; // L: 60
- }
+ return this.field4278 > var1.field4278 ? 1 : 0; // L: 16 17
}
}
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object;",
- garbageValue = "735656301"
- )
- public Object method6402(Object var1, Object var2) {
- synchronized(this) { // L: 65
- if (this.field4280 != -1L) { // L: 66
- this.method6404();
- }
-
- class363 var4 = (class363)this.field4287.get(var1); // L: 67
- if (var4 != null) { // L: 68
- Object var8 = var4.field4289; // L: 69
- var4.field4289 = var2; // L: 70
- this.method6403(var4, false); // L: 71
- return var8; // L: 72
- } else {
- class363 var5;
- if (this.method6401() && this.field4287.size() == this.field4286) { // L: 74
- var5 = (class363)this.field4281.remove(); // L: 75
- this.field4287.remove(var5.field4288); // L: 76
- this.field4282.remove(var5); // L: 77
- }
-
- var5 = new class363(var2, var1); // L: 79
- this.field4287.put(var1, var5); // L: 80
- this.method6403(var5, true); // L: 81
- return null; // L: 82
- }
- }
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Lmw;ZI)V",
- garbageValue = "1467205859"
- )
- void method6403(class363 var1, boolean var2) {
- if (!var2) { // L: 88
- this.field4282.remove(var1); // L: 89
- if (this.method6401() && !this.field4281.remove(var1)) { // L: 90 91
- throw new IllegalStateException("");
- }
- }
-
- var1.field4290 = System.currentTimeMillis(); // L: 94
- if (this.method6401()) { // L: 95
- switch(this.field4285.field4273) { // L: 96
- case 0:
- var1.field4291 = var1.field4290; // L: 98
- break;
- case 1:
- ++var1.field4291; // L: 101
- }
-
- this.field4281.add(var1); // L: 104
- }
-
- this.field4282.add(var1); // L: 106
- } // L: 107
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "23"
- )
- void method6404() {
- if (-1L == this.field4280) { // L: 111
- throw new IllegalStateException("");
+ public boolean equals(Object var1) {
+ if (var1 instanceof class362) { // L: 22
+ return this.field4275.equals(((class362)var1).field4275);
} else {
- long var1 = System.currentTimeMillis() - this.field4280; // L: 112
-
- while (!this.field4282.isEmpty()) { // L: 113
- class363 var3 = (class363)this.field4282.peek(); // L: 114
- if (var3.field4290 >= var1) { // L: 115
- return; // L: 120
- }
-
- this.field4287.remove(var3.field4288); // L: 116
- this.field4282.remove(var3); // L: 117
- if (this.method6401()) { // L: 118
- this.field4281.remove(var3);
- }
- }
-
+ throw new IllegalArgumentException(); // L: 23
}
- } // L: 122
+ }
+
+ public int hashCode() {
+ return this.field4275.hashCode(); // L: 28
+ }
+
+ public int compareTo(Object var1) {
+ return this.method6553((class362)var1); // L: 32
+ }
+
+ @ObfuscatedName("ic")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "985949639"
+ )
+ @Export("resumePauseWidget")
+ static void resumePauseWidget(int var0, int var1) {
+ PacketBufferNode var2 = EnumComposition.getPacketBufferNode(ClientPacket.field2995, Client.packetWriter.isaacCipher); // L: 9588
+ var2.packetBuffer.writeIntME(var1); // L: 9589
+ var2.packetBuffer.method7783(var0); // L: 9590
+ Client.packetWriter.addNode(var2); // L: 9591
+ } // L: 9592
}
diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java
deleted file mode 100644
index a377e1a138..0000000000
--- a/runescape-client/src/main/java/class363.java
+++ /dev/null
@@ -1,91 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mw")
-public final class class363 implements Comparable {
- @ObfuscatedName("o")
- Object field4289;
- @ObfuscatedName("q")
- Object field4288;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- longValue = 8122509668442582777L
- )
- long field4290;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- longValue = -2881932506811436755L
- )
- long field4291;
-
- class363(Object var1, Object var2) {
- this.field4289 = var1; // L: 10
- this.field4288 = var2; // L: 11
- } // L: 12
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lmw;I)I",
- garbageValue = "-1341616281"
- )
- int method6415(class363 var1) {
- if (this.field4291 < var1.field4291) {
- return -1; // L: 15
- } else {
- return this.field4291 > var1.field4291 ? 1 : 0; // L: 16 17
- }
- }
-
- public boolean equals(Object var1) {
- if (var1 instanceof class363) { // L: 22
- return this.field4288.equals(((class363)var1).field4288);
- } else {
- throw new IllegalArgumentException(); // L: 23
- }
- }
-
- public int compareTo(Object var1) {
- return this.method6415((class363)var1); // L: 32
- }
-
- public int hashCode() {
- return this.field4288.hashCode(); // L: 28
- }
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(Lki;I[B[BI)V",
- garbageValue = "-1210183331"
- )
- @Export("Widget_setKey")
- static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
- if (var0.field3474 == null) { // L: 988
- if (var2 == null) { // L: 989
- return; // L: 995
- }
-
- var0.field3474 = new byte[11][]; // L: 990
- var0.field3419 = new byte[11][]; // L: 991
- var0.field3476 = new int[11]; // L: 992
- var0.field3481 = new int[11]; // L: 993
- }
-
- var0.field3474[var1] = var2; // L: 997
- if (var2 != null) {
- var0.field3473 = true; // L: 998
- } else {
- var0.field3473 = false; // L: 1000
-
- for (int var4 = 0; var4 < var0.field3474.length; ++var4) { // L: 1001
- if (var0.field3474[var4] != null) { // L: 1002
- var0.field3473 = true; // L: 1003
- break;
- }
- }
- }
-
- var0.field3419[var1] = var3; // L: 1008
- } // L: 1009
-}
diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java
index 26c5c4ab3b..8102718045 100644
--- a/runescape-client/src/main/java/class385.java
+++ b/runescape-client/src/main/java/class385.java
@@ -1,13 +1,39 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nk")
+@ObfuscatedName("nx")
public class class385 {
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 1054152823
+ @ObfuscatedName("c")
+ float field4383;
+ @ObfuscatedName("v")
+ float field4382;
+ @ObfuscatedName("q")
+ float field4384;
+
+ static {
+ new class385(0.0F, 0.0F, 0.0F); // L: 5
+ new class385(1.0F, 1.0F, 1.0F); // L: 9
+ new class385(1.0F, 0.0F, 0.0F); // L: 13
+ new class385(0.0F, 1.0F, 0.0F); // L: 17
+ new class385(0.0F, 0.0F, 1.0F); // L: 21
+ } // L: 26
+
+ class385(float var1, float var2, float var3) {
+ this.field4383 = var1; // L: 33
+ this.field4382 = var2; // L: 34
+ this.field4384 = var3; // L: 35
+ } // L: 36
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)F",
+ garbageValue = "84"
)
- @Export("RunException_revision")
- public static int RunException_revision;
+ final float method6929() {
+ return (float)Math.sqrt((double)(this.field4384 * this.field4384 + this.field4383 * this.field4383 + this.field4382 * this.field4382)); // L: 39
+ }
+
+ public String toString() {
+ return this.field4383 + ", " + this.field4382 + ", " + this.field4384; // L: 44
+ }
}
diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java
index fbdf1821e5..c0f3ece1dc 100644
--- a/runescape-client/src/main/java/class386.java
+++ b/runescape-client/src/main/java/class386.java
@@ -1,40 +1,126 @@
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nv")
-public class class386 {
- @ObfuscatedName("o")
- float field4392;
+@ObfuscatedName("ni")
+public final class class386 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "[Lni;"
+ )
+ public static class386[] field4389;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = 1938256603
+ )
+ static int field4386;
@ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = 585469667
+ )
+ public static int field4385;
+ @ObfuscatedName("f")
+ float field4388;
+ @ObfuscatedName("j")
+ float field4387;
+ @ObfuscatedName("e")
float field4390;
- @ObfuscatedName("l")
+ @ObfuscatedName("g")
float field4391;
static {
- new class386(0.0F, 0.0F, 0.0F); // L: 5
- new class386(1.0F, 1.0F, 1.0F); // L: 9
- new class386(1.0F, 0.0F, 0.0F); // L: 13
- new class386(0.0F, 1.0F, 0.0F); // L: 17
- new class386(0.0F, 0.0F, 1.0F); // L: 21
- FontName.method7230(100); // L: 25
- } // L: 26
+ field4389 = new class386[0]; // L: 4
+ field4386 = 100; // L: 10
+ field4389 = new class386[100]; // L: 11
+ field4385 = 0; // L: 12
+ new class386();
+ } // L: 18
- class386(float var1, float var2, float var3) {
- this.field4392 = var1; // L: 35
- this.field4390 = var2; // L: 36
- this.field4391 = var3; // L: 37
- } // L: 38
+ public class386() {
+ this.method6951(); // L: 32
+ } // L: 33
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1892686311"
+ )
+ public void method6936() {
+ synchronized(field4389) { // L: 26
+ if (field4385 < field4386 - 1) { // L: 27
+ field4389[++field4385 - 1] = this;
+ }
+
+ }
+ } // L: 29
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(FFFFI)V",
+ garbageValue = "365980617"
+ )
+ void method6942(float var1, float var2, float var3, float var4) {
+ this.field4388 = var1; // L: 36
+ this.field4387 = var2; // L: 37
+ this.field4390 = var3; // L: 38
+ this.field4391 = var4; // L: 39
+ } // L: 40
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)F",
- garbageValue = "44"
+ descriptor = "(FFFFI)V",
+ garbageValue = "1728138085"
)
- final float method6771() {
- return (float)Math.sqrt((double)(this.field4392 * this.field4392 + this.field4390 * this.field4390 + this.field4391 * this.field4391)); // L: 41
+ public void method6945(float var1, float var2, float var3, float var4) {
+ float var5 = (float)Math.sin((double)(var4 * 0.5F)); // L: 43
+ float var6 = (float)Math.cos((double)(var4 * 0.5F)); // L: 44
+ this.field4388 = var5 * var1; // L: 45
+ this.field4387 = var2 * var5; // L: 46
+ this.field4390 = var3 * var5; // L: 47
+ this.field4391 = var6; // L: 48
+ } // L: 49
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "112"
+ )
+ public final void method6951() {
+ this.field4390 = 0.0F; // L: 52
+ this.field4387 = 0.0F; // L: 53
+ this.field4388 = 0.0F; // L: 54
+ this.field4391 = 1.0F; // L: 55
+ } // L: 56
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Lni;I)V",
+ garbageValue = "-1489073832"
+ )
+ public final void method6938(class386 var1) {
+ this.method6942(var1.field4388 * this.field4391 + this.field4388 * var1.field4391 + this.field4390 * var1.field4387 - var1.field4390 * this.field4387, this.field4388 * var1.field4390 + var1.field4391 * this.field4387 - this.field4390 * var1.field4388 + var1.field4387 * this.field4391, this.field4391 * var1.field4390 + (this.field4387 * var1.field4388 + var1.field4391 * this.field4390 - var1.field4387 * this.field4388), var1.field4391 * this.field4391 - this.field4388 * var1.field4388 - this.field4387 * var1.field4387 - this.field4390 * var1.field4390); // L: 59
+ } // L: 60
+
+ public int hashCode() {
+ boolean var1 = true; // L: 73
+ float var2 = 1.0F; // L: 74
+ var2 = this.field4388 + var2 * 31.0F; // L: 75
+ var2 = 31.0F * var2 + this.field4387; // L: 76
+ var2 = this.field4390 + var2 * 31.0F; // L: 77
+ var2 = 31.0F * var2 + this.field4391; // L: 78
+ return (int)var2; // L: 79
}
public String toString() {
- return this.field4392 + ", " + this.field4390 + ", " + this.field4391; // L: 46
+ return this.field4388 + "," + this.field4387 + "," + this.field4390 + "," + this.field4391; // L: 84
+ }
+
+ public boolean equals(Object var1) {
+ if (!(var1 instanceof class386)) { // L: 64
+ return false; // L: 68
+ } else {
+ class386 var2 = (class386)var1; // L: 65
+ return var2.field4388 == this.field4388 && this.field4387 == var2.field4387 && var2.field4390 == this.field4390 && var2.field4391 == this.field4391; // L: 66
+ }
}
}
diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java
index 6ae3198666..b809764c53 100644
--- a/runescape-client/src/main/java/class387.java
+++ b/runescape-client/src/main/java/class387.java
@@ -1,136 +1,548 @@
+import java.util.Arrays;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
-@ObfuscatedName("nh")
+@ObfuscatedName("ny")
public final class class387 {
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "[Lnh;"
+ descriptor = "[Lny;"
)
- public static class387[] field4395;
- @ObfuscatedName("k")
- float field4393;
- @ObfuscatedName("a")
- float field4394;
- @ObfuscatedName("m")
- float field4396;
- @ObfuscatedName("p")
- float field4397;
+ static class387[] field4393;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = 1126407779
+ )
+ static int field4396;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lny;"
+ )
+ public static final class387 field4397;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1178194851
+ )
+ static int field4395;
+ @ObfuscatedName("e")
+ public float[] field4394;
static {
- field4395 = new class387[0]; // L: 4
- class10.method87(100); // L: 9
- new class387();
- } // L: 14
+ field4393 = new class387[0]; // L: 9
+ field4396 = 100; // L: 15
+ field4393 = new class387[100]; // L: 16
+ field4395 = 0; // L: 17
+ field4397 = new class387();
+ } // L: 22
public class387() {
- this.method6782(); // L: 34
- } // L: 35
+ this.field4394 = new float[16];
+ this.method6956(); // L: 41
+ } // L: 42
+
+ @ObfuscatedSignature(
+ descriptor = "(Lny;)V"
+ )
+ public class387(class387 var1) {
+ this.field4394 = new float[16];
+ this.method6973(var1); // L: 45
+ } // L: 46
+
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;Z)V"
+ )
+ public class387(Buffer var1, boolean var2) {
+ this.field4394 = new float[16]; // L: 21
+ this.method6957(var1, var2); // L: 49
+ } // L: 50
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "-48"
+ )
+ public void method6968() {
+ synchronized(field4393) { // L: 35
+ if (field4395 < field4396 - 1) { // L: 36
+ field4393[++field4395 - 1] = this;
+ }
+
+ }
+ } // L: 38
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "57"
+ descriptor = "(Lqt;ZS)V",
+ garbageValue = "128"
)
- public void method6779() {
- synchronized(field4395) { // L: 28
- if (Frames.field2492 < GrandExchangeOfferAgeComparator.field4072 - 1) { // L: 29
- field4395[++Frames.field2492 - 1] = this;
+ void method6957(Buffer var1, boolean var2) {
+ if (var2) { // L: 53
+ class388 var13 = new class388(); // L: 54
+ int var6 = var1.readShort(); // L: 57
+ var6 &= 16383; // L: 59
+ float var5 = (float)((double)((float)var6 / 16384.0F) * 6.283185307179586D); // L: 60
+ var13.method7029(var5); // L: 62
+ int var9 = var1.readShort(); // L: 65
+ var9 &= 16383; // L: 67
+ float var8 = (float)(6.283185307179586D * (double)((float)var9 / 16384.0F)); // L: 68
+ var13.method7027(var8); // L: 70
+ int var12 = var1.readShort(); // L: 73
+ var12 &= 16383; // L: 75
+ float var11 = (float)(6.283185307179586D * (double)((float)var12 / 16384.0F)); // L: 76
+ var13.method7039(var11); // L: 78
+ var13.method7026((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 79
+ this.method6979(var13); // L: 80
+ } else {
+ for (int var3 = 0; var3 < 16; ++var3) { // L: 83
+ this.field4394[var3] = var1.method7740(); // L: 84
+ }
+ }
+
+ } // L: 87
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)[F",
+ garbageValue = "1345466465"
+ )
+ float[] method6958() {
+ float[] var1 = new float[3]; // L: 90
+ if ((double)this.field4394[2] < 0.999D && (double)this.field4394[2] > -0.999D) { // L: 91
+ var1[1] = (float)(-Math.asin((double)this.field4394[2])); // L: 92
+ double var2 = Math.cos((double)var1[1]); // L: 93
+ var1[0] = (float)Math.atan2((double)this.field4394[6] / var2, (double)this.field4394[10] / var2); // L: 94
+ var1[2] = (float)Math.atan2((double)this.field4394[1] / var2, (double)this.field4394[0] / var2); // L: 95
+ } else {
+ var1[0] = 0.0F; // L: 98
+ var1[1] = (float)Math.atan2((double)this.field4394[2], 0.0D); // L: 99
+ var1[2] = (float)Math.atan2((double)(-this.field4394[9]), (double)this.field4394[5]); // L: 100
+ }
+
+ return var1; // L: 102
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(B)[F",
+ garbageValue = "10"
+ )
+ public float[] method6959() {
+ float[] var1 = new float[]{(float)(-Math.asin((double)this.field4394[6])), 0.0F, 0.0F}; // L: 106 107
+ double var2 = Math.cos((double)var1[0]); // L: 108
+ double var4;
+ double var6;
+ if (Math.abs(var2) > 0.005D) { // L: 109
+ var4 = (double)this.field4394[2]; // L: 110
+ var6 = (double)this.field4394[10]; // L: 111
+ double var8 = (double)this.field4394[4]; // L: 112
+ double var10 = (double)this.field4394[5]; // L: 113
+ var1[1] = (float)Math.atan2(var4, var6); // L: 114
+ var1[2] = (float)Math.atan2(var8, var10); // L: 115
+ } else {
+ var4 = (double)this.field4394[1]; // L: 118
+ var6 = (double)this.field4394[0]; // L: 119
+ if (this.field4394[6] < 0.0F) { // L: 120
+ var1[1] = (float)Math.atan2(var4, var6); // L: 121
+ } else {
+ var1[1] = (float)(-Math.atan2(var4, var6)); // L: 124
}
+ var1[2] = 0.0F; // L: 126
}
- } // L: 31
- @ObfuscatedName("l")
+ return var1; // L: 128
+ }
+
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "(FFFFI)V",
- garbageValue = "-1983266145"
+ descriptor = "(I)V",
+ garbageValue = "-927373903"
)
- void method6797(float var1, float var2, float var3, float var4) {
- this.field4393 = var1; // L: 38
- this.field4394 = var2; // L: 39
- this.field4396 = var3; // L: 40
- this.field4397 = var4; // L: 41
- } // L: 42
+ void method6956() {
+ this.field4394[0] = 1.0F; // L: 132
+ this.field4394[1] = 0.0F; // L: 133
+ this.field4394[2] = 0.0F; // L: 134
+ this.field4394[3] = 0.0F; // L: 135
+ this.field4394[4] = 0.0F; // L: 136
+ this.field4394[5] = 1.0F; // L: 137
+ this.field4394[6] = 0.0F; // L: 138
+ this.field4394[7] = 0.0F; // L: 139
+ this.field4394[8] = 0.0F; // L: 140
+ this.field4394[9] = 0.0F; // L: 141
+ this.field4394[10] = 1.0F; // L: 142
+ this.field4394[11] = 0.0F; // L: 143
+ this.field4394[12] = 0.0F; // L: 144
+ this.field4394[13] = 0.0F; // L: 145
+ this.field4394[14] = 0.0F; // L: 146
+ this.field4394[15] = 1.0F; // L: 147
+ } // L: 148
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "540046278"
+ )
+ public void method7016() {
+ this.field4394[0] = 0.0F; // L: 151
+ this.field4394[1] = 0.0F; // L: 152
+ this.field4394[2] = 0.0F; // L: 153
+ this.field4394[3] = 0.0F; // L: 154
+ this.field4394[4] = 0.0F; // L: 155
+ this.field4394[5] = 0.0F; // L: 156
+ this.field4394[6] = 0.0F; // L: 157
+ this.field4394[7] = 0.0F; // L: 158
+ this.field4394[8] = 0.0F; // L: 159
+ this.field4394[9] = 0.0F; // L: 160
+ this.field4394[10] = 0.0F; // L: 161
+ this.field4394[11] = 0.0F; // L: 162
+ this.field4394[12] = 0.0F; // L: 163
+ this.field4394[13] = 0.0F; // L: 164
+ this.field4394[14] = 0.0F; // L: 165
+ this.field4394[15] = 0.0F; // L: 166
+ } // L: 167
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(Lny;B)V",
+ garbageValue = "-5"
+ )
+ public void method6973(class387 var1) {
+ System.arraycopy(var1.field4394, 0, this.field4394, 0, 16); // L: 170
+ } // L: 171
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(FI)V",
+ garbageValue = "-1114711003"
+ )
+ public void method6963(float var1) {
+ this.method6964(var1, var1, var1); // L: 174
+ } // L: 175
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(FFFI)V",
+ garbageValue = "-700106798"
+ )
+ public void method6964(float var1, float var2, float var3) {
+ this.method6956(); // L: 178
+ this.field4394[0] = var1; // L: 179
+ this.field4394[5] = var2; // L: 180
+ this.field4394[10] = var3; // L: 181
+ } // L: 182
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(Lny;I)V",
+ garbageValue = "1311675690"
+ )
+ public void method6965(class387 var1) {
+ for (int var2 = 0; var2 < this.field4394.length; ++var2) { // L: 185
+ float[] var10000 = this.field4394; // L: 186
+ var10000[var2] += var1.field4394[var2];
+ }
+
+ } // L: 188
+
+ @ObfuscatedName("t")
+ @ObfuscatedSignature(
+ descriptor = "(Lny;B)V",
+ garbageValue = "-20"
+ )
+ public void method6962(class387 var1) {
+ float var2 = this.field4394[3] * var1.field4394[12] + var1.field4394[8] * this.field4394[2] + var1.field4394[0] * this.field4394[0] + var1.field4394[4] * this.field4394[1]; // L: 191
+ float var3 = this.field4394[2] * var1.field4394[9] + this.field4394[0] * var1.field4394[1] + this.field4394[1] * var1.field4394[5] + this.field4394[3] * var1.field4394[13]; // L: 192
+ float var4 = var1.field4394[10] * this.field4394[2] + var1.field4394[2] * this.field4394[0] + var1.field4394[6] * this.field4394[1] + var1.field4394[14] * this.field4394[3]; // L: 193
+ float var5 = this.field4394[3] * var1.field4394[15] + this.field4394[2] * var1.field4394[11] + var1.field4394[3] * this.field4394[0] + this.field4394[1] * var1.field4394[7]; // L: 194
+ float var6 = var1.field4394[12] * this.field4394[7] + this.field4394[4] * var1.field4394[0] + var1.field4394[4] * this.field4394[5] + this.field4394[6] * var1.field4394[8]; // L: 195
+ float var7 = this.field4394[5] * var1.field4394[5] + this.field4394[4] * var1.field4394[1] + this.field4394[6] * var1.field4394[9] + var1.field4394[13] * this.field4394[7]; // L: 196
+ float var8 = this.field4394[7] * var1.field4394[14] + var1.field4394[10] * this.field4394[6] + var1.field4394[2] * this.field4394[4] + this.field4394[5] * var1.field4394[6]; // L: 197
+ float var9 = this.field4394[6] * var1.field4394[11] + var1.field4394[3] * this.field4394[4] + this.field4394[5] * var1.field4394[7] + var1.field4394[15] * this.field4394[7]; // L: 198
+ float var10 = this.field4394[9] * var1.field4394[4] + this.field4394[8] * var1.field4394[0] + var1.field4394[8] * this.field4394[10] + this.field4394[11] * var1.field4394[12]; // L: 199
+ float var11 = var1.field4394[13] * this.field4394[11] + this.field4394[10] * var1.field4394[9] + this.field4394[8] * var1.field4394[1] + this.field4394[9] * var1.field4394[5]; // L: 200
+ float var12 = this.field4394[8] * var1.field4394[2] + this.field4394[9] * var1.field4394[6] + this.field4394[10] * var1.field4394[10] + this.field4394[11] * var1.field4394[14]; // L: 201
+ float var13 = this.field4394[10] * var1.field4394[11] + var1.field4394[7] * this.field4394[9] + this.field4394[8] * var1.field4394[3] + var1.field4394[15] * this.field4394[11]; // L: 202
+ float var14 = this.field4394[15] * var1.field4394[12] + var1.field4394[8] * this.field4394[14] + var1.field4394[4] * this.field4394[13] + this.field4394[12] * var1.field4394[0]; // L: 203
+ float var15 = var1.field4394[9] * this.field4394[14] + var1.field4394[1] * this.field4394[12] + this.field4394[13] * var1.field4394[5] + this.field4394[15] * var1.field4394[13]; // L: 204
+ float var16 = this.field4394[14] * var1.field4394[10] + this.field4394[12] * var1.field4394[2] + var1.field4394[6] * this.field4394[13] + var1.field4394[14] * this.field4394[15]; // L: 205
+ float var17 = this.field4394[13] * var1.field4394[7] + var1.field4394[3] * this.field4394[12] + this.field4394[14] * var1.field4394[11] + this.field4394[15] * var1.field4394[15]; // L: 206
+ this.field4394[0] = var2; // L: 207
+ this.field4394[1] = var3; // L: 208
+ this.field4394[2] = var4; // L: 209
+ this.field4394[3] = var5; // L: 210
+ this.field4394[4] = var6; // L: 211
+ this.field4394[5] = var7; // L: 212
+ this.field4394[6] = var8; // L: 213
+ this.field4394[7] = var9; // L: 214
+ this.field4394[8] = var10; // L: 215
+ this.field4394[9] = var11; // L: 216
+ this.field4394[10] = var12; // L: 217
+ this.field4394[11] = var13; // L: 218
+ this.field4394[12] = var14; // L: 219
+ this.field4394[13] = var15; // L: 220
+ this.field4394[14] = var16; // L: 221
+ this.field4394[15] = var17; // L: 222
+ } // L: 223
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(Lni;B)V",
+ garbageValue = "-93"
+ )
+ public void method6967(class386 var1) {
+ float var2 = var1.field4391 * var1.field4391; // L: 226
+ float var3 = var1.field4388 * var1.field4391; // L: 227
+ float var4 = var1.field4391 * var1.field4387; // L: 228
+ float var5 = var1.field4391 * var1.field4390; // L: 229
+ float var6 = var1.field4388 * var1.field4388; // L: 230
+ float var7 = var1.field4388 * var1.field4387; // L: 231
+ float var8 = var1.field4390 * var1.field4388; // L: 232
+ float var9 = var1.field4387 * var1.field4387; // L: 233
+ float var10 = var1.field4387 * var1.field4390; // L: 234
+ float var11 = var1.field4390 * var1.field4390; // L: 235
+ this.field4394[0] = var2 + var6 - var11 - var9; // L: 236
+ this.field4394[1] = var7 + var5 + var7 + var5; // L: 237
+ this.field4394[2] = var8 - var4 - var4 + var8; // L: 238
+ this.field4394[4] = var7 - var5 - var5 + var7; // L: 239
+ this.field4394[5] = var9 + var2 - var6 - var11; // L: 240
+ this.field4394[6] = var10 + var3 + var10 + var3; // L: 241
+ this.field4394[8] = var8 + var8 + var4 + var4; // L: 242
+ this.field4394[9] = var10 + (var10 - var3 - var3); // L: 243
+ this.field4394[10] = var2 + var11 - var9 - var6; // L: 244
+ } // L: 245
+
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(Lnu;I)V",
+ garbageValue = "-2099825365"
+ )
+ void method6979(class388 var1) {
+ this.field4394[0] = var1.field4405; // L: 248
+ this.field4394[1] = var1.field4400; // L: 249
+ this.field4394[2] = var1.field4402; // L: 250
+ this.field4394[3] = 0.0F; // L: 251
+ this.field4394[4] = var1.field4409; // L: 252
+ this.field4394[5] = var1.field4403; // L: 253
+ this.field4394[6] = var1.field4408; // L: 254
+ this.field4394[7] = 0.0F; // L: 255
+ this.field4394[8] = var1.field4401; // L: 256
+ this.field4394[9] = var1.field4407; // L: 257
+ this.field4394[10] = var1.field4406; // L: 258
+ this.field4394[11] = 0.0F; // L: 259
+ this.field4394[12] = var1.field4404; // L: 260
+ this.field4394[13] = var1.field4410; // L: 261
+ this.field4394[14] = var1.field4411; // L: 262
+ this.field4394[15] = 1.0F; // L: 263
+ } // L: 264
+
+ @ObfuscatedName("u")
+ @ObfuscatedSignature(
+ descriptor = "(I)F",
+ garbageValue = "1763200209"
+ )
+ float method6969() {
+ return this.field4394[12] * this.field4394[9] * this.field4394[3] * this.field4394[6] + (this.field4394[14] * this.field4394[8] * this.field4394[5] * this.field4394[3] + this.field4394[10] * this.field4394[4] * this.field4394[3] * this.field4394[13] + (this.field4394[12] * this.field4394[11] * this.field4394[5] * this.field4394[2] + (this.field4394[12] * this.field4394[1] * this.field4394[7] * this.field4394[10] + (this.field4394[15] * this.field4394[1] * this.field4394[6] * this.field4394[8] + this.field4394[11] * this.field4394[0] * this.field4394[6] * this.field4394[13] + (this.field4394[15] * this.field4394[10] * this.field4394[0] * this.field4394[5] - this.field4394[14] * this.field4394[11] * this.field4394[5] * this.field4394[0] - this.field4394[15] * this.field4394[9] * this.field4394[0] * this.field4394[6]) + this.field4394[7] * this.field4394[0] * this.field4394[9] * this.field4394[14] - this.field4394[10] * this.field4394[0] * this.field4394[7] * this.field4394[13] - this.field4394[10] * this.field4394[1] * this.field4394[4] * this.field4394[15] + this.field4394[1] * this.field4394[4] * this.field4394[11] * this.field4394[14] - this.field4394[11] * this.field4394[6] * this.field4394[1] * this.field4394[12] - this.field4394[14] * this.field4394[7] * this.field4394[1] * this.field4394[8]) + this.field4394[4] * this.field4394[2] * this.field4394[9] * this.field4394[15] - this.field4394[2] * this.field4394[4] * this.field4394[11] * this.field4394[13] - this.field4394[15] * this.field4394[8] * this.field4394[5] * this.field4394[2]) + this.field4394[13] * this.field4394[7] * this.field4394[2] * this.field4394[8] - this.field4394[2] * this.field4394[7] * this.field4394[9] * this.field4394[12] - this.field4394[9] * this.field4394[4] * this.field4394[3] * this.field4394[14]) - this.field4394[10] * this.field4394[3] * this.field4394[5] * this.field4394[12] - this.field4394[13] * this.field4394[3] * this.field4394[6] * this.field4394[8]); // L: 267
+ }
@ObfuscatedName("k")
@ObfuscatedSignature(
- descriptor = "(FFFFB)V",
- garbageValue = "-1"
+ descriptor = "(I)V",
+ garbageValue = "961919913"
)
- public void method6784(float var1, float var2, float var3, float var4) {
- float var5 = (float)Math.sin((double)(0.5F * var4)); // L: 45
- float var6 = (float)Math.cos((double)(var4 * 0.5F)); // L: 46
- this.field4393 = var1 * var5; // L: 47
- this.field4394 = var2 * var5; // L: 48
- this.field4396 = var5 * var3; // L: 49
- this.field4397 = var6; // L: 50
- } // L: 51
+ public void method6970() {
+ float var1 = 1.0F / this.method6969(); // L: 271
+ float var2 = (this.field4394[7] * this.field4394[9] * this.field4394[14] + this.field4394[5] * this.field4394[10] * this.field4394[15] - this.field4394[14] * this.field4394[5] * this.field4394[11] - this.field4394[15] * this.field4394[6] * this.field4394[9] + this.field4394[11] * this.field4394[6] * this.field4394[13] - this.field4394[13] * this.field4394[7] * this.field4394[10]) * var1; // L: 272
+ float var3 = (this.field4394[14] * this.field4394[11] * this.field4394[1] + this.field4394[15] * -this.field4394[1] * this.field4394[10] + this.field4394[9] * this.field4394[2] * this.field4394[15] - this.field4394[13] * this.field4394[2] * this.field4394[11] - this.field4394[9] * this.field4394[3] * this.field4394[14] + this.field4394[10] * this.field4394[3] * this.field4394[13]) * var1; // L: 273
+ float var4 = (this.field4394[14] * this.field4394[3] * this.field4394[5] + this.field4394[13] * this.field4394[7] * this.field4394[2] + (this.field4394[15] * this.field4394[6] * this.field4394[1] - this.field4394[14] * this.field4394[1] * this.field4394[7] - this.field4394[2] * this.field4394[5] * this.field4394[15]) - this.field4394[13] * this.field4394[6] * this.field4394[3]) * var1; // L: 274
+ float var5 = var1 * (this.field4394[6] * this.field4394[3] * this.field4394[9] + (this.field4394[5] * this.field4394[2] * this.field4394[11] + this.field4394[7] * this.field4394[1] * this.field4394[10] + this.field4394[11] * -this.field4394[1] * this.field4394[6] - this.field4394[9] * this.field4394[7] * this.field4394[2] - this.field4394[10] * this.field4394[3] * this.field4394[5])); // L: 275
+ float var6 = (this.field4394[12] * this.field4394[7] * this.field4394[10] + (this.field4394[15] * this.field4394[10] * -this.field4394[4] + this.field4394[4] * this.field4394[11] * this.field4394[14] + this.field4394[8] * this.field4394[6] * this.field4394[15] - this.field4394[12] * this.field4394[6] * this.field4394[11] - this.field4394[7] * this.field4394[8] * this.field4394[14])) * var1; // L: 276
+ float var7 = var1 * (this.field4394[2] * this.field4394[11] * this.field4394[12] + (this.field4394[15] * this.field4394[10] * this.field4394[0] - this.field4394[11] * this.field4394[0] * this.field4394[14] - this.field4394[15] * this.field4394[2] * this.field4394[8]) + this.field4394[3] * this.field4394[8] * this.field4394[14] - this.field4394[10] * this.field4394[3] * this.field4394[12]); // L: 277
+ float var8 = (this.field4394[2] * this.field4394[4] * this.field4394[15] + this.field4394[14] * this.field4394[7] * this.field4394[0] + -this.field4394[0] * this.field4394[6] * this.field4394[15] - this.field4394[2] * this.field4394[7] * this.field4394[12] - this.field4394[3] * this.field4394[4] * this.field4394[14] + this.field4394[12] * this.field4394[3] * this.field4394[6]) * var1; // L: 278
+ float var9 = (this.field4394[7] * this.field4394[2] * this.field4394[8] + (this.field4394[6] * this.field4394[0] * this.field4394[11] - this.field4394[10] * this.field4394[7] * this.field4394[0] - this.field4394[2] * this.field4394[4] * this.field4394[11]) + this.field4394[4] * this.field4394[3] * this.field4394[10] - this.field4394[8] * this.field4394[3] * this.field4394[6]) * var1; // L: 279
+ float var10 = var1 * (this.field4394[12] * this.field4394[5] * this.field4394[11] + (this.field4394[9] * this.field4394[4] * this.field4394[15] - this.field4394[4] * this.field4394[11] * this.field4394[13] - this.field4394[8] * this.field4394[5] * this.field4394[15]) + this.field4394[8] * this.field4394[7] * this.field4394[13] - this.field4394[12] * this.field4394[9] * this.field4394[7]); // L: 280
+ float var11 = (this.field4394[3] * this.field4394[9] * this.field4394[12] + (this.field4394[15] * this.field4394[9] * -this.field4394[0] + this.field4394[13] * this.field4394[11] * this.field4394[0] + this.field4394[1] * this.field4394[8] * this.field4394[15] - this.field4394[11] * this.field4394[1] * this.field4394[12] - this.field4394[8] * this.field4394[3] * this.field4394[13])) * var1; // L: 281
+ float var12 = (this.field4394[7] * this.field4394[1] * this.field4394[12] + (this.field4394[15] * this.field4394[5] * this.field4394[0] - this.field4394[7] * this.field4394[0] * this.field4394[13] - this.field4394[15] * this.field4394[1] * this.field4394[4]) + this.field4394[3] * this.field4394[4] * this.field4394[13] - this.field4394[12] * this.field4394[5] * this.field4394[3]) * var1; // L: 282
+ float var13 = var1 * (this.field4394[8] * this.field4394[5] * this.field4394[3] + (this.field4394[11] * this.field4394[4] * this.field4394[1] + this.field4394[9] * this.field4394[0] * this.field4394[7] + this.field4394[11] * -this.field4394[0] * this.field4394[5] - this.field4394[1] * this.field4394[7] * this.field4394[8] - this.field4394[4] * this.field4394[3] * this.field4394[9])); // L: 283
+ float var14 = var1 * (this.field4394[6] * this.field4394[9] * this.field4394[12] + (this.field4394[5] * this.field4394[8] * this.field4394[14] + this.field4394[9] * -this.field4394[4] * this.field4394[14] + this.field4394[13] * this.field4394[4] * this.field4394[10] - this.field4394[12] * this.field4394[10] * this.field4394[5] - this.field4394[6] * this.field4394[8] * this.field4394[13])); // L: 284
+ float var15 = var1 * (this.field4394[14] * this.field4394[9] * this.field4394[0] - this.field4394[10] * this.field4394[0] * this.field4394[13] - this.field4394[14] * this.field4394[8] * this.field4394[1] + this.field4394[12] * this.field4394[10] * this.field4394[1] + this.field4394[13] * this.field4394[8] * this.field4394[2] - this.field4394[9] * this.field4394[2] * this.field4394[12]); // L: 285
+ float var16 = var1 * (this.field4394[12] * this.field4394[2] * this.field4394[5] + (this.field4394[1] * this.field4394[4] * this.field4394[14] + this.field4394[13] * this.field4394[6] * this.field4394[0] + this.field4394[14] * this.field4394[5] * -this.field4394[0] - this.field4394[6] * this.field4394[1] * this.field4394[12] - this.field4394[4] * this.field4394[2] * this.field4394[13])); // L: 286
+ float var17 = (this.field4394[9] * this.field4394[2] * this.field4394[4] + this.field4394[5] * this.field4394[0] * this.field4394[10] - this.field4394[9] * this.field4394[0] * this.field4394[6] - this.field4394[10] * this.field4394[1] * this.field4394[4] + this.field4394[1] * this.field4394[6] * this.field4394[8] - this.field4394[5] * this.field4394[2] * this.field4394[8]) * var1; // L: 287
+ this.field4394[0] = var2; // L: 288
+ this.field4394[1] = var3; // L: 289
+ this.field4394[2] = var4; // L: 290
+ this.field4394[3] = var5; // L: 291
+ this.field4394[4] = var6; // L: 292
+ this.field4394[5] = var7; // L: 293
+ this.field4394[6] = var8; // L: 294
+ this.field4394[7] = var9; // L: 295
+ this.field4394[8] = var10; // L: 296
+ this.field4394[9] = var11; // L: 297
+ this.field4394[10] = var12; // L: 298
+ this.field4394[11] = var13; // L: 299
+ this.field4394[12] = var14; // L: 300
+ this.field4394[13] = var15; // L: 301
+ this.field4394[14] = var16; // L: 302
+ this.field4394[15] = var17; // L: 303
+ } // L: 304
- @ObfuscatedName("a")
+ @ObfuscatedName("h")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "4"
+ descriptor = "(I)[F",
+ garbageValue = "-1510680862"
)
- public final void method6782() {
- this.field4396 = 0.0F; // L: 54
- this.field4394 = 0.0F; // L: 55
- this.field4393 = 0.0F; // L: 56
- this.field4397 = 1.0F; // L: 57
- } // L: 58
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Lnh;B)V",
- garbageValue = "94"
- )
- public final void method6783(class387 var1) {
- this.method6797(var1.field4397 * this.field4393 + var1.field4393 * this.field4397 + var1.field4394 * this.field4396 - var1.field4396 * this.field4394, this.field4393 * var1.field4396 + this.field4394 * var1.field4397 - var1.field4393 * this.field4396 + this.field4397 * var1.field4394, this.field4397 * var1.field4396 + (this.field4394 * var1.field4393 + var1.field4397 * this.field4396 - var1.field4394 * this.field4393), this.field4397 * var1.field4397 - var1.field4393 * this.field4393 - var1.field4394 * this.field4394 - var1.field4396 * this.field4396); // L: 61
- } // L: 62
-
- public boolean equals(Object var1) {
- if (!(var1 instanceof class387)) { // L: 66
- return false; // L: 70
- } else {
- class387 var2 = (class387)var1; // L: 67
- return var2.field4393 == this.field4393 && var2.field4394 == this.field4394 && this.field4396 == var2.field4396 && this.field4397 == var2.field4397; // L: 68
- }
- }
-
- public int hashCode() {
- boolean var1 = true; // L: 75
- float var2 = 1.0F; // L: 76
- var2 = 31.0F * var2 + this.field4393;
- var2 = 31.0F * var2 + this.field4394;
- var2 = this.field4396 + var2 * 31.0F;
- var2 = 31.0F * var2 + this.field4397; // L: 80
- return (int)var2;
+ public float[] method6992() {
+ float[] var1 = new float[3]; // L: 341
+ class385 var2 = new class385(this.field4394[0], this.field4394[1], this.field4394[2]); // L: 342
+ class385 var3 = new class385(this.field4394[4], this.field4394[5], this.field4394[6]); // L: 343
+ class385 var4 = new class385(this.field4394[8], this.field4394[9], this.field4394[10]); // L: 344
+ var1[0] = var2.method6929(); // L: 345
+ var1[1] = var3.method6929(); // L: 346
+ var1[2] = var4.method6929(); // L: 347
+ return var1; // L: 348
}
public String toString() {
- return this.field4393 + "," + this.field4394 + "," + this.field4396 + "," + this.field4397; // L: 86
- }
+ StringBuilder var1 = new StringBuilder(); // L: 309
+ this.method6959(); // L: 310
+ this.method6958(); // L: 311
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Llp;Llp;III)Lmx;",
- garbageValue = "-1067807239"
- )
- public static Font method6781(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
- if (!User.method6514(var0, var2, var3)) { // L: 69
- return null;
- } else {
- byte[] var5 = var1.takeFile(var2, var3); // L: 71
- Font var4;
- if (var5 == null) { // L: 73
- var4 = null; // L: 74
- } else {
- Font var6 = new Font(var5, class453.SpriteBuffer_xOffsets, class453.SpriteBuffer_yOffsets, ScriptFrame.SpriteBuffer_spriteWidths, class453.SpriteBuffer_spriteHeights, Decimator.SpriteBuffer_spritePalette, class127.SpriteBuffer_pixels); // L: 77
- VarcInt.method3325(); // L: 78
- var4 = var6; // L: 79
+ for (int var2 = 0; var2 < 4; ++var2) { // L: 312
+ for (int var3 = 0; var3 < 4; ++var3) { // L: 313
+ if (var3 > 0) {
+ var1.append("\t"); // L: 314
+ }
+
+ float var4 = this.field4394[var3 + var2 * 4]; // L: 315
+ if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 316
+ var4 = 0.0F;
+ }
+
+ var1.append(var4); // L: 317
}
- return var4; // L: 81
+ var1.append("\n"); // L: 319
+ }
+
+ return var1.toString(); // L: 321
+ }
+
+ public int hashCode() {
+ boolean var1 = true; // L: 326
+ byte var2 = 1; // L: 327
+ int var3 = var2 * 31 + Arrays.hashCode(this.field4394); // L: 328
+ return var3; // L: 329
+ }
+
+ public boolean equals(Object var1) {
+ if (!(var1 instanceof class387)) { // L: 334
+ return false;
+ } else {
+ class387 var2 = (class387)var1; // L: 335
+
+ for (int var3 = 0; var3 < 16; ++var3) { // L: 336
+ if (var2.field4394[var3] != this.field4394[var3]) {
+ return false;
+ }
+ }
+
+ return true; // L: 337
+ }
+ }
+
+ @ObfuscatedName("ag")
+ @ObfuscatedSignature(
+ descriptor = "(ILbi;ZI)I",
+ garbageValue = "-412405575"
+ )
+ static int method7021(int var0, Script var1, boolean var2) {
+ if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3855
+ class446.Interpreter_intStackSize -= 2; // L: 3856
+ Client.field748 = (short)class20.method255(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]); // L: 3857
+ if (Client.field748 <= 0) { // L: 3858
+ Client.field748 = 256;
+ }
+
+ Client.field749 = (short)class20.method255(Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]); // L: 3859
+ if (Client.field749 <= 0) { // L: 3860
+ Client.field749 = 256;
+ }
+
+ return 1; // L: 3861
+ } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3863
+ class446.Interpreter_intStackSize -= 2; // L: 3864
+ Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3865
+ if (Client.zoomHeight <= 0) { // L: 3866
+ Client.zoomHeight = 256;
+ }
+
+ Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3867
+ if (Client.zoomWidth <= 0) { // L: 3868
+ Client.zoomWidth = 320;
+ }
+
+ return 1; // L: 3869
+ } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3871
+ class446.Interpreter_intStackSize -= 4; // L: 3872
+ Client.field752 = (short)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize]; // L: 3873
+ if (Client.field752 <= 0) { // L: 3874
+ Client.field752 = 1;
+ }
+
+ Client.field753 = (short)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 1]; // L: 3875
+ if (Client.field753 <= 0) { // L: 3876
+ Client.field753 = 32767;
+ } else if (Client.field753 < Client.field752) { // L: 3877
+ Client.field753 = Client.field752;
+ }
+
+ Client.field754 = (short)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 2]; // L: 3878
+ if (Client.field754 <= 0) { // L: 3879
+ Client.field754 = 1;
+ }
+
+ Client.field755 = (short)Interpreter.Interpreter_intStack[class446.Interpreter_intStackSize + 3]; // L: 3880
+ if (Client.field755 <= 0) { // L: 3881
+ Client.field755 = 32767;
+ } else if (Client.field755 < Client.field754) { // L: 3882
+ Client.field755 = Client.field754;
+ }
+
+ return 1; // L: 3883
+ } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3885
+ if (Client.viewportWidget != null) { // L: 3886
+ class201.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3887
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3888
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3889
+ } else {
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3892
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = -1; // L: 3893
+ }
+
+ return 1; // L: 3895
+ } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3897
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3898
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3899
+ return 1; // L: 3900
+ } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3902
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Frames.method4350(Client.field748); // L: 3903
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Frames.method4350(Client.field749); // L: 3904
+ return 1; // L: 3905
+ } else if (var0 == 6220) { // L: 3907
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3908
+ return 1; // L: 3909
+ } else if (var0 == 6221) { // L: 3911
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = 0; // L: 3912
+ return 1; // L: 3913
+ } else if (var0 == 6222) { // L: 3915
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = Script.canvasWidth; // L: 3916
+ return 1; // L: 3917
+ } else if (var0 == 6223) { // L: 3919
+ Interpreter.Interpreter_intStack[++class446.Interpreter_intStackSize - 1] = class78.canvasHeight; // L: 3920
+ return 1; // L: 3921
+ } else {
+ return 2; // L: 3923
}
}
}
diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java
index 9a14624698..931466f496 100644
--- a/runescape-client/src/main/java/class388.java
+++ b/runescape-client/src/main/java/class388.java
@@ -1,436 +1,171 @@
-import java.util.Arrays;
-import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nw")
-public final class class388 {
+@ObfuscatedName("nu")
+public class class388 {
+ @ObfuscatedName("c")
+ float field4405;
+ @ObfuscatedName("v")
+ float field4400;
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "[Lnw;"
- )
- static class388[] field4402;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -96166557
- )
- static int field4401;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lnw;"
- )
- public static final class388 field4403;
- @ObfuscatedName("a")
- public float[] field4400;
+ float field4402;
+ @ObfuscatedName("f")
+ float field4409;
+ @ObfuscatedName("j")
+ float field4403;
+ @ObfuscatedName("e")
+ float field4408;
+ @ObfuscatedName("g")
+ float field4401;
+ @ObfuscatedName("w")
+ float field4407;
+ @ObfuscatedName("y")
+ float field4406;
+ @ObfuscatedName("i")
+ float field4404;
+ @ObfuscatedName("s")
+ float field4410;
+ @ObfuscatedName("t")
+ float field4411;
static {
- field4402 = new class388[0]; // L: 9
- MilliClock.method3219(100); // L: 14
- field4403 = new class388(); // L: 18
- }
+ new class388();
+ } // L: 6
- public class388() {
- this.field4400 = new float[16];
- this.method6861(); // L: 43
- } // L: 44
-
- @ObfuscatedSignature(
- descriptor = "(Lnw;)V"
- )
- public class388(class388 var1) {
- this.field4400 = new float[16];
- this.method6868(var1); // L: 47
- } // L: 48
-
- @ObfuscatedSignature(
- descriptor = "(Lpx;Z)V"
- )
- public class388(Buffer var1, boolean var2) {
- this.field4400 = new float[16]; // L: 17
- this.method6808(var1, var2); // L: 51
- } // L: 52
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-830138790"
- )
- public void method6865() {
- synchronized(field4402) { // L: 37
- if (field4401 < GrandExchangeOfferTotalQuantityComparator.field4069 - 1) { // L: 38
- field4402[++field4401 - 1] = this;
- }
-
- }
- } // L: 40
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Lpx;ZI)V",
- garbageValue = "-1065467020"
- )
- void method6808(Buffer var1, boolean var2) {
- if (var2) { // L: 55
- class389 var4 = new class389(); // L: 56
- var4.method6877(ByteArrayPool.method6364(var1.readShort())); // L: 57
- var4.method6878(ByteArrayPool.method6364(var1.readShort())); // L: 58
- var4.method6879(ByteArrayPool.method6364(var1.readShort())); // L: 59
- var4.method6887((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 60
- this.method6812(var4); // L: 61
- } else {
- for (int var3 = 0; var3 < 16; ++var3) { // L: 64
- this.field4400[var3] = var1.method7570(); // L: 65
- }
- }
-
- } // L: 68
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(I)[F",
- garbageValue = "817063007"
- )
- float[] method6809() {
- float[] var1 = new float[3]; // L: 71
- if ((double)this.field4400[2] < 0.999D && (double)this.field4400[2] > -0.999D) { // L: 72
- var1[1] = (float)(-Math.asin((double)this.field4400[2])); // L: 73
- double var2 = Math.cos((double)var1[1]); // L: 74
- var1[0] = (float)Math.atan2((double)this.field4400[6] / var2, (double)this.field4400[10] / var2); // L: 75
- var1[2] = (float)Math.atan2((double)this.field4400[1] / var2, (double)this.field4400[0] / var2); // L: 76
- } else {
- var1[0] = 0.0F; // L: 79
- var1[1] = (float)Math.atan2((double)this.field4400[2], 0.0D); // L: 80
- var1[2] = (float)Math.atan2((double)(-this.field4400[9]), (double)this.field4400[5]); // L: 81
- }
-
- return var1; // L: 83
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(I)[F",
- garbageValue = "796221265"
- )
- public float[] method6810() {
- float[] var1 = new float[]{(float)(-Math.asin((double)this.field4400[6])), 0.0F, 0.0F}; // L: 87 88
- double var2 = Math.cos((double)var1[0]); // L: 89
- double var4;
- double var6;
- if (Math.abs(var2) > 0.005D) { // L: 90
- var4 = (double)this.field4400[2]; // L: 91
- var6 = (double)this.field4400[10]; // L: 92
- double var8 = (double)this.field4400[4]; // L: 93
- double var10 = (double)this.field4400[5]; // L: 94
- var1[1] = (float)Math.atan2(var4, var6); // L: 95
- var1[2] = (float)Math.atan2(var8, var10); // L: 96
- } else {
- var4 = (double)this.field4400[1]; // L: 99
- var6 = (double)this.field4400[0]; // L: 100
- if (this.field4400[6] < 0.0F) { // L: 101
- var1[1] = (float)Math.atan2(var4, var6); // L: 102
- } else {
- var1[1] = (float)(-Math.atan2(var4, var6)); // L: 105
- }
-
- var1[2] = 0.0F; // L: 107
- }
-
- return var1; // L: 109
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1318194285"
- )
- void method6861() {
- this.field4400[0] = 1.0F; // L: 113
- this.field4400[1] = 0.0F; // L: 114
- this.field4400[2] = 0.0F; // L: 115
- this.field4400[3] = 0.0F; // L: 116
- this.field4400[4] = 0.0F; // L: 117
- this.field4400[5] = 1.0F; // L: 118
- this.field4400[6] = 0.0F; // L: 119
- this.field4400[7] = 0.0F; // L: 120
- this.field4400[8] = 0.0F; // L: 121
- this.field4400[9] = 0.0F; // L: 122
- this.field4400[10] = 1.0F; // L: 123
- this.field4400[11] = 0.0F; // L: 124
- this.field4400[12] = 0.0F; // L: 125
- this.field4400[13] = 0.0F; // L: 126
- this.field4400[14] = 0.0F; // L: 127
- this.field4400[15] = 1.0F; // L: 128
- } // L: 129
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-2033689784"
- )
- public void method6829() {
- this.field4400[0] = 0.0F; // L: 132
- this.field4400[1] = 0.0F; // L: 133
- this.field4400[2] = 0.0F; // L: 134
- this.field4400[3] = 0.0F; // L: 135
- this.field4400[4] = 0.0F; // L: 136
- this.field4400[5] = 0.0F; // L: 137
- this.field4400[6] = 0.0F; // L: 138
- this.field4400[7] = 0.0F; // L: 139
- this.field4400[8] = 0.0F; // L: 140
- this.field4400[9] = 0.0F; // L: 141
- this.field4400[10] = 0.0F; // L: 142
- this.field4400[11] = 0.0F; // L: 143
- this.field4400[12] = 0.0F; // L: 144
- this.field4400[13] = 0.0F; // L: 145
- this.field4400[14] = 0.0F; // L: 146
- this.field4400[15] = 0.0F; // L: 147
- } // L: 148
-
- @ObfuscatedName("r")
- @ObfuscatedSignature(
- descriptor = "(Lnw;B)V",
- garbageValue = "37"
- )
- public void method6868(class388 var1) {
- System.arraycopy(var1.field4400, 0, this.field4400, 0, 16); // L: 151
- } // L: 152
-
- @ObfuscatedName("v")
- @ObfuscatedSignature(
- descriptor = "(FB)V",
- garbageValue = "114"
- )
- public void method6806(float var1) {
- this.method6814(var1, var1, var1); // L: 155
- } // L: 156
-
- @ObfuscatedName("y")
- @ObfuscatedSignature(
- descriptor = "(FFFI)V",
- garbageValue = "627006193"
- )
- public void method6814(float var1, float var2, float var3) {
- this.method6861(); // L: 159
- this.field4400[0] = var1; // L: 160
- this.field4400[5] = var2; // L: 161
- this.field4400[10] = var3; // L: 162
- } // L: 163
+ class388() {
+ this.method7022(); // L: 22
+ } // L: 23
@ObfuscatedName("c")
- @ObfuscatedSignature(
- descriptor = "(Lnw;I)V",
- garbageValue = "-1672549450"
- )
- public void method6815(class388 var1) {
- for (int var2 = 0; var2 < this.field4400.length; ++var2) { // L: 166
- float[] var10000 = this.field4400; // L: 167
- var10000[var2] += var1.field4400[var2];
- }
-
- } // L: 169
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(Lnw;B)V",
- garbageValue = "0"
- )
- public void method6816(class388 var1) {
- float var2 = var1.field4400[8] * this.field4400[2] + var1.field4400[4] * this.field4400[1] + var1.field4400[0] * this.field4400[0] + this.field4400[3] * var1.field4400[12]; // L: 172
- float var3 = this.field4400[1] * var1.field4400[5] + var1.field4400[1] * this.field4400[0] + var1.field4400[9] * this.field4400[2] + var1.field4400[13] * this.field4400[3]; // L: 173
- float var4 = this.field4400[2] * var1.field4400[10] + this.field4400[1] * var1.field4400[6] + var1.field4400[2] * this.field4400[0] + this.field4400[3] * var1.field4400[14]; // L: 174
- float var5 = this.field4400[3] * var1.field4400[15] + var1.field4400[11] * this.field4400[2] + var1.field4400[3] * this.field4400[0] + this.field4400[1] * var1.field4400[7]; // L: 175
- float var6 = this.field4400[7] * var1.field4400[12] + this.field4400[4] * var1.field4400[0] + var1.field4400[4] * this.field4400[5] + this.field4400[6] * var1.field4400[8]; // L: 176
- float var7 = var1.field4400[1] * this.field4400[4] + var1.field4400[5] * this.field4400[5] + var1.field4400[9] * this.field4400[6] + var1.field4400[13] * this.field4400[7]; // L: 177
- float var8 = this.field4400[6] * var1.field4400[10] + this.field4400[4] * var1.field4400[2] + var1.field4400[6] * this.field4400[5] + this.field4400[7] * var1.field4400[14]; // L: 178
- float var9 = this.field4400[4] * var1.field4400[3] + this.field4400[5] * var1.field4400[7] + this.field4400[6] * var1.field4400[11] + this.field4400[7] * var1.field4400[15]; // L: 179
- float var10 = this.field4400[9] * var1.field4400[4] + var1.field4400[0] * this.field4400[8] + var1.field4400[8] * this.field4400[10] + this.field4400[11] * var1.field4400[12]; // L: 180
- float var11 = var1.field4400[1] * this.field4400[8] + var1.field4400[5] * this.field4400[9] + this.field4400[10] * var1.field4400[9] + var1.field4400[13] * this.field4400[11]; // L: 181
- float var12 = var1.field4400[14] * this.field4400[11] + var1.field4400[6] * this.field4400[9] + var1.field4400[2] * this.field4400[8] + var1.field4400[10] * this.field4400[10]; // L: 182
- float var13 = var1.field4400[15] * this.field4400[11] + var1.field4400[11] * this.field4400[10] + var1.field4400[7] * this.field4400[9] + this.field4400[8] * var1.field4400[3]; // L: 183
- float var14 = var1.field4400[8] * this.field4400[14] + this.field4400[13] * var1.field4400[4] + var1.field4400[0] * this.field4400[12] + var1.field4400[12] * this.field4400[15]; // L: 184
- float var15 = var1.field4400[13] * this.field4400[15] + var1.field4400[9] * this.field4400[14] + this.field4400[13] * var1.field4400[5] + var1.field4400[1] * this.field4400[12]; // L: 185
- float var16 = this.field4400[13] * var1.field4400[6] + this.field4400[12] * var1.field4400[2] + this.field4400[14] * var1.field4400[10] + this.field4400[15] * var1.field4400[14]; // L: 186
- float var17 = this.field4400[12] * var1.field4400[3] + var1.field4400[7] * this.field4400[13] + this.field4400[14] * var1.field4400[11] + var1.field4400[15] * this.field4400[15]; // L: 187
- this.field4400[0] = var2; // L: 188
- this.field4400[1] = var3; // L: 189
- this.field4400[2] = var4; // L: 190
- this.field4400[3] = var5; // L: 191
- this.field4400[4] = var6; // L: 192
- this.field4400[5] = var7; // L: 193
- this.field4400[6] = var8; // L: 194
- this.field4400[7] = var9; // L: 195
- this.field4400[8] = var10; // L: 196
- this.field4400[9] = var11; // L: 197
- this.field4400[10] = var12; // L: 198
- this.field4400[11] = var13; // L: 199
- this.field4400[12] = var14; // L: 200
- this.field4400[13] = var15; // L: 201
- this.field4400[14] = var16; // L: 202
- this.field4400[15] = var17; // L: 203
- } // L: 204
-
- @ObfuscatedName("b")
- @ObfuscatedSignature(
- descriptor = "(Lnh;I)V",
- garbageValue = "74712963"
- )
- public void method6817(class387 var1) {
- float var2 = var1.field4397 * var1.field4397; // L: 207
- float var3 = var1.field4393 * var1.field4397; // L: 208
- float var4 = var1.field4397 * var1.field4394; // L: 209
- float var5 = var1.field4396 * var1.field4397; // L: 210
- float var6 = var1.field4393 * var1.field4393; // L: 211
- float var7 = var1.field4394 * var1.field4393; // L: 212
- float var8 = var1.field4396 * var1.field4393; // L: 213
- float var9 = var1.field4394 * var1.field4394; // L: 214
- float var10 = var1.field4394 * var1.field4396; // L: 215
- float var11 = var1.field4396 * var1.field4396; // L: 216
- this.field4400[0] = var2 + var6 - var11 - var9; // L: 217
- this.field4400[1] = var7 + var5 + var7 + var5; // L: 218
- this.field4400[2] = var8 - var4 - var4 + var8; // L: 219
- this.field4400[4] = var7 + (var7 - var5 - var5); // L: 220
- this.field4400[5] = var9 + var2 - var6 - var11; // L: 221
- this.field4400[6] = var10 + var3 + var10 + var3; // L: 222
- this.field4400[8] = var4 + var8 + var4 + var8; // L: 223
- this.field4400[9] = var10 + (var10 - var3 - var3); // L: 224
- this.field4400[10] = var2 + var11 - var9 - var6; // L: 225
- } // L: 226
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(Lnt;I)V",
- garbageValue = "-51279559"
- )
- void method6812(class389 var1) {
- this.field4400[0] = var1.field4410; // L: 229
- this.field4400[1] = var1.field4405; // L: 230
- this.field4400[2] = var1.field4406; // L: 231
- this.field4400[3] = 0.0F; // L: 232
- this.field4400[4] = var1.field4407; // L: 233
- this.field4400[5] = var1.field4409; // L: 234
- this.field4400[6] = var1.field4412; // L: 235
- this.field4400[7] = 0.0F; // L: 236
- this.field4400[8] = var1.field4413; // L: 237
- this.field4400[9] = var1.field4411; // L: 238
- this.field4400[10] = var1.field4404; // L: 239
- this.field4400[11] = 0.0F; // L: 240
- this.field4400[12] = var1.field4408; // L: 241
- this.field4400[13] = var1.field4414; // L: 242
- this.field4400[14] = var1.field4415; // L: 243
- this.field4400[15] = 1.0F; // L: 244
- } // L: 245
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(I)F",
- garbageValue = "1576396889"
- )
- float method6819() {
- return this.field4400[12] * this.field4400[9] * this.field4400[6] * this.field4400[3] + (this.field4400[5] * this.field4400[3] * this.field4400[8] * this.field4400[14] + this.field4400[13] * this.field4400[4] * this.field4400[3] * this.field4400[10] + (this.field4400[13] * this.field4400[8] * this.field4400[7] * this.field4400[2] + this.field4400[4] * this.field4400[2] * this.field4400[9] * this.field4400[15] + this.field4400[7] * this.field4400[1] * this.field4400[10] * this.field4400[12] + (this.field4400[8] * this.field4400[1] * this.field4400[6] * this.field4400[15] + this.field4400[14] * this.field4400[1] * this.field4400[4] * this.field4400[11] + (this.field4400[0] * this.field4400[5] * this.field4400[10] * this.field4400[15] - this.field4400[14] * this.field4400[0] * this.field4400[5] * this.field4400[11] - this.field4400[15] * this.field4400[0] * this.field4400[6] * this.field4400[9] + this.field4400[0] * this.field4400[6] * this.field4400[11] * this.field4400[13] + this.field4400[9] * this.field4400[7] * this.field4400[0] * this.field4400[14] - this.field4400[13] * this.field4400[7] * this.field4400[0] * this.field4400[10] - this.field4400[15] * this.field4400[1] * this.field4400[4] * this.field4400[10]) - this.field4400[12] * this.field4400[6] * this.field4400[1] * this.field4400[11] - this.field4400[7] * this.field4400[1] * this.field4400[8] * this.field4400[14]) - this.field4400[13] * this.field4400[4] * this.field4400[2] * this.field4400[11] - this.field4400[15] * this.field4400[2] * this.field4400[5] * this.field4400[8] + this.field4400[12] * this.field4400[11] * this.field4400[2] * this.field4400[5] - this.field4400[9] * this.field4400[2] * this.field4400[7] * this.field4400[12] - this.field4400[14] * this.field4400[9] * this.field4400[3] * this.field4400[4]) - this.field4400[12] * this.field4400[3] * this.field4400[5] * this.field4400[10] - this.field4400[6] * this.field4400[3] * this.field4400[8] * this.field4400[13]); // L: 248
- }
-
- @ObfuscatedName("x")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "122973203"
+ garbageValue = "-1938760120"
)
- public void method6820() {
- float var1 = 1.0F / this.method6819(); // L: 252
- float var2 = (this.field4400[15] * this.field4400[10] * this.field4400[5] - this.field4400[11] * this.field4400[5] * this.field4400[14] - this.field4400[15] * this.field4400[6] * this.field4400[9] + this.field4400[13] * this.field4400[6] * this.field4400[11] + this.field4400[14] * this.field4400[7] * this.field4400[9] - this.field4400[7] * this.field4400[10] * this.field4400[13]) * var1; // L: 253
- float var3 = var1 * (this.field4400[13] * this.field4400[10] * this.field4400[3] + (this.field4400[1] * this.field4400[11] * this.field4400[14] + this.field4400[15] * this.field4400[10] * -this.field4400[1] + this.field4400[2] * this.field4400[9] * this.field4400[15] - this.field4400[11] * this.field4400[2] * this.field4400[13] - this.field4400[9] * this.field4400[3] * this.field4400[14])); // L: 254
- float var4 = var1 * (this.field4400[14] * this.field4400[5] * this.field4400[3] + this.field4400[2] * this.field4400[7] * this.field4400[13] + (this.field4400[6] * this.field4400[1] * this.field4400[15] - this.field4400[14] * this.field4400[7] * this.field4400[1] - this.field4400[15] * this.field4400[2] * this.field4400[5]) - this.field4400[13] * this.field4400[3] * this.field4400[6]); // L: 255
- float var5 = var1 * (this.field4400[11] * -this.field4400[1] * this.field4400[6] + this.field4400[10] * this.field4400[7] * this.field4400[1] + this.field4400[11] * this.field4400[5] * this.field4400[2] - this.field4400[7] * this.field4400[2] * this.field4400[9] - this.field4400[10] * this.field4400[3] * this.field4400[5] + this.field4400[6] * this.field4400[3] * this.field4400[9]); // L: 256
- float var6 = var1 * (this.field4400[15] * this.field4400[8] * this.field4400[6] + this.field4400[14] * this.field4400[11] * this.field4400[4] + this.field4400[10] * -this.field4400[4] * this.field4400[15] - this.field4400[11] * this.field4400[6] * this.field4400[12] - this.field4400[8] * this.field4400[7] * this.field4400[14] + this.field4400[12] * this.field4400[10] * this.field4400[7]); // L: 257
- float var7 = (this.field4400[8] * this.field4400[3] * this.field4400[14] + this.field4400[11] * this.field4400[2] * this.field4400[12] + (this.field4400[15] * this.field4400[0] * this.field4400[10] - this.field4400[14] * this.field4400[0] * this.field4400[11] - this.field4400[15] * this.field4400[2] * this.field4400[8]) - this.field4400[12] * this.field4400[3] * this.field4400[10]) * var1; // L: 258
- float var8 = var1 * (this.field4400[6] * this.field4400[3] * this.field4400[12] + (this.field4400[15] * -this.field4400[0] * this.field4400[6] + this.field4400[7] * this.field4400[0] * this.field4400[14] + this.field4400[15] * this.field4400[4] * this.field4400[2] - this.field4400[12] * this.field4400[7] * this.field4400[2] - this.field4400[14] * this.field4400[3] * this.field4400[4])); // L: 259
- float var9 = var1 * (this.field4400[11] * this.field4400[6] * this.field4400[0] - this.field4400[10] * this.field4400[7] * this.field4400[0] - this.field4400[2] * this.field4400[4] * this.field4400[11] + this.field4400[2] * this.field4400[7] * this.field4400[8] + this.field4400[4] * this.field4400[3] * this.field4400[10] - this.field4400[6] * this.field4400[3] * this.field4400[8]); // L: 260
- float var10 = (this.field4400[11] * this.field4400[5] * this.field4400[12] + (this.field4400[15] * this.field4400[4] * this.field4400[9] - this.field4400[13] * this.field4400[4] * this.field4400[11] - this.field4400[8] * this.field4400[5] * this.field4400[15]) + this.field4400[8] * this.field4400[7] * this.field4400[13] - this.field4400[12] * this.field4400[9] * this.field4400[7]) * var1; // L: 261
- float var11 = (this.field4400[9] * this.field4400[3] * this.field4400[12] + (this.field4400[11] * this.field4400[0] * this.field4400[13] + this.field4400[9] * -this.field4400[0] * this.field4400[15] + this.field4400[8] * this.field4400[1] * this.field4400[15] - this.field4400[12] * this.field4400[11] * this.field4400[1] - this.field4400[3] * this.field4400[8] * this.field4400[13])) * var1; // L: 262
- float var12 = var1 * (this.field4400[15] * this.field4400[5] * this.field4400[0] - this.field4400[0] * this.field4400[7] * this.field4400[13] - this.field4400[1] * this.field4400[4] * this.field4400[15] + this.field4400[7] * this.field4400[1] * this.field4400[12] + this.field4400[13] * this.field4400[3] * this.field4400[4] - this.field4400[12] * this.field4400[3] * this.field4400[5]); // L: 263
- float var13 = var1 * (this.field4400[3] * this.field4400[5] * this.field4400[8] + (this.field4400[1] * this.field4400[4] * this.field4400[11] + this.field4400[7] * this.field4400[0] * this.field4400[9] + -this.field4400[0] * this.field4400[5] * this.field4400[11] - this.field4400[7] * this.field4400[1] * this.field4400[8] - this.field4400[9] * this.field4400[3] * this.field4400[4])); // L: 264
- float var14 = (this.field4400[10] * this.field4400[4] * this.field4400[13] + this.field4400[9] * -this.field4400[4] * this.field4400[14] + this.field4400[8] * this.field4400[5] * this.field4400[14] - this.field4400[5] * this.field4400[10] * this.field4400[12] - this.field4400[13] * this.field4400[8] * this.field4400[6] + this.field4400[12] * this.field4400[6] * this.field4400[9]) * var1; // L: 265
- float var15 = (this.field4400[14] * this.field4400[9] * this.field4400[0] - this.field4400[0] * this.field4400[10] * this.field4400[13] - this.field4400[1] * this.field4400[8] * this.field4400[14] + this.field4400[12] * this.field4400[1] * this.field4400[10] + this.field4400[8] * this.field4400[2] * this.field4400[13] - this.field4400[12] * this.field4400[9] * this.field4400[2]) * var1; // L: 266
- float var16 = (this.field4400[14] * this.field4400[4] * this.field4400[1] + this.field4400[14] * this.field4400[5] * -this.field4400[0] + this.field4400[13] * this.field4400[6] * this.field4400[0] - this.field4400[12] * this.field4400[1] * this.field4400[6] - this.field4400[13] * this.field4400[4] * this.field4400[2] + this.field4400[5] * this.field4400[2] * this.field4400[12]) * var1; // L: 267
- float var17 = (this.field4400[9] * this.field4400[2] * this.field4400[4] + this.field4400[5] * this.field4400[0] * this.field4400[10] - this.field4400[9] * this.field4400[0] * this.field4400[6] - this.field4400[1] * this.field4400[4] * this.field4400[10] + this.field4400[1] * this.field4400[6] * this.field4400[8] - this.field4400[8] * this.field4400[5] * this.field4400[2]) * var1; // L: 268
- this.field4400[0] = var2; // L: 269
- this.field4400[1] = var3; // L: 270
- this.field4400[2] = var4; // L: 271
- this.field4400[3] = var5; // L: 272
- this.field4400[4] = var6; // L: 273
- this.field4400[5] = var7; // L: 274
- this.field4400[6] = var8; // L: 275
- this.field4400[7] = var9; // L: 276
- this.field4400[8] = var10; // L: 277
- this.field4400[9] = var11; // L: 278
- this.field4400[10] = var12; // L: 279
- this.field4400[11] = var13; // L: 280
- this.field4400[12] = var14; // L: 281
- this.field4400[13] = var15; // L: 282
- this.field4400[14] = var16; // L: 283
- this.field4400[15] = var17; // L: 284
- } // L: 285
+ void method7022() {
+ this.field4411 = 0.0F;
+ this.field4410 = 0.0F;
+ this.field4404 = 0.0F;
+ this.field4407 = 0.0F;
+ this.field4401 = 0.0F; // L: 30
+ this.field4408 = 0.0F; // L: 31
+ this.field4409 = 0.0F; // L: 32
+ this.field4402 = 0.0F; // L: 33
+ this.field4400 = 0.0F; // L: 34
+ this.field4406 = 1.0F; // L: 35
+ this.field4403 = 1.0F; // L: 36
+ this.field4405 = 1.0F; // L: 37
+ } // L: 38
- @ObfuscatedName("n")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)[F",
- garbageValue = "82"
+ descriptor = "(FI)V",
+ garbageValue = "1277086210"
)
- public float[] method6821() {
- float[] var1 = new float[3]; // L: 322
- class386 var2 = new class386(this.field4400[0], this.field4400[1], this.field4400[2]); // L: 323
- class386 var3 = new class386(this.field4400[4], this.field4400[5], this.field4400[6]); // L: 324
- class386 var4 = new class386(this.field4400[8], this.field4400[9], this.field4400[10]); // L: 325
- var1[0] = var2.method6771(); // L: 326
- var1[1] = var3.method6771(); // L: 327
- var1[2] = var4.method6771(); // L: 328
- return var1; // L: 329
- }
+ void method7029(float var1) {
+ float var2 = (float)Math.cos((double)var1); // L: 41
+ float var3 = (float)Math.sin((double)var1); // L: 42
+ float var4 = this.field4400; // L: 43
+ float var5 = this.field4403; // L: 44
+ float var6 = this.field4407; // L: 45
+ float var7 = this.field4410; // L: 46
+ this.field4400 = var4 * var2 - var3 * this.field4402; // L: 47
+ this.field4402 = this.field4402 * var2 + var3 * var4; // L: 48
+ this.field4403 = var5 * var2 - var3 * this.field4408; // L: 49
+ this.field4408 = var3 * var5 + var2 * this.field4408; // L: 50
+ this.field4407 = var2 * var6 - this.field4406 * var3; // L: 51
+ this.field4406 = var3 * var6 + var2 * this.field4406; // L: 52
+ this.field4410 = var2 * var7 - var3 * this.field4411; // L: 53
+ this.field4411 = this.field4411 * var2 + var3 * var7; // L: 54
+ } // L: 55
- public int hashCode() {
- boolean var1 = true; // L: 307
- byte var2 = 1; // L: 308
- int var3 = 31 * var2 + Arrays.hashCode(this.field4400); // L: 309
- return var3; // L: 310
- }
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(FI)V",
+ garbageValue = "287874371"
+ )
+ void method7027(float var1) {
+ float var2 = (float)Math.cos((double)var1); // L: 58
+ float var3 = (float)Math.sin((double)var1); // L: 59
+ float var4 = this.field4405; // L: 60
+ float var5 = this.field4409; // L: 61
+ float var6 = this.field4401; // L: 62
+ float var7 = this.field4404; // L: 63
+ this.field4405 = var4 * var2 + this.field4402 * var3; // L: 64
+ this.field4402 = this.field4402 * var2 - var3 * var4; // L: 65
+ this.field4409 = var2 * var5 + this.field4408 * var3; // L: 66
+ this.field4408 = var2 * this.field4408 - var5 * var3; // L: 67
+ this.field4401 = var2 * var6 + this.field4406 * var3; // L: 68
+ this.field4406 = var2 * this.field4406 - var6 * var3; // L: 69
+ this.field4404 = var7 * var2 + var3 * this.field4411; // L: 70
+ this.field4411 = this.field4411 * var2 - var7 * var3; // L: 71
+ } // L: 72
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(FI)V",
+ garbageValue = "736372883"
+ )
+ void method7039(float var1) {
+ float var2 = (float)Math.cos((double)var1); // L: 75
+ float var3 = (float)Math.sin((double)var1); // L: 76
+ float var4 = this.field4405; // L: 77
+ float var5 = this.field4409; // L: 78
+ float var6 = this.field4401; // L: 79
+ float var7 = this.field4404; // L: 80
+ this.field4405 = var4 * var2 - var3 * this.field4400; // L: 81
+ this.field4400 = var4 * var3 + var2 * this.field4400; // L: 82
+ this.field4409 = var5 * var2 - this.field4403 * var3; // L: 83
+ this.field4403 = var3 * var5 + this.field4403 * var2; // L: 84
+ this.field4401 = var2 * var6 - this.field4407 * var3; // L: 85
+ this.field4407 = var6 * var3 + this.field4407 * var2; // L: 86
+ this.field4404 = var7 * var2 - var3 * this.field4410; // L: 87
+ this.field4410 = var3 * var7 + var2 * this.field4410; // L: 88
+ } // L: 89
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(FFFI)V",
+ garbageValue = "1389632603"
+ )
+ void method7026(float var1, float var2, float var3) {
+ this.field4404 += var1; // L: 92
+ this.field4410 += var2; // L: 93
+ this.field4411 += var3; // L: 94
+ } // L: 95
public String toString() {
- StringBuilder var1 = new StringBuilder(); // L: 290
- this.method6810(); // L: 291
- this.method6809(); // L: 292
-
- for (int var2 = 0; var2 < 4; ++var2) { // L: 293
- for (int var3 = 0; var3 < 4; ++var3) { // L: 294
- if (var3 > 0) {
- var1.append("\t"); // L: 295
- }
-
- float var4 = this.field4400[var3 + var2 * 4]; // L: 296
- if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 297
- var4 = 0.0F;
- }
-
- var1.append(var4); // L: 298
- }
-
- var1.append("\n"); // L: 300
- }
-
- return var1.toString(); // L: 302
+ return this.field4405 + "," + this.field4409 + "," + this.field4401 + "," + this.field4404 + "\n" + this.field4400 + "," + this.field4403 + "," + this.field4407 + "," + this.field4410 + "\n" + this.field4402 + "," + this.field4408 + "," + this.field4406 + "," + this.field4411; // L: 99
}
- public boolean equals(Object var1) {
- if (!(var1 instanceof class388)) { // L: 315
- return false;
- } else {
- class388 var2 = (class388)var1; // L: 316
-
- for (int var3 = 0; var3 < 16; ++var3) { // L: 317
- if (this.field4400[var3] != var2.field4400[var3]) {
- return false;
- }
- }
-
- return true; // L: 318
- }
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IB)I",
+ garbageValue = "-34"
+ )
+ @Export("getVarbit")
+ public static int getVarbit(int var0) {
+ VarbitComposition var1 = WorldMapCacheName.method5054(var0); // L: 24
+ int var2 = var1.baseVar; // L: 25
+ int var3 = var1.startBit; // L: 26
+ int var4 = var1.endBit; // L: 27
+ int var5 = Varps.Varps_masks[var4 - var3]; // L: 28
+ return Varps.Varps_main[var2] >> var3 & var5; // L: 29
}
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(FFFF[FI)V",
+ garbageValue = "-885047060"
+ )
+ static void method7040(float var0, float var1, float var2, float var3, float[] var4) {
+ float var5 = var1 - var0; // L: 321
+ float var6 = var2 - var1; // L: 322
+ float var7 = var3 - var2; // L: 323
+ float var8 = var6 - var5; // L: 324
+ var4[3] = var7 - var6 - var8; // L: 325
+ var4[2] = var8 + var8 + var8; // L: 326
+ var4[1] = var5 + var5 + var5; // L: 327
+ var4[0] = var0; // L: 328
+ } // L: 329
}
diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java
index 00dc1310a3..92e90bf4a2 100644
--- a/runescape-client/src/main/java/class389.java
+++ b/runescape-client/src/main/java/class389.java
@@ -1,139 +1,18 @@
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("nt")
+@ObfuscatedName("nk")
public class class389 {
- @ObfuscatedName("o")
- float field4410;
- @ObfuscatedName("q")
- float field4405;
- @ObfuscatedName("l")
- float field4406;
- @ObfuscatedName("k")
- float field4407;
- @ObfuscatedName("a")
- float field4409;
- @ObfuscatedName("m")
- float field4412;
- @ObfuscatedName("p")
- float field4413;
- @ObfuscatedName("s")
- float field4411;
- @ObfuscatedName("r")
- float field4404;
- @ObfuscatedName("v")
- float field4408;
- @ObfuscatedName("y")
- float field4414;
@ObfuscatedName("c")
- float field4415;
-
- static {
- new class389();
- } // L: 6
-
- class389() {
- this.method6876(); // L: 22
- } // L: 23
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "1906485872"
+ float[] field4415;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = -2004377365
)
- void method6876() {
- this.field4415 = 0.0F; // L: 26
- this.field4414 = 0.0F; // L: 27
- this.field4408 = 0.0F; // L: 28
- this.field4411 = 0.0F; // L: 29
- this.field4413 = 0.0F; // L: 30
- this.field4412 = 0.0F; // L: 31
- this.field4407 = 0.0F; // L: 32
- this.field4406 = 0.0F; // L: 33
- this.field4405 = 0.0F; // L: 34
- this.field4404 = 1.0F; // L: 35
- this.field4409 = 1.0F; // L: 36
- this.field4410 = 1.0F; // L: 37
- } // L: 38
+ int field4414;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(FI)V",
- garbageValue = "-1653714241"
- )
- void method6877(float var1) {
- float var2 = (float)Math.cos((double)var1); // L: 41
- float var3 = (float)Math.sin((double)var1); // L: 42
- float var4 = this.field4405; // L: 43
- float var5 = this.field4409; // L: 44
- float var6 = this.field4411; // L: 45
- float var7 = this.field4414; // L: 46
- this.field4405 = var4 * var2 - this.field4406 * var3; // L: 47
- this.field4406 = this.field4406 * var2 + var3 * var4; // L: 48
- this.field4409 = var5 * var2 - var3 * this.field4412; // L: 49
- this.field4412 = var3 * var5 + this.field4412 * var2; // L: 50
- this.field4411 = var6 * var2 - this.field4404 * var3; // L: 51
- this.field4404 = var3 * var6 + var2 * this.field4404; // L: 52
- this.field4414 = var2 * var7 - var3 * this.field4415; // L: 53
- this.field4415 = var2 * this.field4415 + var7 * var3; // L: 54
- } // L: 55
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(FI)V",
- garbageValue = "1318784664"
- )
- void method6878(float var1) {
- float var2 = (float)Math.cos((double)var1); // L: 58
- float var3 = (float)Math.sin((double)var1); // L: 59
- float var4 = this.field4410; // L: 60
- float var5 = this.field4407; // L: 61
- float var6 = this.field4413; // L: 62
- float var7 = this.field4408; // L: 63
- this.field4410 = var4 * var2 + this.field4406 * var3; // L: 64
- this.field4406 = this.field4406 * var2 - var4 * var3; // L: 65
- this.field4407 = var5 * var2 + var3 * this.field4412; // L: 66
- this.field4412 = var2 * this.field4412 - var5 * var3; // L: 67
- this.field4413 = var2 * var6 + var3 * this.field4404; // L: 68
- this.field4404 = var2 * this.field4404 - var6 * var3; // L: 69
- this.field4408 = this.field4415 * var3 + var7 * var2; // L: 70
- this.field4415 = this.field4415 * var2 - var3 * var7; // L: 71
- } // L: 72
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(FI)V",
- garbageValue = "1867033025"
- )
- void method6879(float var1) {
- float var2 = (float)Math.cos((double)var1); // L: 75
- float var3 = (float)Math.sin((double)var1); // L: 76
- float var4 = this.field4410; // L: 77
- float var5 = this.field4407; // L: 78
- float var6 = this.field4413; // L: 79
- float var7 = this.field4408; // L: 80
- this.field4410 = var2 * var4 - var3 * this.field4405; // L: 81
- this.field4405 = var4 * var3 + var2 * this.field4405; // L: 82
- this.field4407 = var5 * var2 - this.field4409 * var3; // L: 83
- this.field4409 = var5 * var3 + this.field4409 * var2; // L: 84
- this.field4413 = var2 * var6 - var3 * this.field4411; // L: 85
- this.field4411 = var6 * var3 + this.field4411 * var2; // L: 86
- this.field4408 = var2 * var7 - var3 * this.field4414; // L: 87
- this.field4414 = this.field4414 * var2 + var7 * var3; // L: 88
- } // L: 89
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(FFFI)V",
- garbageValue = "-1766831994"
- )
- void method6887(float var1, float var2, float var3) {
- this.field4408 += var1; // L: 92
- this.field4414 += var2; // L: 93
- this.field4415 += var3; // L: 94
- } // L: 95
-
- public String toString() {
- return this.field4410 + "," + this.field4407 + "," + this.field4413 + "," + this.field4408 + "\n" + this.field4405 + "," + this.field4409 + "," + this.field4411 + "," + this.field4414 + "\n" + this.field4406 + "," + this.field4412 + "," + this.field4404 + "," + this.field4415; // L: 99
- }
+ class389(float[] var1, int var2) {
+ this.field4415 = var1; // L: 10
+ this.field4414 = var2; // L: 11
+ } // L: 12
}
diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java
index fec03855c9..020f6bb8da 100644
--- a/runescape-client/src/main/java/class390.java
+++ b/runescape-client/src/main/java/class390.java
@@ -1,18 +1,83 @@
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oo")
-public class class390 {
- @ObfuscatedName("o")
- float[] field4416;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = 1754270311
+@ObfuscatedName("of")
+public enum class390 implements MouseWheel {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lof;"
)
- int field4417;
+ field4422(0, 1),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lof;"
+ )
+ field4418(1, 2),
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lof;"
+ )
+ field4419(3, 3),
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lof;"
+ )
+ field4420(2, 10);
- class390(float[] var1, int var2) {
- this.field4416 = var1; // L: 10
- this.field4417 = var2; // L: 11
- } // L: 12
+ @ObfuscatedName("tm")
+ @ObfuscatedGetter(
+ intValue = 1311264541
+ )
+ static int field4423;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = -1525922993
+ )
+ final int field4417;
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = 1014236719
+ )
+ final int field4421;
+
+ class390(int var3, int var4) {
+ this.field4417 = var3; // L: 16
+ this.field4421 = var4; // L: 17
+ } // L: 18
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-100"
+ )
+ @Export("rsOrdinal")
+ public int rsOrdinal() {
+ return this.field4421; // L: 22
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(B)Lqu;",
+ garbageValue = "14"
+ )
+ static IndexedSprite method7053() {
+ IndexedSprite var0 = new IndexedSprite(); // L: 136
+ var0.width = ModelData0.SpriteBuffer_spriteWidth; // L: 137
+ var0.height = class456.SpriteBuffer_spriteHeight; // L: 138
+ var0.xOffset = class426.SpriteBuffer_xOffsets[0]; // L: 139
+ var0.yOffset = class142.SpriteBuffer_yOffsets[0]; // L: 140
+ var0.subWidth = class359.SpriteBuffer_spriteWidths[0]; // L: 141
+ var0.subHeight = class456.SpriteBuffer_spriteHeights[0]; // L: 142
+ var0.palette = class13.SpriteBuffer_spritePalette; // L: 143
+ var0.pixels = class421.SpriteBuffer_pixels[0]; // L: 144
+ class426.SpriteBuffer_xOffsets = null; // L: 146
+ class142.SpriteBuffer_yOffsets = null; // L: 147
+ class359.SpriteBuffer_spriteWidths = null; // L: 148
+ class456.SpriteBuffer_spriteHeights = null; // L: 149
+ class13.SpriteBuffer_spritePalette = null; // L: 150
+ class421.SpriteBuffer_pixels = null; // L: 151
+ return var0; // L: 153
+ }
}
diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java
index 972fea8dce..0d2fcf0be9 100644
--- a/runescape-client/src/main/java/class391.java
+++ b/runescape-client/src/main/java/class391.java
@@ -1,60 +1,34 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oe")
-public enum class391 implements MouseWheel {
- @ObfuscatedName("o")
+@ObfuscatedName("ok")
+public class class391 implements class396 {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Loe;"
+ descriptor = "Lpt;"
)
- field4422(1, 1),
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Loe;"
- )
- field4419(2, 2),
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Loe;"
- )
- field4421(0, 3),
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Loe;"
- )
- field4424(3, 10);
+ public final class420 field4424;
- @ObfuscatedName("bo")
@ObfuscatedSignature(
- descriptor = "Lpj;"
+ descriptor = "(Lpl;)V"
)
- @Export("loginType")
- static LoginType loginType;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = 2065434727
- )
- final int field4423;
- @ObfuscatedName("m")
- @ObfuscatedGetter(
- intValue = -683331803
- )
- final int field4420;
+ class391(class421 var1) {
+ this.field4424 = var1; // L: 14
+ } // L: 15
- class391(int var3, int var4) {
- this.field4423 = var3; // L: 16
- this.field4420 = var4; // L: 17
- } // L: 18
-
- @ObfuscatedName("o")
@ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "30"
+ descriptor = "(Loz;)V"
)
- @Export("rsOrdinal")
- public int rsOrdinal() {
- return this.field4420; // L: 22
+ public class391(class392 var1) {
+ this(new class421(var1)); // L: 10
+ } // L: 11
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-275089160"
+ )
+ public int method7055(int var1) {
+ return this.field4424.vmethod7440(var1); // L: 18
}
}
diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java
index e11d0ffb56..4089cc23b1 100644
--- a/runescape-client/src/main/java/class392.java
+++ b/runescape-client/src/main/java/class392.java
@@ -1,45 +1,71 @@
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oa")
-public class class392 implements class397 {
- @ObfuscatedName("o")
+@ObfuscatedName("oz")
+public abstract class class392 extends class249 implements class449 {
@ObfuscatedSignature(
- descriptor = "Lpk;"
+ descriptor = "(Lkx;Llb;I)V"
)
- public final class421 field4427;
+ protected class392(StudioGame var1, Language var2, int var3) {
+ super(var1, var2, var3); // L: 15
+ } // L: 16
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Lpw;)V"
+ descriptor = "(II)Loj;",
+ garbageValue = "-231569171"
)
- class392(class422 var1) {
- this.field4427 = var1; // L: 14
- } // L: 15
+ protected abstract class394 vmethod7521(int var1);
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lod;)V"
+ descriptor = "(I)I",
+ garbageValue = "1559402072"
)
- public class392(class393 var1) {
- this(new class422(var1)); // L: 10
- } // L: 11
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "-1"
- )
- public int method6905(int var1) {
- return this.field4427.vmethod7293(var1); // L: 18
+ public int method7058() {
+ return super.field2884; // L: 19
}
- @ObfuscatedName("bc")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;I)I",
- garbageValue = "666324052"
+ descriptor = "(II)Ljava/lang/Object;",
+ garbageValue = "1786905463"
)
- @Export("stringCp1252NullTerminatedByteSize")
- public static int stringCp1252NullTerminatedByteSize(String var0) {
- return var0.length() + 1; // L: 121
+ public Object vmethod8027(int var1) {
+ class394 var2 = this.vmethod7521(var1); // L: 24
+ return var2 != null && var2.method7074() ? var2.method7082() : null; // L: 25 26
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)Lqr;",
+ garbageValue = "-145331804"
+ )
+ public class450 method7060(Buffer var1) {
+ int var2 = var1.readUnsignedShort(); // L: 30
+ class394 var3 = this.vmethod7521(var2); // L: 31
+ class450 var4 = new class450(var2); // L: 32
+ Class var5 = var3.field4428.field4659; // L: 33
+ if (var5 == Integer.class) { // L: 34
+ var4.field4766 = var1.readInt();
+ } else if (var5 == Long.class) {
+ var4.field4766 = var1.readLong(); // L: 35
+ } else if (var5 == String.class) { // L: 36
+ var4.field4766 = var1.readStringCp1252NullCircumfixed();
+ } else {
+ if (!class445.class.isAssignableFrom(var5)) { // L: 37
+ throw new IllegalStateException(); // L: 46
+ }
+
+ try {
+ class445 var6 = (class445)var5.newInstance(); // L: 39
+ var6.method8005(var1); // L: 40
+ var4.field4766 = var6; // L: 41
+ } catch (InstantiationException var7) { // L: 43
+ } catch (IllegalAccessException var8) { // L: 44
+ }
+ }
+
+ return var4; // L: 47
}
}
diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java
index 8e3153b1a3..3ec2b31436 100644
--- a/runescape-client/src/main/java/class393.java
+++ b/runescape-client/src/main/java/class393.java
@@ -1,74 +1,24 @@
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("od")
-public abstract class class393 extends class250 implements class446 {
- @ObfuscatedName("dt")
- static boolean field4428;
-
- @ObfuscatedSignature(
- descriptor = "(Lke;Llq;I)V"
+@ObfuscatedName("or")
+public class class393 extends class394 {
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ longValue = -2173351521365145711L
)
- protected class393(StudioGame var1, Language var2, int var3) {
- super(var1, var2, var3); // L: 15
- } // L: 16
+ static long field4425;
- @ObfuscatedName("o")
+ public class393(int var1) {
+ super(var1); // L: 7
+ } // L: 8
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Lou;",
- garbageValue = "-318323569"
+ descriptor = "(Lqt;II)V",
+ garbageValue = "803287054"
)
- protected abstract class395 vmethod7381(int var1);
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "970560687"
- )
- public int method6909() {
- return super.field2926; // L: 19
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/Object;",
- garbageValue = "-322202585"
- )
- public Object vmethod7814(int var1) {
- class395 var2 = this.vmethod7381(var1); // L: 24
- return var2 != null && var2.method6929() ? var2.method6930() : null; // L: 25 26
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)Lqx;",
- garbageValue = "1616655669"
- )
- public class447 method6920(Buffer var1) {
- int var2 = var1.readUnsignedShort(); // L: 30
- class395 var3 = this.vmethod7381(var2); // L: 31
- class447 var4 = new class447(var2); // L: 32
- Class var5 = var3.field4430.field4667; // L: 33
- if (var5 == Integer.class) { // L: 34
- var4.field4742 = var1.readInt();
- } else if (var5 == Long.class) {
- var4.field4742 = var1.readLong(); // L: 35
- } else if (var5 == String.class) { // L: 36
- var4.field4742 = var1.readStringCp1252NullCircumfixed();
- } else {
- if (!class442.class.isAssignableFrom(var5)) { // L: 37
- throw new IllegalStateException(); // L: 46
- }
-
- try {
- class442 var6 = (class442)var5.newInstance(); // L: 39
- var6.method7783(var1); // L: 40
- var4.field4742 = var6; // L: 41
- } catch (InstantiationException var7) { // L: 43
- } catch (IllegalAccessException var8) { // L: 44
- }
- }
-
- return var4; // L: 47
- }
+ void vmethod7080(Buffer var1, int var2) {
+ } // L: 12
}
diff --git a/runescape-client/src/main/java/class394.java b/runescape-client/src/main/java/class394.java
index c5fce7db60..6a68027a7e 100644
--- a/runescape-client/src/main/java/class394.java
+++ b/runescape-client/src/main/java/class394.java
@@ -1,17 +1,91 @@
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ow")
-public class class394 extends class395 {
- public class394(int var1) {
- super(var1); // L: 7
- } // L: 8
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1749736682"
+@ObfuscatedName("oj")
+public abstract class class394 implements class248 {
+ @ObfuscatedName("e")
+ @ObfuscatedGetter(
+ intValue = -1016903311
)
- void vmethod6936(Buffer var1, int var2) {
- } // L: 12
+ public static int field4429;
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lpv;"
+ )
+ class432 field4428;
+
+ class394(int var1) {
+ } // L: 13
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;II)V",
+ garbageValue = "803287054"
+ )
+ abstract void vmethod7080(Buffer var1, int var2);
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1106157654"
+ )
+ public void method7073(Buffer var1) {
+ while (true) {
+ int var2 = var1.readUnsignedByte(); // L: 17
+ if (var2 == 0) { // L: 18
+ return; // L: 47
+ }
+
+ class390[] var3 = new class390[]{class390.field4418, class390.field4419, class390.field4420, class390.field4422}; // L: 21
+ class390 var4 = (class390)Actor.findEnumerated(var3, var2); // L: 23
+ if (var4 != null) { // L: 24
+ switch(var4.field4417) { // L: 25
+ case 0:
+ int var6 = var1.readUnsignedByte(); // L: 39
+ this.field4428 = MusicPatchNode.method5472(var6); // L: 40
+ if (this.field4428 != null) {
+ break;
+ }
+
+ throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var6); // L: 41
+ case 1:
+ class308[] var5 = new class308[]{class308.field3939, class308.field3938, class308.field3941, class308.field3940}; // L: 32
+ Actor.findEnumerated(var5, var1.readUnsignedByte()); // L: 34
+ break; // L: 35
+ case 2:
+ var1.readStringCp1252NullCircumfixed(); // L: 27
+ break;
+ default:
+ throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 37
+ }
+ } else {
+ this.vmethod7080(var1, var2); // L: 45
+ }
+ }
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "1341290829"
+ )
+ boolean method7074() {
+ return this.field4428 != null; // L: 52
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/Object;",
+ garbageValue = "-72788464"
+ )
+ Object method7082() {
+ if (this.field4428 == class432.field4658) { // L: 56
+ return 0; // L: 57
+ } else if (this.field4428 == class432.field4656) { // L: 59
+ return -1L; // L: 60
+ } else {
+ return this.field4428 == class432.field4657 ? "" : null; // L: 62 63 65
+ }
+ }
}
diff --git a/runescape-client/src/main/java/class395.java b/runescape-client/src/main/java/class395.java
index 37548061d2..0170f866ff 100644
--- a/runescape-client/src/main/java/class395.java
+++ b/runescape-client/src/main/java/class395.java
@@ -1,97 +1,5 @@
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ou")
-public abstract class class395 implements class249 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lpm;"
- )
- class433 field4430;
-
- class395(int var1) {
- } // L: 13
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lpx;II)V",
- garbageValue = "-1749736682"
- )
- abstract void vmethod6936(Buffer var1, int var2);
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)V",
- garbageValue = "622445456"
- )
- public void method6927(Buffer var1) {
- while (true) {
- int var2 = var1.readUnsignedByte(); // L: 17
- if (var2 == 0) { // L: 18
- return; // L: 64
- }
-
- class391[] var3 = new class391[]{class391.field4421, class391.field4419, class391.field4424, class391.field4422}; // L: 21
- class391 var4 = (class391)class291.findEnumerated(var3, var2); // L: 23
- if (var4 != null) { // L: 24
- switch(var4.field4423) { // L: 25
- case 1:
- int var6 = var1.readUnsignedByte(); // L: 37
- int var8 = class431.field4651[var6]; // L: 40
- class433 var7;
- if (var8 == 1) { // L: 41
- var7 = class433.field4664; // L: 42
- } else if (var8 == 2) { // L: 45
- var7 = class433.field4656; // L: 46
- } else if (var8 == 3) { // L: 49
- var7 = class433.field4655; // L: 50
- } else {
- var7 = null; // L: 53
- }
-
- this.field4430 = var7; // L: 55
- if (this.field4430 != null) { // L: 56
- break;
- }
-
- throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var6);
- case 2:
- class309[] var5 = new class309[]{class309.field3973, class309.field3976, class309.field3972, class309.field3974}; // L: 32
- class291.findEnumerated(var5, var1.readUnsignedByte()); // L: 34
- break; // L: 35
- case 3:
- var1.readStringCp1252NullCircumfixed(); // L: 27
- break;
- default:
- throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 59
- }
- } else {
- this.vmethod6936(var1, var2); // L: 62
- }
- }
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "8"
- )
- boolean method6929() {
- return this.field4430 != null; // L: 69
- }
-
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/Object;",
- garbageValue = "-29"
- )
- Object method6930() {
- if (this.field4430 == class433.field4664) { // L: 73
- return 0; // L: 74
- } else if (this.field4430 == class433.field4655) { // L: 76
- return -1L; // L: 77
- } else {
- return this.field4430 == class433.field4656 ? "" : null; // L: 79 80 82
- }
- }
+@ObfuscatedName("ol")
+public interface class395 {
}
diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java
index 8b1b9a241a..9dac7e403c 100644
--- a/runescape-client/src/main/java/class396.java
+++ b/runescape-client/src/main/java/class396.java
@@ -1,5 +1,5 @@
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("ol")
-public interface class396 {
+@ObfuscatedName("on")
+public interface class396 extends class395 {
}
diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java
index 6bab3c4597..6d020431f8 100644
--- a/runescape-client/src/main/java/class397.java
+++ b/runescape-client/src/main/java/class397.java
@@ -1,5 +1,36 @@
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ob")
-public interface class397 extends class396 {
+@ObfuscatedName("ot")
+public class class397 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Lot;"
+ )
+ public static final class397 field4431;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lot;"
+ )
+ static final class397 field4430;
+ @ObfuscatedName("q")
+ String field4432;
+
+ static {
+ field4431 = new class397("application/json"); // L: 4
+ field4430 = new class397("text/plain"); // L: 5
+ }
+
+ class397(String var1) {
+ this.field4432 = var1; // L: 9
+ } // L: 10
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "-851015132"
+ )
+ public String method7086() {
+ return this.field4432; // L: 13
+ }
}
diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java
index 0d1e4f5020..da24bf6756 100644
--- a/runescape-client/src/main/java/class398.java
+++ b/runescape-client/src/main/java/class398.java
@@ -1,36 +1,13 @@
+import java.io.UnsupportedEncodingException;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("oz")
-public class class398 {
- @ObfuscatedName("o")
+@ObfuscatedName("oi")
+public interface class398 {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Loz;"
+ descriptor = "(I)[B",
+ garbageValue = "793389020"
)
- public static final class398 field4432;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Loz;"
- )
- static final class398 field4433;
- @ObfuscatedName("l")
- String field4434;
-
- static {
- field4432 = new class398("application/json"); // L: 4
- field4433 = new class398("text/plain"); // L: 5
- }
-
- class398(String var1) {
- this.field4434 = var1; // L: 9
- } // L: 10
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "120"
- )
- public String method6940() {
- return this.field4434; // L: 13
- }
+ byte[] vmethod7114() throws UnsupportedEncodingException;
}
diff --git a/runescape-client/src/main/java/class399.java b/runescape-client/src/main/java/class399.java
index cf3297a985..d669cac35a 100644
--- a/runescape-client/src/main/java/class399.java
+++ b/runescape-client/src/main/java/class399.java
@@ -1,13 +1,72 @@
import java.io.UnsupportedEncodingException;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
-@ObfuscatedName("ot")
-public interface class399 {
- @ObfuscatedName("o")
+@ObfuscatedName("om")
+public class class399 implements class398 {
+ @ObfuscatedName("q")
+ JSONObject field4436;
+
+ public class399(byte[] var1) throws UnsupportedEncodingException {
+ this.method7098(var1); // L: 17
+ } // L: 18
+
+ public class399(String var1) throws UnsupportedEncodingException {
+ this.method7099(var1); // L: 13
+ } // L: 14
+
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)[B",
- garbageValue = "-2132228640"
+ garbageValue = "793389020"
)
- byte[] vmethod6962() throws UnsupportedEncodingException;
+ public byte[] vmethod7114() throws UnsupportedEncodingException {
+ return this.field4436 == null ? new byte[0] : this.field4436.toString().getBytes("UTF-8"); // L: 50 51 53
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "([BI)V",
+ garbageValue = "-448448712"
+ )
+ void method7098(byte[] var1) throws UnsupportedEncodingException {
+ String var2 = new String(var1, "UTF-8"); // L: 21
+ this.method7099(var2); // L: 22
+ } // L: 23
+
+ @ObfuscatedName("y")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "2042516666"
+ )
+ void method7099(String var1) throws UnsupportedEncodingException {
+ try {
+ if (var1.charAt(0) == '{') { // L: 27
+ this.field4436 = new JSONObject(var1); // L: 28
+ } else {
+ if (var1.charAt(0) != '[') { // L: 30
+ throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); // L: 36
+ }
+
+ JSONArray var2 = new JSONArray(var1); // L: 31
+ this.field4436 = new JSONObject(); // L: 32
+ this.field4436.put("arrayValues", var2); // L: 33
+ }
+
+ } catch (JSONException var3) { // L: 39
+ throw new UnsupportedEncodingException(var3.getMessage()); // L: 40
+ }
+ } // L: 42
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(I)Lorg/json/JSONObject;",
+ garbageValue = "1036463091"
+ )
+ public JSONObject method7100() {
+ return this.field4436; // L: 45
+ }
}
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
index bef01347d5..ec70fd402f 100644
--- a/runescape-client/src/main/java/class4.java
+++ b/runescape-client/src/main/java/class4.java
@@ -1,43 +1,79 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
+import netscape.javascript.JSObject;
-@ObfuscatedName("a")
+@ObfuscatedName("j")
public final class class4 {
- @ObfuscatedName("s")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "2109768845"
+ descriptor = "Llh;"
)
- @Export("Messages_getLastChatID")
- static int Messages_getLastChatID(int var0) {
- Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 64
- if (var1 == null) { // L: 65
- return -1;
- } else {
- return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 66 67
- }
- }
-
- @ObfuscatedName("jy")
+ @Export("HitSplatDefinition_fontsArchive")
+ public static AbstractArchive HitSplatDefinition_fontsArchive;
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(IIIIIIIB)V",
- garbageValue = "-57"
+ descriptor = "Lqu;"
)
- @Export("updateRootInterface")
- static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
- if (WorldMapDecoration.loadInterface(var0)) { // L: 11204
- WorldMapRegion.updateInterface(NetSocket.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11205
- }
- } // L: 11206
+ @Export("titleboxSprite")
+ static IndexedSprite titleboxSprite;
+ @ObfuscatedName("ee")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive20")
+ static Archive archive20;
- @ObfuscatedName("lk")
+ @ObfuscatedName("hw")
@ObfuscatedSignature(
descriptor = "(I)V",
- garbageValue = "-924904180"
+ garbageValue = "-1151585250"
)
- static void method22() {
- Client.packetWriter.addNode(WallDecoration.getPacketBufferNode(ClientPacket.field3020, Client.packetWriter.isaacCipher)); // L: 12669
- Client.oculusOrbState = 0; // L: 12670
- } // L: 12671
+ static final void method11() {
+ for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7783 7784 7790
+ if (var0.hitpoints == -1) { // L: 7785
+ var0.delay = 0; // L: 7786
+ class151.method3146(var0); // L: 7787
+ } else {
+ var0.remove(); // L: 7789
+ }
+ }
+
+ } // L: 7792
+
+ @ObfuscatedName("ii")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
+ garbageValue = "-1285432829"
+ )
+ @Export("insertMenuItemNoShift")
+ public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
+ class268.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9700
+ } // L: 9701
+
+ @ObfuscatedName("ly")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/String;I)V",
+ garbageValue = "-2033528269"
+ )
+ static void method12(String var0) {
+ GrandExchangeOfferTotalQuantityComparator.field4045 = var0; // L: 12343
+
+ try {
+ String var1 = class353.client.getParameter(Integer.toString(18)); // L: 12345
+ String var2 = class353.client.getParameter(Integer.toString(13)); // L: 12346
+ String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12347
+ if (var0.length() == 0) { // L: 12348
+ var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
+ } else {
+ var3 = var3 + "; Expires=" + NPC.method2382(class115.method2692() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 12349
+ }
+
+ Client var4 = class353.client; // L: 12350
+ String var5 = "document.cookie=\"" + var3 + "\""; // L: 12351
+ JSObject.getWindow(var4).eval(var5); // L: 12354
+ } catch (Throwable var6) { // L: 12357
+ }
+
+ } // L: 12358
}
diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java
index e815e4766a..a7b251d0ab 100644
--- a/runescape-client/src/main/java/class400.java
+++ b/runescape-client/src/main/java/class400.java
@@ -1,82 +1,51 @@
import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-@ObfuscatedName("oh")
-public class class400 implements class399 {
- @ObfuscatedName("l")
- JSONObject field4439;
+@ObfuscatedName("op")
+public class class400 implements class398 {
+ @ObfuscatedName("v")
+ final Map field4437;
- public class400(byte[] var1) throws UnsupportedEncodingException {
- this.method6946(var1); // L: 17
- } // L: 18
+ public class400(Map var1) {
+ this.field4437 = var1; // L: 11
+ } // L: 12
- public class400(String var1) throws UnsupportedEncodingException {
- this.method6954(var1); // L: 13
- } // L: 14
-
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)[B",
- garbageValue = "-2132228640"
+ garbageValue = "793389020"
)
- public byte[] vmethod6962() throws UnsupportedEncodingException {
- return this.field4439 == null ? new byte[0] : this.field4439.toString().getBytes("UTF-8"); // L: 50 51 53
+ public byte[] vmethod7114() throws UnsupportedEncodingException {
+ return this.method7122().getBytes("UTF-8"); // L: 16
}
- @ObfuscatedName("l")
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "([BI)V",
- garbageValue = "1886855287"
+ descriptor = "(I)Ljava/lang/String;",
+ garbageValue = "1192893333"
)
- void method6946(byte[] var1) throws UnsupportedEncodingException {
- String var2 = new String(var1, "UTF-8"); // L: 21
- this.method6954(var2); // L: 22
- } // L: 23
+ public String method7122() throws UnsupportedEncodingException {
+ StringBuilder var1 = new StringBuilder(); // L: 20
+ Iterator var2 = this.field4437.entrySet().iterator(); // L: 21
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "3"
- )
- void method6954(String var1) throws UnsupportedEncodingException {
- try {
- if (var1.charAt(0) == '{') { // L: 27
- this.field4439 = new JSONObject(var1); // L: 28
- } else {
- if (var1.charAt(0) != '[') { // L: 30
- throw new UnsupportedEncodingException("Invalid JSON passed to the JSON content builder."); // L: 36
- }
-
- JSONArray var2 = new JSONArray(var1); // L: 31
- this.field4439 = new JSONObject(); // L: 32
- this.field4439.put("arrayValues", var2); // L: 33
- }
-
- } catch (JSONException var3) { // L: 39
- throw new UnsupportedEncodingException(var3.getMessage()); // L: 40
+ while (var2.hasNext()) {
+ Entry var3 = (Entry)var2.next(); // L: 22
+ String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8"); // L: 24
+ String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8"); // L: 25
+ var1.append(var4).append("=").append(var5).append("&"); // L: 26
}
- } // L: 42
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(I)Lorg/json/JSONObject;",
- garbageValue = "579331976"
- )
- public JSONObject method6947() {
- return this.field4439; // L: 45
+ if (var1.length() == 0) { // L: 29
+ return "";
+ } else {
+ var1.deleteCharAt(var1.length() - 1); // L: 30
+ var1.insert(0, "?"); // L: 31
+ return var1.toString(); // L: 32
+ }
}
-
- @ObfuscatedName("x")
- @ObfuscatedSignature(
- descriptor = "(IB)V",
- garbageValue = "50"
- )
- static void method6957(int var0) {
- class126.method2799(14); // L: 1944
- Login.field887 = var0; // L: 1945
- } // L: 1946
}
diff --git a/runescape-client/src/main/java/class401.java b/runescape-client/src/main/java/class401.java
index 5a19aae2b9..a43f4b87b4 100644
--- a/runescape-client/src/main/java/class401.java
+++ b/runescape-client/src/main/java/class401.java
@@ -1,109 +1,21 @@
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ov")
-public class class401 implements class399 {
- @ObfuscatedName("q")
- final Map field4440;
+public class class401 {
+ @ObfuscatedName("j")
+ static final int[] field4442;
+ @ObfuscatedName("e")
+ static final int[] field4443;
- public class401(Map var1) {
- this.field4440 = var1; // L: 11
- } // L: 12
+ static {
+ field4442 = new int[16384]; // L: 8
+ field4443 = new int[16384]; // L: 9
+ double var0 = 3.834951969714103E-4D; // L: 12
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(I)[B",
- garbageValue = "-2132228640"
- )
- public byte[] vmethod6962() throws UnsupportedEncodingException {
- return this.method6961().getBytes("UTF-8"); // L: 16
- }
-
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "(I)Ljava/lang/String;",
- garbageValue = "685635787"
- )
- public String method6961() throws UnsupportedEncodingException {
- StringBuilder var1 = new StringBuilder(); // L: 20
- Iterator var2 = this.field4440.entrySet().iterator(); // L: 21
-
- while (var2.hasNext()) {
- Entry var3 = (Entry)var2.next(); // L: 22
- String var4 = URLEncoder.encode((String)var3.getKey(), "UTF-8");
- String var5 = URLEncoder.encode((String)var3.getValue(), "UTF-8");
- var1.append(var4).append("=").append(var5).append("&");
+ for (int var2 = 0; var2 < 16384; ++var2) { // L: 13
+ field4442[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); // L: 14
+ field4443[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); // L: 15
}
- if (var1.length() == 0) {
- return "";
- } else {
- var1.deleteCharAt(var1.length() - 1);
- var1.insert(0, "?"); // L: 31
- return var1.toString(); // L: 32
- }
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)Lgp;",
- garbageValue = "-961996891"
- )
- @Export("StructDefinition_getStructDefinition")
- public static StructComposition StructDefinition_getStructDefinition(int var0) {
- StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23
- if (var1 != null) { // L: 24
- return var1;
- } else {
- byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25
- var1 = new StructComposition(); // L: 26
- if (var2 != null) { // L: 27
- var1.decode(new Buffer(var2));
- }
-
- var1.postDecode(); // L: 28
- StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
- return var1; // L: 30
- }
- }
-
- @ObfuscatedName("jp")
- @ObfuscatedSignature(
- descriptor = "(Lki;B)Z",
- garbageValue = "-1"
- )
- @Export("runCs1")
- static final boolean runCs1(Widget var0) {
- if (var0.cs1Comparisons == null) { // L: 10886
- return false;
- } else {
- for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10887
- int var2 = Players.method2413(var0, var1); // L: 10888
- int var3 = var0.cs1ComparisonValues[var1]; // L: 10889
- if (var0.cs1Comparisons[var1] == 2) { // L: 10890
- if (var2 >= var3) { // L: 10891
- return false;
- }
- } else if (var0.cs1Comparisons[var1] == 3) { // L: 10893
- if (var2 <= var3) { // L: 10894
- return false;
- }
- } else if (var0.cs1Comparisons[var1] == 4) { // L: 10896
- if (var2 == var3) { // L: 10897
- return false;
- }
- } else if (var3 != var2) { // L: 10899
- return false;
- }
- }
-
- return true; // L: 10901
- }
- }
+ } // L: 17
}
diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java
index f4b6fecad1..96b1783873 100644
--- a/runescape-client/src/main/java/class402.java
+++ b/runescape-client/src/main/java/class402.java
@@ -1,21 +1,21 @@
import net.runelite.mapping.ObfuscatedName;
-@ObfuscatedName("or")
+@ObfuscatedName("oc")
public class class402 {
- @ObfuscatedName("a")
- static final int[] field4444;
- @ObfuscatedName("m")
- static final int[] field4445;
+ @ObfuscatedName("i")
+ static final int[] field4449;
+ @ObfuscatedName("s")
+ static final int[] field4450;
static {
- field4444 = new int[16384]; // L: 8
- field4445 = new int[16384]; // L: 9
- double var0 = 3.834951969714103E-4D; // L: 12
+ field4449 = new int[2048]; // L: 13
+ field4450 = new int[2048]; // L: 14
+ double var0 = 0.0030679615757712823D; // L: 17
- for (int var2 = 0; var2 < 16384; ++var2) { // L: 13
- field4444[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14
- field4445[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15
+ for (int var2 = 0; var2 < 2048; ++var2) { // L: 18
+ field4449[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19
+ field4450[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20
}
- } // L: 17
+ } // L: 22
}
diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java
deleted file mode 100644
index d9970bf0bc..0000000000
--- a/runescape-client/src/main/java/class403.java
+++ /dev/null
@@ -1,29 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ox")
-public class class403 {
- @ObfuscatedName("sg")
- @ObfuscatedSignature(
- descriptor = "Lbr;"
- )
- @Export("decimator")
- static Decimator decimator;
- @ObfuscatedName("v")
- static final int[] field4453;
- @ObfuscatedName("y")
- static final int[] field4450;
-
- static {
- field4453 = new int[2048]; // L: 13
- field4450 = new int[2048]; // L: 14
- double var0 = 0.0030679615757712823D; // L: 17
-
- for (int var2 = 0; var2 < 2048; ++var2) { // L: 18
- field4453[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19
- field4450[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20
- }
-
- } // L: 22
-}
diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java
new file mode 100644
index 0000000000..81aa83eed1
--- /dev/null
+++ b/runescape-client/src/main/java/class407.java
@@ -0,0 +1,11 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ow")
+public class class407 extends Node {
+ @ObfuscatedName("c")
+ public long field4459;
+
+ public class407(long var1) {
+ this.field4459 = var1; // L: 7
+ } // L: 8
+}
diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java
deleted file mode 100644
index 208390466f..0000000000
--- a/runescape-client/src/main/java/class408.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("on")
-public class class408 extends Node {
- @ObfuscatedName("o")
- public long field4463;
-
- public class408(long var1) {
- this.field4463 = var1; // L: 7
- } // L: 8
-}
diff --git a/runescape-client/src/main/java/class420.java b/runescape-client/src/main/java/class420.java
new file mode 100644
index 0000000000..9ca1dd3f26
--- /dev/null
+++ b/runescape-client/src/main/java/class420.java
@@ -0,0 +1,19 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("pt")
+public interface class420 extends Iterable {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-2111872296"
+ )
+ int vmethod7440(int var1);
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(ILjava/lang/Object;S)V",
+ garbageValue = "31470"
+ )
+ void vmethod7441(int var1, Object var2);
+}
diff --git a/runescape-client/src/main/java/class421.java b/runescape-client/src/main/java/class421.java
index 8c2117384d..761fdbb4ee 100644
--- a/runescape-client/src/main/java/class421.java
+++ b/runescape-client/src/main/java/class421.java
@@ -1,19 +1,93 @@
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pk")
-public interface class421 extends Iterable {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "41"
+@ObfuscatedName("pl")
+public class class421 implements class420 {
+ @ObfuscatedName("y")
+ @Export("SpriteBuffer_pixels")
+ public static byte[][] SpriteBuffer_pixels;
+ @ObfuscatedName("s")
+ @ObfuscatedGetter(
+ intValue = -390104157
)
- int vmethod7293(int var1);
+ static int field4607;
+ @ObfuscatedName("c")
+ Map field4606;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lqw;"
+ )
+ final class449 field4605;
- @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(ILjava/lang/Object;B)V",
- garbageValue = "113"
+ descriptor = "(Lqw;)V"
)
- void vmethod7295(int var1, Object var2);
+ public class421(class449 var1) {
+ this.field4605 = var1; // L: 15
+ } // L: 16
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(II)I",
+ garbageValue = "-2111872296"
+ )
+ public int vmethod7440(int var1) {
+ if (this.field4606 != null) { // L: 20
+ class450 var2 = (class450)this.field4606.get(var1); // L: 21
+ if (var2 != null) {
+ return (Integer)var2.field4766; // L: 22
+ }
+ }
+
+ return (Integer)this.field4605.vmethod8027(var1); // L: 24
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(ILjava/lang/Object;S)V",
+ garbageValue = "31470"
+ )
+ public void vmethod7441(int var1, Object var2) {
+ if (this.field4606 == null) { // L: 29
+ this.field4606 = new HashMap(); // L: 30
+ this.field4606.put(var1, new class450(var1, var2)); // L: 31
+ } else {
+ class450 var3 = (class450)this.field4606.get(var1); // L: 34
+ if (var3 == null) {
+ this.field4606.put(var1, new class450(var1, var2)); // L: 35
+ } else {
+ var3.field4766 = var2; // L: 36
+ }
+ }
+
+ } // L: 38
+
+ public Iterator iterator() {
+ return this.field4606 == null ? Collections.emptyList().iterator() : this.field4606.values().iterator(); // L: 42 43
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;Ljava/lang/String;Ljava/lang/String;B)Lqu;",
+ garbageValue = "73"
+ )
+ @Export("SpriteBuffer_getIndexedSpriteByName")
+ public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+ int var3 = var0.getGroupId(var1); // L: 85
+ int var4 = var0.getFileId(var3, var2); // L: 86
+ IndexedSprite var5;
+ if (!Ignored.method6774(var0, var3, var4)) { // L: 89
+ var5 = null; // L: 90
+ } else {
+ var5 = class390.method7053(); // L: 93
+ }
+
+ return var5; // L: 95
+ }
}
diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java
deleted file mode 100644
index 0996d7e64f..0000000000
--- a/runescape-client/src/main/java/class422.java
+++ /dev/null
@@ -1,114 +0,0 @@
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("pw")
-public class class422 implements class421 {
- @ObfuscatedName("o")
- Map field4606;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lqo;"
- )
- final class446 field4607;
-
- @ObfuscatedSignature(
- descriptor = "(Lqo;)V"
- )
- public class422(class446 var1) {
- this.field4607 = var1; // L: 15
- } // L: 16
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(IB)I",
- garbageValue = "41"
- )
- public int vmethod7293(int var1) {
- if (this.field4606 != null) { // L: 20
- class447 var2 = (class447)this.field4606.get(var1); // L: 21
- if (var2 != null) {
- return (Integer)var2.field4742; // L: 22
- }
- }
-
- return (Integer)this.field4607.vmethod7814(var1); // L: 24
- }
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(ILjava/lang/Object;B)V",
- garbageValue = "113"
- )
- public void vmethod7295(int var1, Object var2) {
- if (this.field4606 == null) { // L: 29
- this.field4606 = new HashMap(); // L: 30
- this.field4606.put(var1, new class447(var1, var2)); // L: 31
- } else {
- class447 var3 = (class447)this.field4606.get(var1); // L: 34
- if (var3 == null) {
- this.field4606.put(var1, new class447(var1, var2)); // L: 35
- } else {
- var3.field4742 = var2; // L: 36
- }
- }
-
- } // L: 38
-
- public Iterator iterator() {
- return this.field4606 == null ? Collections.emptyList().iterator() : this.field4606.values().iterator(); // L: 42 43
- }
-
- @ObfuscatedName("gl")
- @ObfuscatedSignature(
- descriptor = "(IIII)V",
- garbageValue = "-2021735109"
- )
- static final void method7303(int var0, int var1, int var2) {
- if (class343.cameraX < var0) { // L: 3922
- class343.cameraX = (var0 - class343.cameraX) * HitSplatDefinition.field2077 / 1000 + class343.cameraX + class229.field2805; // L: 3923
- if (class343.cameraX > var0) { // L: 3924
- class343.cameraX = var0;
- }
- }
-
- if (class343.cameraX > var0) { // L: 3926
- class343.cameraX -= (class343.cameraX - var0) * HitSplatDefinition.field2077 / 1000 + class229.field2805; // L: 3927
- if (class343.cameraX < var0) { // L: 3928
- class343.cameraX = var0;
- }
- }
-
- if (class295.cameraY < var1) { // L: 3930
- class295.cameraY = (var1 - class295.cameraY) * HitSplatDefinition.field2077 / 1000 + class295.cameraY + class229.field2805; // L: 3931
- if (class295.cameraY > var1) { // L: 3932
- class295.cameraY = var1;
- }
- }
-
- if (class295.cameraY > var1) { // L: 3934
- class295.cameraY -= (class295.cameraY - var1) * HitSplatDefinition.field2077 / 1000 + class229.field2805; // L: 3935
- if (class295.cameraY < var1) { // L: 3936
- class295.cameraY = var1;
- }
- }
-
- if (FaceNormal.cameraZ < var2) { // L: 3938
- FaceNormal.cameraZ = (var2 - FaceNormal.cameraZ) * HitSplatDefinition.field2077 / 1000 + FaceNormal.cameraZ + class229.field2805; // L: 3939
- if (FaceNormal.cameraZ > var2) { // L: 3940
- FaceNormal.cameraZ = var2;
- }
- }
-
- if (FaceNormal.cameraZ > var2) { // L: 3942
- FaceNormal.cameraZ -= (FaceNormal.cameraZ - var2) * HitSplatDefinition.field2077 / 1000 + class229.field2805; // L: 3943
- if (FaceNormal.cameraZ < var2) { // L: 3944
- FaceNormal.cameraZ = var2;
- }
- }
-
- } // L: 3946
-}
diff --git a/runescape-client/src/main/java/class423.java b/runescape-client/src/main/java/class423.java
new file mode 100644
index 0000000000..63a894b427
--- /dev/null
+++ b/runescape-client/src/main/java/class423.java
@@ -0,0 +1,14 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("pg")
+public class class423 {
+ @ObfuscatedName("q")
+ static final char[] field4622;
+ @ObfuscatedName("f")
+ static final char[] field4625;
+
+ static {
+ field4622 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8
+ field4625 = new char[]{'[', ']', '#'}; // L: 9
+ }
+}
diff --git a/runescape-client/src/main/java/class424.java b/runescape-client/src/main/java/class424.java
deleted file mode 100644
index 713024422f..0000000000
--- a/runescape-client/src/main/java/class424.java
+++ /dev/null
@@ -1,22 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("pe")
-public class class424 {
- @ObfuscatedName("l")
- static final char[] field4621;
- @ObfuscatedName("k")
- static final char[] field4623;
- @ObfuscatedName("cx")
- @ObfuscatedSignature(
- descriptor = "Lqd;"
- )
- @Export("worldSelectRightSprite")
- static IndexedSprite worldSelectRightSprite;
-
- static {
- field4621 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8
- field4623 = new char[]{'[', ']', '#'}; // L: 9
- }
-}
diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java
new file mode 100644
index 0000000000..8bcb198304
--- /dev/null
+++ b/runescape-client/src/main/java/class426.java
@@ -0,0 +1,43 @@
+import java.util.Iterator;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ph")
+class class426 implements Iterator {
+ @ObfuscatedName("f")
+ @Export("SpriteBuffer_xOffsets")
+ public static int[] SpriteBuffer_xOffsets;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 443476841
+ )
+ int field4644;
+ // $FF: synthetic field
+ @ObfuscatedSignature(
+ descriptor = "Lpr;"
+ )
+ final class427 this$0;
+
+ @ObfuscatedSignature(
+ descriptor = "(Lpr;)V"
+ )
+ class426(class427 var1) {
+ this.this$0 = var1; // L: 51
+ }
+
+ public boolean hasNext() {
+ return this.field4644 < this.this$0.method7058(); // L: 56
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException(); // L: 69
+ }
+
+ public Object next() {
+ int var1 = ++this.field4644 - 1; // L: 61
+ class393 var2 = (class393)this.this$0.field4648.get((long)var1); // L: 62
+ return var2 != null ? var2 : this.this$0.method7522(var1); // L: 63 64
+ }
+}
diff --git a/runescape-client/src/main/java/class427.java b/runescape-client/src/main/java/class427.java
index e4a3007dbc..53767ec9bb 100644
--- a/runescape-client/src/main/java/class427.java
+++ b/runescape-client/src/main/java/class427.java
@@ -1,118 +1,204 @@
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.util.Iterator;
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pg")
-class class427 implements Iterator {
- @ObfuscatedName("o")
+@ObfuscatedName("pr")
+public class class427 extends class392 implements class251 {
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ final AbstractArchive field4650;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lic;"
+ )
+ final DemotingHashTable field4648;
+ @ObfuscatedName("f")
@ObfuscatedGetter(
- intValue = -1587824921
+ intValue = 49618459
)
- int field4643;
- // $FF: synthetic field
- @ObfuscatedSignature(
- descriptor = "Lpd;"
- )
- final class428 this$0;
+ final int field4649;
@ObfuscatedSignature(
- descriptor = "(Lpd;)V"
+ descriptor = "(Lkx;ILlb;Llh;)V"
)
- class427(class428 var1) {
- this.this$0 = var1; // L: 51
- }
+ public class427(StudioGame var1, int var2, Language var3, AbstractArchive var4) {
+ super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19
+ this.field4648 = new DemotingHashTable(64); // L: 15
+ this.field4650 = var4; // L: 20
+ this.field4649 = var2; // L: 21
+ } // L: 22
- public boolean hasNext() {
- return this.field4643 < this.this$0.method6909(); // L: 56
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- public Object next() {
- int var1 = ++this.field4643 - 1; // L: 61
- class394 var2 = (class394)this.this$0.field4646.get((long)var1); // L: 62
- return var2 != null ? var2 : this.this$0.method7380(var1); // L: 63 64
- }
-
- @ObfuscatedName("l")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Throwable;B)Ljava/lang/String;",
- garbageValue = "7"
+ descriptor = "(II)Loj;",
+ garbageValue = "-231569171"
)
- static String method7379(Throwable var0) throws IOException {
- String var1;
- if (var0 instanceof RunException) { // L: 67
- RunException var2 = (RunException)var0; // L: 68
- var1 = var2.message + " | "; // L: 69
- var0 = var2.throwable; // L: 70
- } else {
- var1 = ""; // L: 72
+ protected class394 vmethod7521(int var1) {
+ synchronized(this.field4648) { // L: 26
+ class393 var2 = (class393)this.field4648.get((long)var1); // L: 27
+ if (var2 == null) { // L: 28
+ var2 = this.method7522(var1); // L: 29
+ this.field4648.method5130(var2, (long)var1); // L: 30
+ }
+
+ return var2; // L: 33
+ }
+ }
+
+ @ObfuscatedName("z")
+ @ObfuscatedSignature(
+ descriptor = "(II)Lor;",
+ garbageValue = "-1832880212"
+ )
+ class393 method7522(int var1) {
+ byte[] var2 = this.field4650.takeFile(this.field4649, var1); // L: 37
+ class393 var3 = new class393(var1); // L: 38
+ if (var2 != null) { // L: 39
+ var3.method7073(new Buffer(var2));
}
- StringWriter var12 = new StringWriter(); // L: 73
- PrintWriter var3 = new PrintWriter(var12); // L: 74
- var0.printStackTrace(var3); // L: 75
- var3.close(); // L: 76
- String var4 = var12.toString(); // L: 77
- BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78
- String var6 = var5.readLine(); // L: 79
+ return var3; // L: 40
+ }
- while (true) {
- while (true) {
- String var7 = var5.readLine(); // L: 81
- if (var7 == null) { // L: 82
- var1 = var1 + "| " + var6; // L: 100
- return var1; // L: 101
+ @ObfuscatedName("r")
+ @ObfuscatedSignature(
+ descriptor = "(B)V",
+ garbageValue = "4"
+ )
+ public void method7525() {
+ synchronized(this.field4648) { // L: 44
+ this.field4648.clear(); // L: 45
+ }
+ } // L: 47
+
+ public Iterator iterator() {
+ return new class426(this); // L: 51
+ }
+
+ @ObfuscatedName("hy")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1896128691"
+ )
+ static final int method7523() {
+ if (class19.clientPreferences.method2245()) { // L: 4886
+ return PacketWriter.Client_plane;
+ } else {
+ int var0 = 3; // L: 4887
+ if (ViewportMouse.cameraPitch < 310) { // L: 4888
+ int var1;
+ int var2;
+ if (Client.oculusOrbState == 1) { // L: 4891
+ var1 = InterfaceParent.oculusOrbFocalPointX >> 7; // L: 4892
+ var2 = class141.oculusOrbFocalPointY >> 7; // L: 4893
+ } else {
+ var1 = class101.localPlayer.x >> 7; // L: 4896
+ var2 = class101.localPlayer.y >> 7; // L: 4897
}
- int var8 = var7.indexOf(40); // L: 83
- int var9 = var7.indexOf(41, var8 + 1); // L: 84
- if (var8 >= 0 && var9 >= 0) { // L: 85
- String var10 = var7.substring(var8 + 1, var9); // L: 86
- int var11 = var10.indexOf(".java:"); // L: 87
- if (var11 >= 0) { // L: 88
- var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89
- var1 = var1 + var10 + ' '; // L: 90
- continue; // L: 91
+ int var3 = class18.cameraX >> 7; // L: 4899
+ int var4 = class228.cameraZ >> 7; // L: 4900
+ if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { // L: 4901
+ return PacketWriter.Client_plane;
+ }
+
+ if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { // L: 4902
+ return PacketWriter.Client_plane;
+ }
+
+ if ((Tiles.Tiles_renderFlags[PacketWriter.Client_plane][var3][var4] & 4) != 0) { // L: 4903
+ var0 = PacketWriter.Client_plane;
+ }
+
+ int var5;
+ if (var1 > var3) { // L: 4905
+ var5 = var1 - var3;
+ } else {
+ var5 = var3 - var1; // L: 4906
+ }
+
+ int var6;
+ if (var2 > var4) { // L: 4908
+ var6 = var2 - var4;
+ } else {
+ var6 = var4 - var2; // L: 4909
+ }
+
+ int var7;
+ int var8;
+ if (var5 > var6) { // L: 4910
+ var7 = var6 * 65536 / var5; // L: 4911
+ var8 = 32768; // L: 4912
+
+ while (var3 != var1) { // L: 4913
+ if (var3 < var1) { // L: 4914
+ ++var3;
+ } else if (var3 > var1) { // L: 4915
+ --var3;
+ }
+
+ if ((Tiles.Tiles_renderFlags[PacketWriter.Client_plane][var3][var4] & 4) != 0) { // L: 4916
+ var0 = PacketWriter.Client_plane;
+ }
+
+ var8 += var7; // L: 4917
+ if (var8 >= 65536) { // L: 4918
+ var8 -= 65536; // L: 4919
+ if (var4 < var2) { // L: 4920
+ ++var4;
+ } else if (var4 > var2) { // L: 4921
+ --var4;
+ }
+
+ if ((Tiles.Tiles_renderFlags[PacketWriter.Client_plane][var3][var4] & 4) != 0) { // L: 4922
+ var0 = PacketWriter.Client_plane;
+ }
+ }
}
+ } else if (var6 > 0) { // L: 4926
+ var7 = var5 * 65536 / var6; // L: 4927
+ var8 = 32768; // L: 4928
- var7 = var7.substring(0, var8); // L: 93
+ while (var4 != var2) { // L: 4929
+ if (var4 < var2) { // L: 4930
+ ++var4;
+ } else if (var4 > var2) { // L: 4931
+ --var4;
+ }
+
+ if ((Tiles.Tiles_renderFlags[PacketWriter.Client_plane][var3][var4] & 4) != 0) { // L: 4932
+ var0 = PacketWriter.Client_plane;
+ }
+
+ var8 += var7; // L: 4933
+ if (var8 >= 65536) { // L: 4934
+ var8 -= 65536; // L: 4935
+ if (var3 < var1) { // L: 4936
+ ++var3;
+ } else if (var3 > var1) { // L: 4937
+ --var3;
+ }
+
+ if ((Tiles.Tiles_renderFlags[PacketWriter.Client_plane][var3][var4] & 4) != 0) { // L: 4938
+ var0 = PacketWriter.Client_plane;
+ }
+ }
+ }
+ }
+ }
+
+ if (class101.localPlayer.x >= 0 && class101.localPlayer.y >= 0 && class101.localPlayer.x < 13312 && class101.localPlayer.y < 13312) { // L: 4943
+ if ((Tiles.Tiles_renderFlags[PacketWriter.Client_plane][class101.localPlayer.x >> 7][class101.localPlayer.y >> 7] & 4) != 0) { // L: 4944
+ var0 = PacketWriter.Client_plane;
}
- var7 = var7.trim(); // L: 95
- var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96
- var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97
- var1 = var1 + var7 + ' '; // L: 98
+ return var0; // L: 4945
+ } else {
+ return PacketWriter.Client_plane;
}
}
}
-
- @ObfuscatedName("jj")
- @ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/String;",
- garbageValue = "1191393646"
- )
- @Export("formatItemStacks")
- static final String formatItemStacks(int var0) {
- String var1 = Integer.toString(var0); // L: 10729
-
- for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10730
- var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10731
- }
-
- if (var1.length() > 9) { // L: 10733
- return " " + class166.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "";
- } else {
- return var1.length() > 6 ? " " + class166.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class166.colorStartTag(16776960) + var1 + ""; // L: 10734 10735
- }
- }
}
diff --git a/runescape-client/src/main/java/class428.java b/runescape-client/src/main/java/class428.java
index 35e2d20d72..9e67a73cb8 100644
--- a/runescape-client/src/main/java/class428.java
+++ b/runescape-client/src/main/java/class428.java
@@ -1,80 +1,19 @@
-import java.util.Iterator;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pd")
-public class class428 extends class393 implements class252 {
- @ObfuscatedName("q")
+@ObfuscatedName("pf")
+public interface class428 {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Llp;"
+ descriptor = "(Ljava/lang/Object;Lqt;B)V",
+ garbageValue = "-51"
)
- final AbstractArchive field4645;
- @ObfuscatedName("l")
+ void vmethod7583(Object var1, Buffer var2);
+
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "Lic;"
+ descriptor = "(Lqt;I)Ljava/lang/Object;",
+ garbageValue = "-261873850"
)
- final DemotingHashTable field4646;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = 858241003
- )
- final int field4647;
-
- @ObfuscatedSignature(
- descriptor = "(Lke;ILlq;Llp;)V"
- )
- public class428(StudioGame var1, int var2, Language var3, AbstractArchive var4) {
- super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19
- this.field4646 = new DemotingHashTable(64); // L: 15
- this.field4645 = var4; // L: 20
- this.field4647 = var2; // L: 21
- } // L: 22
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(II)Lou;",
- garbageValue = "-318323569"
- )
- protected class395 vmethod7381(int var1) {
- synchronized(this.field4646) { // L: 26
- class394 var2 = (class394)this.field4646.get((long)var1); // L: 27
- if (var2 == null) { // L: 28
- var2 = this.method7380(var1); // L: 29
- this.field4646.method4942(var2, (long)var1); // L: 30
- }
-
- return var2; // L: 33
- }
- }
-
- @ObfuscatedName("t")
- @ObfuscatedSignature(
- descriptor = "(IB)Low;",
- garbageValue = "52"
- )
- class394 method7380(int var1) {
- byte[] var2 = this.field4645.takeFile(this.field4647, var1); // L: 37
- class394 var3 = new class394(var1); // L: 38
- if (var2 != null) {
- var3.method6927(new Buffer(var2)); // L: 39
- }
-
- return var3; // L: 40
- }
-
- @ObfuscatedName("g")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-380169429"
- )
- public void method7382() {
- synchronized(this.field4646) { // L: 44
- this.field4646.clear(); // L: 45
- }
- } // L: 47
-
- public Iterator iterator() {
- return new class427(this); // L: 51
- }
+ Object vmethod7580(Buffer var1);
}
diff --git a/runescape-client/src/main/java/class429.java b/runescape-client/src/main/java/class429.java
index 0978e53ae0..ddc6186322 100644
--- a/runescape-client/src/main/java/class429.java
+++ b/runescape-client/src/main/java/class429.java
@@ -1,19 +1,32 @@
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pb")
-public interface class429 {
- @ObfuscatedName("o")
+@ObfuscatedName("pz")
+final class class429 implements class428 {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;Lpx;I)V",
- garbageValue = "-2139027116"
+ descriptor = "(Ljava/lang/Object;Lqt;B)V",
+ garbageValue = "-51"
)
- void vmethod7440(Object var1, Buffer var2);
+ public void vmethod7583(Object var1, Buffer var2) {
+ this.method7543((Integer)var1, var2); // L: 21
+ } // L: 22
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)Ljava/lang/Object;",
- garbageValue = "352015354"
+ descriptor = "(Lqt;I)Ljava/lang/Object;",
+ garbageValue = "-261873850"
)
- Object vmethod7436(Buffer var1);
+ public Object vmethod7580(Buffer var1) {
+ return var1.readInt(); // L: 17
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Integer;Lqt;I)V",
+ garbageValue = "-97266206"
+ )
+ void method7543(Integer var1, Buffer var2) {
+ var2.writeInt(var1); // L: 12
+ } // L: 13
}
diff --git a/runescape-client/src/main/java/class430.java b/runescape-client/src/main/java/class430.java
index fa8875a89f..a88540d002 100644
--- a/runescape-client/src/main/java/class430.java
+++ b/runescape-client/src/main/java/class430.java
@@ -1,41 +1,23 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pp")
-final class class430 implements class429 {
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -1505376757
- )
- @Export("clientType")
- public static int clientType;
+@ObfuscatedName("pu")
+public class class430 {
+ @ObfuscatedName("v")
+ static final int[] field4652;
+ @ObfuscatedName("y")
+ static int[][] field4651;
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;Lpx;I)V",
- garbageValue = "-2139027116"
- )
- public void vmethod7440(Object var1, Buffer var2) {
- this.method7399((Integer)var1, var2); // L: 21
- } // L: 22
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)Ljava/lang/Object;",
- garbageValue = "352015354"
- )
- public Object vmethod7436(Buffer var1) {
- return var1.readInt(); // L: 17
+ static {
+ field4652 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 5
}
- @ObfuscatedName("s")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Integer;Lpx;I)V",
- garbageValue = "819909184"
+ descriptor = "(Llh;III)[Lqe;",
+ garbageValue = "-1014009105"
)
- void method7399(Integer var1, Buffer var2) {
- var2.writeInt(var1); // L: 12
- } // L: 13
+ public static SpritePixels[] method7547(AbstractArchive var0, int var1, int var2) {
+ return !Ignored.method6774(var0, var1, var2) ? null : class266.method5212(); // L: 52 53
+ }
}
diff --git a/runescape-client/src/main/java/class431.java b/runescape-client/src/main/java/class431.java
index ff52aeaff2..f1c8a46734 100644
--- a/runescape-client/src/main/java/class431.java
+++ b/runescape-client/src/main/java/class431.java
@@ -1,11 +1,47 @@
import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pa")
-public class class431 {
- @ObfuscatedName("o")
- public static final int[] field4651;
+@ObfuscatedName("pj")
+final class class431 implements class428 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Object;Lqt;B)V",
+ garbageValue = "-51"
+ )
+ public void vmethod7583(Object var1, Buffer var2) {
+ this.method7554((Long)var1, var2); // L: 35
+ } // L: 36
- static {
- field4651 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)Ljava/lang/Object;",
+ garbageValue = "-261873850"
+ )
+ public Object vmethod7580(Buffer var1) {
+ return var1.readLong(); // L: 31
+ }
+
+ @ObfuscatedName("w")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Long;Lqt;I)V",
+ garbageValue = "590392359"
+ )
+ void method7554(Long var1, Buffer var2) {
+ var2.writeLong(var1); // L: 26
+ } // L: 27
+
+ @ObfuscatedName("i")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;II)Z",
+ garbageValue = "-140653331"
+ )
+ static boolean method7559(AbstractArchive var0, int var1) {
+ byte[] var2 = var0.takeFileFlat(var1); // L: 183
+ if (var2 == null) { // L: 184
+ return false;
+ } else {
+ ChatChannel.SpriteBuffer_decode(var2); // L: 185
+ return true; // L: 186
+ }
}
}
diff --git a/runescape-client/src/main/java/class432.java b/runescape-client/src/main/java/class432.java
index adecd0ace0..dd78eed74b 100644
--- a/runescape-client/src/main/java/class432.java
+++ b/runescape-client/src/main/java/class432.java
@@ -1,32 +1,196 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pr")
-final class class432 implements class429 {
- @ObfuscatedName("o")
+@ObfuscatedName("pv")
+public class class432 implements MouseWheel {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;Lpx;I)V",
- garbageValue = "-2139027116"
+ descriptor = "Lpv;"
)
- public void vmethod7440(Object var1, Buffer var2) {
- this.method7409((Long)var1, var2); // L: 35
- } // L: 36
-
+ public static final class432 field4658;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lpv;"
+ )
+ public static final class432 field4656;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(Lpx;I)Ljava/lang/Object;",
- garbageValue = "352015354"
+ descriptor = "Lpv;"
)
- public Object vmethod7436(Buffer var1) {
- return var1.readLong(); // L: 31
+ public static final class432 field4657;
+ @ObfuscatedName("fc")
+ @ObfuscatedGetter(
+ intValue = 2112320967
+ )
+ static int field4663;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = 1402359519
+ )
+ public final int field4660;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = -970810999
+ )
+ public final int field4655;
+ @ObfuscatedName("e")
+ public final Class field4659;
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "Lpf;"
+ )
+ final class428 field4661;
+
+ static {
+ field4658 = new class432(2, 0, Integer.class, new class429()); // L: 10
+ field4656 = new class432(1, 1, Long.class, new class431());
+ field4657 = new class432(0, 2, String.class, new class433());
}
- @ObfuscatedName("s")
@ObfuscatedSignature(
- descriptor = "(Ljava/lang/Long;Lpx;I)V",
- garbageValue = "1601706825"
+ descriptor = "(IILjava/lang/Class;Lpf;)V"
)
- void method7409(Long var1, Buffer var2) {
- var2.writeLong(var1); // L: 26
+ class432(int var1, int var2, Class var3, class428 var4) {
+ this.field4660 = var1;
+ this.field4655 = var2;
+ this.field4659 = var3; // L: 64
+ this.field4661 = var4; // L: 65
+ } // L: 66
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-100"
+ )
+ @Export("rsOrdinal")
+ public int rsOrdinal() {
+ return this.field4655; // L: 90
+ }
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;B)Ljava/lang/Object;",
+ garbageValue = "0"
+ )
+ public Object method7565(Buffer var1) {
+ return this.field4661.vmethod7580(var1); // L: 94
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "692269534"
+ )
+ static void method7572() {
+ if (class360.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 124
+ KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 125
+ KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 126
+ KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 127
+ KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 128
+ KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 129
+ KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 130
+ KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 131
+ KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 132
+ KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 133
+ KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 134
+ KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 135
+ KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 136
+ } else {
+ KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 139
+ KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 140
+ KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 141
+ KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 142
+ KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 143
+ KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 144
+ KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 145
+ KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 146
+ KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 147
+ KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 148
+ KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 149
+ KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 150
+ }
+
+ } // L: 152
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(IIII)Lqe;",
+ garbageValue = "-1646762131"
+ )
+ static SpritePixels method7578(int var0, int var1, int var2) {
+ DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38
+ long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41
+ return (SpritePixels)var3.get(var4); // L: 43
+ }
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(I[BLnd;B)V",
+ garbageValue = "72"
+ )
+ static void method7576(int var0, byte[] var1, ArchiveDisk var2) {
+ ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18
+ var3.type = 0; // L: 19
+ var3.key = (long)var0; // L: 20
+ var3.data = var1; // L: 21
+ var3.archiveDisk = var2; // L: 22
+ synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23
+ ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24
+ } // L: 25
+
+ Tiles.method2065(); // L: 26
} // L: 27
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(IB)Lfa;",
+ garbageValue = "-43"
+ )
+ @Export("WorldMapElement_get")
+ public static WorldMapElement WorldMapElement_get(int var0) {
+ return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)[Lpv;",
+ garbageValue = "2133763161"
+ )
+ public static class432[] method7566() {
+ return new class432[]{field4657, field4658, field4656}; // L: 58
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Class;I)Lpv;",
+ garbageValue = "-1091159826"
+ )
+ public static class432 method7561(Class var0) {
+ class432[] var1 = method7566(); // L: 70
+
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 71
+ class432 var3 = var1[var2]; // L: 72
+ if (var3.field4659 == var0) {
+ return var3; // L: 74
+ }
+ }
+
+ return null; // L: 78
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Class;I)Lpf;",
+ garbageValue = "1729544461"
+ )
+ public static class428 method7577(Class var0) {
+ class432 var1 = method7561(var0); // L: 83
+ if (var1 == null) {
+ throw new IllegalArgumentException(); // L: 84
+ } else {
+ return var1.field4661; // L: 85
+ }
+ }
}
diff --git a/runescape-client/src/main/java/class433.java b/runescape-client/src/main/java/class433.java
index 441db21afa..c06e75867a 100644
--- a/runescape-client/src/main/java/class433.java
+++ b/runescape-client/src/main/java/class433.java
@@ -1,174 +1,32 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("pm")
-public class class433 implements MouseWheel {
- @ObfuscatedName("o")
+@ObfuscatedName("pc")
+final class class433 implements class428 {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lpm;"
+ descriptor = "(Ljava/lang/Object;Lqt;B)V",
+ garbageValue = "-51"
)
- public static final class433 field4664;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lpm;"
- )
- public static final class433 field4655;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lpm;"
- )
- public static final class433 field4656;
- @ObfuscatedName("i")
- @ObfuscatedGetter(
- intValue = 511130033
- )
- @Export("canvasHeight")
- public static int canvasHeight;
- @ObfuscatedName("hw")
- @ObfuscatedGetter(
- intValue = -2114897749
- )
- static int field4657;
- @ObfuscatedName("k")
- @ObfuscatedGetter(
- intValue = -822067139
- )
- final int field4654;
- @ObfuscatedName("a")
- @ObfuscatedGetter(
- intValue = 1795458283
- )
- public final int field4658;
- @ObfuscatedName("m")
- public final Class field4667;
- @ObfuscatedName("p")
- @ObfuscatedSignature(
- descriptor = "Lpb;"
- )
- final class429 field4660;
+ public void vmethod7583(Object var1, Buffer var2) {
+ this.method7586((String)var1, var2); // L: 49
+ } // L: 50
- static {
- field4664 = new class433(0, 0, Integer.class, new class430()); // L: 10
- field4655 = new class433(2, 1, Long.class, new class432()); // L: 24
- field4656 = new class433(1, 2, String.class, new class434()); // L: 38
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)Ljava/lang/Object;",
+ garbageValue = "-261873850"
+ )
+ public Object vmethod7580(Buffer var1) {
+ return var1.readStringCp1252NullTerminated(); // L: 45
}
+ @ObfuscatedName("w")
@ObfuscatedSignature(
- descriptor = "(IILjava/lang/Class;Lpb;)V"
+ descriptor = "(Ljava/lang/String;Lqt;B)V",
+ garbageValue = "0"
)
- class433(int var1, int var2, Class var3, class429 var4) {
- this.field4654 = var1; // L: 58
- this.field4658 = var2; // L: 59
- this.field4667 = var3; // L: 60
- this.field4660 = var4; // L: 61
- } // L: 62
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "30"
- )
- @Export("rsOrdinal")
- public int rsOrdinal() {
- return this.field4658; // L: 99
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(Lpx;B)Ljava/lang/Object;",
- garbageValue = "-88"
- )
- public Object method7423(Buffer var1) {
- return this.field4660.vmethod7436(var1); // L: 103
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;Lpx;I)V",
- garbageValue = "2054774363"
- )
- public static void method7420(Object var0, Buffer var1) {
- class429 var2 = method7424(var0.getClass()); // L: 66
- var2.vmethod7440(var0, var1); // L: 67
- } // L: 68
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Class;B)Lpb;",
- garbageValue = "95"
- )
- static class429 method7424(Class var0) {
- class433[] var2 = new class433[]{field4655, field4656, field4664}; // L: 77
- class433[] var3 = var2; // L: 79
- int var4 = 0;
-
- class433 var1;
- while (true) {
- if (var4 >= var3.length) {
- var1 = null; // L: 90
- break;
- }
-
- class433 var5 = var3[var4]; // L: 81
- if (var5.field4667 == var0) { // L: 83
- var1 = var5; // L: 84
- break;
- }
-
- ++var4; // L: 80
- }
-
- if (var1 == null) { // L: 93
- throw new IllegalArgumentException();
- } else {
- return var1.field4660; // L: 94
- }
- }
-
- @ObfuscatedName("jq")
- @ObfuscatedSignature(
- descriptor = "(IIIIIII)V",
- garbageValue = "687799312"
- )
- static final void method7433(int var0, int var1, int var2, int var3, int var4, int var5) {
- int var6 = var2 - var0; // L: 10684
- int var7 = var3 - var1; // L: 10685
- int var8 = var6 >= 0 ? var6 : -var6; // L: 10686
- int var9 = var7 >= 0 ? var7 : -var7; // L: 10687
- int var10 = var8; // L: 10688
- if (var8 < var9) { // L: 10689
- var10 = var9;
- }
-
- if (var10 != 0) { // L: 10690
- int var11 = (var6 << 16) / var10; // L: 10691
- int var12 = (var7 << 16) / var10; // L: 10692
- if (var12 <= var11) { // L: 10693
- var11 = -var11;
- } else {
- var12 = -var12; // L: 10694
- }
-
- int var13 = var5 * var12 >> 17; // L: 10695
- int var14 = var5 * var12 + 1 >> 17; // L: 10696
- int var15 = var5 * var11 >> 17; // L: 10697
- int var16 = var5 * var11 + 1 >> 17; // L: 10698
- var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10699
- var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10700
- int var17 = var0 + var13; // L: 10701
- int var18 = var0 - var14; // L: 10702
- int var19 = var0 + var6 - var14; // L: 10703
- int var20 = var0 + var6 + var13; // L: 10704
- int var21 = var15 + var1; // L: 10705
- int var22 = var1 - var16; // L: 10706
- int var23 = var7 + var1 - var16; // L: 10707
- int var24 = var15 + var7 + var1; // L: 10708
- Rasterizer3D.method3976(var17, var18, var19); // L: 10709
- Rasterizer3D.method3919(var21, var22, var23, var17, var18, var19, var4); // L: 10710
- Rasterizer3D.method3976(var17, var19, var20); // L: 10711
- Rasterizer3D.method3919(var21, var23, var24, var17, var19, var20, var4); // L: 10712
- }
- } // L: 10713
+ void method7586(String var1, Buffer var2) {
+ var2.writeStringCp1252NullTerminated(var1); // L: 40
+ } // L: 41
}
diff --git a/runescape-client/src/main/java/class434.java b/runescape-client/src/main/java/class434.java
index 37c6d5f6c0..aa447dec01 100644
--- a/runescape-client/src/main/java/class434.java
+++ b/runescape-client/src/main/java/class434.java
@@ -1,43 +1,11 @@
-import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ps")
-final class class434 implements class429 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/Object;Lpx;I)V",
- garbageValue = "-2139027116"
+@ObfuscatedName("py")
+public final class class434 {
+ @ObfuscatedName("ta")
+ @ObfuscatedGetter(
+ intValue = -1341126459
)
- public void vmethod7440(Object var1, Buffer var2) {
- this.method7435((String)var1, var2); // L: 49
- } // L: 50
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)Ljava/lang/Object;",
- garbageValue = "352015354"
- )
- public Object vmethod7436(Buffer var1) {
- return var1.readStringCp1252NullTerminated(); // L: 45
- }
-
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;Lpx;I)V",
- garbageValue = "1690387944"
- )
- void method7435(String var1, Buffer var2) {
- var2.writeStringCp1252NullTerminated(var1); // L: 40
- } // L: 41
-
- @ObfuscatedName("lb")
- @ObfuscatedSignature(
- descriptor = "(Lki;I)Z",
- garbageValue = "284900734"
- )
- @Export("isComponentHidden")
- static boolean isComponentHidden(Widget var0) {
- return var0.isHidden; // L: 12509
- }
+ static int field4664;
}
diff --git a/runescape-client/src/main/java/class435.java b/runescape-client/src/main/java/class435.java
new file mode 100644
index 0000000000..960e49acf2
--- /dev/null
+++ b/runescape-client/src/main/java/class435.java
@@ -0,0 +1,87 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("po")
+public class class435 extends DualNode {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ static AbstractArchive field4666;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
+ )
+ @Export("PlayerAppearance_cachedModels")
+ static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
+ @ObfuscatedName("q")
+ public int[][] field4668;
+ @ObfuscatedName("f")
+ public Object[][] field4669;
+
+ static {
+ PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(64); // L: 11
+ }
+
+ class435() {
+ } // L: 16
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)V",
+ garbageValue = "1788628332"
+ )
+ void method7592(Buffer var1) {
+ while (true) {
+ int var2 = var1.readUnsignedByte(); // L: 35
+ if (var2 == 0) { // L: 36
+ return; // L: 39
+ }
+
+ this.method7593(var1, var2); // L: 37
+ }
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;II)V",
+ garbageValue = "1985465936"
+ )
+ void method7593(Buffer var1, int var2) {
+ if (var2 == 1) { // L: 42
+ int var3 = var1.readUnsignedByte(); // L: 43
+ if (this.field4668 == null) { // L: 44
+ this.field4668 = new int[var3][];
+ }
+
+ for (int var4 = var1.readUnsignedByte(); var4 != 255; var4 = var1.readUnsignedByte()) { // L: 45 46 58
+ int var5 = var4 & 127; // L: 47
+ boolean var6 = (var4 & 128) != 0; // L: 48
+ int[] var7 = new int[var1.readUnsignedByte()]; // L: 49
+
+ for (int var8 = 0; var8 < var7.length; ++var8) { // L: 50
+ var7[var8] = var1.readUShortSmart(); // L: 51
+ }
+
+ this.field4668[var5] = var7; // L: 53
+ if (var6) { // L: 54
+ if (this.field4669 == null) {
+ this.field4669 = new Object[this.field4668.length][]; // L: 55
+ }
+
+ this.field4669[var5] = Frames.method4353(var1, var7); // L: 56
+ }
+ }
+ }
+
+ } // L: 62
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1716843483"
+ )
+ void method7602() {
+ } // L: 64
+}
diff --git a/runescape-client/src/main/java/class436.java b/runescape-client/src/main/java/class436.java
new file mode 100644
index 0000000000..631b3cc23e
--- /dev/null
+++ b/runescape-client/src/main/java/class436.java
@@ -0,0 +1,80 @@
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ps")
+public class class436 extends DualNode {
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "[Lpv;"
+ )
+ class432[] field4670;
+ @ObfuscatedName("j")
+ List field4673;
+
+ @ObfuscatedSignature(
+ descriptor = "(Llh;I)V"
+ )
+ public class436(AbstractArchive var1, int var2) {
+ byte[] var3 = var1.takeFile(var2, 0); // L: 26
+ this.method7618(new Buffer(var3)); // L: 27
+ } // L: 28
+
+ @ObfuscatedSignature(
+ descriptor = "(Llh;II)V"
+ )
+ public class436(AbstractArchive var1, int var2, int var3) {
+ byte[] var4 = var1.takeFile(var2, var3 + 1); // L: 21
+ this.method7618(new Buffer(var4)); // L: 22
+ } // L: 23
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)V",
+ garbageValue = "-1912545561"
+ )
+ void method7618(Buffer var1) {
+ int var2 = var1.method7754(); // L: 31
+ this.field4670 = new class432[var2]; // L: 32
+ this.field4673 = new ArrayList(var2); // L: 33
+
+ for (int var3 = 0; var3 < var2; ++var3) { // L: 34
+ this.field4670[var3] = (class432)Actor.findEnumerated(class432.method7566(), var1.readUnsignedByte()); // L: 35
+ int var4 = var1.method7754(); // L: 36
+ HashMap var5 = new HashMap(var4); // L: 37
+
+ while (var4-- > 0) { // L: 38
+ Object var6 = this.field4670[var3].method7565(var1); // L: 39
+ int var7 = var1.method7754(); // L: 40
+ ArrayList var8 = new ArrayList(); // L: 41
+
+ while (var7-- > 0) { // L: 42
+ int var9 = var1.method7754(); // L: 43
+ var8.add(var9); // L: 44
+ }
+
+ var5.put(var6, var8); // L: 46
+ }
+
+ this.field4673.add(var3, var5); // L: 48
+ }
+
+ } // L: 50
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(Ljava/lang/Object;II)Ljava/util/List;",
+ garbageValue = "-1640295603"
+ )
+ public List method7619(Object var1, int var2) {
+ if (var2 < 0) { // L: 53
+ var2 = 0;
+ }
+
+ Map var3 = (Map)this.field4673.get(var2); // L: 54
+ return (List)var3.get(var1); // L: 55
+ }
+}
diff --git a/runescape-client/src/main/java/class437.java b/runescape-client/src/main/java/class437.java
new file mode 100644
index 0000000000..b2aea2cf54
--- /dev/null
+++ b/runescape-client/src/main/java/class437.java
@@ -0,0 +1,110 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("px")
+public class class437 extends DualNode {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "Llh;"
+ )
+ static AbstractArchive field4675;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lii;"
+ )
+ @Export("Widget_cachedSprites")
+ static EvictingDualNodeHashTable Widget_cachedSprites;
+ @ObfuscatedName("q")
+ Object[][] field4676;
+ @ObfuscatedName("f")
+ int[][] field4677;
+ @ObfuscatedName("j")
+ @ObfuscatedGetter(
+ intValue = 1231945791
+ )
+ public int field4678;
+
+ static {
+ Widget_cachedSprites = new EvictingDualNodeHashTable(64); // L: 11
+ }
+
+ class437() {
+ } // L: 17
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;B)V",
+ garbageValue = "1"
+ )
+ void method7635(Buffer var1) {
+ while (true) {
+ int var2 = var1.readUnsignedByte(); // L: 36
+ if (var2 == 0) { // L: 37
+ return; // L: 40
+ }
+
+ this.method7627(var1, var2); // L: 38
+ }
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(IB)[Ljava/lang/Object;",
+ garbageValue = "-23"
+ )
+ public Object[] method7625(int var1) {
+ return this.field4676 == null ? null : this.field4676[var1]; // L: 43 44
+ }
+
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;II)V",
+ garbageValue = "-1966368366"
+ )
+ void method7627(Buffer var1, int var2) {
+ if (var2 == 3) { // L: 48
+ int var3 = var1.readUnsignedByte(); // L: 49
+ if (this.field4676 == null) { // L: 50
+ this.field4676 = new Object[var3][]; // L: 51
+ this.field4677 = new int[var3][]; // L: 52
+ }
+
+ for (int var4 = var1.readUnsignedByte(); var4 != 255; var4 = var1.readUnsignedByte()) { // L: 54 55 78
+ int var5 = var1.readUnsignedByte(); // L: 56
+ int[] var6 = new int[var5]; // L: 57
+
+ for (int var7 = 0; var7 < var5; ++var7) { // L: 58
+ var6[var7] = var1.readUShortSmart(); // L: 59
+ }
+
+ Object[][] var16 = this.field4676; // L: 61
+ int var10 = var1.readUShortSmart(); // L: 65
+ Object[] var11 = new Object[var6.length * var10]; // L: 66
+
+ for (int var12 = 0; var12 < var10; ++var12) { // L: 67
+ for (int var13 = 0; var13 < var6.length; ++var13) { // L: 68
+ int var14 = var13 + var6.length * var12; // L: 69
+ class432 var15 = MusicPatchNode.method5472(var6[var13]); // L: 70
+ var11[var14] = var15.method7565(var1); // L: 71
+ }
+ }
+
+ var16[var4] = var11; // L: 76
+ this.field4677[var4] = var6; // L: 77
+ }
+ } else if (var2 == 4) { // L: 81
+ this.field4678 = var1.method7754(); // L: 82
+ }
+
+ } // L: 85
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-110987764"
+ )
+ void method7636() {
+ } // L: 87
+}
diff --git a/runescape-client/src/main/java/class438.java b/runescape-client/src/main/java/class438.java
new file mode 100644
index 0000000000..d14af31ae0
--- /dev/null
+++ b/runescape-client/src/main/java/class438.java
@@ -0,0 +1,21 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("pp")
+public class class438 {
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -1532753849
+ )
+ static final int field4680;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = 875475555
+ )
+ static final int field4683;
+
+ static {
+ field4680 = (int)(Math.pow(2.0D, 4.0D) - 1.0D); // L: 10
+ field4683 = (int)(Math.pow(2.0D, 8.0D) - 1.0D); // L: 11
+ }
+}
diff --git a/runescape-client/src/main/java/class442.java b/runescape-client/src/main/java/class442.java
deleted file mode 100644
index 7ae67c5bcc..0000000000
--- a/runescape-client/src/main/java/class442.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("qe")
-public interface class442 {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(Lpx;I)V"
- )
- void method7783(Buffer var1);
-}
diff --git a/runescape-client/src/main/java/class443.java b/runescape-client/src/main/java/class443.java
deleted file mode 100644
index d6671e2967..0000000000
--- a/runescape-client/src/main/java/class443.java
+++ /dev/null
@@ -1,81 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("qu")
-public class class443 implements MouseWheel {
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- public static final class443 field4734;
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- public static final class443 field4730;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- static final class443 field4732;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- static final class443 field4729;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- static final class443 field4733;
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lqu;"
- )
- static final class443 field4731;
- @ObfuscatedName("p")
- @ObfuscatedGetter(
- intValue = 937638557
- )
- final int field4735;
- @ObfuscatedName("s")
- @ObfuscatedGetter(
- intValue = 1478684649
- )
- final int field4736;
-
- static {
- field4734 = new class443(3, 0); // L: 8
- field4730 = new class443(4, 2); // L: 9
- field4732 = new class443(1, 5); // L: 10
- field4729 = new class443(2, 6); // L: 11
- field4733 = new class443(5, 7); // L: 12
- field4731 = new class443(0, 8); // L: 13
- }
-
- class443(int var1, int var2) {
- this.field4735 = var1; // L: 18
- this.field4736 = var2; // L: 19
- } // L: 20
-
- @ObfuscatedName("o")
- @ObfuscatedSignature(
- descriptor = "(B)I",
- garbageValue = "30"
- )
- @Export("rsOrdinal")
- public int rsOrdinal() {
- return this.field4736; // L: 24
- }
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(I)Z",
- garbageValue = "-832611575"
- )
- public boolean method7790() {
- return this == field4730; // L: 28
- }
-}
diff --git a/runescape-client/src/main/java/class445.java b/runescape-client/src/main/java/class445.java
new file mode 100644
index 0000000000..29a6d48fc3
--- /dev/null
+++ b/runescape-client/src/main/java/class445.java
@@ -0,0 +1,11 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("qf")
+public interface class445 {
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(Lqt;I)V"
+ )
+ void method8005(Buffer var1);
+}
diff --git a/runescape-client/src/main/java/class446.java b/runescape-client/src/main/java/class446.java
index 6a5dbca54b..b6909679b3 100644
--- a/runescape-client/src/main/java/class446.java
+++ b/runescape-client/src/main/java/class446.java
@@ -1,12 +1,87 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("qo")
-public interface class446 {
- @ObfuscatedName("l")
+@ObfuscatedName("qm")
+public class class446 implements MouseWheel {
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(II)Ljava/lang/Object;",
- garbageValue = "-322202585"
+ descriptor = "Lqm;"
)
- Object vmethod7814(int var1);
+ public static final class446 field4751;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lqm;"
+ )
+ public static final class446 field4750;
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "Lqm;"
+ )
+ static final class446 field4753;
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "Lqm;"
+ )
+ static final class446 field4752;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Lqm;"
+ )
+ static final class446 field4758;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Lqm;"
+ )
+ static final class446 field4754;
+ @ObfuscatedName("y")
+ @ObfuscatedGetter(
+ intValue = 273043499
+ )
+ @Export("Interpreter_intStackSize")
+ static int Interpreter_intStackSize;
+ @ObfuscatedName("g")
+ @ObfuscatedGetter(
+ intValue = -1684945137
+ )
+ final int field4749;
+ @ObfuscatedName("w")
+ @ObfuscatedGetter(
+ intValue = -1783922233
+ )
+ final int field4756;
+
+ static {
+ field4751 = new class446(1, 0); // L: 8
+ field4750 = new class446(3, 2); // L: 9
+ field4753 = new class446(4, 5); // L: 10
+ field4752 = new class446(0, 6); // L: 11
+ field4758 = new class446(2, 7); // L: 12
+ field4754 = new class446(5, 8); // L: 13
+ }
+
+ class446(int var1, int var2) {
+ this.field4749 = var1; // L: 18
+ this.field4756 = var2; // L: 19
+ } // L: 20
+
+ @ObfuscatedName("c")
+ @ObfuscatedSignature(
+ descriptor = "(B)I",
+ garbageValue = "-100"
+ )
+ @Export("rsOrdinal")
+ public int rsOrdinal() {
+ return this.field4756; // L: 24
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)Z",
+ garbageValue = "612370997"
+ )
+ public boolean method8008() {
+ return this == field4750; // L: 28
+ }
}
diff --git a/runescape-client/src/main/java/class447.java b/runescape-client/src/main/java/class447.java
deleted file mode 100644
index 33e1c01f60..0000000000
--- a/runescape-client/src/main/java/class447.java
+++ /dev/null
@@ -1,41 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("qx")
-public class class447 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 1868107489
- )
- public final int field4741;
- @ObfuscatedName("q")
- public Object field4742;
-
- public class447(int var1) {
- this.field4741 = var1; // L: 8
- } // L: 9
-
- public class447(int var1, Object var2) {
- this.field4741 = var1; // L: 12
- this.field4742 = var2; // L: 13
- } // L: 14
-
- public int hashCode() {
- return super.hashCode(); // L: 18
- }
-
- public boolean equals(Object var1) {
- if (!(var1 instanceof class447)) { // L: 23
- return false;
- } else {
- class447 var2 = (class447)var1; // L: 24
- if (var2.field4742 == null && this.field4742 != null) { // L: 25
- return false;
- } else if (this.field4742 == null && var2.field4742 != null) { // L: 26
- return false;
- } else {
- return this.field4741 == var2.field4741 && var2.field4742.equals(this.field4742); // L: 27
- }
- }
- }
-}
diff --git a/runescape-client/src/main/java/class449.java b/runescape-client/src/main/java/class449.java
new file mode 100644
index 0000000000..91446a93d3
--- /dev/null
+++ b/runescape-client/src/main/java/class449.java
@@ -0,0 +1,12 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("qw")
+public interface class449 {
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(II)Ljava/lang/Object;",
+ garbageValue = "1786905463"
+ )
+ Object vmethod8027(int var1);
+}
diff --git a/runescape-client/src/main/java/class450.java b/runescape-client/src/main/java/class450.java
new file mode 100644
index 0000000000..83b7344610
--- /dev/null
+++ b/runescape-client/src/main/java/class450.java
@@ -0,0 +1,41 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("qr")
+public class class450 {
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 599765167
+ )
+ public final int field4765;
+ @ObfuscatedName("v")
+ public Object field4766;
+
+ public class450(int var1) {
+ this.field4765 = var1; // L: 8
+ } // L: 9
+
+ public class450(int var1, Object var2) {
+ this.field4765 = var1; // L: 12
+ this.field4766 = var2; // L: 13
+ } // L: 14
+
+ public boolean equals(Object var1) {
+ if (!(var1 instanceof class450)) { // L: 23
+ return false;
+ } else {
+ class450 var2 = (class450)var1; // L: 24
+ if (var2.field4766 == null && this.field4766 != null) { // L: 25
+ return false;
+ } else if (this.field4766 == null && var2.field4766 != null) { // L: 26
+ return false;
+ } else {
+ return var2.field4765 == this.field4765 && var2.field4766.equals(this.field4766); // L: 27
+ }
+ }
+ }
+
+ public int hashCode() {
+ return super.hashCode(); // L: 18
+ }
+}
diff --git a/runescape-client/src/main/java/class453.java b/runescape-client/src/main/java/class453.java
deleted file mode 100644
index 51c6e948af..0000000000
--- a/runescape-client/src/main/java/class453.java
+++ /dev/null
@@ -1,34 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("qk")
-public class class453 {
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = 1540266419
- )
- @Export("SpriteBuffer_spriteCount")
- public static int SpriteBuffer_spriteCount;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = 1346768065
- )
- @Export("SpriteBuffer_spriteWidth")
- public static int SpriteBuffer_spriteWidth;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 1623360163
- )
- @Export("SpriteBuffer_spriteHeight")
- public static int SpriteBuffer_spriteHeight;
- @ObfuscatedName("k")
- @Export("SpriteBuffer_xOffsets")
- public static int[] SpriteBuffer_xOffsets;
- @ObfuscatedName("a")
- @Export("SpriteBuffer_yOffsets")
- public static int[] SpriteBuffer_yOffsets;
- @ObfuscatedName("p")
- @Export("SpriteBuffer_spriteHeights")
- public static int[] SpriteBuffer_spriteHeights;
-}
diff --git a/runescape-client/src/main/java/class456.java b/runescape-client/src/main/java/class456.java
new file mode 100644
index 0000000000..9c7e7b0eb8
--- /dev/null
+++ b/runescape-client/src/main/java/class456.java
@@ -0,0 +1,22 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("qb")
+public class class456 {
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = -1735704061
+ )
+ @Export("SpriteBuffer_spriteCount")
+ static int SpriteBuffer_spriteCount;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = -1214569761
+ )
+ @Export("SpriteBuffer_spriteHeight")
+ static int SpriteBuffer_spriteHeight;
+ @ObfuscatedName("g")
+ @Export("SpriteBuffer_spriteHeights")
+ public static int[] SpriteBuffer_spriteHeights;
+}
diff --git a/runescape-client/src/main/java/class462.java b/runescape-client/src/main/java/class462.java
deleted file mode 100644
index 4b89b761be..0000000000
--- a/runescape-client/src/main/java/class462.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("qf")
-public class class462 {
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("musicSamplesArchive")
- public static AbstractArchive musicSamplesArchive;
-}
diff --git a/runescape-client/src/main/java/class464.java b/runescape-client/src/main/java/class464.java
new file mode 100644
index 0000000000..7b841c6bde
--- /dev/null
+++ b/runescape-client/src/main/java/class464.java
@@ -0,0 +1,9 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("qk")
+public class class464 {
+ @ObfuscatedName("l")
+ @Export("ByteArrayPool_arrays")
+ public static byte[][][] ByteArrayPool_arrays;
+}
diff --git a/runescape-client/src/main/java/class465.java b/runescape-client/src/main/java/class465.java
new file mode 100644
index 0000000000..119627acff
--- /dev/null
+++ b/runescape-client/src/main/java/class465.java
@@ -0,0 +1,9 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ql")
+public class class465 {
+ @ObfuscatedName("z")
+ @Export("Tiles_hueMultiplier")
+ static int[] Tiles_hueMultiplier;
+}
diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java
index 1184da7b77..4ae529d05f 100644
--- a/runescape-client/src/main/java/class47.java
+++ b/runescape-client/src/main/java/class47.java
@@ -2,12 +2,12 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("ai")
+@ObfuscatedName("aw")
public interface class47 {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(I)Lal;",
- garbageValue = "-1051033843"
+ descriptor = "(B)Lar;",
+ garbageValue = "71"
)
@Export("player")
PcmPlayer player();
diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java
index b6e76c8fdb..31d7c46cae 100644
--- a/runescape-client/src/main/java/class5.java
+++ b/runescape-client/src/main/java/class5.java
@@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("m")
+@ObfuscatedName("e")
public class class5 implements class2 {
- @ObfuscatedName("o")
- final MessageDigest field9;
+ @ObfuscatedName("c")
+ final MessageDigest field13;
@ObfuscatedSignature(
- descriptor = "(Lr;)V"
+ descriptor = "(Ly;)V"
)
class5(class8 var1) {
- this.field9 = this.method27(); // L: 14
+ this.field13 = this.method19(); // L: 14
} // L: 15
- @ObfuscatedName("o")
- boolean method36(int var1, String var2, long var3) {
- byte[] var5 = this.method37(var2, var3); // L: 18
- return method25(var5) >= var1; // L: 19
+ @ObfuscatedName("c")
+ boolean method20(int var1, String var2, long var3) {
+ byte[] var5 = this.method18(var2, var3); // L: 18
+ return method16(var5) >= var1; // L: 19
}
- @ObfuscatedName("k")
- byte[] method37(String var1, long var2) {
+ @ObfuscatedName("f")
+ byte[] method18(String var1, long var2) {
StringBuilder var4 = new StringBuilder(); // L: 56
var4.append(var1).append(Long.toHexString(var2)); // L: 57
- this.field9.reset(); // L: 58
+ this.field13.reset(); // L: 58
try {
- this.field9.update(var4.toString().getBytes("UTF-8")); // L: 60
+ this.field13.update(var4.toString().getBytes("UTF-8")); // L: 60
} catch (UnsupportedEncodingException var6) { // L: 62
var6.printStackTrace(); // L: 63
}
- return this.field9.digest(); // L: 65
+ return this.field13.digest(); // L: 65
}
- @ObfuscatedName("a")
- MessageDigest method27() {
+ @ObfuscatedName("j")
+ MessageDigest method19() {
try {
return MessageDigest.getInstance("SHA-256"); // L: 70
} catch (NoSuchAlgorithmException var2) { // L: 72
@@ -47,14 +47,14 @@ public class class5 implements class2 {
}
}
- @ObfuscatedName("q")
- static int method25(byte[] var0) {
+ @ObfuscatedName("v")
+ static int method16(byte[] var0) {
int var1 = 0; // L: 23
byte[] var2 = var0; // L: 25
for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26
byte var4 = var2[var3]; // L: 27
- int var5 = method35(var4); // L: 29
+ int var5 = method21(var4); // L: 29
var1 += var5; // L: 30
if (var5 != 8) { // L: 31
break;
@@ -64,8 +64,8 @@ public class class5 implements class2 {
return var1; // L: 37
}
- @ObfuscatedName("l")
- static int method35(byte var0) {
+ @ObfuscatedName("q")
+ static int method21(byte var0) {
int var1 = 0; // L: 41
if (var0 == 0) { // L: 42
var1 = 8; // L: 43
diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java
index 9d0445798e..0371aad9f6 100644
--- a/runescape-client/src/main/java/class6.java
+++ b/runescape-client/src/main/java/class6.java
@@ -3,101 +3,95 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("p")
+@ObfuscatedName("g")
public enum class6 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lp;"
+ descriptor = "Lg;"
)
- field16(0, 0);
+ field17(0, 0);
- @ObfuscatedName("i")
- @Export("BZip2Decompressor_block")
- static int[] BZip2Decompressor_block;
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "Lqu;"
+ )
+ @Export("titlebuttonSprite")
+ static IndexedSprite titlebuttonSprite;
+ @ObfuscatedName("ef")
+ @ObfuscatedSignature(
+ descriptor = "Llc;"
+ )
+ @Export("archive17")
+ static Archive archive17;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = -1659874385
+ )
+ public final int field16;
@ObfuscatedName("q")
@ObfuscatedGetter(
- intValue = 2103814257
- )
- public final int field11;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = 23593839
+ intValue = -162249617
)
final int field15;
class6(int var3, int var4) {
- this.field11 = var3; // L: 12
+ this.field16 = var3; // L: 12
this.field15 = var4; // L: 13
} // L: 14
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.field15; // L: 18
}
- @ObfuscatedName("m")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(III)I",
- garbageValue = "-918039654"
+ descriptor = "(I)Z",
+ garbageValue = "-1172724173"
)
- static int method45(int var0, int var1) {
- long var2 = (long)((var0 << 16) + var1); // L: 164
- return WorldMapIcon_0.NetCache_currentResponse != null && var2 == WorldMapIcon_0.NetCache_currentResponse.key ? class357.NetCache_responseArchiveBuffer.offset * 99 / (class357.NetCache_responseArchiveBuffer.array.length - WorldMapIcon_0.NetCache_currentResponse.padding) + 1 : 0; // L: 165 166
+ public static boolean method37() {
+ ReflectionCheck var0 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 28
+ return var0 != null; // L: 29
}
- @ObfuscatedName("t")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(CB)Z",
- garbageValue = "-55"
+ descriptor = "(IIILgk;II)V",
+ garbageValue = "565551340"
)
- @Export("isCharPrintable")
- public static boolean isCharPrintable(char var0) {
- if (var0 >= ' ' && var0 <= '~') { // L: 187
- return true;
- } else if (var0 >= 160 && var0 <= 255) {
- return true; // L: 188
- } else {
- return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 189
+ static void method38(int var0, int var1, int var2, ObjectComposition var3, int var4) {
+ ObjectSound var5 = new ObjectSound(); // L: 67
+ var5.plane = var0; // L: 68
+ var5.x = var1 * 128; // L: 69
+ var5.y = var2 * 128; // L: 70
+ int var6 = var3.sizeX; // L: 71
+ int var7 = var3.sizeY; // L: 72
+ if (var4 == 1 || var4 == 3) { // L: 73
+ var6 = var3.sizeY; // L: 74
+ var7 = var3.sizeX; // L: 75
}
- }
- @ObfuscatedName("ah")
- @ObfuscatedSignature(
- descriptor = "(ILbb;ZI)I",
- garbageValue = "1816581663"
- )
- static int method47(int var0, Script var1, boolean var2) {
- if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4484
- if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4489
- if (var0 == 6750) { // L: 4493
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4494
- return 1; // L: 4495
- } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4497
- if (var0 == 6754) { // L: 4501
- int var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 4502
- NPCComposition var4 = WorldMapSectionType.getNpcDefinition(var3); // L: 4503
- Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4504
- return 1; // L: 4505
- } else {
- return 2; // L: 4507
- }
- } else {
- Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4498
- return 1; // L: 4499
- }
- } else {
- --class12.Interpreter_intStackSize; // L: 4490
- return 1; // L: 4491
- }
- } else {
- class12.Interpreter_intStackSize -= 2; // L: 4485
- --class9.Interpreter_stringStackSize; // L: 4486
- return 1; // L: 4487
+ var5.maxX = (var6 + var1) * 128; // L: 77
+ var5.maxY = (var7 + var2) * 128; // L: 78
+ var5.soundEffectId = var3.ambientSoundId; // L: 79
+ var5.field812 = var3.int7 * 128; // L: 80
+ var5.field819 = var3.int5; // L: 81
+ var5.field811 = var3.int6; // L: 82
+ var5.soundEffectIds = var3.soundEffectIds; // L: 83
+ if (var3.transforms != null) { // L: 84
+ var5.obj = var3; // L: 85
+ var5.set(); // L: 86
}
- }
+
+ ObjectSound.objectSounds.addFirst(var5); // L: 88
+ if (var5.soundEffectIds != null) { // L: 89
+ var5.field809 = var5.field819 + (int)(Math.random() * (double)(var5.field811 - var5.field819));
+ }
+
+ } // L: 90
}
diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java
index 97497929ee..93b0d37764 100644
--- a/runescape-client/src/main/java/class65.java
+++ b/runescape-client/src/main/java/class65.java
@@ -1,29 +1,47 @@
import java.math.BigInteger;
+import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bz")
+@ObfuscatedName("bs")
public class class65 {
- @ObfuscatedName("a")
- static final BigInteger field854;
- @ObfuscatedName("m")
- static final BigInteger field862;
+ @ObfuscatedName("j")
+ static final BigInteger field865;
+ @ObfuscatedName("e")
+ static final BigInteger field868;
static {
- field854 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20
- field862 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21
+ field865 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20
+ field868 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21
}
- @ObfuscatedName("ib")
+ @ObfuscatedName("gw")
@ObfuscatedSignature(
- descriptor = "(III)Lgw;",
- garbageValue = "-1781154478"
+ descriptor = "(Lci;III)V",
+ garbageValue = "-1780893346"
)
- static RouteStrategy method1879(int var0, int var1) {
- Client.field771.approxDestinationX = var0; // L: 8689
- Client.field771.approxDestinationY = var1; // L: 8690
- Client.field771.approxDestinationSizeX = 1; // L: 8691
- Client.field771.approxDestinationSizeY = 1; // L: 8692
- return Client.field771; // L: 8693
- }
+ @Export("performPlayerAnimation")
+ static void performPlayerAnimation(Player var0, int var1, int var2) {
+ if (var0.sequence == var1 && var1 != -1) { // L: 4344
+ int var3 = ScriptFrame.SequenceDefinition_get(var1).field2174; // L: 4345
+ if (var3 == 1) { // L: 4346
+ var0.sequenceFrame = 0; // L: 4347
+ var0.sequenceFrameCycle = 0; // L: 4348
+ var0.sequenceDelay = var2; // L: 4349
+ var0.field1190 = 0; // L: 4350
+ }
+
+ if (var3 == 2) { // L: 4352
+ var0.field1190 = 0; // L: 4353
+ }
+ } else if (var1 == -1 || var0.sequence == -1 || ScriptFrame.SequenceDefinition_get(var1).field2183 >= ScriptFrame.SequenceDefinition_get(var0.sequence).field2183) { // L: 4356
+ var0.sequence = var1; // L: 4357
+ var0.sequenceFrame = 0; // L: 4358
+ var0.sequenceFrameCycle = 0; // L: 4359
+ var0.sequenceDelay = var2; // L: 4360
+ var0.field1190 = 0; // L: 4361
+ var0.field1203 = var0.pathLength; // L: 4362
+ }
+
+ } // L: 4364
}
diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java
index b7cb96a565..54bd54eeb2 100644
--- a/runescape-client/src/main/java/class67.java
+++ b/runescape-client/src/main/java/class67.java
@@ -1,122 +1,93 @@
+import java.io.File;
+import java.io.IOException;
import java.math.BigInteger;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("bt")
+@ObfuscatedName("bb")
public class class67 {
- @ObfuscatedName("o")
- static final BigInteger field875;
- @ObfuscatedName("q")
- static final BigInteger field871;
- @ObfuscatedName("w")
+ @ObfuscatedName("c")
+ static final BigInteger field886;
+ @ObfuscatedName("v")
+ static final BigInteger field885;
+ @ObfuscatedName("ex")
@ObfuscatedSignature(
- descriptor = "Lqd;"
+ descriptor = "Llc;"
)
- @Export("options_buttons_0Sprite")
- static IndexedSprite options_buttons_0Sprite;
+ @Export("archive15")
+ static Archive archive15;
static {
- field875 = new BigInteger("10001", 16); // L: 6
- field871 = new BigInteger("b53e1d1321015e2b89b11477ee53d8352f43919de31343ff871ec92cae904da943010aeeb8026f3499c5850107833d2068992bf58921ee3a16ead4ac3f5b0aba763660bd6e68e45b863c2d6364b1d6faa581596c56c1117caf3f637c8dd223d6272654c304d3de1c13c47ef929a582788a1f9058b01e13082fbe05d69591d05d", 16); // L: 7
+ field886 = new BigInteger("10001", 16); // L: 6
+ field885 = new BigInteger("ab3795934893fe2209c5ef0b149e4a64c8eac69bdf1d8ded99aba2d9e37e69a949a553c06d069e59cc7519e70b2463213d3de4d98e1120469788b9df4033740b2730933e1cd68c86cadc8b15c877947c5db2e85e2fb1feb775dabaf99a4c5d07260a728e859086e32bd3a07ac5ebdaf72e4cc11beb54168a6441e878e4e49471", 16); // L: 7
}
- @ObfuscatedName("p")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(Lpx;IIIIIIB)V",
- garbageValue = "109"
+ descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lpn;",
+ garbageValue = "-1474288872"
)
- @Export("loadTerrain")
- static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
- int var7;
- if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 168
- Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 169
-
- while (true) {
- var7 = var0.readUnsignedByte(); // L: 171
- if (var7 == 0) { // L: 172
- if (var1 == 0) {
- Tiles.Tiles_heights[0][var2][var3] = -GrandExchangeOfferUnitPriceComparator.method5846(var4 + var2 + 932731, 556238 + var3 + var5) * 8; // L: 173
- } else {
- Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 174
- }
- break;
- }
-
- if (var7 == 1) { // L: 177
- int var8 = var0.readUnsignedByte(); // L: 178
- if (var8 == 1) { // L: 179
- var8 = 0;
- }
-
- if (var1 == 0) { // L: 180
- Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
- } else {
- Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 181
- }
- break;
- }
-
- if (var7 <= 49) { // L: 184
- Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 185
- Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 186
- RunException.field4812[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 187
- } else if (var7 <= 81) { // L: 190
- Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 191
- } else {
- Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 194
- }
- }
- } else {
- while (true) {
- var7 = var0.readUnsignedByte(); // L: 199
- if (var7 == 0) { // L: 200
- break;
- }
-
- if (var7 == 1) { // L: 201
- var0.readUnsignedByte(); // L: 202
- break;
- }
-
- if (var7 <= 49) { // L: 205
- var0.readUnsignedByte();
- }
+ @Export("getPreferencesFile")
+ public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
+ File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 249
+ if (var3.exists()) { // L: 250
+ try {
+ AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 252
+ return var10; // L: 253
+ } catch (IOException var9) { // L: 255
}
}
- } // L: 208
+ String var4 = ""; // L: 257
+ if (class93.cacheGamebuild == 33) { // L: 258
+ var4 = "_rc";
+ } else if (class93.cacheGamebuild == 34) { // L: 259
+ var4 = "_wip";
+ }
- @ObfuscatedName("s")
- @ObfuscatedSignature(
- descriptor = "(Llp;IB)Lqd;",
- garbageValue = "69"
- )
- public static IndexedSprite method1883(AbstractArchive var0, int var1) {
- if (!class28.method374(var0, var1)) { // L: 130
- return null;
- } else {
- IndexedSprite var3 = new IndexedSprite(); // L: 133
- var3.width = class453.SpriteBuffer_spriteWidth; // L: 134
- var3.height = class453.SpriteBuffer_spriteHeight; // L: 135
- var3.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 136
- var3.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 137
- var3.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 138
- var3.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 139
- var3.palette = Decimator.SpriteBuffer_spritePalette; // L: 140
- var3.pixels = class127.SpriteBuffer_pixels[0]; // L: 141
- VarcInt.method3325(); // L: 142
- return var3; // L: 145
+ File var5 = new File(class123.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 260
+ AccessFile var6;
+ if (!var2 && var5.exists()) { // L: 261
+ try {
+ var6 = new AccessFile(var5, "rw", 10000L); // L: 263
+ return var6; // L: 264
+ } catch (IOException var8) { // L: 266
+ }
+ }
+
+ try {
+ var6 = new AccessFile(var3, "rw", 10000L); // L: 269
+ return var6; // L: 270
+ } catch (IOException var7) { // L: 272
+ throw new RuntimeException(); // L: 273
}
}
- @ObfuscatedName("ki")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(II)V",
- garbageValue = "1989518897"
+ descriptor = "(II)Z",
+ garbageValue = "1525199469"
)
- static final void method1881(int var0) {
- var0 = Math.min(Math.max(var0, 0), 127); // L: 12073
- class12.clientPreferences.updateSoundEffectVolume(var0); // L: 12074
- } // L: 12075
+ public static boolean method1885(int var0) {
+ return (var0 >> 21 & 1) != 0; // L: 25
+ }
+
+ @ObfuscatedName("e")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1608144091"
+ )
+ public static void method1886() {
+ ParamComposition.ParamDefinition_cached.clear(); // L: 56
+ } // L: 57
+
+ @ObfuscatedName("g")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "-1419146368"
+ )
+ public static void method1887() {
+ class437.Widget_cachedSprites.clear(); // L: 90
+ } // L: 91
}
diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java
index 373c8a5a77..efb943c79c 100644
--- a/runescape-client/src/main/java/class7.java
+++ b/runescape-client/src/main/java/class7.java
@@ -2,86 +2,135 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("s")
+@ObfuscatedName("w")
public class class7 {
- @ObfuscatedName("bo")
- @ObfuscatedGetter(
- intValue = -1318475581
- )
- static int field26;
- @ObfuscatedName("mg")
- @ObfuscatedGetter(
- intValue = 881204407
- )
- @Export("menuHeight")
- static int menuHeight;
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
ExecutorService field25;
+ @ObfuscatedName("v")
+ Future field22;
@ObfuscatedName("q")
- Future field20;
- @ObfuscatedName("l")
@ObfuscatedSignature(
- descriptor = "Lpx;"
+ descriptor = "Lqt;"
)
- final Buffer field19;
- @ObfuscatedName("k")
+ final Buffer field21;
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lk;"
+ descriptor = "Lf;"
)
- final class3 field22;
+ final class3 field24;
@ObfuscatedSignature(
- descriptor = "(Lpx;Lk;)V"
+ descriptor = "(Lqt;Lf;)V"
)
public class7(Buffer var1, class3 var2) {
this.field25 = Executors.newSingleThreadExecutor(); // L: 10
- this.field19 = var1; // L: 16
- this.field22 = var2; // L: 17
- this.method52(); // L: 18
+ this.field21 = var1; // L: 16
+ this.field24 = var2; // L: 17
+ this.method43(); // L: 18
} // L: 19
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "(B)Z",
- garbageValue = "16"
+ descriptor = "(I)Z",
+ garbageValue = "1259823289"
)
- public boolean method49() {
- return this.field20.isDone(); // L: 22
+ public boolean method46() {
+ return this.field22.isDone(); // L: 22
}
- @ObfuscatedName("q")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "-81"
+ descriptor = "(I)V",
+ garbageValue = "-750933605"
)
- public void method50() {
+ public void method41() {
this.field25.shutdown(); // L: 26
this.field25 = null; // L: 27
} // L: 28
- @ObfuscatedName("l")
+ @ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "(S)Lpx;",
- garbageValue = "26345"
+ descriptor = "(I)Lqt;",
+ garbageValue = "1646387788"
)
- public Buffer method51() {
+ public Buffer method42() {
try {
- return (Buffer)this.field20.get(); // L: 32
+ return (Buffer)this.field22.get(); // L: 32
} catch (Exception var2) { // L: 34
return null; // L: 35
}
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(S)V",
- garbageValue = "16321"
+ descriptor = "(I)V",
+ garbageValue = "422290407"
)
- void method52() {
- this.field20 = this.field25.submit(new class1(this, this.field19, this.field22)); // L: 40
+ void method43() {
+ this.field22 = this.field25.submit(new class1(this, this.field21, this.field24)); // L: 40
} // L: 41
+
+ @ObfuscatedName("q")
+ @ObfuscatedSignature(
+ descriptor = "(Llh;III)Lqe;",
+ garbageValue = "488582948"
+ )
+ @Export("SpriteBuffer_getSprite")
+ public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+ if (!Ignored.method6774(var0, var1, var2)) { // L: 57
+ return null;
+ } else {
+ SpritePixels var4 = new SpritePixels(); // L: 60
+ var4.width = ModelData0.SpriteBuffer_spriteWidth; // L: 61
+ var4.height = class456.SpriteBuffer_spriteHeight; // L: 62
+ var4.xOffset = class426.SpriteBuffer_xOffsets[0]; // L: 63
+ var4.yOffset = class142.SpriteBuffer_yOffsets[0]; // L: 64
+ var4.subWidth = class359.SpriteBuffer_spriteWidths[0]; // L: 65
+ var4.subHeight = class456.SpriteBuffer_spriteHeights[0]; // L: 66
+ int var5 = var4.subWidth * var4.subHeight; // L: 67
+ byte[] var6 = class421.SpriteBuffer_pixels[0]; // L: 68
+ var4.pixels = new int[var5]; // L: 69
+
+ for (int var7 = 0; var7 < var5; ++var7) { // L: 70
+ var4.pixels[var7] = class13.SpriteBuffer_spritePalette[var6[var7] & 255];
+ }
+
+ class426.SpriteBuffer_xOffsets = null; // L: 72
+ class142.SpriteBuffer_yOffsets = null; // L: 73
+ class359.SpriteBuffer_spriteWidths = null; // L: 74
+ class456.SpriteBuffer_spriteHeights = null; // L: 75
+ class13.SpriteBuffer_spritePalette = null; // L: 76
+ class421.SpriteBuffer_pixels = null;
+ return var4; // L: 81
+ }
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)[Lce;",
+ garbageValue = "-916941960"
+ )
+ static AttackOption[] method52() {
+ return new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1294, AttackOption.AttackOption_hidden, AttackOption.field1288}; // L: 12504
+ }
+
+ @ObfuscatedName("e")
+ static int method51(long var0) {
+ return (int)(var0 >>> 14 & 3L); // L: 77
+ }
+
+ @ObfuscatedName("jf")
+ @ObfuscatedSignature(
+ descriptor = "(III)V",
+ garbageValue = "2121106568"
+ )
+ @Export("runIntfCloseListeners")
+ static final void runIntfCloseListeners(int var0, int var1) {
+ if (WorldMapSection2.loadInterface(var0)) { // L: 11581
+ TaskHandler.runComponentCloseListeners(SoundCache.Widget_interfaceComponents[var0], var1); // L: 11582
+ }
+ } // L: 11583
}
diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java
index dff57bc41e..f80ac4750d 100644
--- a/runescape-client/src/main/java/class78.java
+++ b/runescape-client/src/main/java/class78.java
@@ -1,51 +1,13 @@
import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("co")
+@ObfuscatedName("cr")
public class class78 {
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(II)Lgv;",
- garbageValue = "788038626"
+ @ObfuscatedName("m")
+ @ObfuscatedGetter(
+ intValue = 765680333
)
- @Export("getParamDefinition")
- public static ParamComposition getParamDefinition(int var0) {
- ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25
- if (var1 != null) { // L: 26
- return var1;
- } else {
- byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27
- var1 = new ParamComposition(); // L: 28
- if (var2 != null) { // L: 29
- var1.decode(new Buffer(var2));
- }
-
- var1.postDecode(); // L: 30
- ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
- return var1; // L: 32
- }
- }
-
- @ObfuscatedName("w")
- @ObfuscatedSignature(
- descriptor = "(CI)Z",
- garbageValue = "2081460925"
- )
- @Export("isAlphaNumeric")
- public static boolean isAlphaNumeric(char var0) {
- return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 154
- }
-
- @ObfuscatedName("lf")
- @ObfuscatedSignature(
- descriptor = "(B)V",
- garbageValue = "4"
- )
- @Export("Clan_leaveChat")
- static final void Clan_leaveChat() {
- PacketBufferNode var0 = WallDecoration.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 12457
- var0.packetBuffer.writeByte(0); // L: 12458
- Client.packetWriter.addNode(var0); // L: 12459
- } // L: 12460
+ @Export("canvasHeight")
+ public static int canvasHeight;
}
diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java
index 6bd0505aed..50f6519e7f 100644
--- a/runescape-client/src/main/java/class8.java
+++ b/runescape-client/src/main/java/class8.java
@@ -1,35 +1,35 @@
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("r")
+@ObfuscatedName("y")
public class class8 {
- @ObfuscatedName("o")
- final int field29;
+ @ObfuscatedName("c")
+ final int field27;
+ @ObfuscatedName("v")
+ final int field26;
@ObfuscatedName("q")
- final int field30;
- @ObfuscatedName("l")
- final String field31;
+ final String field28;
@ObfuscatedSignature(
- descriptor = "(Lpx;)V"
+ descriptor = "(Lqt;)V"
)
class8(Buffer var1) {
this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19
} // L: 20
class8(int var1, int var2, String var3) {
- this.field29 = var1; // L: 13
- this.field30 = var2; // L: 14
- this.field31 = var3; // L: 15
+ this.field27 = var1; // L: 13
+ this.field26 = var2; // L: 14
+ this.field28 = var3; // L: 15
} // L: 16
- @ObfuscatedName("o")
- String method60() {
- return Integer.toHexString(this.field29) + Integer.toHexString(this.field30) + this.field31; // L: 23
+ @ObfuscatedName("c")
+ String method57() {
+ return Integer.toHexString(this.field27) + Integer.toHexString(this.field26) + this.field28; // L: 23
}
- @ObfuscatedName("q")
- int method58() {
- return this.field30; // L: 27
+ @ObfuscatedName("v")
+ int method55() {
+ return this.field26; // L: 27
}
}
diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java
index 4766bcd2ff..b02a408c87 100644
--- a/runescape-client/src/main/java/class82.java
+++ b/runescape-client/src/main/java/class82.java
@@ -3,235 +3,273 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cs")
+@ObfuscatedName("cc")
public enum class82 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lcs;"
+ descriptor = "Lcc;"
)
- field1073(0, -1),
+ field1069(0, -1),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lcc;"
+ )
+ field1066(1, 1),
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lcs;"
+ descriptor = "Lcc;"
)
- field1079(1, 1),
- @ObfuscatedName("l")
+ field1067(2, 7),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lcs;"
+ descriptor = "Lcc;"
)
- field1078(2, 7),
- @ObfuscatedName("k")
+ field1068(3, 8),
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "Lcs;"
+ descriptor = "Lcc;"
)
- field1075(3, 8),
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lcs;"
- )
- field1076(4, 9);
+ field1073(4, 9);
- @ObfuscatedName("s")
- @Export("ItemDefinition_inMembersWorld")
- public static boolean ItemDefinition_inMembersWorld;
- @ObfuscatedName("r")
- static int[] field1072;
- @ObfuscatedName("ax")
- @Export("client")
- @ObfuscatedSignature(
- descriptor = "Lclient;"
- )
- static Client client;
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = 2093138331
+ intValue = -20141329
)
- final int field1077;
- @ObfuscatedName("p")
+ final int field1065;
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 612324331
+ intValue = 868910059
)
- final int field1081;
+ final int field1071;
class82(int var3, int var4) {
- this.field1077 = var3; // L: 20
- this.field1081 = var4; // L: 21
+ this.field1065 = var3; // L: 20
+ this.field1071 = var4; // L: 21
} // L: 22
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field1081; // L: 26
+ return this.field1071; // L: 26
}
- @ObfuscatedName("q")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "(IB)Lgy;",
- garbageValue = "1"
+ descriptor = "(II)Ldq;",
+ garbageValue = "2053304227"
)
- @Export("getObjectDefinition")
- public static ObjectComposition getObjectDefinition(int var0) {
- ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79
- if (var1 != null) { // L: 80
- return var1;
- } else {
- byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 81
- var1 = new ObjectComposition(); // L: 82
- var1.id = var0; // L: 83
- if (var2 != null) { // L: 84
- var1.decode(new Buffer(var2));
- }
-
- var1.postDecode(); // L: 85
- if (var1.isSolid) { // L: 86
- var1.interactType = 0; // L: 87
- var1.boolean1 = false; // L: 88
- }
-
- ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90
- return var1; // L: 91
+ static class118 method2116(int var0) {
+ class118[] var1 = new class118[]{class118.field1481, class118.field1477, class118.field1478, class118.field1479, class118.field1480, class118.field1484}; // L: 33
+ class118 var2 = (class118)Actor.findEnumerated(var1, var0); // L: 35
+ if (var2 == null) { // L: 36
+ var2 = class118.field1481;
}
+
+ return var2; // L: 37
}
- @ObfuscatedName("hs")
+ @ObfuscatedName("it")
@ObfuscatedSignature(
- descriptor = "(ZLpc;B)V",
- garbageValue = "-25"
+ descriptor = "(IIIIB)V",
+ garbageValue = "0"
)
- static final void method2098(boolean var0, PacketBuffer var1) {
- while (true) {
- if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 8080
- int var2 = var1.readBits(15); // L: 8081
- if (var2 != 32767) { // L: 8082
- boolean var3 = false; // L: 8083
- if (Client.npcs[var2] == null) { // L: 8084
- Client.npcs[var2] = new NPC(); // L: 8085
- var3 = true; // L: 8086
+ @Export("addSceneMenuOptions")
+ static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+ if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9722
+ class4.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9723
+ }
+
+ long var4 = -1L; // L: 9726
+ long var6 = -1L; // L: 9727
+
+ int var8;
+ for (var8 = 0; var8 < Frames.method4349(); ++var8) { // L: 9728
+ long var24 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9731
+ if (var6 != var24) { // L: 9734
+ var6 = var24; // L: 9735
+ long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9739
+ int var14 = (int)(var15 >>> 0 & 127L); // L: 9741
+ var14 = var14; // L: 9745
+ int var28 = InterfaceParent.method2095(var8); // L: 9746
+ int var16 = TileItem.method2414(var8); // L: 9747
+ int var17 = JagexCache.method3250(var8); // L: 9748
+ if (var16 == 2 && class356.scene.getObjectFlags(PacketWriter.Client_plane, var14, var28, var24) >= 0) { // L: 9749 9750
+ ObjectComposition var18 = class162.getObjectDefinition(var17); // L: 9751
+ if (var18.transforms != null) { // L: 9752
+ var18 = var18.transform();
}
- NPC var4 = Client.npcs[var2]; // L: 8088
- Client.npcIndices[++Client.npcCount - 1] = var2; // L: 8089
- var4.npcCycle = Client.cycle; // L: 8090
- int var5;
- int var6;
- int var7;
- int var10;
- if (class393.field4428) { // L: 8094
- int var8 = Client.defaultRotations[var1.readBits(3)]; // L: 8095
- if (var3) { // L: 8096
- var4.orientation = var4.rotation = var8;
- }
+ if (var18 == null) { // L: 9753
+ continue;
+ }
- if (var0) { // L: 8097
- var7 = var1.readBits(8); // L: 8098
- if (var7 > 127) { // L: 8099
- var7 -= 256;
- }
- } else {
- var7 = var1.readBits(5); // L: 8102
- if (var7 > 15) { // L: 8103
- var7 -= 32;
- }
- }
-
- var4.definition = WorldMapSectionType.getNpcDefinition(var1.readBits(14)); // L: 8105
- boolean var9 = var1.readBits(1) == 1; // L: 8106
- if (var9) { // L: 8107
- var1.readBits(32); // L: 8108
- }
-
- var5 = var1.readBits(1); // L: 8110
- var10 = var1.readBits(1); // L: 8111
- if (var10 == 1) { // L: 8112
- Client.field601[++Client.field565 - 1] = var2;
- }
-
- if (var0) { // L: 8113
- var6 = var1.readBits(8); // L: 8114
- if (var6 > 127) { // L: 8115
- var6 -= 256;
- }
- } else {
- var6 = var1.readBits(5); // L: 8118
- if (var6 > 15) { // L: 8119
- var6 -= 32;
- }
+ if (Client.isItemSelected == 1) { // L: 9754
+ class4.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class122.colorStartTag(65535) + var18.name, 1, var17, var14, var28); // L: 9755
+ } else if (Client.isSpellSelected) { // L: 9758
+ if ((HealthBar.selectedSpellFlags & 4) == 4) { // L: 9759
+ class4.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class122.colorStartTag(65535) + var18.name, 2, var17, var14, var28); // L: 9760
}
} else {
- boolean var11 = var1.readBits(1) == 1; // L: 8123
- if (var11) { // L: 8124
- var1.readBits(32); // L: 8125
- }
+ String[] var19 = var18.actions; // L: 9765
+ if (var19 != null) { // L: 9766
+ for (int var20 = 4; var20 >= 0; --var20) { // L: 9767
+ if (var19[var20] != null) { // L: 9768
+ short var21 = 0; // L: 9769
+ if (var20 == 0) { // L: 9770
+ var21 = 3;
+ }
- if (var0) { // L: 8127
- var7 = var1.readBits(8); // L: 8128
- if (var7 > 127) { // L: 8129
- var7 -= 256;
- }
- } else {
- var7 = var1.readBits(5); // L: 8132
- if (var7 > 15) { // L: 8133
- var7 -= 32;
+ if (var20 == 1) { // L: 9771
+ var21 = 4;
+ }
+
+ if (var20 == 2) { // L: 9772
+ var21 = 5;
+ }
+
+ if (var20 == 3) { // L: 9773
+ var21 = 6;
+ }
+
+ if (var20 == 4) { // L: 9774
+ var21 = 1001;
+ }
+
+ class4.insertMenuItemNoShift(var19[var20], class122.colorStartTag(65535) + var18.name, var21, var17, var14, var28); // L: 9775
+ }
}
}
- var5 = var1.readBits(1); // L: 8135
- if (var0) { // L: 8136
- var6 = var1.readBits(8); // L: 8137
- if (var6 > 127) { // L: 8138
- var6 -= 256;
- }
- } else {
- var6 = var1.readBits(5); // L: 8141
- if (var6 > 15) { // L: 8142
- var6 -= 32;
+ class4.insertMenuItemNoShift("Examine", class122.colorStartTag(65535) + var18.name, 1002, var18.id, var14, var28); // L: 9780
+ }
+ }
+
+ Player var22;
+ int var29;
+ NPC var30;
+ int var37;
+ int[] var38;
+ if (var16 == 1) { // L: 9785
+ NPC var33 = Client.npcs[var17]; // L: 9786
+ if (var33 == null) { // L: 9787
+ continue;
+ }
+
+ if (var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) { // L: 9788
+ for (var29 = 0; var29 < Client.npcCount; ++var29) { // L: 9789
+ var30 = Client.npcs[Client.npcIndices[var29]]; // L: 9790
+ if (var30 != null && var33 != var30 && var30.definition.size == 1 && var30.x == var33.x && var30.y == var33.y) { // L: 9791
+ class160.addNpcToMenu(var30, Client.npcIndices[var29], var14, var28);
}
}
- var4.definition = WorldMapSectionType.getNpcDefinition(var1.readBits(14)); // L: 8144
- int var12 = Client.defaultRotations[var1.readBits(3)]; // L: 8145
- if (var3) { // L: 8146
- var4.orientation = var4.rotation = var12;
- }
+ var29 = Players.Players_count; // L: 9793
+ var38 = Players.Players_indices; // L: 9794
- var10 = var1.readBits(1); // L: 8147
- if (var10 == 1) { // L: 8148
- Client.field601[++Client.field565 - 1] = var2;
+ for (var37 = 0; var37 < var29; ++var37) { // L: 9795
+ var22 = Client.players[var38[var37]]; // L: 9796
+ if (var22 != null && var22.x == var33.x && var22.y == var33.y) { // L: 9797
+ DynamicObject.addPlayerToMenu(var22, var38[var37], var14, var28);
+ }
}
}
- var4.field1167 = var4.definition.size; // L: 8150
- var4.field1204 = var4.definition.rotation; // L: 8151
- if (var4.field1204 == 0) { // L: 8152
- var4.rotation = 0;
+ class160.addNpcToMenu(var33, var17, var14, var28); // L: 9800
+ }
+
+ if (var16 == 0) { // L: 9802
+ Player var34 = Client.players[var17]; // L: 9803
+ if (var34 == null) { // L: 9804
+ continue;
}
- var4.walkSequence = var4.definition.walkSequence; // L: 8153
- var4.walkBackSequence = var4.definition.walkBackSequence; // L: 8154
- var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 8155
- var4.walkRightSequence = var4.definition.walkRightSequence; // L: 8156
- var4.idleSequence = var4.definition.idleSequence; // L: 8157
- var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 8158
- var4.turnRightSequence = var4.definition.turnRightSequence; // L: 8159
- var4.runSequence = var4.definition.field1959; // L: 8160
- var4.field1150 = var4.definition.field1960; // L: 8161
- var4.field1183 = var4.definition.field1961; // L: 8162
- var4.field1152 = var4.definition.field1946; // L: 8163
- var4.field1160 = var4.definition.field1985; // L: 8164
- var4.field1154 = var4.definition.field1964; // L: 8165
- var4.field1155 = var4.definition.field1956; // L: 8166
- var4.field1156 = var4.definition.field1966; // L: 8167
- var4.method2341(ModelData0.localPlayer.pathX[0] + var6, ModelData0.localPlayer.pathY[0] + var7, var5 == 1); // L: 8168
- continue; // L: 8169
+ if ((var34.x & 127) == 64 && (var34.y & 127) == 64) { // L: 9805
+ for (var29 = 0; var29 < Client.npcCount; ++var29) { // L: 9806
+ var30 = Client.npcs[Client.npcIndices[var29]]; // L: 9807
+ if (var30 != null && var30.definition.size == 1 && var30.x == var34.x && var30.y == var34.y) { // L: 9808
+ class160.addNpcToMenu(var30, Client.npcIndices[var29], var14, var28);
+ }
+ }
+
+ var29 = Players.Players_count; // L: 9810
+ var38 = Players.Players_indices; // L: 9811
+
+ for (var37 = 0; var37 < var29; ++var37) { // L: 9812
+ var22 = Client.players[var38[var37]]; // L: 9813
+ if (var22 != null && var22 != var34 && var34.x == var22.x && var22.y == var34.y) { // L: 9814
+ DynamicObject.addPlayerToMenu(var22, var38[var37], var14, var28);
+ }
+ }
+ }
+
+ if (var17 != Client.combatTargetPlayerIndex) { // L: 9817
+ DynamicObject.addPlayerToMenu(var34, var17, var14, var28);
+ } else {
+ var4 = var24; // L: 9818
+ }
+ }
+
+ if (var16 == 3) { // L: 9820
+ NodeDeque var36 = Client.groundItems[PacketWriter.Client_plane][var14][var28]; // L: 9821
+ if (var36 != null) { // L: 9822
+ for (TileItem var35 = (TileItem)var36.first(); var35 != null; var35 = (TileItem)var36.next()) { // L: 9823 9824 9857
+ ItemComposition var39 = EnumComposition.ItemDefinition_get(var35.id); // L: 9825
+ if (Client.isItemSelected == 1) { // L: 9826
+ class4.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class122.colorStartTag(16748608) + var39.name, 16, var35.id, var14, var28); // L: 9827
+ } else if (Client.isSpellSelected) { // L: 9830
+ if ((HealthBar.selectedSpellFlags & 1) == 1) { // L: 9831
+ class4.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class122.colorStartTag(16748608) + var39.name, 17, var35.id, var14, var28); // L: 9832
+ }
+ } else {
+ String[] var31 = var39.groundActions; // L: 9837
+
+ for (int var32 = 4; var32 >= 0; --var32) { // L: 9838
+ if (var31 != null && var31[var32] != null) { // L: 9839
+ byte var23 = 0; // L: 9840
+ if (var32 == 0) { // L: 9841
+ var23 = 18;
+ }
+
+ if (var32 == 1) { // L: 9842
+ var23 = 19;
+ }
+
+ if (var32 == 2) { // L: 9843
+ var23 = 20;
+ }
+
+ if (var32 == 3) { // L: 9844
+ var23 = 21;
+ }
+
+ if (var32 == 4) { // L: 9845
+ var23 = 22;
+ }
+
+ class4.insertMenuItemNoShift(var31[var32], class122.colorStartTag(16748608) + var39.name, var23, var35.id, var14, var28); // L: 9846
+ } else if (var32 == 2) { // L: 9849
+ class4.insertMenuItemNoShift("Take", class122.colorStartTag(16748608) + var39.name, 20, var35.id, var14, var28); // L: 9850
+ }
+ }
+
+ class4.insertMenuItemNoShift("Examine", class122.colorStartTag(16748608) + var39.name, 1004, var35.id, var14, var28); // L: 9854
+ }
+ }
+ }
}
}
-
- var1.exportIndex(); // L: 8170
- return; // L: 8171
}
- }
+
+ if (-1L != var4) { // L: 9862
+ var8 = (int)(var4 >>> 0 & 127L); // L: 9865
+ int var10 = (int)(var4 >>> 7 & 127L); // L: 9870
+ Player var12 = Client.players[Client.combatTargetPlayerIndex]; // L: 9873
+ DynamicObject.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); // L: 9874
+ }
+
+ } // L: 9876
}
diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java
index 8be1049964..9be4257c58 100644
--- a/runescape-client/src/main/java/class83.java
+++ b/runescape-client/src/main/java/class83.java
@@ -5,66 +5,84 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cm")
public enum class83 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "Lcm;"
)
- field1088(0, -1),
+ field1074(0, -1),
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Lcm;"
+ )
+ field1084(1, 2),
@ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "Lcm;"
)
- field1083(1, 2),
- @ObfuscatedName("l")
+ field1075(2, 3),
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "Lcm;"
)
- field1084(2, 3),
- @ObfuscatedName("k")
+ field1077(3, 4),
+ @ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Lcm;"
)
- field1087(3, 4),
- @ObfuscatedName("a")
+ field1078(4, 5),
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "Lcm;"
)
- field1086(4, 5),
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "Lcm;"
- )
- field1092(5, 6);
+ field1079(5, 6);
- @ObfuscatedName("n")
- @Export("cacheSubPaths")
- static String[] cacheSubPaths;
- @ObfuscatedName("he")
- @Export("regionMapArchiveIds")
- static int[] regionMapArchiveIds;
- @ObfuscatedName("p")
+ @ObfuscatedName("g")
@ObfuscatedGetter(
- intValue = 403650745
+ intValue = -91214193
)
- final int field1090;
- @ObfuscatedName("s")
+ final int field1080;
+ @ObfuscatedName("w")
@ObfuscatedGetter(
- intValue = 105353159
+ intValue = -1146405405
)
- final int field1089;
+ final int field1081;
class83(int var3, int var4) {
- this.field1090 = var3; // L: 21
- this.field1089 = var4; // L: 22
+ this.field1080 = var3; // L: 21
+ this.field1081 = var4; // L: 22
} // L: 23
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field1089; // L: 27
+ return this.field1081; // L: 27
+ }
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "(I)V",
+ garbageValue = "155608234"
+ )
+ public static void method2118() {
+ if (KeyHandler.KeyHandler_instance != null) { // L: 167
+ synchronized(KeyHandler.KeyHandler_instance) { // L: 168
+ KeyHandler.KeyHandler_instance = null; // L: 169
+ } // L: 170
+ }
+
+ } // L: 172
+
+ @ObfuscatedName("s")
+ @ObfuscatedSignature(
+ descriptor = "(CI)Z",
+ garbageValue = "563268449"
+ )
+ @Export("isDigit")
+ public static boolean isDigit(char var0) {
+ return var0 >= '0' && var0 <= '9'; // L: 159
}
}
diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java
index 17b838eac0..dab7d6022d 100644
--- a/runescape-client/src/main/java/class9.java
+++ b/runescape-client/src/main/java/class9.java
@@ -3,106 +3,290 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("v")
+@ObfuscatedName("i")
public class class9 implements MouseWheel {
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
- descriptor = "Lv;"
+ descriptor = "Li;"
)
- public static final class9 field32;
+ public static final class9 field36;
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "Li;"
+ )
+ public static final class9 field30;
@ObfuscatedName("q")
@ObfuscatedSignature(
- descriptor = "Lv;"
+ descriptor = "Li;"
)
- public static final class9 field40;
- @ObfuscatedName("l")
- @ObfuscatedSignature(
- descriptor = "Lv;"
- )
- static final class9 field36;
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "Lv;"
- )
- static final class9 field34;
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "Lv;"
- )
- static final class9 field37;
- @ObfuscatedName("y")
- @ObfuscatedGetter(
- intValue = -1322409525
- )
- @Export("Interpreter_stringStackSize")
- static int Interpreter_stringStackSize;
+ static final class9 field31;
@ObfuscatedName("f")
@ObfuscatedSignature(
- descriptor = "Lit;"
+ descriptor = "Li;"
)
- @Export("worldMapEvent")
- static WorldMapEvent worldMapEvent;
- @ObfuscatedName("m")
+ static final class9 field39;
+ @ObfuscatedName("j")
+ @ObfuscatedSignature(
+ descriptor = "Li;"
+ )
+ static final class9 field33;
+ @ObfuscatedName("iq")
+ @ObfuscatedSignature(
+ descriptor = "[Lqe;"
+ )
+ @Export("mapDotSprites")
+ static SpritePixels[] mapDotSprites;
+ @ObfuscatedName("e")
@ObfuscatedGetter(
- intValue = -941198057
+ intValue = -145879233
)
- int field33;
- @ObfuscatedName("p")
- String field38;
- @ObfuscatedName("s")
- boolean field39;
- @ObfuscatedName("r")
- boolean field35;
+ int field29;
+ @ObfuscatedName("g")
+ String field35;
+ @ObfuscatedName("w")
+ boolean field40;
+ @ObfuscatedName("y")
+ boolean field37;
static {
- field32 = new class9(0, "POST", true, true); // L: 6
- field40 = new class9(1, "GET", true, false); // L: 7
- field36 = new class9(2, "PUT", false, true); // L: 8
- field34 = new class9(3, "PATCH", false, true); // L: 9
- field37 = new class9(4, "DELETE", false, true); // L: 10
+ field36 = new class9(0, "POST", true, true); // L: 6
+ field30 = new class9(1, "GET", true, false); // L: 7
+ field31 = new class9(2, "PUT", false, true); // L: 8
+ field39 = new class9(3, "PATCH", false, true); // L: 9
+ field33 = new class9(4, "DELETE", false, true); // L: 10
}
class9(int var1, String var2, boolean var3, boolean var4) {
- this.field33 = var1; // L: 17
- this.field38 = var2; // L: 18
- this.field39 = var3; // L: 19
- this.field35 = var4; // L: 20
+ this.field29 = var1; // L: 17
+ this.field35 = var2; // L: 18
+ this.field40 = var3; // L: 19
+ this.field37 = var4; // L: 20
} // L: 21
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "30"
+ garbageValue = "-100"
)
@Export("rsOrdinal")
public int rsOrdinal() {
- return this.field33; // L: 37
+ return this.field29; // L: 37
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-29760861"
+ garbageValue = "1680698316"
)
- boolean method76() {
- return this.field39; // L: 24
+ boolean method61() {
+ return this.field40; // L: 24
}
- @ObfuscatedName("a")
+ @ObfuscatedName("j")
@ObfuscatedSignature(
- descriptor = "(B)Ljava/lang/String;",
- garbageValue = "-128"
+ descriptor = "(S)Ljava/lang/String;",
+ garbageValue = "311"
)
- public String method67() {
- return this.field38; // L: 28
+ public String method64() {
+ return this.field35; // L: 28
}
- @ObfuscatedName("m")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "(I)Z",
- garbageValue = "-791619446"
+ garbageValue = "-1657994418"
)
- boolean method68() {
- return this.field35; // L: 32
+ boolean method62() {
+ return this.field37; // L: 32
}
+
+ @ObfuscatedName("ge")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1270247165"
+ )
+ @Export("getWindowedMode")
+ static int getWindowedMode() {
+ return Client.isResizable ? 2 : 1; // L: 4367
+ }
+
+ @ObfuscatedName("jj")
+ @ObfuscatedSignature(
+ descriptor = "(Lkb;III)V",
+ garbageValue = "2138979483"
+ )
+ @Export("Widget_addToMenu")
+ static final void Widget_addToMenu(Widget var0, int var1, int var2) {
+ if (var0.buttonType == 1) { // L: 10891
+ class4.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10892
+ }
+
+ String var3;
+ if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10895
+ var3 = WorldMapIcon_0.Widget_getSpellActionName(var0); // L: 10896
+ if (var3 != null) { // L: 10897
+ class4.insertMenuItemNoShift(var3, class122.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10898
+ }
+ }
+
+ if (var0.buttonType == 3) { // L: 10902
+ class4.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10903
+ }
+
+ if (var0.buttonType == 4) { // L: 10906
+ class4.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10907
+ }
+
+ if (var0.buttonType == 5) { // L: 10910
+ class4.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10911
+ }
+
+ if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10914
+ class4.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10915
+ }
+
+ int var4;
+ int var13;
+ if (var0.type == 2) { // L: 10918
+ var13 = 0; // L: 10919
+
+ for (var4 = 0; var4 < var0.height; ++var4) { // L: 10920
+ for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10921
+ int var6 = (var0.paddingX + 32) * var15; // L: 10922
+ int var7 = (var0.paddingY + 32) * var4; // L: 10923
+ if (var13 < 20) { // L: 10924
+ var6 += var0.inventoryXOffsets[var13]; // L: 10925
+ var7 += var0.inventoryYOffsets[var13]; // L: 10926
+ }
+
+ if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 10928
+ Client.dragItemSlotDestination = var13; // L: 10929
+ class161.hoveredItemContainer = var0; // L: 10930
+ if (var0.itemIds[var13] > 0) { // L: 10931
+ ItemComposition var8 = EnumComposition.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10932
+ if (Client.isItemSelected == 1 && class120.method2759(class124.getWidgetFlags(var0))) { // L: 10933
+ if (var0.id != ModeWhere.selectedItemWidget || var13 != EnumComposition.selectedItemSlot) { // L: 10934
+ class4.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class122.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10935
+ }
+ } else if (Client.isSpellSelected && class120.method2759(class124.getWidgetFlags(var0))) { // L: 10939
+ if ((HealthBar.selectedSpellFlags & 16) == 16) { // L: 10940
+ class4.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class122.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10941
+ }
+ } else {
+ String[] var9 = var8.inventoryActions; // L: 10946
+ int var10 = -1; // L: 10947
+ if (Client.shiftClickDrop) { // L: 10948
+ boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10951
+ if (var11) { // L: 10953
+ var10 = var8.getShiftClickIndex(); // L: 10954
+ }
+ }
+
+ int var16;
+ if (class120.method2759(class124.getWidgetFlags(var0))) { // L: 10957
+ for (var16 = 4; var16 >= 3; --var16) { // L: 10958
+ if (var16 != var10) { // L: 10959
+ class150.addWidgetItemMenuItem(var0, var8, var13, var16, false); // L: 10960
+ }
+ }
+ }
+
+ if (FontName.method7386(class124.getWidgetFlags(var0))) { // L: 10963
+ class4.insertMenuItemNoShift("Use", class122.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10964
+ }
+
+ if (class120.method2759(class124.getWidgetFlags(var0))) { // L: 10967
+ for (var16 = 2; var16 >= 0; --var16) { // L: 10968
+ if (var10 != var16) { // L: 10969
+ class150.addWidgetItemMenuItem(var0, var8, var13, var16, false); // L: 10970
+ }
+ }
+
+ if (var10 >= 0) { // L: 10972
+ class150.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10973
+ }
+ }
+
+ var9 = var0.itemActions; // L: 10976
+ if (var9 != null) { // L: 10977
+ for (var16 = 4; var16 >= 0; --var16) { // L: 10978
+ if (var9[var16] != null) { // L: 10979
+ byte var12 = 0; // L: 10980
+ if (var16 == 0) { // L: 10981
+ var12 = 39;
+ }
+
+ if (var16 == 1) { // L: 10982
+ var12 = 40;
+ }
+
+ if (var16 == 2) { // L: 10983
+ var12 = 41;
+ }
+
+ if (var16 == 3) { // L: 10984
+ var12 = 42;
+ }
+
+ if (var16 == 4) { // L: 10985
+ var12 = 43;
+ }
+
+ class4.insertMenuItemNoShift(var9[var16], class122.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10986
+ }
+ }
+ }
+
+ class4.insertMenuItemNoShift("Examine", class122.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10991
+ }
+ }
+ }
+
+ ++var13; // L: 10996
+ }
+ }
+ }
+
+ if (var0.isIf3) { // L: 11000
+ if (Client.isSpellSelected) { // L: 11001
+ if (class67.method1885(class124.getWidgetFlags(var0)) && (HealthBar.selectedSpellFlags & 32) == 32) { // L: 11002
+ class4.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11003
+ }
+ } else {
+ for (var13 = 9; var13 >= 5; --var13) { // L: 11008
+ String var14 = class14.method157(var0, var13); // L: 11009
+ if (var14 != null) { // L: 11010
+ class4.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 11011
+ }
+ }
+
+ var3 = WorldMapIcon_0.Widget_getSpellActionName(var0); // L: 11015
+ if (var3 != null) { // L: 11016
+ class4.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11017
+ }
+
+ for (var4 = 4; var4 >= 0; --var4) { // L: 11020
+ String var5 = class14.method157(var0, var4); // L: 11021
+ if (var5 != null) { // L: 11022
+ class268.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11023
+ }
+ }
+
+ if (FontName.method7385(class124.getWidgetFlags(var0))) { // L: 11027
+ class4.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11028
+ }
+ }
+ }
+
+ } // L: 11033
+
+ @ObfuscatedName("jm")
+ @ObfuscatedSignature(
+ descriptor = "(ZB)V",
+ garbageValue = "-112"
+ )
+ @Export("setTapToDrop")
+ static void setTapToDrop(boolean var0) {
+ Client.tapToDrop = var0; // L: 11036
+ } // L: 11037
}
diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java
index c539950e9c..e892dfc019 100644
--- a/runescape-client/src/main/java/class92.java
+++ b/runescape-client/src/main/java/class92.java
@@ -1,148 +1,34 @@
-import java.util.Date;
-import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-import netscape.javascript.JSObject;
-@ObfuscatedName("cw")
+@ObfuscatedName("cz")
public class class92 {
- @ObfuscatedName("by")
- @Export("otp")
- static String otp;
- @ObfuscatedName("cb")
- static boolean field1273;
- @ObfuscatedName("ei")
+ @ObfuscatedName("e")
@ObfuscatedSignature(
- descriptor = "Lle;"
+ descriptor = "(B)V",
+ garbageValue = "-35"
)
- @Export("archive18")
- static Archive archive18;
+ public static void method2389() {
+ HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89
+ HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90
+ } // L: 91
- @ObfuscatedName("q")
+ @ObfuscatedName("lr")
@ObfuscatedSignature(
- descriptor = "(IB)Lki;",
- garbageValue = "-94"
+ descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
+ garbageValue = "38"
)
- @Export("getWidget")
- public static Widget getWidget(int var0) {
- int var1 = var0 >> 16; // L: 229
- int var2 = var0 & 65535; // L: 230
- if (NetSocket.Widget_interfaceComponents[var1] == null || NetSocket.Widget_interfaceComponents[var1][var2] == null) { // L: 231
- boolean var3 = WorldMapDecoration.loadInterface(var1); // L: 232
- if (!var3) { // L: 233
- return null;
+ static String method2388(String var0) {
+ PlayerType[] var1 = SoundSystem.PlayerType_values(); // L: 12443
+
+ for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12444
+ PlayerType var3 = var1[var2]; // L: 12445
+ if (var3.modIcon != -1 && var0.startsWith(SecureRandomCallable.method2066(var3.modIcon))) { // L: 12447 12448
+ var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12449
+ break;
}
}
- return NetSocket.Widget_interfaceComponents[var1][var2]; // L: 235
+ return var0; // L: 12456
}
-
- @ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(III)V",
- garbageValue = "-1946484556"
- )
- public static void method2372(int var0, int var1) {
- VarbitComposition var2 = class1.method9(var0); // L: 33
- int var3 = var2.baseVar; // L: 34
- int var4 = var2.startBit; // L: 35
- int var5 = var2.endBit; // L: 36
- int var6 = Varps.Varps_masks[var5 - var4]; // L: 37
- if (var1 < 0 || var1 > var6) { // L: 38
- var1 = 0;
- }
-
- var6 <<= var4; // L: 39
- Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40
- } // L: 41
-
- @ObfuscatedName("k")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/CharSequence;I)I",
- garbageValue = "379207215"
- )
- public static int method2373(CharSequence var0) {
- return class202.method4016(var0, 10, true);
- }
-
- @ObfuscatedName("a")
- @ObfuscatedSignature(
- descriptor = "(II)I",
- garbageValue = "1906975961"
- )
- @Export("Messages_getHistorySize")
- static int Messages_getHistorySize(int var0) {
- ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44
- return var1 == null ? 0 : var1.size(); // L: 45 46
- }
-
- @ObfuscatedName("m")
- @ObfuscatedSignature(
- descriptor = "(IIIB)I",
- garbageValue = "-127"
- )
- public static int method2376(int var0, int var1, int var2) {
- int var3 = class147.method3000(var2 - var1 + 1); // L: 68
- var3 <<= var1; // L: 69
- var0 |= var3; // L: 70
- return var0; // L: 71
- }
-
- @ObfuscatedName("h")
- @ObfuscatedSignature(
- descriptor = "(I)V",
- garbageValue = "-1780450470"
- )
- public static void method2370() {
- ItemComposition.ItemDefinition_cached.clear(); // L: 541
- ItemComposition.ItemDefinition_cachedModels.clear(); // L: 542
- ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 543
- } // L: 544
-
- @ObfuscatedName("fb")
- @ObfuscatedSignature(
- descriptor = "(I)J",
- garbageValue = "-1003322759"
- )
- static long method2374() {
- return Client.field611; // L: 3049
- }
-
- @ObfuscatedName("lg")
- @ObfuscatedSignature(
- descriptor = "(Ljava/lang/String;B)V",
- garbageValue = "-34"
- )
- static void method2377(String var0) {
- Client.field662 = var0; // L: 12542
-
- try {
- String var1 = class82.client.getParameter(Integer.toString(18)); // L: 12544
- String var2 = class82.client.getParameter(Integer.toString(13)); // L: 12545
- String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12546
- String var5;
- if (var0.length() == 0) { // L: 12547
- var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
- } else {
- String var4 = var3 + "; Expires="; // L: 12549
- long var6 = class113.method2624() + 94608000000L; // L: 12551
- Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 12553
- int var8 = Calendar.Calendar_calendar.get(7); // L: 12554
- int var9 = Calendar.Calendar_calendar.get(5); // L: 12555
- int var10 = Calendar.Calendar_calendar.get(2); // L: 12556
- int var11 = Calendar.Calendar_calendar.get(1); // L: 12557
- int var12 = Calendar.Calendar_calendar.get(11); // L: 12558
- int var13 = Calendar.Calendar_calendar.get(12); // L: 12559
- int var14 = Calendar.Calendar_calendar.get(13); // L: 12560
- var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 12561
- var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 12563
- }
-
- Client var16 = class82.client; // L: 12565
- var5 = "document.cookie=\"" + var3 + "\""; // L: 12566
- JSObject.getWindow(var16).eval(var5); // L: 12569
- } catch (Throwable var15) { // L: 12572
- }
-
- } // L: 12573
}
diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java
index a5f3790b7c..37fa997647 100644
--- a/runescape-client/src/main/java/class93.java
+++ b/runescape-client/src/main/java/class93.java
@@ -3,111 +3,151 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
-@ObfuscatedName("cf")
+@ObfuscatedName("cu")
public class class93 {
- @ObfuscatedName("i")
- @ObfuscatedSignature(
- descriptor = "Llp;"
- )
- @Export("Widget_fontsArchive")
- static AbstractArchive Widget_fontsArchive;
- @ObfuscatedName("bd")
- static String field1280;
- @ObfuscatedName("o")
- @ObfuscatedGetter(
- intValue = -504702499
- )
- int field1281;
- @ObfuscatedName("q")
- @ObfuscatedGetter(
- intValue = 517872849
- )
- int field1276;
- @ObfuscatedName("l")
- @ObfuscatedGetter(
- intValue = -1558357321
- )
- int field1278;
@ObfuscatedName("k")
@ObfuscatedGetter(
- intValue = -1244522073
+ intValue = 337729441
+ )
+ @Export("cacheGamebuild")
+ static int cacheGamebuild;
+ @ObfuscatedName("c")
+ @ObfuscatedGetter(
+ intValue = 722950439
+ )
+ int field1280;
+ @ObfuscatedName("v")
+ @ObfuscatedGetter(
+ intValue = -1232104347
+ )
+ int field1283;
+ @ObfuscatedName("q")
+ @ObfuscatedGetter(
+ intValue = 375330431
)
int field1279;
+ @ObfuscatedName("f")
+ @ObfuscatedGetter(
+ intValue = -2011383933
+ )
+ int field1281;
class93(int var1, int var2, int var3, int var4) {
- this.field1281 = var1; // L: 10
- this.field1276 = var2; // L: 11
- this.field1278 = var3; // L: 12
- this.field1279 = var4; // L: 13
+ this.field1280 = var1; // L: 10
+ this.field1283 = var2; // L: 11
+ this.field1279 = var3; // L: 12
+ this.field1281 = var4; // L: 13
} // L: 14
- @ObfuscatedName("o")
+ @ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "279766476"
+ garbageValue = "-376919384"
)
- int method2379() {
- return this.field1281; // L: 17
+ int method2391() {
+ return this.field1280; // L: 17
+ }
+
+ @ObfuscatedName("v")
+ @ObfuscatedSignature(
+ descriptor = "(I)I",
+ garbageValue = "1976546197"
+ )
+ int method2392() {
+ return this.field1283; // L: 21
}
@ObfuscatedName("q")
- @ObfuscatedSignature(
- descriptor = "(I)I",
- garbageValue = "-1644349592"
- )
- int method2380() {
- return this.field1276; // L: 21
- }
-
- @ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(B)I",
- garbageValue = "0"
+ garbageValue = "1"
)
- int method2389() {
- return this.field1278; // L: 25
+ int method2400() {
+ return this.field1279; // L: 25
}
- @ObfuscatedName("k")
+ @ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)I",
- garbageValue = "1608300695"
+ garbageValue = "-936836113"
)
- int method2382() {
- return this.field1279; // L: 29
+ int method2393() {
+ return this.field1281; // L: 29
}
- @ObfuscatedName("o")
+ @ObfuscatedName("v")
@ObfuscatedSignature(
- descriptor = "(Llp;Llp;ZI)V",
- garbageValue = "-14189171"
+ descriptor = "(Llc;II)V",
+ garbageValue = "-222305285"
)
- public static void method2392(AbstractArchive var0, AbstractArchive var1, boolean var2) {
- ObjectComposition.ObjectDefinition_archive = var0; // L: 73
- ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74
- ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75
- } // L: 76
+ static void method2403(Archive var0, int var1) {
+ if (var0.field3990) { // L: 62
+ if (var1 <= NetCache.field4031) { // L: 63
+ throw new RuntimeException(""); // L: 64
+ }
- @ObfuscatedName("it")
- @ObfuscatedSignature(
- descriptor = "(IIIII)V",
- garbageValue = "-536546120"
- )
- @Export("selectSpell")
- static void selectSpell(int var0, int var1, int var2, int var3) {
- Widget var4 = ApproximateRouteStrategy.getWidgetChild(var0, var1); // L: 9770
- if (var4 != null && var4.onTargetEnter != null) { // L: 9771
- ScriptEvent var5 = new ScriptEvent(); // L: 9772
- var5.widget = var4; // L: 9773
- var5.args = var4.onTargetEnter; // L: 9774
- class144.runScriptEvent(var5); // L: 9775
+ if (var1 < NetCache.field4032) { // L: 66
+ NetCache.field4032 = var1; // L: 67
+ }
+ } else {
+ if (var1 >= NetCache.field4032) { // L: 71
+ throw new RuntimeException(""); // L: 72
+ }
+
+ if (var1 > NetCache.field4031) { // L: 74
+ NetCache.field4031 = var1; // L: 75
+ }
}
- Client.selectedSpellItemId = var3; // L: 9777
- Client.isSpellSelected = true; // L: 9778
- ArchiveDiskActionHandler.selectedSpellWidget = var0; // L: 9779
- Client.selectedSpellChildIndex = var1; // L: 9780
- class113.selectedSpellFlags = var2; // L: 9781
- GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 9782
- } // L: 9783
+ if (KitDefinition.field1862 != null) { // L: 78
+ DirectByteArrayCopier.method5512(var0, var1); // L: 79
+ } else {
+ ClanChannel.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 82
+ NetCache.NetCache_archives[var1] = var0; // L: 83
+ }
+ } // L: 80 84
+
+ @ObfuscatedName("f")
+ @ObfuscatedSignature(
+ descriptor = "([BB)V",
+ garbageValue = "100"
+ )
+ @Export("ByteArrayPool_release")
+ public static synchronized void ByteArrayPool_release(byte[] var0) {
+ if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4207) { // L: 98
+ ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 99
+ } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4208) { // L: 102
+ ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 103
+ } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4209) { // L: 106
+ ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 107
+ } else if (var0.length == 30000 && ByteArrayPool.field4216 < ByteArrayPool.field4210) { // L: 110
+ ByteArrayPool.field4214[++ByteArrayPool.field4216 - 1] = var0; // L: 111
+ } else {
+ if (class464.ByteArrayPool_arrays != null) { // L: 114
+ for (int var1 = 0; var1 < Canvas.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 115
+ if (var0.length == Canvas.ByteArrayPool_alternativeSizes[var1] && class17.ByteArrayPool_altSizeArrayCounts[var1] < class464.ByteArrayPool_arrays[var1].length) { // L: 116
+ class464.ByteArrayPool_arrays[var1][class17.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 117
+ return; // L: 118
+ }
+ }
+ }
+
+ }
+ } // L: 100 104 108 112 122
+
+ @ObfuscatedName("az")
+ @ObfuscatedSignature(
+ descriptor = "([BIII)I",
+ garbageValue = "-769795107"
+ )
+ public static int method2404(byte[] var0, int var1, int var2) {
+ int var3 = -1; // L: 47
+
+ for (int var4 = var1; var4 < var2; ++var4) { // L: 48
+ var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49
+ }
+
+ var3 = ~var3; // L: 51
+ return var3; // L: 52
+ }
}
diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java b/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java
index 9524b6ba63..3a0aa1a4fc 100644
--- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java
+++ b/runescape-client/src/main/java/com/jagex/oldscape/pub/OtlTokenResponse.java
@@ -7,4 +7,8 @@ public interface OtlTokenResponse {
boolean isSuccess();
String getToken();
+
+ String getAccessToken();
+
+ String getRefreshToken();
}