Merge pull request #2699 from ThatGamerBlue/190

chore: rev 190

buildSrc/src/main/kotlin/Dependencies.kt

@@ -27,8 +27,8 @@ object ProjectVersions {
     const val launcherVersion = "2.2.0"
     const val rlVersion = "1.6.19"
 
-    const val openosrsVersion = "3.3.7"
+    const val openosrsVersion = "3.3.8"
 
-    const val rsversion = 189
+    const val rsversion = 190
     const val cacheversion = 165
 }

runescape-client/src/main/java/AbstractArchive.java

@@ -4,81 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iy")
+@ObfuscatedName("ic")
 @Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Lmw;"
+		signature = "Lmu;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("a")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1088785149
+		intValue = -1465326177
 	)
-	static int field3143;
+	static int field3177;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1667499623
+		intValue = 307318581
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lmj;"
+		signature = "Lmh;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "[Lmj;"
+		signature = "[Lmh;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@Export("files")
 	Object[][] files;
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1296799789
+		intValue = 981186733
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
 	@Export("shallowFiles")
 	boolean shallowFiles;
 
 	static {
 		gzipDecompressor = new GZipDecompressor();
-		field3143 = 0;
+		field3177 = 0;
 	}
 
 	AbstractArchive(boolean var1, boolean var2) {
@@ -86,15 +86,15 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BB)V",
-		garbageValue = "32768"
+		garbageValue = "-101"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
-		this.hash = GrandExchangeOfferUnitPriceComparator.method225(var1, var1.length);
+		this.hash = FloorOverlayDefinition.method4936(var1, var1.length);
-		Buffer var2 = new Buffer(class217.decompressBytes(var1));
+		Buffer var2 = new Buffer(Coord.decompressBytes(var1));
 		int var3 = var2.readUnsignedByte();
 		if (var3 >= 5 && var3 <= 7) {
 			if (var3 >= 6) {
@@ -103,7 +103,7 @@ public abstract class AbstractArchive {
 
 			int var4 = var2.readUnsignedByte();
 			if (var3 >= 7) {
-				this.groupCount = var2.method5778();
+				this.groupCount = var2.method5733();
 			} else {
 				this.groupCount = var2.readUnsignedShort();
 			}
@@ -114,7 +114,7 @@ public abstract class AbstractArchive {
 			int var7;
 			if (var3 >= 7) {
 				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupIds[var7] = var5 += var2.method5778();
+					this.groupIds[var7] = var5 += var2.method5733();
 					if (this.groupIds[var7] > var6) {
 						var6 = this.groupIds[var7];
 					}
@@ -170,7 +170,7 @@ public abstract class AbstractArchive {
 					this.fileIds[var8] = new int[var9];
 
 					for (var11 = 0; var11 < var9; ++var11) {
-						var12 = this.fileIds[var8][var11] = var5 += var2.method5778();
+						var12 = this.fileIds[var8][var11] = var5 += var2.method5733();
 						if (var12 > var10) {
 							var10 = var12;
 						}
@@ -219,29 +219,29 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "-11"
+		garbageValue = "479482423"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(IIB)[B",
+		signature = "(III)[B",
-		garbageValue = "-30"
+		garbageValue = "1860640327"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
 		return this.takeFileEncrypted(var1, var2, (int[])null);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(II[II)[B",
-		garbageValue = "688237624"
+		garbageValue = "-1226634846"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
@@ -257,7 +257,7 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var5 = class39.method644(this.files[var1][var2], false);
+			byte[] var5 = FloorUnderlayDefinition.method4613(this.files[var1][var2], false);
 			if (this.shallowFiles) {
 				this.files[var1][var2] = null;
 			}
@@ -268,10 +268,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "1871586288"
+		garbageValue = "1957538709"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
@@ -289,12 +289,12 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-700946668"
+		garbageValue = "-2058273834"
 	)
-	public boolean method4251(int var1) {
+	public boolean method4359(int var1) {
 		if (this.files.length == 1) {
 			return this.tryLoadFile(0, var1);
 		} else if (this.files[var1].length == 1) {
@@ -304,10 +304,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "-74"
+		garbageValue = "1896348837"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
@@ -319,10 +319,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "2004742407"
+		garbageValue = "0"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
@@ -341,20 +341,20 @@ public abstract class AbstractArchive {
 		return var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(II)I",
-		garbageValue = "9"
+		garbageValue = "-1350822089"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		return this.groups[var1] != null ? 100 : 0;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(II)[B",
-		garbageValue = "-197924565"
+		garbageValue = "1718789334"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
@@ -367,10 +367,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(III)[B",
-		garbageValue = "1361179955"
+		garbageValue = "490044156"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
@@ -386,17 +386,17 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var4 = class39.method644(this.files[var1][var2], false);
+			byte[] var4 = FloorUnderlayDefinition.method4613(this.files[var1][var2], false);
 			return var4;
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(IB)[B",
+		signature = "(II)[B",
-		garbageValue = "100"
+		garbageValue = "1362853135"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
@@ -409,49 +409,49 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "-42"
+		garbageValue = "-1560066319"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(II)[I",
+		signature = "(IB)[I",
-		garbageValue = "1090009385"
+		garbageValue = "-56"
 	)
 	@Export("getGroupFileIds")
 	public int[] getGroupFileIds(int var1) {
 		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(II)I",
-		garbageValue = "60"
+		garbageValue = "-888140327"
 	)
 	@Export("getGroupFileCount")
 	public int getGroupFileCount(int var1) {
 		return this.files[var1].length;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-30"
+		garbageValue = "-763058439"
 	)
 	@Export("getGroupCount")
 	public int getGroupCount() {
 		return this.files.length;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "504262227"
+		garbageValue = "-1760033757"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
@@ -461,10 +461,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-1058828801"
+		garbageValue = "-546235261"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
@@ -474,10 +474,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "3"
+		garbageValue = "1"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
@@ -491,10 +491,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I[II)Z",
-		garbageValue = "1499207460"
+		garbageValue = "-1692394825"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
@@ -518,14 +518,14 @@ public abstract class AbstractArchive {
 			} else {
 				byte[] var21;
 				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
-					var21 = class39.method644(this.groups[var1], false);
+					var21 = FloorUnderlayDefinition.method4613(this.groups[var1], false);
 				} else {
-					var21 = class39.method644(this.groups[var1], true);
+					var21 = FloorUnderlayDefinition.method4613(this.groups[var1], true);
 					Buffer var8 = new Buffer(var21);
 					var8.xteaDecrypt(var2, 5, var8.array.length);
 				}
 
-				byte[] var25 = class217.decompressBytes(var21);
+				byte[] var25 = Coord.decompressBytes(var21);
 				if (this.releaseGroups) {
 					this.groups[var1] = null;
 				}
@@ -535,7 +535,7 @@ public abstract class AbstractArchive {
 					int var9 = var25.length;
 					--var9;
 					var10 = var25[var9] & 255;
-					var9 -= var3 * var10 * 4;
+					var9 -= var10 * var3 * 4;
 					Buffer var11 = new Buffer(var25);
 					int[] var12 = new int[var3];
 					var11.offset = var9;
@@ -551,10 +551,10 @@ public abstract class AbstractArchive {
 						}
 					}
 
-					byte[][] var23 = new byte[var3][];
+					byte[][] var22 = new byte[var3][];
 
 					for (var14 = 0; var14 < var3; ++var14) {
-						var23[var14] = new byte[var12[var14]];
+						var22[var14] = new byte[var12[var14]];
 						var12[var14] = 0;
 					}
 
@@ -567,7 +567,7 @@ public abstract class AbstractArchive {
 
 						for (var17 = 0; var17 < var3; ++var17) {
 							var16 += var11.readInt();
-							System.arraycopy(var25, var14, var23[var17], var12[var17], var16);
+							System.arraycopy(var25, var14, var22[var17], var12[var17], var16);
 							var12[var17] += var16;
 							var14 += var16;
 						}
@@ -576,7 +576,7 @@ public abstract class AbstractArchive {
 					for (var15 = 0; var15 < var3; ++var15) {
 						if (!this.shallowFiles) {
 							var17 = var4[var15];
-							byte[] var19 = var23[var15];
+							byte[] var19 = var22[var15];
 							Object var18;
 							if (var19 == null) {
 								var18 = null;
@@ -590,7 +590,7 @@ public abstract class AbstractArchive {
 
 							var5[var17] = var18;
 						} else {
-							var5[var4[var15]] = var23[var15];
+							var5[var4[var15]] = var22[var15];
 						}
 					}
 				} else if (!this.shallowFiles) {
@@ -616,109 +616,189 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;S)I",
+		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "-10732"
+		garbageValue = "-1113782685"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
 		var1 = var1.toLowerCase();
-		return this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		return this.groupNameHashTable.get(class219.hashString(var1));
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
 		signature = "(ILjava/lang/String;I)I",
-		garbageValue = "374626728"
+		garbageValue = "1362853135"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
 		var2 = var2.toLowerCase();
-		return this.fileNameHashTables[var1].get(HealthBarDefinition.hashString(var2));
+		return this.fileNameHashTables[var1].get(class219.hashString(var2));
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "1971024882"
+		garbageValue = "-1310066556"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		int var3 = this.groupNameHashTable.get(class219.hashString(var1));
 		if (var3 < 0) {
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2));
+			int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2));
 			return var4 >= 0;
 		}
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;Ljava/lang/String;I)[B",
-		garbageValue = "-1226254785"
+		garbageValue = "-222408314"
 	)
 	@Export("takeFileByNames")
 	public byte[] takeFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		int var3 = this.groupNameHashTable.get(class219.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2));
+		int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2));
 		return this.takeFile(var3, var4);
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "-612487532"
+		garbageValue = "-778364429"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		int var3 = this.groupNameHashTable.get(class219.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2));
+		int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2));
 		return this.tryLoadFile(var3, var4);
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;S)Z",
+		signature = "(Ljava/lang/String;B)Z",
-		garbageValue = "5353"
+		garbageValue = "-81"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		int var2 = this.groupNameHashTable.get(class219.hashString(var1));
 		return this.tryLoadGroup(var2);
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "904314096"
+		garbageValue = "-1143877885"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		int var2 = this.groupNameHashTable.get(class219.hashString(var1));
 		if (var2 >= 0) {
 			this.loadRegionFromGroup(var2);
 		}
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)I",
+		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "-63"
+		garbageValue = "-252379742"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1));
+		int var2 = this.groupNameHashTable.get(class219.hashString(var1));
 		return this.groupLoadPercent(var2);
 	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(Lkn;IIIIIII)V",
+		garbageValue = "-1571118584"
+	)
+	@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) {
+			Tiles.Tiles_renderFlags[var1][var2][var3] = 0;
+
+			while (true) {
+				var7 = var0.readUnsignedByte();
+				if (var7 == 0) {
+					if (var1 == 0) {
+						Tiles.Tiles_heights[0][var2][var3] = -PacketBufferNode.method3750(var4 + var2 + 932731, var3 + 556238 + var5) * 8;
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
+					}
+					break;
+				}
+
+				if (var7 == 1) {
+					int var8 = var0.readUnsignedByte();
+					if (var8 == 1) {
+						var8 = 0;
+					}
+
+					if (var1 == 0) {
+						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8;
+					}
+					break;
+				}
+
+				if (var7 <= 49) {
+					Tiles.field524[var1][var2][var3] = var0.readByte();
+					Tiles.field525[var1][var2][var3] = (byte)((var7 - 2) / 4);
+					WorldMapLabel.field269[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
+				} else if (var7 <= 81) {
+					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49);
+				} else {
+					Tiles.field530[var1][var2][var3] = (byte)(var7 - 81);
+				}
+			}
+		} else {
+			while (true) {
+				var7 = var0.readUnsignedByte();
+				if (var7 == 0) {
+					break;
+				}
+
+				if (var7 == 1) {
+					var0.readUnsignedByte();
+					break;
+				}
+
+				if (var7 <= 49) {
+					var0.readUnsignedByte();
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("gr")
+	@ObfuscatedSignature(
+		signature = "(I)I",
+		garbageValue = "682759182"
+	)
+	static final int method4411() {
+		if (NetSocket.clientPreferences.roofsHidden) {
+			return TileItemPile.Client_plane;
+		} else {
+			int var0 = Language.getTileHeight(MouseHandler.cameraX, ObjectSound.cameraZ, TileItemPile.Client_plane);
+			return var0 - WorldMapSection3.cameraY < 800 && (Tiles.Tiles_renderFlags[TileItemPile.Client_plane][MouseHandler.cameraX >> 7][ObjectSound.cameraZ >> 7] & 4) != 0 ? TileItemPile.Client_plane : 3;
+		}
+	}
 }

runescape-client/src/main/java/AbstractByteArrayCopier.java

@@ -3,850 +3,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hi")
+@ObfuscatedName("hq")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)[B",
-		garbageValue = "1422436059"
+		garbageValue = "300747627"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "([BB)V",
-		garbageValue = "0"
+		garbageValue = "92"
 	)
 	@Export("set")
 	public abstract void set(byte[] var1);
-
-	@ObfuscatedName("gv")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZI)V",
-		garbageValue = "-411552883"
-	)
-	@Export("drawLoadingMessage")
-	static final void drawLoadingMessage(String var0, boolean var1) {
-		if (Client.showLoadingMessages) {
-			byte var2 = 4;
-			int var3 = var2 + 6;
-			int var4 = var2 + 6;
-			int var5 = WorldMapData_0.fontPlain12.lineWidth(var0, 250);
-			int var6 = WorldMapData_0.fontPlain12.lineCount(var0, 250) * 13;
-			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 0);
-			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215);
-			WorldMapData_0.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
-			int var7 = var3 - var2;
-			int var8 = var4 - var2;
-			int var9 = var2 + var5 + var2;
-			int var10 = var2 + var6 + var2;
-
-			for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) {
-				if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) {
-					Client.field679[var11] = true;
-				}
-			}
-
-			if (var1) {
-				class206.rasterProvider.drawFull(0, 0);
-			} else {
-				WorldMapScaleHandler.method848(var3, var4, var5, var6);
-			}
-
-		}
-	}
-
-	@ObfuscatedName("hn")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1582432822"
-	)
-	static void method4023() {
-		Client.menuOptionsCount = 0;
-		Client.isMenuOpen = false;
-	}
-
-	@ObfuscatedName("ij")
-	@ObfuscatedSignature(
-		signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V",
-		garbageValue = "2048227519"
-	)
-	@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) {
-			var2 -= 2000;
-		}
-
-		PacketBufferNode var8;
-		if (var2 == 1) {
-			Client.mouseCrossX = var6;
-			Client.mouseCrossY = var7;
-			Client.mouseCrossColor = 2;
-			Client.mouseCrossState = 0;
-			Client.destinationX = var0;
-			Client.destinationY = var1;
-			var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.method5610(Client.selectedItemSlot);
-			var8.packetBuffer.writeShortLE(WorldMapSection2.selectedItemWidget);
-			var8.packetBuffer.method5609(class89.baseY + var1);
-			var8.packetBuffer.method5609(var0 + class69.baseX);
-			var8.packetBuffer.method5609(var3);
-			var8.packetBuffer.method5609(FaceNormal.selectedItemId);
-			var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-			Client.packetWriter.addNode(var8);
-		} else if (var2 == 2) {
-			Client.mouseCrossX = var6;
-			Client.mouseCrossY = var7;
-			Client.mouseCrossColor = 2;
-			Client.mouseCrossState = 0;
-			Client.destinationX = var0;
-			Client.destinationY = var1;
-			var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.writeShort(Client.selectedSpellChildIndex);
-			var8.packetBuffer.writeInt(class7.selectedSpellWidget);
-			var8.packetBuffer.method5610(var3);
-			var8.packetBuffer.method5609(class89.baseY + var1);
-			var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-			var8.packetBuffer.method5609(var0 + class69.baseX);
-			Client.packetWriter.addNode(var8);
-		} else if (var2 == 3) {
-			Client.mouseCrossX = var6;
-			Client.mouseCrossY = var7;
-			Client.mouseCrossColor = 2;
-			Client.mouseCrossState = 0;
-			Client.destinationX = var0;
-			Client.destinationY = var1;
-			var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-			var8.packetBuffer.writeIntME(var0 + class69.baseX);
-			var8.packetBuffer.method5609(var3);
-			var8.packetBuffer.method5609(class89.baseY + var1);
-			Client.packetWriter.addNode(var8);
-		} else if (var2 == 4) {
-			Client.mouseCrossX = var6;
-			Client.mouseCrossY = var7;
-			Client.mouseCrossColor = 2;
-			Client.mouseCrossState = 0;
-			Client.destinationX = var0;
-			Client.destinationY = var1;
-			var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.writeShort(var3);
-			var8.packetBuffer.writeIntME(var0 + class69.baseX);
-			var8.packetBuffer.writeIntME(class89.baseY + var1);
-			var8.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-			Client.packetWriter.addNode(var8);
-		} else if (var2 == 5) {
-			Client.mouseCrossX = var6;
-			Client.mouseCrossY = var7;
-			Client.mouseCrossColor = 2;
-			Client.mouseCrossState = 0;
-			Client.destinationX = var0;
-			Client.destinationY = var1;
-			var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.method5610(var0 + class69.baseX);
-			var8.packetBuffer.writeIntME(class89.baseY + var1);
-			var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-			var8.packetBuffer.method5610(var3);
-			Client.packetWriter.addNode(var8);
-		} else if (var2 == 6) {
-			Client.mouseCrossX = var6;
-			Client.mouseCrossY = var7;
-			Client.mouseCrossColor = 2;
-			Client.mouseCrossState = 0;
-			Client.destinationX = var0;
-			Client.destinationY = var1;
-			var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.method5610(var3);
-			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-			var8.packetBuffer.writeShort(var0 + class69.baseX);
-			var8.packetBuffer.method5609(class89.baseY + var1);
-			Client.packetWriter.addNode(var8);
-		} else {
-			PacketBufferNode var9;
-			NPC var13;
-			if (var2 == 7) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.writeShort(Client.selectedItemSlot);
-					var9.packetBuffer.writeShort(FaceNormal.selectedItemId);
-					var9.packetBuffer.writeInt(WorldMapSection2.selectedItemWidget);
-					var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var9.packetBuffer.method5609(var3);
-					Client.packetWriter.addNode(var9);
-				}
-			} else if (var2 == 8) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var9.packetBuffer.writeInt(class7.selectedSpellWidget);
-					var9.packetBuffer.writeShort(Client.selectedSpellChildIndex);
-					var9.packetBuffer.writeShort(var3);
-					Client.packetWriter.addNode(var9);
-				}
-			} else if (var2 == 9) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.method5609(var3);
-					var9.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					Client.packetWriter.addNode(var9);
-				}
-			} else if (var2 == 10) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.writeShort(var3);
-					var9.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					Client.packetWriter.addNode(var9);
-				}
-			} else if (var2 == 11) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.method5610(var3);
-					var9.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					Client.packetWriter.addNode(var9);
-				}
-			} else if (var2 == 12) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var9.packetBuffer.method5609(var3);
-					Client.packetWriter.addNode(var9);
-				}
-			} else if (var2 == 13) {
-				var13 = Client.npcs[var3];
-				if (var13 != null) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher);
-					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var9.packetBuffer.writeShort(var3);
-					Client.packetWriter.addNode(var9);
-				}
-			} else {
-				Player var15;
-				if (var2 == 14) {
-					var15 = Client.players[var3];
-					if (var15 != null) {
-						Client.mouseCrossX = var6;
-						Client.mouseCrossY = var7;
-						Client.mouseCrossColor = 2;
-						Client.mouseCrossState = 0;
-						Client.destinationX = var0;
-						Client.destinationY = var1;
-						var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher);
-						var9.packetBuffer.method5610(FaceNormal.selectedItemId);
-						var9.packetBuffer.method5610(var3);
-						var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-						var9.packetBuffer.writeIntME(Client.selectedItemSlot);
-						var9.packetBuffer.writeInt(WorldMapSection2.selectedItemWidget);
-						Client.packetWriter.addNode(var9);
-					}
-				} else if (var2 == 15) {
-					var15 = Client.players[var3];
-					if (var15 != null) {
-						Client.mouseCrossX = var6;
-						Client.mouseCrossY = var7;
-						Client.mouseCrossColor = 2;
-						Client.mouseCrossState = 0;
-						Client.destinationX = var0;
-						Client.destinationY = var1;
-						var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher);
-						var9.packetBuffer.writeShort(var3);
-						var9.packetBuffer.method5617(class7.selectedSpellWidget);
-						var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-						var9.packetBuffer.method5610(Client.selectedSpellChildIndex);
-						Client.packetWriter.addNode(var9);
-					}
-				} else if (var2 == 16) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.method5610(FaceNormal.selectedItemId);
-					var8.packetBuffer.writeIntME(var3);
-					var8.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var8.packetBuffer.writeShortLE(WorldMapSection2.selectedItemWidget);
-					var8.packetBuffer.writeIntME(var0 + class69.baseX);
-					var8.packetBuffer.writeIntME(Client.selectedItemSlot);
-					var8.packetBuffer.method5609(class89.baseY + var1);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 17) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var8.packetBuffer.method5609(var3);
-					var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex);
-					var8.packetBuffer.writeShort(class89.baseY + var1);
-					var8.packetBuffer.method5617(class7.selectedSpellWidget);
-					var8.packetBuffer.writeIntME(var0 + class69.baseX);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 18) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.writeIntME(var3);
-					var8.packetBuffer.writeIntME(var0 + class69.baseX);
-					var8.packetBuffer.method5609(class89.baseY + var1);
-					var8.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 19) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.writeShort(class89.baseY + var1);
-					var8.packetBuffer.method5610(var0 + class69.baseX);
-					var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var8.packetBuffer.writeShort(var3);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 20) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var8.packetBuffer.method5609(var0 + class69.baseX);
-					var8.packetBuffer.method5610(class89.baseY + var1);
-					var8.packetBuffer.writeIntME(var3);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 21) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var8.packetBuffer.method5609(var3);
-					var8.packetBuffer.method5609(var0 + class69.baseX);
-					var8.packetBuffer.method5610(class89.baseY + var1);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 22) {
-					Client.mouseCrossX = var6;
-					Client.mouseCrossY = var7;
-					Client.mouseCrossColor = 2;
-					Client.mouseCrossState = 0;
-					Client.destinationX = var0;
-					Client.destinationY = var1;
-					var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher);
-					var8.packetBuffer.writeShort(var3);
-					var8.packetBuffer.method5610(class89.baseY + var1);
-					var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-					var8.packetBuffer.method5610(var0 + class69.baseX);
-					Client.packetWriter.addNode(var8);
-				} else if (var2 == 23) {
-					if (Client.isMenuOpen) {
-						GrandExchangeOfferWorldComparator.scene.setViewportWalking();
-					} else {
-						GrandExchangeOfferWorldComparator.scene.menuOpen(ScriptEvent.Client_plane, var0, var1, true);
-					}
-				} else {
-					PacketBufferNode var10;
-					Widget var16;
-					if (var2 == 24) {
-						var16 = MusicPatchNode.getWidget(var1);
-						boolean var11 = true;
-						if (var16.contentType > 0) {
-							var11 = WorldMapSectionType.method344(var16);
-						}
-
-						if (var11) {
-							var10 = FaceNormal.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
-							var10.packetBuffer.writeInt(var1);
-							Client.packetWriter.addNode(var10);
-						}
-					} else {
-						if (var2 == 25) {
-							var16 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0);
-							if (var16 != null) {
-								GrandExchangeOffer.Widget_runOnTargetLeave();
-								WorldMapData_1.selectSpell(var1, var0, WorldMapRectangle.method388(ScriptEvent.getWidgetClickMask(var16)), var16.itemId);
-								Client.isItemSelected = 0;
-								Client.selectedSpellActionName = PrivateChatMode.method5965(var16);
-								if (Client.selectedSpellActionName == null) {
-									Client.selectedSpellActionName = "null";
-								}
-
-								if (var16.isIf3) {
-									Client.selectedSpellName = var16.dataText + class297.colorStartTag(16777215);
-								} else {
-									Client.selectedSpellName = class297.colorStartTag(65280) + var16.spellName + class297.colorStartTag(16777215);
-								}
-							}
-
-							return;
-						}
-
-						if (var2 == 26) {
-							class227.method4184();
-						} else {
-							int var12;
-							Widget var14;
-							if (var2 == 28) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.writeInt(var1);
-								Client.packetWriter.addNode(var8);
-								var14 = MusicPatchNode.getWidget(var1);
-								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
-									var12 = var14.cs1Instructions[0][1];
-									Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12];
-									class22.changeGameOptions(var12);
-								}
-							} else if (var2 == 29) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.writeInt(var1);
-								Client.packetWriter.addNode(var8);
-								var14 = MusicPatchNode.getWidget(var1);
-								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
-									var12 = var14.cs1Instructions[0][1];
-									if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) {
-										Varps.Varps_main[var12] = var14.cs1ComparisonValues[0];
-										class22.changeGameOptions(var12);
-									}
-								}
-							} else if (var2 == 30) {
-								if (Client.meslayerContinueWidget == null) {
-									class58.resumePauseWidget(var1, var0);
-									Client.meslayerContinueWidget = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0);
-									ItemContainer.invalidateWidget(Client.meslayerContinueWidget);
-								}
-							} else if (var2 == 31) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.writeShortLE(var1);
-								var8.packetBuffer.writeIntME(Client.selectedItemSlot);
-								var8.packetBuffer.method5644(WorldMapSection2.selectedItemWidget);
-								var8.packetBuffer.method5610(var0);
-								var8.packetBuffer.writeShort(var3);
-								var8.packetBuffer.method5610(FaceNormal.selectedItemId);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else if (var2 == 32) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.method5609(Client.selectedSpellChildIndex);
-								var8.packetBuffer.method5644(class7.selectedSpellWidget);
-								var8.packetBuffer.method5610(var3);
-								var8.packetBuffer.method5610(var0);
-								var8.packetBuffer.method5644(var1);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else if (var2 == 33) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.method5609(var3);
-								var8.packetBuffer.method5617(var1);
-								var8.packetBuffer.writeShort(var0);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else if (var2 == 34) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.writeInt(var1);
-								var8.packetBuffer.method5610(var3);
-								var8.packetBuffer.writeIntME(var0);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else if (var2 == 35) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.writeInt(var1);
-								var8.packetBuffer.method5609(var3);
-								var8.packetBuffer.writeShort(var0);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else if (var2 == 36) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.method5609(var0);
-								var8.packetBuffer.method5617(var1);
-								var8.packetBuffer.method5609(var3);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else if (var2 == 37) {
-								var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher);
-								var8.packetBuffer.writeIntME(var0);
-								var8.packetBuffer.method5644(var1);
-								var8.packetBuffer.method5610(var3);
-								Client.packetWriter.addNode(var8);
-								Client.field786 = 0;
-								WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-								Client.field880 = var0;
-							} else {
-								if (var2 == 38) {
-									GrandExchangeOffer.Widget_runOnTargetLeave();
-									var16 = MusicPatchNode.getWidget(var1);
-									Client.isItemSelected = 1;
-									Client.selectedItemSlot = var0;
-									WorldMapSection2.selectedItemWidget = var1;
-									FaceNormal.selectedItemId = var3;
-									ItemContainer.invalidateWidget(var16);
-									Client.selectedItemName = class297.colorStartTag(16748608) + AbstractWorldMapData.ItemDefinition_get(var3).name + class297.colorStartTag(16777215);
-									if (Client.selectedItemName == null) {
-										Client.selectedItemName = "null";
-									}
-
-									return;
-								}
-
-								if (var2 == 39) {
-									var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher);
-									var8.packetBuffer.writeShort(var3);
-									var8.packetBuffer.method5609(var0);
-									var8.packetBuffer.method5617(var1);
-									Client.packetWriter.addNode(var8);
-									Client.field786 = 0;
-									WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-									Client.field880 = var0;
-								} else if (var2 == 40) {
-									var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher);
-									var8.packetBuffer.writeShortLE(var1);
-									var8.packetBuffer.writeIntME(var3);
-									var8.packetBuffer.writeShort(var0);
-									Client.packetWriter.addNode(var8);
-									Client.field786 = 0;
-									WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-									Client.field880 = var0;
-								} else if (var2 == 41) {
-									var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher);
-									var8.packetBuffer.method5609(var0);
-									var8.packetBuffer.method5644(var1);
-									var8.packetBuffer.writeShort(var3);
-									Client.packetWriter.addNode(var8);
-									Client.field786 = 0;
-									WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-									Client.field880 = var0;
-								} else if (var2 == 42) {
-									var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher);
-									var8.packetBuffer.writeInt(var1);
-									var8.packetBuffer.method5610(var0);
-									var8.packetBuffer.method5610(var3);
-									Client.packetWriter.addNode(var8);
-									Client.field786 = 0;
-									WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-									Client.field880 = var0;
-								} else if (var2 == 43) {
-									var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
-									var8.packetBuffer.writeIntME(var0);
-									var8.packetBuffer.method5617(var1);
-									var8.packetBuffer.writeIntME(var3);
-									Client.packetWriter.addNode(var8);
-									Client.field786 = 0;
-									WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-									Client.field880 = var0;
-								} else if (var2 == 44) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										var9.packetBuffer.writeIntME(var3);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 45) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.method5610(var3);
-										var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 46) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										var9.packetBuffer.writeShort(var3);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 47) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.writeShort(var3);
-										var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 48) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										var9.packetBuffer.writeShort(var3);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 49) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										var9.packetBuffer.writeIntME(var3);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 50) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										var9.packetBuffer.writeShort(var3);
-										Client.packetWriter.addNode(var9);
-									}
-								} else if (var2 == 51) {
-									var15 = Client.players[var3];
-									if (var15 != null) {
-										Client.mouseCrossX = var6;
-										Client.mouseCrossY = var7;
-										Client.mouseCrossColor = 2;
-										Client.mouseCrossState = 0;
-										Client.destinationX = var0;
-										Client.destinationY = var1;
-										var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher);
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-										var9.packetBuffer.writeShort(var3);
-										Client.packetWriter.addNode(var9);
-									}
-								} else {
-									label662: {
-										if (var2 != 57) {
-											if (var2 == 58) {
-												var16 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0);
-												if (var16 != null) {
-													var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher);
-													var9.packetBuffer.method5610(Client.field837);
-													var9.packetBuffer.method5610(Client.selectedSpellChildIndex);
-													var9.packetBuffer.writeIntME(var0);
-													var9.packetBuffer.method5609(var16.itemId);
-													var9.packetBuffer.writeInt(class7.selectedSpellWidget);
-													var9.packetBuffer.method5644(var1);
-													Client.packetWriter.addNode(var9);
-												}
-												break label662;
-											}
-
-											if (var2 == 1001) {
-												Client.mouseCrossX = var6;
-												Client.mouseCrossY = var7;
-												Client.mouseCrossColor = 2;
-												Client.mouseCrossState = 0;
-												Client.destinationX = var0;
-												Client.destinationY = var1;
-												var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher);
-												var8.packetBuffer.writeIntME(var3);
-												var8.packetBuffer.method5609(var0 + class69.baseX);
-												var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
-												var8.packetBuffer.writeShort(class89.baseY + var1);
-												Client.packetWriter.addNode(var8);
-												break label662;
-											}
-
-											if (var2 == 1002) {
-												Client.mouseCrossX = var6;
-												Client.mouseCrossY = var7;
-												Client.mouseCrossColor = 2;
-												Client.mouseCrossState = 0;
-												var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher);
-												var8.packetBuffer.method5610(var3);
-												Client.packetWriter.addNode(var8);
-												break label662;
-											}
-
-											if (var2 == 1003) {
-												Client.mouseCrossX = var6;
-												Client.mouseCrossY = var7;
-												Client.mouseCrossColor = 2;
-												Client.mouseCrossState = 0;
-												var13 = Client.npcs[var3];
-												if (var13 != null) {
-													NPCDefinition var17 = var13.definition;
-													if (var17.transforms != null) {
-														var17 = var17.transform();
-													}
-
-													if (var17 != null) {
-														var10 = FaceNormal.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher);
-														var10.packetBuffer.writeIntME(var17.id);
-														Client.packetWriter.addNode(var10);
-													}
-												}
-												break label662;
-											}
-
-											if (var2 == 1004) {
-												Client.mouseCrossX = var6;
-												Client.mouseCrossY = var7;
-												Client.mouseCrossColor = 2;
-												Client.mouseCrossState = 0;
-												var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher);
-												var8.packetBuffer.method5610(var3);
-												Client.packetWriter.addNode(var8);
-												break label662;
-											}
-
-											if (var2 == 1005) {
-												var16 = MusicPatchNode.getWidget(var1);
-												if (var16 != null && var16.itemQuantities[var0] >= 100000) {
-													Skeleton.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + AbstractWorldMapData.ItemDefinition_get(var3).name);
-												} else {
-													var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher);
-													var9.packetBuffer.method5610(var3);
-													Client.packetWriter.addNode(var9);
-												}
-
-												Client.field786 = 0;
-												WorldMapID.field307 = MusicPatchNode.getWidget(var1);
-												Client.field880 = var0;
-												break label662;
-											}
-
-											if (var2 != 1007) {
-												if (var2 == 1009 || var2 == 1011 || var2 == 1010 || var2 == 1008 || var2 == 1012) {
-													GrandExchangeOfferAgeComparator.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1));
-												}
-												break label662;
-											}
-										}
-
-										var16 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0);
-										if (var16 != null) {
-											ClientPacket.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5);
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (Client.isItemSelected != 0) {
-			Client.isItemSelected = 0;
-			ItemContainer.invalidateWidget(MusicPatchNode.getWidget(WorldMapSection2.selectedItemWidget));
-		}
-
-		if (Client.isSpellSelected) {
-			GrandExchangeOffer.Widget_runOnTargetLeave();
-		}
-
-		if (WorldMapID.field307 != null && Client.field786 == 0) {
-			ItemContainer.invalidateWidget(WorldMapID.field307);
-		}
-
-	}
 }

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("kh")
+@ObfuscatedName("ka")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "[Lle;"
+		signature = "[Llh;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("a")
+	@ObfuscatedName("v")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("l")
+	@ObfuscatedName("e")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.readMetrics(var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("y")
 	@Export("readMetrics")
 	void readMetrics(byte[] var1) {
 		this.advances = new int[256];
@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 				if (var13 != 32 && var13 != 160) {
 					for (var8 = 0; var8 < 256; ++var8) {
 						if (var8 != 32 && var8 != 160) {
-							this.kerning[var8 + (var13 << 8)] = (byte)method5478(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5603(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("h")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}
 
-		return this.advances[TaskHandler.charToByteCp1252(var1) & 255];
+		return this.advances[UserComparator3.charToByteCp1252(var1) & 255];
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) {
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 					}
 
 					if (var2 == -1) {
-						var4 += this.advances[(char)(TaskHandler.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(UserComparator3.charToByteCp1252(var6) & 255)];
 						if (this.kerning != null && var3 != -1) {
 							var4 += this.kerning[var6 + (var3 << 8)];
 						}
@@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("r")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) {
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("ah")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("ai")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("ao")
 	@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) {
@@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ax")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ag")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) {
@@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ab")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("am")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,38 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ak")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
-			int var2;
-			String var3;
 			if (var1.startsWith("col=")) {
-				var3 = var1.substring(4);
+				AbstractFont_color = Username.method5398(var1.substring(4), 16);
-				var2 = class105.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_color = var2;
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) {
-				var3 = var1.substring(4);
+				AbstractFont_strike = Username.method5398(var1.substring(4), 16);
-				var2 = class105.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_strike = var2;
 			} else if (var1.equals("str")) {
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) {
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) {
-				var3 = var1.substring(2);
+				AbstractFont_underline = Username.method5398(var1.substring(2), 16);
-				var2 = class105.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_underline = var2;
 			} else if (var1.equals("u")) {
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) {
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) {
-				var3 = var1.substring(5);
+				AbstractFont_shadow = Username.method5398(var1.substring(5), 16);
-				var2 = class105.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_shadow = var2;
 			} else if (var1.equals("shad")) {
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) {
@@ -621,12 +611,12 @@ public abstract class AbstractFont extends Rasterizer2D {
 			} else if (var1.equals("br")) {
 				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
 			}
-		} catch (Exception var5) {
+		} catch (Exception var3) {
 		}
 
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ad")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -649,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("as")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -658,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var6 = 0; var6 < var1.length(); ++var6) {
 			if (var1.charAt(var6) != 0) {
-				char var7 = (char)(TaskHandler.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(UserComparator3.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -738,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("ar")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -748,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var9 = 0; var9 < var1.length(); ++var9) {
 			if (var1.charAt(var9) != 0) {
-				char var10 = (char)(TaskHandler.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(UserComparator3.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -856,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("c")
-	static int method5478(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	static int method5603(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
 		int var7 = var2[var5];
 		int var8 = var7 + var4[var5];
 		int var9 = var2[var6];
@@ -892,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("l")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length();
@@ -921,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ap")
 	@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;
@@ -963,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("al")
 	@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);
@@ -1011,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("an")
 	@Export("AbstractFont_drawGlyphAlpha")
 	static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -1053,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ac")
 	@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;

runescape-client/src/main/java/AbstractRasterProvider.java

@@ -4,23 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lj")
+@ObfuscatedName("lo")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("a")
+	@ObfuscatedName("q")
-	public static String[] field3871;
-	@ObfuscatedName("k")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2037520285
+		intValue = 1291852267
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -645523785
+		intValue = -1133589313
 	)
 	@Export("height")
 	public int height;
@@ -28,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "1321130014"
+		garbageValue = "-5"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(IIIIS)V",
+		signature = "(IIIII)V",
-		garbageValue = "32475"
+		garbageValue = "-1334771637"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1783812684"
+		garbageValue = "25855118"
 	)
 	@Export("apply")
 	public final void apply() {

runescape-client/src/main/java/AbstractSocket.java

@@ -4,88 +4,57 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lt")
+@ObfuscatedName("lj")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "7"
+		garbageValue = "-768493590"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "1436175029"
+		garbageValue = "-8"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "195119972"
+		garbageValue = "-1942767880"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "0"
+		garbageValue = "1355091335"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "([BIIB)I",
-		garbageValue = "33"
+		garbageValue = "37"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "-2040746201"
+		garbageValue = "-105"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "(III)V",
-		garbageValue = "-842833143"
-	)
-	public static final void method5886(int var0, int var1) {
-		ViewportMouse.ViewportMouse_x = var0;
-		ViewportMouse.ViewportMouse_y = var1;
-		ViewportMouse.ViewportMouse_isInViewport = true;
-		ViewportMouse.ViewportMouse_entityCount = 0;
-		ViewportMouse.ViewportMouse_false0 = false;
-	}
-
-	@ObfuscatedName("ke")
-	@ObfuscatedSignature(
-		signature = "(Lhe;IIIB)V",
-		garbageValue = "7"
-	)
-	@Export("drawCompass")
-	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
-		SpriteMask var4 = var0.getSpriteMask(false);
-		if (var4 != null) {
-			if (Client.minimapState < 3) {
-				ChatChannel.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);
-			}
-
-		}
-	}
 }

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("df")
+@ObfuscatedName("dy")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("position")
 	int position;
 

runescape-client/src/main/java/AbstractUserComparator.java

@@ -1,27 +1,30 @@
 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("js")
+@ObfuscatedName("jk")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("k")
+	@ObfuscatedName("ix")
-	@Export("Interpreter_intLocals")
+	@ObfuscatedGetter(
-	static int[] Interpreter_intLocals;
+		intValue = -1488914561
-	@ObfuscatedName("m")
+	)
+	@Export("selectedItemWidget")
+	static int selectedItemWidget;
+	@ObfuscatedName("o")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;I)V",
+		signature = "(Ljava/util/Comparator;S)V",
-		garbageValue = "747268472"
+		garbageValue = "-28900"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -33,10 +36,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljd;Ljd;I)I",
+		signature = "(Ljf;Ljf;I)I",
-		garbageValue = "1451673304"
+		garbageValue = "864234218"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -46,142 +49,4 @@ public abstract class AbstractUserComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
-
-	@ObfuscatedName("ai")
-	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
-		garbageValue = "-729583156"
-	)
-	static int method5119(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CLIENTCLOCK) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle;
-			return 1;
-		} else {
-			int var3;
-			int var4;
-			if (var0 == ScriptOpcodes.INV_GETOBJ) {
-				Interpreter.Interpreter_intStackSize -= 2;
-				var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere
-					.method3761(var3, var4);
-				return 1;
-			} else if (var0 == ScriptOpcodes.INV_GETNUM) {
-				Interpreter.Interpreter_intStackSize -= 2;
-				var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.ItemContainer_getCount(var3, var4);
-				return 1;
-			} else if (var0 == ScriptOpcodes.INV_TOTAL) {
-				Interpreter.Interpreter_intStackSize -= 2;
-				var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AttackOption.method2157(var3, var4);
-				return 1;
-			} else if (var0 == ScriptOpcodes.INV_SIZE) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class231.getInvDefinition(var3).size;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STAT) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3];
-				return 1;
-			} else if (var0 == ScriptOpcodes.STAT_BASE) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3];
-				return 1;
-			} else if (var0 == ScriptOpcodes.STAT_XP) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3];
-				return 1;
-			} else {
-				int var5;
-				if (var0 == ScriptOpcodes.COORD) {
-					var3 = ScriptEvent.Client_plane;
-					var4 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX;
-					var5 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28);
-					return 1;
-				} else if (var0 == ScriptOpcodes.COORDX) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383;
-					return 1;
-				} else if (var0 == ScriptOpcodes.COORDZ) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28;
-					return 1;
-				} else if (var0 == ScriptOpcodes.COORDY) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383;
-					return 1;
-				} else if (var0 == ScriptOpcodes.MAP_MEMBERS) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0;
-					return 1;
-				} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) {
-					Interpreter.Interpreter_intStackSize -= 2;
-					var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
-					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere
-						.method3761(var3, var4);
-					return 1;
-				} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) {
-					Interpreter.Interpreter_intStackSize -= 2;
-					var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
-					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketBufferNode.ItemContainer_getCount(var3, var4);
-					return 1;
-				} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) {
-					Interpreter.Interpreter_intStackSize -= 2;
-					var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
-					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AttackOption.method2157(var3, var4);
-					return 1;
-				} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) {
-					if (Client.staffModLevel >= 2) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.REBOOTTIMER) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer;
-					return 1;
-				} else if (var0 == ScriptOpcodes.MAP_WORLD) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId;
-					return 1;
-				} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy;
-					return 1;
-				} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight;
-					return 1;
-				} else if (var0 == ScriptOpcodes.PLAYERMOD) {
-					if (Client.playerMod) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDFLAGS) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties;
-					return 1;
-				} else if (var0 == ScriptOpcodes.MOVECOORD) {
-					Interpreter.Interpreter_intStackSize -= 4;
-					var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-					int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
-					var3 += var4 << 14;
-					var3 += var5 << 28;
-					var3 += var6;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3;
-					return 1;
-				} else {
-					return 2;
-				}
-			}
-		}
-	}
 }

runescape-client/src/main/java/AbstractWorldMapData.java

@@ -1,123 +1,113 @@
-import java.util.Date;
+import java.awt.Component;
 import java.util.LinkedList;
 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("ab")
+@ObfuscatedName("ax")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("qb")
+	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Ldw;"
-	)
-	@Export("pcmPlayer1")
-	static PcmPlayer pcmPlayer1;
-	@ObfuscatedName("c")
-	@Export("userHomeDirectory")
-	public static String userHomeDirectory;
-	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1424511881
+		intValue = 1613993877
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -338405967
+		intValue = -341048683
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -407468573
+		intValue = -718032253
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -62405571
+		intValue = -2006912863
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 594626733
+		intValue = -1970114381
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 275280081
+		intValue = -352793185
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1377406919
+		intValue = 449340635
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -687693039
+		intValue = 1711100227
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
-	byte[][][] field205;
+	byte[][][] field185;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
-	byte[][][] field206;
+	byte[][][] field175;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "[[[[Lal;"
+		signature = "[[[[Lak;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("u")
-	boolean field210;
 	@ObfuscatedName("h")
-	boolean field209;
+	boolean field188;
+	@ObfuscatedName("k")
+	boolean field179;
 
 	AbstractWorldMapData() {
 		this.groupId = -1;
 		this.fileId = -1;
 		new LinkedList();
-		this.field210 = false;
+		this.field188 = false;
-		this.field209 = false;
+		this.field179 = false;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkb;B)V",
+		signature = "(Lkn;I)V",
-		garbageValue = "-78"
+		garbageValue = "-1774414997"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-2034466824"
+		garbageValue = "923610125"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field210 && this.field209;
+		return this.field188 && this.field179;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Liy;I)V",
+		signature = "(Lic;S)V",
-		garbageValue = "-1013927348"
+		garbageValue = "19318"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -125,53 +115,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
 			if (var2 != null) {
 				this.readGeography(new Buffer(var2));
-				this.field210 = true;
+				this.field188 = true;
-				this.field209 = true;
+				this.field179 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "778691024"
+		garbageValue = "1097959131"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null;
 		this.floorOverlayIds = null;
-		this.field205 = null;
+		this.field185 = null;
-		this.field206 = null;
+		this.field175 = null;
 		this.decorations = null;
-		this.field210 = false;
+		this.field188 = false;
-		this.field209 = false;
+		this.field179 = false;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(IILkb;B)V",
+		signature = "(IILkn;I)V",
-		garbageValue = "20"
+		garbageValue = "929230318"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte();
 		if (var4 != 0) {
 			if ((var4 & 1) != 0) {
-				this.method355(var1, var2, var3, var4);
+				this.method319(var1, var2, var3, var4);
 			} else {
-				this.method372(var1, var2, var3, var4);
+				this.method320(var1, var2, var3, var4);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(IILkb;IB)V",
+		signature = "(IILkn;II)V",
-		garbageValue = "-123"
+		garbageValue = "1830113999"
 	)
-	void method355(int var1, int var2, Buffer var3, int var4) {
+	void method319(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0;
 		if (var5) {
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
@@ -180,12 +170,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IILkb;II)V",
+		signature = "(IILkn;IB)V",
-		garbageValue = "-1501964087"
+		garbageValue = "73"
 	)
-	void method372(int var1, int var2, Buffer var3, int var4) {
+	void method320(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1;
 		boolean var6 = (var4 & 2) != 0;
 		boolean var7 = (var4 & 4) != 0;
@@ -201,8 +191,8 @@ public abstract class AbstractWorldMapData {
 				if (var10 != 0) {
 					this.floorOverlayIds[var9][var1][var2] = (short)var10;
 					var11 = var3.readUnsignedByte();
-					this.field205[var9][var1][var2] = (byte)(var11 >> 2);
+					this.field185[var9][var1][var2] = (byte)(var11 >> 2);
-					this.field206[var9][var1][var2] = (byte)(var11 & 3);
+					this.field175[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -214,7 +204,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
 
 					for (var11 = 0; var11 < var9; ++var11) {
-						int var12 = var3.method5591();
+						int var12 = var3.method5843();
 						int var13 = var3.readUnsignedByte();
 						var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
 					}
@@ -224,349 +214,55 @@ public abstract class AbstractWorldMapData {
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1491010463"
+		garbageValue = "3"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1765071550"
+		garbageValue = "-4"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(IB)Ljx;",
+		signature = "(Ljava/awt/Component;I)V",
-		garbageValue = "86"
+		garbageValue = "-1541126292"
 	)
-	@Export("ItemDefinition_get")
+	static void method342(Component var0) {
-	public static ItemDefinition ItemDefinition_get(int var0) {
+		var0.addMouseListener(MouseHandler.MouseHandler_instance);
-		ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0);
+		var0.addMouseMotionListener(MouseHandler.MouseHandler_instance);
-		if (var1 != null) {
+		var0.addFocusListener(MouseHandler.MouseHandler_instance);
-			return var1;
-		} else {
-			byte[] var2 = PrivateChatMode.ItemDefinition_archive.takeFile(10, var0);
-			var1 = new ItemDefinition();
-			var1.id = var0;
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.post();
-			if (var1.noteTemplate != -1) {
-				var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
-			}
-
-			if (var1.notedId != -1) {
-				var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
-			}
-
-			if (var1.placeholderTemplate != -1) {
-				var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
-			}
-
-			if (!class169.ItemDefinition_inMembersWorld && var1.isMembersOnly) {
-				var1.name = "Members object";
-				var1.isTradable = false;
-				var1.groundActions = null;
-				var1.inventoryActions = null;
-				var1.shiftClickIndex = -1;
-				var1.team = 0;
-				if (var1.params != null) {
-					boolean var3 = false;
-
-					for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
-						ParamDefinition var5 = IgnoreList.getParamDefinition((int)var4.key);
-						if (var5.autoDisable) {
-							var4.remove();
-						} else {
-							var3 = true;
-						}
-					}
-
-					if (!var3) {
-						var1.params = null;
-					}
-				}
-			}
-
-			ItemDefinition.ItemDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
+		signature = "(I)V",
-		garbageValue = "99208963"
+		garbageValue = "2015859206"
 	)
-	static int method384(int var0, Script var1, boolean var2) {
+	public static void method343() {
-		String var3;
+		HealthBarDefinition.HealthBarDefinition_cached.clear();
-		int var4;
+		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
-		if (var0 == ScriptOpcodes.APPEND_NUM) {
-			var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-			var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4;
-			return 1;
-		} else {
-			String var9;
-			if (var0 == ScriptOpcodes.APPEND) {
-				Interpreter.Interpreter_stringStackSize -= 2;
-				var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-				var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9;
-				return 1;
-			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) {
-				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-				var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + class280.intToString(var4, true);
-				return 1;
-			} else if (var0 == ScriptOpcodes.LOWERCASE) {
-				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase();
-				return 1;
-			} else {
-				int var6;
-				int var10;
-				if (var0 == ScriptOpcodes.FROMDATE) {
-					var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					long var11 = 86400000L * (11745L + (long)var10);
-					Interpreter.Interpreter_calendar.setTime(new Date(var11));
-					var6 = Interpreter.Interpreter_calendar.get(5);
-					int var16 = Interpreter.Interpreter_calendar.get(2);
-					int var8 = Interpreter.Interpreter_calendar.get(1);
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8;
-					return 1;
-				} else if (var0 != ScriptOpcodes.TEXT_GENDER) {
-					if (var0 == ScriptOpcodes.TOSTRING) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.COMPARE) {
-						Interpreter.Interpreter_stringStackSize -= 2;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class227.method4200(Huffman.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], IgnoreList.clientLanguage));
-						return 1;
-					} else {
-						int var5;
-						byte[] var13;
-						Font var14;
-						if (var0 == ScriptOpcodes.PARAHEIGHT) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							Interpreter.Interpreter_intStackSize -= 2;
-							var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							var13 = NPC.archive13.takeFile(var5, 0);
-							var14 = new Font(var13);
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4);
-							return 1;
-						} else if (var0 == ScriptOpcodes.PARAWIDTH) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							Interpreter.Interpreter_intStackSize -= 2;
-							var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							var13 = NPC.archive13.takeFile(var5, 0);
-							var14 = new Font(var13);
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4);
-							return 1;
-						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) {
-							Interpreter.Interpreter_stringStackSize -= 2;
-							var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-							var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-							if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
-							} else {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.ESCAPE) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3);
-							return 1;
-						} else if (var0 == ScriptOpcodes.APPEND_CHAR) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4;
-							return 1;
-						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) {
-							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ArchiveLoader.isCharPrintable((char)var10) ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) {
-							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.isAlphaNumeric((char)var10) ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) {
-							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = World.isCharAlphabetic((char)var10) ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) {
-							var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PcmPlayer.isDigit((char)var10) ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.STRING_LENGTH) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							if (var3 != null) {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length();
-							} else {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.SUBSTRING) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							Interpreter.Interpreter_intStackSize -= 2;
-							var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5);
-							return 1;
-						} else if (var0 == ScriptOpcodes.REMOVETAGS) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							StringBuilder var17 = new StringBuilder(var3.length());
-							boolean var15 = false;
-
-							for (var6 = 0; var6 < var3.length(); ++var6) {
-								char var7 = var3.charAt(var6);
-								if (var7 == '<') {
-									var15 = true;
-								} else if (var7 == '>') {
-									var15 = false;
-								} else if (!var15) {
-									var17.append(var7);
-								}
-							}
-
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString();
-							return 1;
-						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4);
-							return 1;
-						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) {
-							Interpreter.Interpreter_stringStackSize -= 2;
-							var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-							var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-							var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5);
-							return 1;
-						} else if (var0 == ScriptOpcodes.UPPERCASE) {
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase();
-							return 1;
-						} else {
-							return 2;
-						}
-					}
-				} else {
-					Interpreter.Interpreter_stringStackSize -= 2;
-					var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-					var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-					if (ByteArrayPool.localPlayer.appearance != null && ByteArrayPool.localPlayer.appearance.isFemale) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
-					}
-
-					return 1;
-				}
-			}
-		}
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
+		signature = "(I)V",
-		garbageValue = "1350082309"
+		garbageValue = "324919704"
 	)
-	static int method380(int var0, Script var1, boolean var2) {
+	static final void method328() {
-		int var3;
+		Object var10000 = null;
-		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) {
+		String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members";
-			Interpreter.Interpreter_intStackSize -= 2;
+		ObjectSound.addGameMessage(30, "", var0);
-			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (!Client.isCameraLocked) {
-				Client.camAngleX = var3;
-				Client.camAngleY = var4;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) {
-			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-			if (var3 < 0) {
-				var3 = 0;
-			}
-
-			Client.camFollowHeight = var3;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight;
-			return 1;
-		} else {
-			return 2;
-		}
-	}
-
-	@ObfuscatedName("ip")
-	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "112"
-	)
-	static final int method381() {
-		return Client.menuOptionsCount - 1;
-	}
-
-	@ObfuscatedName("js")
-	@ObfuscatedSignature(
-		signature = "(IIII)Lbm;",
-		garbageValue = "-1715974914"
-	)
-	static final InterfaceParent method382(int var0, int var1, int var2) {
-		InterfaceParent var3 = new InterfaceParent();
-		var3.group = var1;
-		var3.type = var2;
-		Client.interfaceParents.put(var3, (long)var0);
-		class4.Widget_resetModelFrames(var1);
-		Widget var4 = MusicPatchNode.getWidget(var0);
-		ItemContainer.invalidateWidget(var4);
-		if (Client.meslayerContinueWidget != null) {
-			ItemContainer.invalidateWidget(Client.meslayerContinueWidget);
-			Client.meslayerContinueWidget = null;
-		}
-
-		ChatChannel.method2354();
-		MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false);
-		WorldMapSectionType.runWidgetOnLoadListener(var1);
-		if (Client.rootInterface != -1) {
-			class198.runIntfCloseListeners(Client.rootInterface, 1);
-		}
-
-		return var3;
-	}
-
-	@ObfuscatedName("kf")
-	@ObfuscatedSignature(
-		signature = "(Lhe;I)Z",
-		garbageValue = "-1425924887"
-	)
-	@Export("isComponentHidden")
-	static boolean isComponentHidden(Widget var0) {
-		return var0.isHidden;
 	}
 }

runescape-client/src/main/java/AbstractWorldMapIcon.java

@@ -4,114 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ax")
+@ObfuscatedName("af")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("sq")
+	@ObfuscatedName("es")
-	@ObfuscatedGetter(
-		intValue = -1106675929
-	)
-	@Export("foundItemIndex")
-	static int foundItemIndex;
-	@ObfuscatedName("dx")
 	@ObfuscatedSignature(
-		signature = "Lih;"
+		signature = "Lig;"
 	)
-	@Export("archive6")
+	@Export("archive17")
-	static Archive archive6;
+	static Archive archive17;
-	@ObfuscatedName("dy")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lih;"
+		signature = "Lhg;"
-	)
-	@Export("archive7")
-	static Archive archive7;
-	@ObfuscatedName("fp")
-	@ObfuscatedSignature(
-		signature = "Lfr;"
-	)
-	@Export("socketTask")
-	static Task socketTask;
-	@ObfuscatedName("la")
-	@ObfuscatedSignature(
-		signature = "Lci;"
-	)
-	@Export("tempMenuAction")
-	static MenuAction tempMenuAction;
-	@ObfuscatedName("my")
-	@ObfuscatedGetter(
-		intValue = 468589673
-	)
-	@Export("selectedSpellFlags")
-	static int selectedSpellFlags;
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "Lhj;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lhj;"
+		signature = "Lhg;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1506769643
+		intValue = -702767977
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -896182235
+		intValue = 2041834837
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		signature = "(Lhj;Lhj;)V"
+		signature = "(Lhg;Lhg;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "16"
+		garbageValue = "0"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)Lau;",
+		signature = "(B)Lar;",
-		garbageValue = "2077771117"
+		garbageValue = "35"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "650401890"
+		garbageValue = "1804331962"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1828864081"
+		garbageValue = "-1265869629"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "-57056512"
+		garbageValue = "422348755"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -122,40 +92,41 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(I)Z",
-		garbageValue = "-32437"
+		garbageValue = "807957820"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "1127928990"
+		garbageValue = "872444562"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = class25.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = Client.WorldMapElement_get(this.getElement());
 			int var4 = this.getSubWidth();
 			int var5 = this.getSubHeight();
 			switch(var3.horizontalAlignment.value) {
 			case 0:
-				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
-					return false;
-				}
-				break;
-			case 1:
 				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
 					break;
 				}
 
+				return false;
+			case 1:
+				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
+					break;
+				}
+
 				return false;
 			case 2:
 				if (var1 <= this.screenX - var4 || var1 > this.screenX) {
@@ -165,17 +136,18 @@ public abstract class AbstractWorldMapIcon {
 
 			switch(var3.verticalAlignment.value) {
 			case 0:
-				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
+				if (var2 >= this.screenY && var2 < var5 + this.screenY) {
-					return false;
+					break;
 				}
-				break;
+
+				return false;
 			case 1:
 				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
 					return false;
 				}
 				break;
 			case 2:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
 					return false;
 				}
 			}
@@ -184,10 +156,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		signature = "(III)Z",
+		signature = "(IIB)Z",
-		garbageValue = "-411865092"
+		garbageValue = "1"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -195,19 +167,46 @@ public abstract class AbstractWorldMapIcon {
 		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;
+			return var2 >= this.screenY && var2 <= var3.height + this.screenY;
 		} else {
 			return false;
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(CB)Z",
+		signature = "(I)V",
-		garbageValue = "0"
+		garbageValue = "-288699605"
 	)
-	@Export("isAlphaNumeric")
+	public static void method687() {
-	public static boolean isAlphaNumeric(char var0) {
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+			if (ArchiveDiskActionHandler.field3181 != 0) {
+				ArchiveDiskActionHandler.field3181 = 1;
+
+				try {
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait();
+				} catch (InterruptedException var3) {
+				}
+			}
+
+		}
+	}
+
+	@ObfuscatedName("fk")
+	@ObfuscatedSignature(
+		signature = "(IIII)V",
+		garbageValue = "-886030498"
+	)
+	@Export("queueSoundEffect")
+	static void queueSoundEffect(int var0, int var1, int var2) {
+		if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
+			Client.soundEffectIds[Client.soundEffectCount] = var0;
+			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
+			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
+			Client.soundEffects[Client.soundEffectCount] = null;
+			Client.soundLocations[Client.soundEffectCount] = 0;
+			++Client.soundEffectCount;
+		}
+
 	}
 }

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("mb")
+@ObfuscatedName("my")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = 1632378019072179927L
+		longValue = 3349439872542127423L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = 3271085237778542147L
+		longValue = 253746605088017275L
 	)
 	@Export("offset")
 	long offset;
@@ -49,21 +49,21 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "47"
+		garbageValue = "239881906"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
-		if (this.offset + (long)var3 > this.maxSize) {
+		if ((long)var3 + this.offset > this.maxSize) {
 			this.file.seek(this.maxSize);
 			this.file.write(1);
 			throw new EOFException();
@@ -73,20 +73,20 @@ public final class AccessFile {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "10"
+		garbageValue = "-1767391731"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
+		signature = "(ZB)V",
-		garbageValue = "2141113619"
+		garbageValue = "-19"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(B)J",
+		signature = "(I)J",
-		garbageValue = "74"
+		garbageValue = "997596889"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-316484023"
+		garbageValue = "-1991806699"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {

runescape-client/src/main/java/Actor.java

@@ -4,320 +4,320 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cw")
+@ObfuscatedName("cc")
 @Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("an")
+	@ObfuscatedName("ae")
-	@Export("isWalking")
-	boolean isWalking;
-	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -1730088457
+		intValue = 744009553
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 58548893
+		intValue = 2097901447
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("af")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 2047396387
+		intValue = 2131261511
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ab")
+	@Export("isWalking")
+	boolean isWalking;
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = 747650361
+		intValue = -2038697523
 	)
-	int field976;
+	int field967;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 1154559573
+		intValue = -316528469
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 399800473
+		intValue = -137751655
 	)
 	@Export("idleSequence")
 	int idleSequence;
-	@ObfuscatedName("am")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -684262003
+		intValue = -1305511341
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1952661919
+		intValue = -513548165
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 2064847885
+		intValue = -72649199
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1807346449
+		intValue = 379584779
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("av")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -598231963
+		intValue = 186381867
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -1622741341
+		intValue = 1749182957
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1458798213
+		intValue = -966124115
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("af")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("az")
+	@ObfuscatedName("at")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aa")
-	boolean field988;
+	boolean field979;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = -1807093205
+		intValue = 447977523
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -1168789031
+		intValue = -825187417
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -54296883
+		intValue = 674699849
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("au")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("aj")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bk")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bh")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bg")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("be")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljx;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 1906218843
+		intValue = -1028152459
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bd")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = -1444761415
+		intValue = 861621789
 	)
-	int field1015;
+	int field992;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = 1296285639
+		intValue = -1977710907
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = -1097128947
+		intValue = 1631636501
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = 1112091343
+		intValue = 1589742041
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = -20846645
+		intValue = -1536630843
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = 1620009483
+		intValue = -1208509489
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = 1370333627
+		intValue = -739438903
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -1532646011
+		intValue = -1247625137
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = 743745547
+		intValue = 2084373007
 	)
-	int field1011;
+	int field1000;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = -1600718851
+		intValue = 2084591071
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -595193051
+		intValue = 1471011659
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = -1426517203
+		intValue = 337978883
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = 1048299633
+		intValue = 1421591937
 	)
-	int field1013;
+	int field987;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = 1503080001
+		intValue = 541486383
 	)
-	int field1033;
+	int field1005;
+	@ObfuscatedName("br")
+	@ObfuscatedGetter(
+		intValue = -558534631
+	)
+	int field995;
+	@ObfuscatedName("bs")
+	@ObfuscatedGetter(
+		intValue = -1971586345
+	)
+	int field1007;
 	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = 1317270699
+		intValue = 1672081961
 	)
-	int field990;
+	int field1008;
 	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 1667801647
+		intValue = -715675955
 	)
-	int field972;
+	int field1009;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 441172781
+		intValue = 1514147523
 	)
-	int field1017;
+	int field966;
-	@ObfuscatedName("bl")
-	@ObfuscatedGetter(
-		intValue = -1550774947
-	)
-	int field1018;
-	@ObfuscatedName("bw")
-	@ObfuscatedGetter(
-		intValue = -625975993
-	)
-	int field1019;
-	@ObfuscatedName("cw")
-	@ObfuscatedGetter(
-		intValue = 1067146179
-	)
-	int field1020;
 	@ObfuscatedName("cc")
 	@ObfuscatedGetter(
-		intValue = 1247809135
+		intValue = 337308087
 	)
-	int field1021;
+	int field1011;
+	@ObfuscatedName("cb")
+	@ObfuscatedGetter(
+		intValue = -1718156865
+	)
+	int field1006;
 	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = 1215799343
+		intValue = -249207775
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = 1881116621
+		intValue = 1368163093
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cz")
 	@ObfuscatedGetter(
-		intValue = 616594567
+		intValue = 1251205823
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cg")
 	@ObfuscatedGetter(
-		intValue = 230967505
+		intValue = 1694854685
 	)
-	int field1025;
+	int field1016;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = 2061571405
+		intValue = 1077718703
 	)
-	int field1026;
+	int field1017;
-	@ObfuscatedName("cu")
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = -525774551
+		intValue = 1769461271
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cj")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("ck")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cv")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cx")
+	@ObfuscatedName("cp")
 	@ObfuscatedGetter(
-		intValue = -1741747755
+		intValue = -706356397
 	)
-	int field1031;
+	int field1022;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("ci")
 	@ObfuscatedGetter(
-		intValue = -932937077
+		intValue = 318153573
 	)
-	int field1032;
+	int field1023;
 
 	Actor() {
 		this.isWalking = false;
-		this.field976 = 1;
+		this.field967 = 1;
 		this.idleSequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -327,7 +327,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field988 = false;
+		this.field979 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -340,7 +340,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field1015 = -1;
+		this.field992 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -348,46 +348,46 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field1011 = 0;
+		this.field1000 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field1025 = 0;
+		this.field1016 = 0;
-		this.field1026 = 32;
+		this.field1017 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field1031 = 0;
+		this.field1022 = 0;
-		this.field1032 = 0;
+		this.field1023 = 0;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "116176402"
+		garbageValue = "1"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1960813077"
+		garbageValue = "78"
 	)
-	final void method1842() {
+	final void method1810() {
 		this.pathLength = 0;
-		this.field1032 = 0;
+		this.field1023 = 0;
 	}
 
 	@ObfuscatedName("be")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "-1774762927"
+		garbageValue = "-1007174032"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -407,38 +407,52 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = GrandExchangeOfferUnitPriceComparator.method213(var1);
+			HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1);
-			var10 = var12.field3327;
+			HitSplatDefinition var12;
-			var11 = var12.field3329;
+			if (var13 != null) {
+				var12 = var13;
+			} else {
+				byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1);
+				var13 = new HitSplatDefinition();
+				if (var14 != null) {
+					var13.decode(new Buffer(var14));
+				}
+
+				HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1);
+				var12 = var13;
+			}
+
+			var10 = var12.field3373;
+			var11 = var12.field3364;
 		}
 
-		int var14;
+		int var15;
 		if (var8) {
 			if (var10 == -1) {
 				return;
 			}
 
 			var9 = 0;
-			var14 = 0;
+			var15 = 0;
 			if (var10 == 0) {
-				var14 = this.hitSplatCycles[0];
+				var15 = this.hitSplatCycles[0];
 			} else if (var10 == 1) {
-				var14 = this.hitSplatValues[0];
+				var15 = this.hitSplatValues[0];
 			}
 
-			for (int var13 = 1; var13 < 4; ++var13) {
+			for (int var16 = 1; var16 < 4; ++var16) {
 				if (var10 == 0) {
-					if (this.hitSplatCycles[var13] < var14) {
+					if (this.hitSplatCycles[var16] < var15) {
-						var9 = var13;
+						var9 = var16;
-						var14 = this.hitSplatCycles[var13];
+						var15 = this.hitSplatCycles[var16];
 					}
-				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) {
+				} else if (var10 == 1 && this.hitSplatValues[var16] < var15) {
-					var9 = var13;
+					var9 = var16;
-					var14 = this.hitSplatValues[var13];
+					var15 = this.hitSplatValues[var16];
 				}
 			}
 
-			if (var10 == 1 && var14 >= var2) {
+			if (var10 == 1 && var15 >= var2) {
 				return;
 			}
 		} else {
@@ -446,11 +460,11 @@ public abstract class Actor extends Entity {
 				this.hitSplatCount = 0;
 			}
 
-			for (var14 = 0; var14 < 4; ++var14) {
+			for (var15 = 0; var15 < 4; ++var15) {
-				byte var15 = this.hitSplatCount;
+				byte var17 = this.hitSplatCount;
 				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
-				if (this.hitSplatCycles[var15] <= var5) {
+				if (this.hitSplatCycles[var17] <= var5) {
-					var9 = var15;
+					var9 = var17;
 					break;
 				}
 			}
@@ -465,10 +479,10 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		signature = "(IIIIIIB)V",
+		signature = "(IIIIIII)V",
-		garbageValue = "-58"
+		garbageValue = "-680285813"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -496,7 +510,7 @@ public abstract class Actor extends Entity {
 		HealthBar var13;
 		for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
 			++var12;
-			if (var13.definition.field3276 == var8.field3276) {
+			if (var13.definition.field3312 == var8.field3312) {
 				var13.put(var2 + var4, var5, var6, var3);
 				return;
 			}
@@ -527,45 +541,85 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "671360815"
+		garbageValue = "43"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+		HealthBarDefinition var2 = LoginPacket.method3745(var1);
-		HealthBarDefinition var2;
-		if (var3 != null) {
-			var2 = var3;
-		} else {
-			byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1);
-			var3 = new HealthBarDefinition();
-			if (var4 != null) {
-				var3.decode(new Buffer(var4));
-			}
 
-			HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1);
+		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) {
-			var2 = var3;
+			if (var2 == var3.definition) {
-		}
+				var3.remove();
-
-		var3 = var2;
-
-		for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
-			if (var3 == var5.definition) {
-				var5.remove();
 				return;
 			}
 		}
 
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(Lch;Lch;IZI)I",
-		garbageValue = "-2086656267"
+		garbageValue = "-1172543926"
 	)
-	static int method1860(int var0) {
+	@Export("compareWorlds")
-		return (int)((Math.log((double)var0) / Interpreter.field1128 - 7.0D) * 256.0D);
+	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
+		if (var2 == 1) {
+			int var4 = var0.population;
+			int var5 = var1.population;
+			if (!var3) {
+				if (var4 == -1) {
+					var4 = 2001;
+				}
+
+				if (var5 == -1) {
+					var5 = 2001;
+				}
+			}
+
+			return var4 - var5;
+		} else if (var2 == 2) {
+			return var0.location - var1.location;
+		} else if (var2 == 3) {
+			if (var0.activity.equals("-")) {
+				if (var1.activity.equals("-")) {
+					return 0;
+				} else {
+					return var3 ? -1 : 1;
+				}
+			} else if (var1.activity.equals("-")) {
+				return var3 ? 1 : -1;
+			} else {
+				return var0.activity.compareTo(var1.activity);
+			}
+		} else if (var2 == 4) {
+			return var0.method1841() ? (var1.method1841() ? 0 : 1) : (var1.method1841() ? -1 : 0);
+		} else if (var2 == 5) {
+			return var0.method1874() ? (var1.method1874() ? 0 : 1) : (var1.method1874() ? -1 : 0);
+		} else if (var2 == 6) {
+			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
+		} else if (var2 == 7) {
+			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
+		} else {
+			return var0.id - var1.id;
+		}
+	}
+
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		signature = "([BIIB)I",
+		garbageValue = "46"
+	)
+	static int method1822(byte[] var0, int var1, int var2) {
+		int var3 = -1;
+
+		for (int var4 = var1; var4 < var2; ++var4) {
+			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255];
+		}
+
+		var3 = ~var3;
+		return var3;
 	}
 }

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("eh")
+@ObfuscatedName("es")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("x")
-	static int[] field1651;
 	@ObfuscatedName("m")
-	static int[] field1655;
+	static int[] field1664;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
-	static int[] field1650;
+	static int[] field1661;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
-	static int[] field1654;
+	static int[] field1662;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
+	static int[] field1663;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Ler;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field1651 = new int[500];
+		field1664 = new int[500];
-		field1655 = new int[500];
+		field1661 = new int[500];
-		field1650 = new int[500];
+		field1662 = new int[500];
-		field1654 = new int[500];
+		field1663 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		signature = "([BLeb;)V"
+		signature = "([BLer;)V"
 	)
 	Animation(byte[] var1, Skeleton var2) {
 		this.skeleton = null;
@@ -69,38 +69,38 @@ public class Animation {
 				if (this.skeleton.transformTypes[var8] != 0) {
 					for (int var10 = var8 - 1; var10 > var6; --var10) {
 						if (this.skeleton.transformTypes[var10] == 0) {
-							field1651[var7] = var10;
+							field1664[var7] = var10;
-							field1655[var7] = 0;
+							field1661[var7] = 0;
-							field1650[var7] = 0;
+							field1662[var7] = 0;
-							field1654[var7] = 0;
+							field1663[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field1651[var7] = var8;
+				field1664[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field1655[var7] = var4.readShortSmart();
+					field1661[var7] = var4.readShortSmart();
 				} else {
-					field1655[var7] = var11;
+					field1661[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field1650[var7] = var4.readShortSmart();
+					field1662[var7] = var4.readShortSmart();
 				} else {
-					field1650[var7] = var11;
+					field1662[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field1654[var7] = var4.readShortSmart();
+					field1663[var7] = var4.readShortSmart();
 				} else {
-					field1654[var7] = var11;
+					field1663[var7] = var11;
 				}
 
 				var6 = var8;
@@ -121,10 +121,10 @@ public class Animation {
 			this.transformZs = new int[var7];
 
 			for (var8 = 0; var8 < var7; ++var8) {
-				this.transformSkeletonLabels[var8] = field1651[var8];
+				this.transformSkeletonLabels[var8] = field1664[var8];
-				this.transformXs[var8] = field1655[var8];
+				this.transformXs[var8] = field1661[var8];
-				this.transformYs[var8] = field1650[var8];
+				this.transformYs[var8] = field1662[var8];
-				this.transformZs[var8] = field1654[var8];
+				this.transformZs[var8] = field1663[var8];
 			}
 
 		}

runescape-client/src/main/java/ApproximateRouteStrategy.java

@@ -1,107 +1,189 @@
-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 netscape.javascript.JSObject;
 
-@ObfuscatedName("bj")
+@ObfuscatedName("bs")
 @Implements("ApproximateRouteStrategy")
 public class ApproximateRouteStrategy extends RouteStrategy {
-	@ObfuscatedName("hp")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 363395723
+		intValue = 955958433
 	)
-	@Export("cameraPitch")
+	static int field630;
-	static int cameraPitch;
+	@ObfuscatedName("lp")
+	@ObfuscatedGetter(
+		intValue = -2033733379
+	)
+	@Export("menuHeight")
+	static int menuHeight;
 
 	ApproximateRouteStrategy() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(IIILfm;B)Z",
+		signature = "(IIILfz;I)Z",
-		garbageValue = "-112"
+		garbageValue = "-1966963917"
 	)
 	@Export("hasArrived")
-	public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
+	protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
 		return var2 == super.approxDestinationX && var3 == super.approxDestinationY;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("ha")
 	@ObfuscatedSignature(
-		signature = "(Liy;IIIZI)V",
+		signature = "(Lby;IIBI)V",
-		garbageValue = "-1342711563"
+		garbageValue = "-549376931"
 	)
-	public static void method1321(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
+	static final void method1284(Player var0, int var1, int var2, byte var3) {
-		class206.field2406 = 1;
+		int var4 = var0.pathX[0];
-		class206.musicTrackArchive = var0;
+		int var5 = var0.pathY[0];
-		class206.musicTrackGroupId = var1;
+		int var6 = var0.transformedSize();
-		class206.musicTrackFileId = var2;
+		if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) {
-		class219.musicTrackVolume = var3;
+			if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
-		GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var4;
+				int var7 = Login.method2235(var4, var5, var0.transformedSize(), class52.method877(var1, var2), Client.collisionMaps[var0.plane], true, Client.field947, Client.field948);
-		AttackOption.field1187 = 10000;
+				if (var7 >= 1) {
-	}
+					for (int var8 = 0; var8 < var7 - 1; ++var8) {
+						var0.method1302(Client.field947[var8], Client.field948[var8], var3);
+					}
 
-	@ObfuscatedName("q")
+				}
-	@ObfuscatedSignature(
+			}
-		signature = "(I)Lfb;",
-		garbageValue = "1735702864"
-	)
-	public static Clock method1326() {
-		try {
-			return new NanoClock();
-		} catch (Throwable var1) {
-			return new MilliClock();
 		}
 	}
 
-	@ObfuscatedName("gt")
+	@ObfuscatedName("hc")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V",
-		garbageValue = "2095073196"
+		garbageValue = "-63"
 	)
-	@Export("getWindowedMode")
+	@Export("insertMenuItem")
-	static int getWindowedMode() {
+	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
-		return Client.isResizable ? 2 : 1;
+		if (!Client.isMenuOpen) {
-	}
+			if (Client.menuOptionsCount < 500) {
-
+				Client.menuActions[Client.menuOptionsCount] = var0;
-	@ObfuscatedName("kp")
+				Client.menuTargets[Client.menuOptionsCount] = var1;
-	@ObfuscatedSignature(
+				Client.menuOpcodes[Client.menuOptionsCount] = var2;
-		signature = "(Ljava/lang/String;I)V",
+				Client.menuIdentifiers[Client.menuOptionsCount] = var3;
-		garbageValue = "-1966698976"
+				Client.menuArguments1[Client.menuOptionsCount] = var4;
-	)
+				Client.menuArguments2[Client.menuOptionsCount] = var5;
-	static void method1328(String var0) {
+				Client.menuShiftClick[Client.menuOptionsCount] = var6;
-		WorldMapData_0.field137 = var0;
+				++Client.menuOptionsCount;
-
-		try {
-			String var1 = WorldMapSection1.client.getParameter(Integer.toString(18));
-			String var2 = WorldMapSection1.client.getParameter(Integer.toString(13));
-			String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2;
-			String var5;
-			if (var0.length() == 0) {
-				var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
-			} else {
-				String var4 = var3 + "; Expires=";
-				long var6 = class217.currentTimeMillis() + 94608000000L;
-				Calendar.Calendar_calendar.setTime(new Date(var6));
-				int var8 = Calendar.Calendar_calendar.get(7);
-				int var9 = Calendar.Calendar_calendar.get(5);
-				int var10 = Calendar.Calendar_calendar.get(2);
-				int var11 = Calendar.Calendar_calendar.get(1);
-				int var12 = Calendar.Calendar_calendar.get(11);
-				int var13 = Calendar.Calendar_calendar.get(12);
-				int var14 = Calendar.Calendar_calendar.get(13);
-				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";
-				var3 = var4 + var5 + "; Max-Age=" + 94608000L;
 			}
 
-			Client var16 = WorldMapSection1.client;
-			var5 = "document.cookie=\"" + var3 + "\"";
-			JSObject.getWindow(var16).eval(var5);
-		} catch (Throwable var15) {
 		}
+	}
 
+	@ObfuscatedName("id")
+	@ObfuscatedSignature(
+		signature = "(Ljz;IIII)V",
+		garbageValue = "1974138271"
+	)
+	@Export("addNpcToMenu")
+	static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
+		if (Client.menuOptionsCount < 400) {
+			if (var0.transforms != null) {
+				var0 = var0.transform();
+			}
+
+			if (var0 != null) {
+				if (var0.isInteractable) {
+					if (!var0.isFollower || Client.followerIndex == var1) {
+						String var4 = var0.name;
+						if (var0.combatLevel != 0) {
+							var4 = var4 + Canvas.method924(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")";
+						}
+
+						if (var0.isFollower && Client.followerOpsLowPriority) {
+							ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+						}
+
+						if (Client.isItemSelected == 1) {
+							ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + var4, 7, var1, var2, var3);
+						} else if (Client.isSpellSelected) {
+							if ((WorldMapSprite.selectedSpellFlags & 2) == 2) {
+								ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + var4, 8, var1, var2, var3);
+							}
+						} else {
+							int var5 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
+							String[] var6 = var0.actions;
+							int var7;
+							int var8;
+							if (var6 != null) {
+								for (var7 = 4; var7 >= 0; --var7) {
+									if (var6[var7] != null && !var6[var7].equalsIgnoreCase("Attack")) {
+										var8 = 0;
+										if (var7 == 0) {
+											var8 = var5 + 9;
+										}
+
+										if (var7 == 1) {
+											var8 = var5 + 10;
+										}
+
+										if (var7 == 2) {
+											var8 = var5 + 11;
+										}
+
+										if (var7 == 3) {
+											var8 = var5 + 12;
+										}
+
+										if (var7 == 4) {
+											var8 = var5 + 13;
+										}
+
+										ScriptEvent.insertMenuItemNoShift(var6[var7], ItemContainer.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+									}
+								}
+							}
+
+							if (var6 != null) {
+								for (var7 = 4; var7 >= 0; --var7) {
+									if (var6[var7] != null && var6[var7].equalsIgnoreCase("Attack")) {
+										short var9 = 0;
+										if (AttackOption.AttackOption_hidden != Client.npcAttackOption) {
+											if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class60.localPlayer.combatLevel) {
+												var9 = 2000;
+											}
+
+											var8 = 0;
+											if (var7 == 0) {
+												var8 = var9 + 9;
+											}
+
+											if (var7 == 1) {
+												var8 = var9 + 10;
+											}
+
+											if (var7 == 2) {
+												var8 = var9 + 11;
+											}
+
+											if (var7 == 3) {
+												var8 = var9 + 12;
+											}
+
+											if (var7 == 4) {
+												var8 = var9 + 13;
+											}
+
+											ScriptEvent.insertMenuItemNoShift(var6[var7], ItemContainer.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+										}
+									}
+								}
+							}
+
+							if (!var0.isFollower || !Client.followerOpsLowPriority) {
+								ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+							}
+						}
+
+					}
+				}
+			}
+		}
 	}
 }

runescape-client/src/main/java/Archive.java

@@ -5,78 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ih")
+@ObfuscatedName("ig")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ao")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Llp;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("j")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Llp;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -523982811
+		intValue = 1429609403
 	)
 	@Export("index")
 	int index;
 	@ObfuscatedName("f")
-	volatile boolean field3154;
+	volatile boolean field3189;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ah")
-	boolean field3156;
+	boolean field3191;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ai")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 379652259
+		intValue = -1541564901
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 1679567941
+		intValue = 1294218015
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 843484953
+		intValue = -973433081
 	)
-	int field3161;
+	int field3196;
 
 	static {
 		Archive_crc = new CRC32();
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Llq;Llq;IZZZ)V"
+		signature = "(Llp;Llp;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3154 = false;
+		this.field3189 = false;
-		this.field3156 = false;
+		this.field3191 = false;
-		this.field3161 = -1;
+		this.field3196 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3156 = var6;
+		this.field3191 = var6;
-		class3.method58(this, this.index);
+		MusicPatchNode.method3968(this, this.index);
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "-11"
+		garbageValue = "479482423"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
@@ -89,116 +89,116 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(II)I",
-		garbageValue = "9"
+		garbageValue = "-1350822089"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		if (super.groups[var1] != null) {
 			return 100;
+		} else if (this.validGroups[var1]) {
+			return 100;
 		} else {
-			return this.validGroups[var1] ? 100 : class3.method59(this.index, var1);
+			int var3 = this.index;
+			long var4 = (long)((var3 << 16) + var1);
+			int var2;
+			if (PlayerType.NetCache_currentResponse != null && PlayerType.NetCache_currentResponse.key == var4) {
+				var2 = CollisionMap.NetCache_responseArchiveBuffer.offset * 99 / (CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding) + 1;
+			} else {
+				var2 = 0;
+			}
+
+			return var2;
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "-42"
+		garbageValue = "-1560066319"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			DynamicObject.method2342(var1, this.archiveDisk, this);
+			WorldMapCacheName.method688(var1, this.archiveDisk, this);
 		} else {
-			Frames.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			WorldMapEvent.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
 		}
 
 	}
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1875788056"
+		garbageValue = "6460755"
 	)
-	public boolean method4343() {
+	public boolean method4456() {
-		return this.field3154;
+		return this.field3189;
 	}
 
-	@ObfuscatedName("cf")
+	@ObfuscatedName("di")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1046602653"
+		garbageValue = "1538719165"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3154) {
+		if (this.field3189) {
 			return 100;
 		} else if (super.groups != null) {
 			return 99;
 		} else {
-			int var1 = class3.method59(255, this.index);
+			int var2 = this.index;
-			if (var1 >= 100) {
+			long var3 = (long)(var2 + 16711680);
-				var1 = 99;
+			int var1;
+			if (PlayerType.NetCache_currentResponse != null && PlayerType.NetCache_currentResponse.key == var3) {
+				var1 = CollisionMap.NetCache_responseArchiveBuffer.offset * 99 / (CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding) + 1;
+			} else {
+				var1 = 0;
 			}
 
-			return var1;
+			int var5 = var1;
+			if (var1 >= 100) {
+				var5 = 99;
+			}
+
+			return var5;
 		}
 	}
 
-	@ObfuscatedName("ca")
+	@ObfuscatedName("dp")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "60"
+		garbageValue = "-1870441691"
 	)
 	@Export("loadIndex")
 	public void loadIndex(int var1, int var2) {
 		this.indexCrc = var1;
 		this.indexVersion = var2;
 		if (this.masterDisk != null) {
-			DynamicObject.method2342(this.index, this.masterDisk, this);
+			WorldMapCacheName.method688(this.index, this.masterDisk, this);
 		} else {
-			Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+			WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}
 
 	}
 
-	@ObfuscatedName("cj")
+	@ObfuscatedName("dc")
 	@ObfuscatedSignature(
 		signature = "(I[BZZI)V",
-		garbageValue = "-1921982231"
+		garbageValue = "-1362503762"
 	)
 	@Export("write")
 	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3154) {
+			if (this.field3189) {
 				throw new RuntimeException();
 			}
 
 			if (this.masterDisk != null) {
-				int var5 = this.index;
+				SecureRandomFuture.method2270(this.index, var2, this.masterDisk);
-				ArchiveDisk var6 = this.masterDisk;
-				ArchiveDiskAction var7 = new ArchiveDiskAction();
-				var7.type = 0;
-				var7.key = (long)var5;
-				var7.data = var2;
-				var7.archiveDisk = var6;
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7);
-				}
-
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-					if (ArchiveDiskActionHandler.field3151 == 0) {
-						class197.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-						class197.ArchiveDiskActionHandler_thread.setDaemon(true);
-						class197.ArchiveDiskActionHandler_thread.start();
-						class197.ArchiveDiskActionHandler_thread.setPriority(5);
-					}
-
-					ArchiveDiskActionHandler.field3151 = 600;
-				}
 			}
 
 			this.decodeIndex(var2);
@@ -207,44 +207,32 @@ public class Archive extends AbstractArchive {
 			var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8);
 			var2[var2.length - 1] = (byte)super.groupVersions[var1];
 			if (this.archiveDisk != null) {
-				WallDecoration.method3402(var1, var2, this.archiveDisk);
+				SecureRandomFuture.method2270(var1, var2, this.archiveDisk);
 				this.validGroups[var1] = true;
 			}
 
 			if (var4) {
-				Object[] var11 = super.groups;
+				super.groups[var1] = MenuAction.method2169(var2, false);
-				Object var15;
-				if (var2 == null) {
-					var15 = null;
-				} else if (var2.length > 136) {
-					DirectByteArrayCopier var8 = new DirectByteArrayCopier();
-					var8.set(var2);
-					var15 = var8;
-				} else {
-					var15 = var2;
-				}
-
-				var11[var1] = var15;
 			}
 		}
 
 	}
 
-	@ObfuscatedName("cp")
+	@ObfuscatedName("dt")
 	@ObfuscatedSignature(
-		signature = "(Llq;I[BZI)V",
+		signature = "(Llp;I[BZI)V",
-		garbageValue = "246844871"
+		garbageValue = "416222280"
 	)
 	@Export("load")
-	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
+	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3154) {
+			if (this.field3189) {
 				throw new RuntimeException();
 			}
 
 			if (var3 == null) {
-				Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
@@ -252,11 +240,11 @@ public class Archive extends AbstractArchive {
 			Archive_crc.update(var3, 0, var3.length);
 			var5 = (int)Archive_crc.getValue();
 			if (var5 != this.indexCrc) {
-				Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
-			Buffer var11 = new Buffer(class217.decompressBytes(var3));
+			Buffer var11 = new Buffer(Coord.decompressBytes(var3));
 			int var12 = var11.readUnsignedByte();
 			if (var12 != 5 && var12 != 6) {
 				throw new RuntimeException(var12 + "," + this.index + "," + var2);
@@ -268,21 +256,21 @@ public class Archive extends AbstractArchive {
 			}
 
 			if (var8 != this.indexVersion) {
-				Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
 			this.decodeIndex(var3);
 			this.loadAllLocal();
 		} else {
-			if (!var4 && var2 == this.field3161) {
+			if (!var4 && var2 == this.field3196) {
-				this.field3154 = true;
+				this.field3189 = true;
 			}
 
 			if (var3 == null || var3.length <= 2) {
 				this.validGroups[var2] = false;
-				if (this.field3156 || var4) {
+				if (this.field3191 || var4) {
-					Frames.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					WorldMapEvent.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -294,8 +282,8 @@ public class Archive extends AbstractArchive {
 			int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
 			if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) {
 				this.validGroups[var2] = false;
-				if (this.field3156 || var4) {
+				if (this.field3191 || var4) {
-					Frames.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					WorldMapEvent.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -321,10 +309,10 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("ck")
+	@ObfuscatedName("ds")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-539943157"
+		garbageValue = "1106038504"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -336,46 +324,46 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3154 = true;
+			this.field3189 = true;
 		} else {
-			this.field3161 = -1;
+			this.field3196 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
-					class228.method4204(var1, this.archiveDisk, this);
+					class228.method4262(var1, this.archiveDisk, this);
-					this.field3161 = var1;
+					this.field3196 = var1;
 				}
 			}
 
-			if (this.field3161 == -1) {
+			if (this.field3196 == -1) {
-				this.field3154 = true;
+				this.field3189 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("ce")
+	@ObfuscatedName("dg")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "18"
+		garbageValue = "1634778176"
 	)
-	public boolean method4352(int var1) {
+	public boolean method4460(int var1) {
 		return this.validGroups[var1];
 	}
 
-	@ObfuscatedName("cv")
+	@ObfuscatedName("do")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "2030059947"
+		garbageValue = "-587516749"
 	)
-	public boolean method4353(int var1) {
+	public boolean method4452(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("cl")
+	@ObfuscatedName("dn")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "110"
+		garbageValue = "-1037828577"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {

runescape-client/src/main/java/ArchiveDisk.java

@@ -6,45 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lq")
+@ObfuscatedName("lp")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("qh")
+	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Lla;"
-	)
-	@Export("sceneMinimapSprite")
-	static Sprite sceneMinimapSprite;
-	@ObfuscatedName("x")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "[Lle;"
+		signature = "Lmn;"
-	)
-	@Export("title_muteSprite")
-	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Lms;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lms;"
+		signature = "Lmn;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1224222019
+		intValue = -114633759
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1681615989
+		intValue = 1458452341
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -54,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(ILms;Lms;I)V"
+		signature = "(ILmn;Lmn;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null;
@@ -66,10 +54,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(II)[B",
-		garbageValue = "-613554322"
+		garbageValue = "475820078"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -101,7 +89,7 @@ public final class ArchiveDisk {
 								return (byte[])var10000;
 							}
 
-							this.datFile.seek((long)var4 * 520L);
+							this.datFile.seek(520L * (long)var4);
 							int var8 = var3 - var6;
 							int var9;
 							int var10;
@@ -125,14 +113,14 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 8;
-								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
+								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
 								var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
 								var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
 								var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
 								var12 = ArchiveDisk_buffer[7] & 255;
 							}
 
-							if (var9 == var1 && var10 == var7 && var12 == this.archive) {
+							if (var9 == var1 && var7 == var10 && var12 == this.archive) {
 								if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) {
 									int var14 = var8 + var13;
 
@@ -163,10 +151,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I[BII)Z",
+		signature = "(I[BIB)Z",
-		garbageValue = "-1923242861"
+		garbageValue = "3"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -184,10 +172,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I[BIZI)Z",
+		signature = "(I[BIZS)Z",
-		garbageValue = "2120818840"
+		garbageValue = "21116"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -228,7 +216,7 @@ public final class ArchiveDisk {
 
 				while (true) {
 					if (var7 < var3) {
-						label171: {
+						label170: {
 							int var9 = 0;
 							int var10;
 							if (var4) {
@@ -239,7 +227,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10);
 									} catch (EOFException var17) {
-										break label171;
+										break label170;
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
@@ -250,7 +238,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8);
 									} catch (EOFException var16) {
-										break label171;
+										break label170;
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
@@ -259,7 +247,7 @@ public final class ArchiveDisk {
 									var12 = ArchiveDisk_buffer[7] & 255;
 								}
 
-								if (var10 != var1 || var11 != var8 || var12 != this.archive) {
+								if (var10 != var1 || var8 != var11 || var12 != this.archive) {
 									var10000 = false;
 									return var10000;
 								}
@@ -277,7 +265,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var6 == var9) {
+								if (var9 == var6) {
 									++var9;
 								}
 							}
@@ -319,7 +307,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[5] = (byte)(var9 >> 8);
 								ArchiveDisk_buffer[6] = (byte)var9;
 								ArchiveDisk_buffer[7] = (byte)this.archive;
-								this.datFile.seek((long)var6 * 520L);
+								this.datFile.seek(520L * (long)var6);
 								this.datFile.write(ArchiveDisk_buffer, 0, 8);
 								var10 = var3 - var7;
 								if (var10 > 512) {
@@ -348,34 +336,4 @@ public final class ArchiveDisk {
 	public String toString() {
 		return "" + this.archive;
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "(I)Lla;",
-		garbageValue = "-389802701"
-	)
-	static Sprite method5932() {
-		Sprite var0 = new Sprite();
-		var0.width = class335.SpriteBuffer_spriteWidth;
-		var0.height = class335.SpriteBuffer_spriteHeight;
-		var0.xOffset = class335.SpriteBuffer_xOffsets[0];
-		var0.yOffset = StructDefinition.SpriteBuffer_yOffsets[0];
-		var0.subWidth = class335.SpriteBuffer_spriteWidths[0];
-		var0.subHeight = class335.SpriteBuffer_spriteHeights[0];
-		int var1 = var0.subHeight * var0.subWidth;
-		byte[] var2 = class4.SpriteBuffer_pixels[0];
-		var0.pixels = new int[var1];
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			var0.pixels[var3] = DefaultsGroup.SpriteBuffer_spritePalette[var2[var3] & 255];
-		}
-
-		class335.SpriteBuffer_xOffsets = null;
-		StructDefinition.SpriteBuffer_yOffsets = null;
-		class335.SpriteBuffer_spriteWidths = null;
-		class335.SpriteBuffer_spriteHeights = null;
-		DefaultsGroup.SpriteBuffer_spritePalette = null;
-		class4.SpriteBuffer_pixels = null;
-		return var0;
-	}
 }

runescape-client/src/main/java/ArchiveDiskAction.java

@@ -4,37 +4,162 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ir")
+@ObfuscatedName("in")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("de")
+	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Lih;"
-	)
-	@Export("archive0")
-	static Archive archive0;
-	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1964239455
+		intValue = -947897909
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("data")
-	public byte[] data;
+	byte[] data;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Llp;"
 	)
 	@Export("archiveDisk")
-	public ArchiveDisk archiveDisk;
+	ArchiveDisk archiveDisk;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lih;"
+		signature = "Lig;"
 	)
 	@Export("archive")
-	public Archive archive;
+	Archive archive;
 
 	ArchiveDiskAction() {
 	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(Lkb;II)Z",
+		garbageValue = "-1045128194"
+	)
+	@Export("updateExternalPlayer")
+	static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
+		int var2 = var0.readBits(2);
+		int var3;
+		int var4;
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		if (var2 == 0) {
+			if (var0.readBits(1) != 0) {
+				updateExternalPlayer(var0, var1);
+			}
+
+			var3 = var0.readBits(13);
+			var4 = var0.readBits(13);
+			boolean var12 = var0.readBits(1) == 1;
+			if (var12) {
+				Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+			}
+
+			if (Client.players[var1] != null) {
+				throw new RuntimeException();
+			} else {
+				Player var6 = Client.players[var1] = new Player();
+				var6.index = var1;
+				if (Players.field1279[var1] != null) {
+					var6.read(Players.field1279[var1]);
+				}
+
+				var6.orientation = Players.Players_orientations[var1];
+				var6.targetIndex = Players.Players_targetIndices[var1];
+				var7 = Players.Players_regions[var1];
+				var8 = var7 >> 28;
+				var9 = var7 >> 14 & 255;
+				var10 = var7 & 255;
+				var6.pathTraversed[0] = Players.field1278[var1];
+				var6.plane = (byte)var8;
+				var6.resetPath((var9 << 13) + var3 - class182.baseX, (var10 << 13) + var4 - SecureRandomFuture.baseY);
+				var6.field659 = false;
+				return true;
+			}
+		} else if (var2 == 1) {
+			var3 = var0.readBits(2);
+			var4 = Players.Players_regions[var1];
+			Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28);
+			return false;
+		} else {
+			int var5;
+			int var11;
+			if (var2 == 2) {
+				var3 = var0.readBits(5);
+				var4 = var3 >> 3;
+				var5 = var3 & 7;
+				var11 = Players.Players_regions[var1];
+				var7 = (var11 >> 28) + var4 & 3;
+				var8 = var11 >> 14 & 255;
+				var9 = var11 & 255;
+				if (var5 == 0) {
+					--var8;
+					--var9;
+				}
+
+				if (var5 == 1) {
+					--var9;
+				}
+
+				if (var5 == 2) {
+					++var8;
+					--var9;
+				}
+
+				if (var5 == 3) {
+					--var8;
+				}
+
+				if (var5 == 4) {
+					++var8;
+				}
+
+				if (var5 == 5) {
+					--var8;
+					++var9;
+				}
+
+				if (var5 == 6) {
+					++var9;
+				}
+
+				if (var5 == 7) {
+					++var8;
+					++var9;
+				}
+
+				Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28);
+				return false;
+			} else {
+				var3 = var0.readBits(18);
+				var4 = var3 >> 16;
+				var5 = var3 >> 8 & 255;
+				var11 = var3 & 255;
+				var7 = Players.Players_regions[var1];
+				var8 = (var7 >> 28) + var4 & 3;
+				var9 = var5 + (var7 >> 14) & 255;
+				var10 = var11 + var7 & 255;
+				Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28);
+				return false;
+			}
+		}
+	}
+
+	@ObfuscatedName("js")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "-418956614"
+	)
+	static boolean method4302(int var0) {
+		for (int var1 = 0; var1 < Client.field894; ++var1) {
+			if (Client.field896[var1] == var0) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

runescape-client/src/main/java/ArchiveDiskActionHandler.java

@@ -7,31 +7,34 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("ip")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Ljh;"
-	)
-	@Export("ArchiveDiskActionHandler_requestQueue")
-	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Ljh;"
+		signature = "Ljp;"
+	)
+	@Export("ArchiveDiskActionHandler_requestQueue")
+	static NodeDeque ArchiveDiskActionHandler_requestQueue;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "Ljp;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
-	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
+	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -191724831
+		intValue = 608159891
 	)
-	public static int field3151;
+	static int field3181;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("ArchiveDiskActionHandler_lock")
-	public static Object ArchiveDiskActionHandler_lock;
+	static Object ArchiveDiskActionHandler_lock;
+	@ObfuscatedName("p")
+	@Export("ArchiveDiskActionHandler_thread")
+	static Thread ArchiveDiskActionHandler_thread;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3151 = 0;
+		field3181 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -60,38 +63,129 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3151 <= 1) {
+						if (field3181 <= 1) {
-							field3151 = 0;
+							field3181 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3151 = 600;
+						field3181 = 600;
 					}
 				} else {
-					class169.sleepExact(100L);
+					SpriteMask.sleepExact(99L);
+					SpriteMask.sleepExact(1L);
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3151 <= 1) {
+						if (field3181 <= 1) {
-							field3151 = 0;
+							field3181 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3151;
+						--field3181;
 					}
 				}
 			}
 		} catch (Exception var13) {
-			WorldMapDecorationType.RunException_sendStackTrace((String)null, var13);
+			class197.RunException_sendStackTrace((String)null, var13);
 		}
 	}
 
-	@ObfuscatedName("bk")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)I",
+		signature = "(Lic;Lic;I)I",
-		garbageValue = "-492522565"
+		garbageValue = "-1395527740"
 	)
-	public static int method4340(String var0) {
+	static int method4429(AbstractArchive var0, AbstractArchive var1) {
-		return var0.length() + 2;
+		int var2 = 0;
+		if (var0.tryLoadFileByNames("title.jpg", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("logo", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("logo_deadman_mode", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("logo_seasonal_mode", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("titlebox", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("titlebutton", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("runes", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("title_mute", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) {
+			++var2;
+		}
+
+		if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) {
+			++var2;
+		}
+
+		var1.tryLoadFileByNames("sl_back", "");
+		var1.tryLoadFileByNames("sl_flags", "");
+		var1.tryLoadFileByNames("sl_arrows", "");
+		var1.tryLoadFileByNames("sl_stars", "");
+		var1.tryLoadFileByNames("sl_button", "");
+		return var2;
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(IB)Z",
+		garbageValue = "8"
+	)
+	@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;
+	}
+
+	@ObfuscatedName("fh")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZB)V",
+		garbageValue = "-20"
+	)
+	@Export("drawLoadingMessage")
+	static final void drawLoadingMessage(String var0, boolean var1) {
+		if (Client.showLoadingMessages) {
+			byte var2 = 4;
+			int var3 = var2 + 6;
+			int var4 = var2 + 6;
+			int var5 = MusicPatchNode2.fontPlain12.lineWidth(var0, 250);
+			int var6 = MusicPatchNode2.fontPlain12.lineCount(var0, 250) * 13;
+			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0);
+			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215);
+			MusicPatchNode2.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
+			class1.method7(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6);
+			if (var1) {
+				ArchiveLoader.rasterProvider.drawFull(0, 0);
+			} else {
+				WorldMapData_0.method243(var3, var4, var5, var6);
+			}
+
+		}
 	}
 }

runescape-client/src/main/java/ArchiveLoader.java

@@ -3,31 +3,56 @@ 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("bz")
+@ObfuscatedName("bl")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("m")
+	@ObfuscatedName("sm")
+	@ObfuscatedGetter(
+		intValue = -1707200579
+	)
+	@Export("foundItemIndex")
+	static int foundItemIndex;
+	@ObfuscatedName("x")
+	@Export("userHomeDirectory")
+	static String userHomeDirectory;
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		signature = "Lih;"
+		signature = "Llo;"
+	)
+	@Export("rasterProvider")
+	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("dw")
+	@Export("mouseCam")
+	static boolean mouseCam;
+	@ObfuscatedName("fy")
+	@ObfuscatedSignature(
+		signature = "Lfa;"
+	)
+	@Export("socketTask")
+	static Task socketTask;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "Lig;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 216071601
+		intValue = 1705798073
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -189862787
+		intValue = 607937277
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		signature = "(Lih;Ljava/lang/String;)V"
+		signature = "(Lig;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -35,17 +60,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "92028555"
+		garbageValue = "-1314527591"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4353(var1) || this.archive.method4352(var1)) {
+			if (!this.archive.method4452(var1) || this.archive.method4460(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -53,155 +78,129 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(CI)Z",
+		signature = "(III)I",
-		garbageValue = "527367819"
+		garbageValue = "1299326622"
 	)
-	@Export("isCharPrintable")
+	static int method1212(int var0, int var1) {
-	public static boolean isCharPrintable(char var0) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var0 >= ' ' && var0 <= '~') {
+		if (var2 == null) {
-			return true;
+			return 0;
-		} else if (var0 >= 160 && var0 <= 255) {
+		} else if (var1 == -1) {
-			return true;
+			return 0;
 		} else {
-			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
+			int var3 = 0;
-		}
-	}
 
-	@ObfuscatedName("f")
+			for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
-	@ObfuscatedSignature(
+				if (var2.ids[var4] == var1) {
-		signature = "(ZB)V",
+					var3 += var2.quantities[var4];
-		garbageValue = "-66"
-	)
-	public static void method1254(boolean var0) {
-		if (var0 != class169.ItemDefinition_inMembersWorld) {
-			class257.method4558();
-			class169.ItemDefinition_inMembersWorld = var0;
-		}
-
-	}
-
-	@ObfuscatedName("km")
-	@ObfuscatedSignature(
-		signature = "(Lhe;IIII)V",
-		garbageValue = "510029442"
-	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		ChatChannel.playPcmPlayers();
-		SpriteMask var4 = var0.getSpriteMask(false);
-		if (var4 != null) {
-			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
-			if (Client.minimapState != 2 && Client.minimapState != 5) {
-				int var5 = Client.camAngleY & 2047;
-				int var6 = ByteArrayPool.localPlayer.x / 32 + 48;
-				int var7 = 464 - ByteArrayPool.localPlayer.y / 32;
-				ArchiveDisk.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
-
-				int var8;
-				int var9;
-				int var10;
-				for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
-					var9 = Client.mapIconXs[var8] * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
-					var10 = Client.mapIconYs[var8] * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
-					ScriptEvent.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4);
 				}
-
-				int var11;
-				int var12;
-				for (var8 = 0; var8 < 104; ++var8) {
-					for (var9 = 0; var9 < 104; ++var9) {
-						NodeDeque var15 = Client.groundItems[ScriptEvent.Client_plane][var8][var9];
-						if (var15 != null) {
-							var11 = var8 * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
-							var12 = var9 * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
-							ScriptEvent.drawSpriteOnMinimap(var1, var2, var11, var12, VarpDefinition.mapDotSprites[0], var4);
-						}
-					}
-				}
-
-				for (var8 = 0; var8 < Client.npcCount; ++var8) {
-					NPC var16 = Client.npcs[Client.npcIndices[var8]];
-					if (var16 != null && var16.isVisible()) {
-						NPCDefinition var18 = var16.definition;
-						if (var18 != null && var18.transforms != null) {
-							var18 = var18.transform();
-						}
-
-						if (var18 != null && var18.drawMapDot && var18.isInteractable) {
-							var11 = var16.x / 32 - ByteArrayPool.localPlayer.x / 32;
-							var12 = var16.y / 32 - ByteArrayPool.localPlayer.y / 32;
-							ScriptEvent.drawSpriteOnMinimap(var1, var2, var11, var12, VarpDefinition.mapDotSprites[1], var4);
-						}
-					}
-				}
-
-				var8 = Players.Players_count;
-				int[] var19 = Players.Players_indices;
-
-				for (var10 = 0; var10 < var8; ++var10) {
-					Player var17 = Client.players[var19[var10]];
-					if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != ByteArrayPool.localPlayer) {
-						var12 = var17.x / 32 - ByteArrayPool.localPlayer.x / 32;
-						int var13 = var17.y / 32 - ByteArrayPool.localPlayer.y / 32;
-						boolean var14 = false;
-						if (ByteArrayPool.localPlayer.team != 0 && var17.team != 0 && var17.team == ByteArrayPool.localPlayer.team) {
-							var14 = true;
-						}
-
-						if (var17.isFriend()) {
-							ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[3], var4);
-						} else if (var14) {
-							ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[4], var4);
-						} else if (var17.isClanMember()) {
-							ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[5], var4);
-						} else {
-							ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[2], var4);
-						}
-					}
-				}
-
-				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
-					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
-						NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
-						if (var20 != null) {
-							var11 = var20.x / 32 - ByteArrayPool.localPlayer.x / 32;
-							var12 = var20.y / 32 - ByteArrayPool.localPlayer.y / 32;
-							class1.worldToMinimap(var1, var2, var11, var12, WorldMapAreaData.mapMarkerSprites[1], var4);
-						}
-					}
-
-					if (Client.hintArrowType == 2) {
-						var10 = Client.hintArrowX * 4 - class69.baseX * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
-						var11 = Client.hintArrowY * 4 - class89.baseY * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
-						class1.worldToMinimap(var1, var2, var10, var11, WorldMapAreaData.mapMarkerSprites[1], var4);
-					}
-
-					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
-						Player var21 = Client.players[Client.hintArrowPlayerIndex];
-						if (var21 != null) {
-							var11 = var21.x / 32 - ByteArrayPool.localPlayer.x / 32;
-							var12 = var21.y / 32 - ByteArrayPool.localPlayer.y / 32;
-							class1.worldToMinimap(var1, var2, var11, var12, WorldMapAreaData.mapMarkerSprites[1], var4);
-						}
-					}
-				}
-
-				if (Client.destinationX != 0) {
-					var10 = Client.destinationX * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
-					var11 = Client.destinationY * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
-					ScriptEvent.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapAreaData.mapMarkerSprites[0], var4);
-				}
-
-				if (!ByteArrayPool.localPlayer.isHidden) {
-					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);
 			}
 
-			Client.field886[var3] = true;
+			return var3;
+		}
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(ILcs;ZI)I",
+		garbageValue = "677134031"
+	)
+	static int method1213(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		if (var0 == ScriptOpcodes.CC_CREATE) {
+			UrlRequester.Interpreter_intStackSize -= 3;
+			var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+			int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2];
+			if (var4 == 0) {
+				throw new RuntimeException();
+			} else {
+				Widget var6 = WorldMapSprite.getWidget(var3);
+				if (var6.children == null) {
+					var6.children = new Widget[var5 + 1];
+				}
+
+				if (var6.children.length <= var5) {
+					Widget[] var7 = new Widget[var5 + 1];
+
+					for (int var8 = 0; var8 < var6.children.length; ++var8) {
+						var7[var8] = var6.children[var8];
+					}
+
+					var6.children = var7;
+				}
+
+				if (var5 > 0 && var6.children[var5 - 1] == null) {
+					throw new RuntimeException("" + (var5 - 1));
+				} else {
+					Widget var12 = new Widget();
+					var12.type = var4;
+					var12.parentId = var12.id = var6.id;
+					var12.childIndex = var5;
+					var12.isIf3 = true;
+					var6.children[var5] = var12;
+					if (var2) {
+						KeyHandler.field407 = var12;
+					} else {
+						SecureRandomCallable.field544 = var12;
+					}
+
+					class234.invalidateWidget(var6);
+					return 1;
+				}
+			}
+		} else {
+			Widget var9;
+			if (var0 == ScriptOpcodes.CC_DELETE) {
+				var9 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544;
+				Widget var10 = WorldMapSprite.getWidget(var9.id);
+				var10.children[var9.childIndex] = null;
+				class234.invalidateWidget(var10);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
+				var9 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
+				var9.children = null;
+				class234.invalidateWidget(var9);
+				return 1;
+			} else if (var0 != ScriptOpcodes.CC_FIND) {
+				if (var0 == ScriptOpcodes.IF_FIND) {
+					var9 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
+					if (var9 != null) {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1;
+						if (var2) {
+							KeyHandler.field407 = var9;
+						} else {
+							SecureRandomCallable.field544 = var9;
+						}
+					} else {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else {
+					return 2;
+				}
+			} else {
+				UrlRequester.Interpreter_intStackSize -= 2;
+				var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+				var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+				Widget var11 = WorldMapLabelSize.getWidgetChild(var3, var4);
+				if (var11 != null && var4 != -1) {
+					Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1;
+					if (var2) {
+						KeyHandler.field407 = var11;
+					} else {
+						SecureRandomCallable.field544 = var11;
+					}
+				} else {
+					Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			}
 		}
 	}
 }

runescape-client/src/main/java/AttackOption.java

@@ -3,48 +3,51 @@ 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("cb")
+@ObfuscatedName("co")
 @Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lcb;"
+		signature = "Lco;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lcb;"
+		signature = "Lco;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lcb;"
+		signature = "Lco;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lcb;"
+		signature = "Lco;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("of")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -1084826611
+		signature = "Lcy;"
 	)
-	public static int field1187;
+	@Export("varcs")
-	@ObfuscatedName("n")
+	static Varcs varcs;
-	@ObfuscatedGetter(
+	@ObfuscatedName("hj")
-		intValue = -1589469367
+	@ObfuscatedSignature(
+		signature = "[Llz;"
 	)
-	static int field1182;
+	@Export("mapDotSprites")
-	@ObfuscatedName("w")
+	static Sprite[] mapDotSprites;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1155763571
+		intValue = -942694603
 	)
 	@Export("id")
 	final int id;
@@ -53,56 +56,160 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "56"
+		garbageValue = "-995092303"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(III)I",
+		signature = "(I)Llh;",
-		garbageValue = "2128537982"
+		garbageValue = "-1275433341"
 	)
-	static int method2157(int var0, int var1) {
+	public static IndexedSprite method2173() {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		IndexedSprite var0 = new IndexedSprite();
-		if (var2 == null) {
+		var0.width = class335.SpriteBuffer_spriteWidth;
-			return 0;
+		var0.height = UserComparator8.SpriteBuffer_spriteHeight;
-		} else if (var1 == -1) {
+		var0.xOffset = class335.SpriteBuffer_xOffsets[0];
-			return 0;
+		var0.yOffset = NPC.SpriteBuffer_yOffsets[0];
-		} else {
+		var0.subWidth = class335.SpriteBuffer_spriteWidths[0];
-			int var3 = 0;
+		var0.subHeight = class335.SpriteBuffer_spriteHeights[0];
+		var0.palette = class335.SpriteBuffer_spritePalette;
+		var0.pixels = ItemDefinition.SpriteBuffer_pixels[0];
+		GrandExchangeEvent.method158();
+		return var0;
+	}
 
-			for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
+	@ObfuscatedName("w")
-				if (var2.ids[var4] == var1) {
+	@ObfuscatedSignature(
-					var3 += var2.quantities[var4];
+		signature = "(B)V",
-				}
+		garbageValue = "-37"
+	)
+	public static void method2181() {
+		SequenceDefinition.SequenceDefinition_cached.clear();
+		SequenceDefinition.SequenceDefinition_cachedFrames.clear();
+	}
+
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		signature = "(ILcs;ZB)I",
+		garbageValue = "-99"
+	)
+	static int method2180(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
+			UrlRequester.Interpreter_intStackSize -= 2;
+			Client.field727 = (short)GrandExchangeOffer.method176(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]);
+			if (Client.field727 <= 0) {
+				Client.field727 = 256;
 			}
 
-			return var3;
+			Client.field924 = (short)GrandExchangeOffer.method176(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]);
+			if (Client.field924 <= 0) {
+				Client.field924 = 256;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
+			UrlRequester.Interpreter_intStackSize -= 2;
+			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+			if (Client.zoomHeight <= 0) {
+				Client.zoomHeight = 256;
+			}
+
+			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+			if (Client.zoomWidth <= 0) {
+				Client.zoomWidth = 320;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
+			UrlRequester.Interpreter_intStackSize -= 4;
+			Client.field927 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+			if (Client.field927 <= 0) {
+				Client.field927 = 1;
+			}
+
+			Client.field928 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+			if (Client.field928 <= 0) {
+				Client.field928 = 32767;
+			} else if (Client.field928 < Client.field927) {
+				Client.field928 = Client.field927;
+			}
+
+			Client.field685 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2];
+			if (Client.field685 <= 0) {
+				Client.field685 = 1;
+			}
+
+			Client.field861 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3];
+			if (Client.field861 <= 0) {
+				Client.field861 = 32767;
+			} else if (Client.field861 < Client.field685) {
+				Client.field861 = Client.field685;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
+			if (Client.viewportWidget != null) {
+				WorldMapID.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.viewportWidth;
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.viewportHeight;
+			} else {
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1;
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.zoomHeight;
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.zoomWidth;
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection0.method295(Client.field727);
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection0.method295(Client.field924);
+			return 1;
+		} else if (var0 == 6220) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6221) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6222) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varcs.canvasWidth;
+			return 1;
+		} else if (var0 == 6223) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class52.canvasHeight;
+			return 1;
+		} else {
+			return 2;
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("ho")
 	@ObfuscatedSignature(
-		signature = "(I)Lle;",
+		signature = "(IIIIB)V",
-		garbageValue = "-2121463415"
+		garbageValue = "-113"
 	)
-	static IndexedSprite method2165() {
+	@Export("selectSpell")
-		IndexedSprite var0 = new IndexedSprite();
+	static void selectSpell(int var0, int var1, int var2, int var3) {
-		var0.width = class335.SpriteBuffer_spriteWidth;
+		Widget var4 = WorldMapLabelSize.getWidgetChild(var0, var1);
-		var0.height = class335.SpriteBuffer_spriteHeight;
+		if (var4 != null && var4.onTargetEnter != null) {
-		var0.xOffset = class335.SpriteBuffer_xOffsets[0];
+			ScriptEvent var5 = new ScriptEvent();
-		var0.yOffset = StructDefinition.SpriteBuffer_yOffsets[0];
+			var5.widget = var4;
-		var0.subWidth = class335.SpriteBuffer_spriteWidths[0];
+			var5.args = var4.onTargetEnter;
-		var0.subHeight = class335.SpriteBuffer_spriteHeights[0];
+			InterfaceParent.runScriptEvent(var5);
-		var0.palette = DefaultsGroup.SpriteBuffer_spritePalette;
+		}
-		var0.pixels = class4.SpriteBuffer_pixels[0];
+
-		Ignored.method5235();
+		Client.field830 = var3;
-		return var0;
+		Client.isSpellSelected = true;
+		ItemContainer.selectedSpellWidget = var0;
+		Client.selectedSpellChildIndex = var1;
+		WorldMapSprite.selectedSpellFlags = var2;
+		class234.invalidateWidget(var4);
 	}
 }

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("dc")
+@ObfuscatedName("da")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
-	static float[][] field1500;
+	static float[][] field1510;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
-	static float field1505;
+	static float field1507;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
-	int[][][] field1497;
+	int[][][] field1516;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
-	int[][][] field1502;
+	int[][][] field1508;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
-	int[] field1504;
+	int[] field1509;
 
 	static {
-		field1500 = new float[2][8];
+		field1510 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field1497 = new int[2][2][4];
+		this.field1516 = new int[2][2][4];
-		this.field1502 = new int[2][2][4];
+		this.field1508 = new int[2][2][4];
-		this.field1504 = new int[2];
+		this.field1509 = new int[2];
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
-	float method2805(int var1, int var2, float var3) {
+	float method2830(int var1, int var2, float var3) {
-		float var4 = (float)this.field1502[var1][0][var2] + var3 * (float)(this.field1502[var1][1][var2] - this.field1502[var1][0][var2]);
+		float var4 = (float)this.field1508[var1][0][var2] + var3 * (float)(this.field1508[var1][1][var2] - this.field1508[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
-	float method2803(int var1, int var2, float var3) {
+	float method2825(int var1, int var2, float var3) {
-		float var4 = (float)this.field1497[var1][0][var2] + var3 * (float)(this.field1497[var1][1][var2] - this.field1497[var1][0][var2]);
+		float var4 = (float)this.field1516[var1][0][var2] + var3 * (float)(this.field1516[var1][1][var2] - this.field1516[var1][0][var2]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1504[0] + (float)(this.field1504[1] - this.field1504[0]) * var2;
+			var3 = (float)this.field1509[0] + (float)(this.field1509[1] - this.field1509[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1505 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			field1507 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1505 * 65536.0F);
+			forwardMultiplier = (int)(field1507 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method2805(var1, 0, var2);
+			var3 = this.method2830(var1, 0, var2);
-			field1500[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2803(var1, 0, var2));
+			field1510[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2825(var1, 0, var2));
-			field1500[var1][1] = var3 * var3;
+			field1510[var1][1] = var3 * var3;
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method2805(var1, var4, var2);
+				var3 = this.method2830(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2803(var1, var4, var2));
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2825(var1, var4, var2));
 				float var6 = var3 * var3;
-				field1500[var1][var4 * 2 + 1] = field1500[var1][var4 * 2 - 1] * var6;
+				field1510[var1][var4 * 2 + 1] = field1510[var1][var4 * 2 - 1] * var6;
-				field1500[var1][var4 * 2] = field1500[var1][var4 * 2 - 1] * var5 + field1500[var1][var4 * 2 - 2] * var6;
+				field1510[var1][var4 * 2] = field1510[var1][var4 * 2 - 1] * var5 + field1510[var1][var4 * 2 - 2] * var6;
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field1500[var1];
+					var10000 = field1510[var1];
-					var10000[var7] += field1500[var1][var7 - 1] * var5 + field1500[var1][var7 - 2] * var6;
+					var10000[var7] += field1510[var1][var7 - 1] * var5 + field1510[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field1500[var1];
+				var10000 = field1510[var1];
-				var10000[1] += field1500[var1][0] * var5 + var6;
+				var10000[1] += field1510[var1][0] * var5 + var6;
-				var10000 = field1500[var1];
+				var10000 = field1510[var1];
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field1500[0];
+					var10000 = field1510[0];
-					var10000[var4] *= field1505;
+					var10000[var4] *= field1507;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field1500[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1510[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2;
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lkb;Lde;)V"
+		signature = "(Lkn;Lds;)V"
 	)
-	final void method2813(Buffer var1, SoundEnvelope var2) {
+	final void method2829(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field1504[0] = var1.readUnsignedShort();
+			this.field1509[0] = var1.readUnsignedShort();
-			this.field1504[1] = var1.readUnsignedShort();
+			this.field1509[1] = var1.readUnsignedShort();
 			int var4 = var1.readUnsignedByte();
 
 			int var5;
 			int var6;
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
-					this.field1497[var5][0][var6] = var1.readUnsignedShort();
+					this.field1516[var5][0][var6] = var1.readUnsignedShort();
-					this.field1502[var5][0][var6] = var1.readUnsignedShort();
+					this.field1508[var5][0][var6] = var1.readUnsignedShort();
 				}
 			}
 
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
 					if ((var4 & 1 << var5 * 4 << var6) != 0) {
-						this.field1497[var5][1][var6] = var1.readUnsignedShort();
+						this.field1516[var5][1][var6] = var1.readUnsignedShort();
-						this.field1502[var5][1][var6] = var1.readUnsignedShort();
+						this.field1508[var5][1][var6] = var1.readUnsignedShort();
 					} else {
-						this.field1497[var5][1][var6] = this.field1497[var5][0][var6];
+						this.field1516[var5][1][var6] = this.field1516[var5][0][var6];
-						this.field1502[var5][1][var6] = this.field1502[var5][0][var6];
+						this.field1508[var5][1][var6] = this.field1508[var5][0][var6];
 					}
 				}
 			}
 
-			if (var4 != 0 || this.field1504[1] != this.field1504[0]) {
+			if (var4 != 0 || this.field1509[1] != this.field1509[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var7 = this.field1504;
+			int[] var7 = this.field1509;
-			this.field1504[1] = 0;
+			this.field1509[1] = 0;
 			var7[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);

runescape-client/src/main/java/BZip2Decompressor.java

@@ -3,10 +3,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lb")
+@ObfuscatedName("ly")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "Llk;"
 	)
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("BZip2Decompressor_decompress")
 	public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
 		synchronized(BZip2Decompressor_state) {
@@ -29,7 +29,7 @@ public final class BZip2Decompressor {
 			BZip2Decompressor_state.bsLive = 0;
 			BZip2Decompressor_state.bsBuff = 0;
 			BZip2Decompressor_state.nextBit_unused = 0;
-			BZip2Decompressor_state.field3724 = 0;
+			BZip2Decompressor_state.field3783 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(Llk;)V"
 	)
-	static void method5838(BZip2State var0) {
+	static void method6004(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = WorldMapData_0.BZip2Decompressor_block;
+		int[] var6 = KitDefinition.BZip2Decompressor_block;
-		int var7 = var0.field3743;
+		int var7 = var0.field3779;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3761 + 1;
+		int var12 = var0.field3766 + 1;
 
 		label61:
 		while (true) {
@@ -148,23 +148,23 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field3724;
+		int var13 = var0.field3783;
-		var0.field3724 += var10 - var10;
+		var0.field3783 += var10 - var10;
-		if (var0.field3724 < var13) {
+		if (var0.field3783 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		WorldMapData_0.BZip2Decompressor_block = var6;
+		KitDefinition.BZip2Decompressor_block = var6;
-		var0.field3743 = var7;
+		var0.field3779 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(Llk;)V"
 	)
@@ -192,9 +192,9 @@ public final class BZip2Decompressor {
 		int[] var23 = null;
 		int[] var24 = null;
 		int[] var25 = null;
-		var0.blockSize100k = 239779841;
+		var0.blockSize100k = -425931053;
-		if (WorldMapData_0.BZip2Decompressor_block == null) {
+		if (KitDefinition.BZip2Decompressor_block == null) {
-			WorldMapData_0.BZip2Decompressor_block = new int[var0.blockSize100k * 818513568];
+			KitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * -2058061088];
 		}
 
 		boolean var26 = true;
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++;
-							WorldMapData_0.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							KitDefinition.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
 							++var47;
 							if (var45 == 0) {
 								++var43;
@@ -489,7 +489,7 @@ public final class BZip2Decompressor {
 							var10000 = var0.unzftab;
 
 							for (var10000[var1 & 255] += var48; var48 > 0; --var48) {
-								WorldMapData_0.BZip2Decompressor_block[var47] = var1 & 255;
+								KitDefinition.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(WorldMapData_0.BZip2Decompressor_block[var36] & 255);
+						var1 = (byte)(KitDefinition.BZip2Decompressor_block[var36] & 255);
-						var10000 = WorldMapData_0.BZip2Decompressor_block;
+						var10000 = KitDefinition.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field3743 = WorldMapData_0.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3779 = KitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3743 = WorldMapData_0.BZip2Decompressor_block[var0.field3743];
+					var0.field3779 = KitDefinition.BZip2Decompressor_block[var0.field3779];
-					var0.su_ch2 = (byte)(var0.field3743 & 255);
+					var0.su_ch2 = (byte)(var0.field3779 & 255);
-					var0.field3743 >>= 8;
+					var0.field3779 >>= 8;
 					++var0.nblocks_used;
-					var0.field3761 = var47;
+					var0.field3766 = var47;
-					method5838(var0);
+					method6004(var0);
-					if (var0.field3761 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					if (var0.field3766 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,7 +538,7 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(Llk;)B"
 	)
@@ -547,7 +547,7 @@ public final class BZip2Decompressor {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(Llk;)B"
 	)
@@ -556,7 +556,7 @@ public final class BZip2Decompressor {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(ILlk;)I"
 	)
@@ -576,7 +576,7 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(Llk;)V"
 	)
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("BZip2Decompressor_createHuffmanTables")
 	static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) {
 		int var7 = 0;

runescape-client/src/main/java/BZip2State.java

@@ -2,165 +2,166 @@ 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("lk")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("x")
-	final int field3756;
 	@ObfuscatedName("m")
-	final int field3725;
-	@ObfuscatedName("k")
-	final int field3726;
-	@ObfuscatedName("d")
-	final int field3729;
-	@ObfuscatedName("w")
 	final int field3750;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
-	final int field3737;
+	final int field3784;
 	@ObfuscatedName("q")
+	final int field3749;
+	@ObfuscatedName("j")
+	final int field3755;
+	@ObfuscatedName("p")
+	final int field3751;
+	@ObfuscatedName("g")
+	final int field3752;
+	@ObfuscatedName("n")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1520658841
+		intValue = 2048322099
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1705468259
+		intValue = -2079551029
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -530026491
+		intValue = -521485937
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1793031375
+		intValue = -962372007
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 828020907
+		intValue = -1091946921
 	)
-	int field3724;
+	int field3783;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1550283393
+		intValue = -475619831
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 2097262377
+		intValue = 37444239
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1241583147
+		intValue = 590709617
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("a")
+	@ObfuscatedName("v")
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1768899761
+		intValue = 1631921855
 	)
 	@Export("originalPointer")
 	int originalPointer;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 755758005
+	)
+	int field3779;
 	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -2111080359
+		intValue = 1026760725
-	)
-	int field3743;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -125465233
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1422716731
+		intValue = -819259021
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("j")
+	@ObfuscatedName("b")
 	@Export("cftab")
 	int[] cftab;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1484476187
+		intValue = -420415873
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ah")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ai")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ao")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ae")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ax")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ag")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("af")
+	@ObfuscatedName("ab")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("at")
+	@ObfuscatedName("am")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ak")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ad")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("am")
+	@ObfuscatedName("as")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ar")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -453266259
+		intValue = 202332287
 	)
-	int field3761;
+	int field3766;
 
 	BZip2State() {
-		this.field3756 = 4096;
+		this.field3750 = 4096;
-		this.field3725 = 16;
+		this.field3784 = 16;
-		this.field3726 = 258;
+		this.field3749 = 258;
-		this.field3729 = 6;
+		this.field3755 = 6;
-		this.field3750 = 50;
+		this.field3751 = 50;
-		this.field3737 = 18002;
+		this.field3752 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -178,4 +179,26 @@ public final class BZip2State {
 		this.perm = new int[6][258];
 		this.minLens = new int[6];
 	}
+
+	@ObfuscatedName("iq")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Lhd;I)Ljava/lang/String;",
+		garbageValue = "-1638627143"
+	)
+	static String method6001(String var0, Widget var1) {
+		if (var0.indexOf("%") != -1) {
+			for (int var2 = 1; var2 <= 5; ++var2) {
+				while (true) {
+					int var3 = var0.indexOf("%" + var2);
+					if (var3 == -1) {
+						break;
+					}
+
+					var0 = var0.substring(0, var3) + class225.method4182(Canvas.method923(var1, var2 - 1)) + var0.substring(var3 + 2);
+				}
+			}
+		}
+
+		return var0;
+	}
 }

runescape-client/src/main/java/BoundaryObject.java

@@ -3,62 +3,61 @@ 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("ep")
+@ObfuscatedName("ez")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 2013637089
-	)
-	@Export("y")
-	int y;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1191949217
+		intValue = 175264999
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -935099037
+		intValue = 782033861
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 2050214703
+		intValue = 1104746355
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -742181125
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1637656997
+		intValue = -1690066511
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lel;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lel;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		longValue = 8712969699368096229L
+		longValue = 3086546930439306913L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1289122601
+		intValue = 485971219
 	)
 	@Export("flags")
 	int flags;
@@ -70,354 +69,178 @@ public final class BoundaryObject {
 
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(IIII)Lce;",
+		signature = "(I)V",
-		garbageValue = "-719728055"
+		garbageValue = "1351583068"
 	)
-	@Export("getWorldMapScript")
+	static void method3390() {
-	static Script getWorldMapScript(int var0, int var1, int var2) {
+		Tiles.field530 = null;
-		int var3 = (var1 << 8) + var0;
+		Tiles.field524 = null;
-		Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16));
+		Tiles.field525 = null;
-		Script var5;
+		WorldMapLabel.field269 = null;
-		if (var6 != null) {
+		HealthBarUpdate.field1031 = null;
-			var5 = var6;
+		class171.field2036 = null;
-		} else {
+		Tiles.field526 = null;
-			String var7 = String.valueOf(var3);
+		BuddyRankComparator.Tiles_hue = null;
-			int var8 = class41.archive12.getGroupId(var7);
+		GrandExchangeOfferAgeComparator.Tiles_saturation = null;
-			if (var8 == -1) {
+		TextureProvider.Tiles_lightness = null;
-				var5 = null;
+		class237.Tiles_hueMultiplier = null;
-			} else {
+		WorldMapRectangle.field198 = null;
-				label56: {
-					byte[] var9 = class41.archive12.takeFileFlat(var8);
-					if (var9 != null) {
-						if (var9.length <= 1) {
-							var5 = null;
-							break label56;
-						}
-
-						var6 = SecureRandomCallable.newScript(var9);
-						if (var6 != null) {
-							Script.Script_cached.put(var6, (long)(var3 << 16));
-							var5 = var6;
-							break label56;
-						}
-					}
-
-					var5 = null;
-				}
-			}
-		}
-
-		if (var5 != null) {
-			return var5;
-		} else {
-			int var4 = class58.method963(var2, var0);
-			Script var12 = (Script)Script.Script_cached.get((long)(var4 << 16));
-			Script var13;
-			if (var12 != null) {
-				var13 = var12;
-			} else {
-				String var14 = String.valueOf(var4);
-				int var10 = class41.archive12.getGroupId(var14);
-				if (var10 == -1) {
-					var13 = null;
-				} else {
-					byte[] var11 = class41.archive12.takeFileFlat(var10);
-					if (var11 != null) {
-						if (var11.length <= 1) {
-							var13 = null;
-							return var13 != null ? var13 : null;
-						}
-
-						var12 = SecureRandomCallable.newScript(var11);
-						if (var12 != null) {
-							Script.Script_cached.put(var12, (long)(var4 << 16));
-							var13 = var12;
-							return var13 != null ? var13 : null;
-						}
-					}
-
-					var13 = null;
-				}
-			}
-
-			return var13 != null ? var13 : null;
-		}
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("hz")
 	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
+		signature = "(Lkb;I)V",
-		garbageValue = "-522510299"
+		garbageValue = "-1547224129"
 	)
-	static int method3376(int var0, Script var1, boolean var2) {
+	static final void method3389(PacketBuffer var0) {
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
+		for (int var1 = 0; var1 < Client.field718; ++var1) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode;
+			int var2 = Client.field719[var1];
-			return 1;
+			NPC var3 = Client.npcs[var2];
-		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
+			int var4 = var0.readUnsignedByte();
-			Interpreter.Interpreter_intStackSize -= 3;
+			int var5;
-			Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			int var6;
-			UserComparator3.privateChatMode = class219.method4052(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
+			int var7;
-			if (UserComparator3.privateChatMode == null) {
+			if ((var4 & 128) != 0) {
-				UserComparator3.privateChatMode = PrivateChatMode.field3806;
+				var5 = var0.method5755();
+				if (var5 == 65535) {
+					var5 = -1;
+				}
+
+				var6 = var0.method5746();
+				if (var5 == var3.sequence && var5 != -1) {
+					var7 = NetSocket.SequenceDefinition_get(var5).field3561;
+					if (var7 == 1) {
+						var3.sequenceFrame = 0;
+						var3.sequenceFrameCycle = 0;
+						var3.sequenceDelay = var6;
+						var3.field1000 = 0;
+					}
+
+					if (var7 == 2) {
+						var3.field1000 = 0;
+					}
+				} else if (var5 == -1 || var3.sequence == -1 || NetSocket.SequenceDefinition_get(var5).field3543 >= NetSocket.SequenceDefinition_get(var3.sequence).field3543) {
+					var3.sequence = var5;
+					var3.sequenceFrame = 0;
+					var3.sequenceFrameCycle = 0;
+					var3.sequenceDelay = var6;
+					var3.field1000 = 0;
+					var3.field1023 = var3.pathLength;
+				}
 			}
 
-			Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			int var8;
-			PacketBufferNode var18 = FaceNormal.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher);
+			if ((var4 & 16) != 0) {
-			var18.packetBuffer.writeByte(Client.publicChatMode);
+				var5 = var0.readUnsignedShort();
-			var18.packetBuffer.writeByte(UserComparator3.privateChatMode.field3804);
+				var6 = var0.method5755();
-			var18.packetBuffer.writeByte(Client.tradeChatMode);
+				var7 = var3.x - (var5 - class182.baseX - class182.baseX) * 64;
-			Client.packetWriter.addNode(var18);
+				var8 = var3.y - (var6 - SecureRandomFuture.baseY - SecureRandomFuture.baseY) * 64;
-			return 1;
+				if (var7 != 0 || var8 != 0) {
-		} else {
+					var3.field992 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
-			String var3;
+				}
-			int var4;
+			}
-			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
+
-				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+			if ((var4 & 2) != 0) {
-				Interpreter.Interpreter_intStackSize -= 2;
+				var3.field995 = var0.method5751();
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+				var3.field1008 = var0.readByte();
-				int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+				var3.field1007 = var0.readByte();
-				PacketBufferNode var6 = FaceNormal.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher);
+				var3.field1009 = var0.method5751();
-				var6.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var3) + 2);
+				var3.field966 = var0.method5757() + Client.cycle;
-				var6.packetBuffer.writeStringCp1252NullTerminated(var3);
+				var3.field1011 = var0.method5755() + Client.cycle;
-				var6.packetBuffer.writeByte(var4 - 1);
+				var3.field1006 = var0.readUnsignedShort();
-				var6.packetBuffer.writeByte(var5);
+				var3.pathLength = 1;
-				Client.packetWriter.addNode(var6);
+				var3.field1023 = 0;
-				return 1;
+				var3.field995 += var3.pathX[0];
-			} else {
+				var3.field1008 += var3.pathY[0];
+				var3.field1007 += var3.pathX[0];
+				var3.field1009 += var3.pathY[0];
+			}
+
+			if ((var4 & 1) != 0) {
+				var5 = var0.method5748();
+				int var9;
 				int var10;
-				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
+				int var11;
-					Interpreter.Interpreter_intStackSize -= 2;
+				if (var5 > 0) {
-					var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+					for (var6 = 0; var6 < var5; ++var6) {
-					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+						var8 = -1;
-					Message var15 = class1.Messages_getByChannelAndID(var10, var4);
+						var9 = -1;
-					if (var15 != null) {
+						var10 = -1;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.count;
+						var7 = var0.readUShortSmart();
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.cycle;
+						if (var7 == 32767) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
+							var7 = var0.readUShortSmart();
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
+							var9 = var0.readUShortSmart();
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
+							var8 = var0.readUShortSmart();
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
+							var10 = var0.readUShortSmart();
-					} else {
+						} else if (var7 != 32766) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+							var9 = var0.readUShortSmart();
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+							var7 = -1;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						}
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					}
 
-					return 1;
+						var11 = var0.readUShortSmart();
-				} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
+						var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
-					var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					Message var16 = PendingSpawn.Messages_getMessage(var10);
-					if (var16 != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.type;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
 					}
+				}
 
-					return 1;
+				var6 = var0.readUnsignedByte();
-				} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
+				if (var6 > 0) {
-					if (UserComparator3.privateChatMode == null) {
+					for (var7 = 0; var7 < var6; ++var7) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+						var8 = var0.readUShortSmart();
-					} else {
+						var9 = var0.readUShortSmart();
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.privateChatMode.field3804;
+						if (var9 != 32767) {
-					}
+							var10 = var0.readUShortSmart();
-
+							var11 = var0.readUnsignedByte();
-					return 1;
+							int var12 = var9 > 0 ? var0.readUnsignedByte() : var11;
-				} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
+							var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
-					var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+						} else {
-					var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+							var3.removeHealthBar(var8);
-					String var14 = var3.toLowerCase();
-					byte var17 = 0;
-					if (var14.startsWith("yellow:")) {
-						var17 = 0;
-						var3 = var3.substring("yellow:".length());
-					} else if (var14.startsWith("red:")) {
-						var17 = 1;
-						var3 = var3.substring("red:".length());
-					} else if (var14.startsWith("green:")) {
-						var17 = 2;
-						var3 = var3.substring("green:".length());
-					} else if (var14.startsWith("cyan:")) {
-						var17 = 3;
-						var3 = var3.substring("cyan:".length());
-					} else if (var14.startsWith("purple:")) {
-						var17 = 4;
-						var3 = var3.substring("purple:".length());
-					} else if (var14.startsWith("white:")) {
-						var17 = 5;
-						var3 = var3.substring("white:".length());
-					} else if (var14.startsWith("flash1:")) {
-						var17 = 6;
-						var3 = var3.substring("flash1:".length());
-					} else if (var14.startsWith("flash2:")) {
-						var17 = 7;
-						var3 = var3.substring("flash2:".length());
-					} else if (var14.startsWith("flash3:")) {
-						var17 = 8;
-						var3 = var3.substring("flash3:".length());
-					} else if (var14.startsWith("glow1:")) {
-						var17 = 9;
-						var3 = var3.substring("glow1:".length());
-					} else if (var14.startsWith("glow2:")) {
-						var17 = 10;
-						var3 = var3.substring("glow2:".length());
-					} else if (var14.startsWith("glow3:")) {
-						var17 = 11;
-						var3 = var3.substring("glow3:".length());
-					} else if (Language.Language_EN != IgnoreList.clientLanguage) {
-						if (var14.startsWith("yellow:")) {
-							var17 = 0;
-							var3 = var3.substring("yellow:".length());
-						} else if (var14.startsWith("red:")) {
-							var17 = 1;
-							var3 = var3.substring("red:".length());
-						} else if (var14.startsWith("green:")) {
-							var17 = 2;
-							var3 = var3.substring("green:".length());
-						} else if (var14.startsWith("cyan:")) {
-							var17 = 3;
-							var3 = var3.substring("cyan:".length());
-						} else if (var14.startsWith("purple:")) {
-							var17 = 4;
-							var3 = var3.substring("purple:".length());
-						} else if (var14.startsWith("white:")) {
-							var17 = 5;
-							var3 = var3.substring("white:".length());
-						} else if (var14.startsWith("flash1:")) {
-							var17 = 6;
-							var3 = var3.substring("flash1:".length());
-						} else if (var14.startsWith("flash2:")) {
-							var17 = 7;
-							var3 = var3.substring("flash2:".length());
-						} else if (var14.startsWith("flash3:")) {
-							var17 = 8;
-							var3 = var3.substring("flash3:".length());
-						} else if (var14.startsWith("glow1:")) {
-							var17 = 9;
-							var3 = var3.substring("glow1:".length());
-						} else if (var14.startsWith("glow2:")) {
-							var17 = 10;
-							var3 = var3.substring("glow2:".length());
-						} else if (var14.startsWith("glow3:")) {
-							var17 = 11;
-							var3 = var3.substring("glow3:".length());
 						}
 					}
+				}
+			}
 
-					var14 = var3.toLowerCase();
+			if ((var4 & 32) != 0) {
-					byte var7 = 0;
+				var3.overheadText = var0.readStringCp1252NullTerminated();
-					if (var14.startsWith("wave:")) {
+				var3.overheadTextCyclesRemaining = 100;
-						var7 = 1;
+			}
-						var3 = var3.substring("wave:".length());
-					} else if (var14.startsWith("wave2:")) {
-						var7 = 2;
-						var3 = var3.substring("wave2:".length());
-					} else if (var14.startsWith("shake:")) {
-						var7 = 3;
-						var3 = var3.substring("shake:".length());
-					} else if (var14.startsWith("scroll:")) {
-						var7 = 4;
-						var3 = var3.substring("scroll:".length());
-					} else if (var14.startsWith("slide:")) {
-						var7 = 5;
-						var3 = var3.substring("slide:".length());
-					} else if (IgnoreList.clientLanguage != Language.Language_EN) {
-						if (var14.startsWith("wave:")) {
-							var7 = 1;
-							var3 = var3.substring("wave:".length());
-						} else if (var14.startsWith("wave2:")) {
-							var7 = 2;
-							var3 = var3.substring("wave2:".length());
-						} else if (var14.startsWith("shake:")) {
-							var7 = 3;
-							var3 = var3.substring("shake:".length());
-						} else if (var14.startsWith("scroll:")) {
-							var7 = 4;
-							var3 = var3.substring("scroll:".length());
-						} else if (var14.startsWith("slide:")) {
-							var7 = 5;
-							var3 = var3.substring("slide:".length());
-						}
-					}
 
-					PacketBufferNode var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher);
+			if ((var4 & 4) != 0) {
-					var8.packetBuffer.writeByte(0);
+				var3.definition = StudioGame.getNpcDefinition(var0.method5757());
-					int var9 = var8.packetBuffer.offset;
+				var3.field967 = var3.definition.size;
-					var8.packetBuffer.writeByte(var4);
+				var3.field1017 = var3.definition.rotation;
-					var8.packetBuffer.writeByte(var17);
+				var3.walkSequence = var3.definition.walkSequence;
-					var8.packetBuffer.writeByte(var7);
+				var3.walkBackSequence = var3.definition.walkBackSequence;
-					GraphicsDefaults.method5966(var8.packetBuffer, var3);
+				var3.walkLeftSequence = var3.definition.walkLeftSequence;
-					var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
+				var3.walkRightSequence = var3.definition.walkRightSequence;
-					Client.packetWriter.addNode(var8);
+				var3.idleSequence = var3.definition.idleSequence;
-					return 1;
+				var3.turnLeftSequence = var3.definition.turnLeftSequence;
-				} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
+				var3.turnRightSequence = var3.definition.turnRightSequence;
-					Interpreter.Interpreter_stringStackSize -= 2;
+			}
-					var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-					String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-					PacketBufferNode var11 = FaceNormal.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher);
-					var11.packetBuffer.writeShort(0);
-					int var13 = var11.packetBuffer.offset;
-					var11.packetBuffer.writeStringCp1252NullTerminated(var3);
-					GraphicsDefaults.method5966(var11.packetBuffer, var12);
-					var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
-					Client.packetWriter.addNode(var11);
-					return 1;
-				} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
-					if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode;
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketWriter.Messages_getHistorySize(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ObjectSound.Messages_getNextChatID(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
-						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class58.Messages_getLastChatID(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.DOCHEAT) {
-						var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-						class60.doCheat(var3);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
-						Client.field814 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field814;
-						return 1;
-					} else if (var0 == ScriptOpcodes.DEBUGMES) {
-						var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-						System.out.println(var3);
-						return 1;
-					} else {
-						return 2;
-					}
-				} else {
-					if (ByteArrayPool.localPlayer != null && ByteArrayPool.localPlayer.username != null) {
-						var3 = ByteArrayPool.localPlayer.username.getName();
-					} else {
-						var3 = "";
-					}
 
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
+			if ((var4 & 8) != 0) {
-					return 1;
+				var3.targetIndex = var0.readUnsignedShort();
+				if (var3.targetIndex == 65535) {
+					var3.targetIndex = -1;
+				}
+			}
+
+			if ((var4 & 64) != 0) {
+				var3.spotAnimation = var0.method5757();
+				var5 = var0.method5767();
+				var3.field1005 = var5 >> 16;
+				var3.field987 = (var5 & 65535) + Client.cycle;
+				var3.spotAnimationFrame = 0;
+				var3.spotAnimationFrameCycle = 0;
+				if (var3.field987 > Client.cycle) {
+					var3.spotAnimationFrame = -1;
+				}
+
+				if (var3.spotAnimation == 65535) {
+					var3.spotAnimation = -1;
 				}
 			}
 		}
+
 	}
 }

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("ld")
+@ObfuscatedName("lv")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 1060370967
-	)
-	@Export("lowY")
-	public int lowY;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1597072337
+		intValue = -961758993
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -456113605
+		intValue = 1458350895
+	)
+	@Export("lowY")
+	public int lowY;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = 875525085
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -239139767
+		intValue = -1188404153
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "1269806188"
+		garbageValue = "-2102954293"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "838675503"
+		garbageValue = "-40"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,31 +63,31 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lld;Lld;B)V",
+		signature = "(Llv;Llv;I)V",
-		garbageValue = "-7"
+		garbageValue = "1555379366"
 	)
-	public void method6047(Bounds var1, Bounds var2) {
+	public void method6202(Bounds var1, Bounds var2) {
-		this.method6051(var1, var2);
+		this.method6199(var1, var2);
-		this.method6052(var1, var2);
+		this.method6194(var1, var2);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lld;Lld;I)V",
+		signature = "(Llv;Llv;B)V",
-		garbageValue = "-1938755982"
+		garbageValue = "58"
 	)
-	void method6051(Bounds var1, Bounds var2) {
+	void method6199(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
-			var2.highX = (var2.highX * -2075179277 - (var1.lowX * -2075179277 - this.lowX * -2075179277)) * -456113605;
+			var2.highX = (var2.highX * 73759861 - (var1.lowX * 73759861 - this.lowX * 73759861)) * 875525085;
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method6053() > var1.method6053()) {
+		if (var2.method6193() > var1.method6193()) {
-			var2.highX -= var2.method6053() - var1.method6053();
+			var2.highX -= var2.method6193() - var1.method6193();
 		}
 
 		if (var2.highX < 0) {
@@ -96,21 +96,21 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lld;Lld;I)V",
+		signature = "(Llv;Llv;I)V",
-		garbageValue = "-642069303"
+		garbageValue = "-810970943"
 	)
-	void method6052(Bounds var1, Bounds var2) {
+	void method6194(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
-			var2.highY = (var2.highY * -707514887 - (var1.lowY * -707514887 - this.lowY * -707514887)) * -239139767;
+			var2.highY = (var2.highY * 1962542455 - (var1.lowY * 1962542455 - this.lowY * 1962542455)) * -1188404153;
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method6050() > var1.method6050()) {
+		if (var2.method6196() > var1.method6196()) {
-			var2.highY -= var2.method6050() - var1.method6050();
+			var2.highY -= var2.method6196() - var1.method6196();
 		}
 
 		if (var2.highY < 0) {
@@ -119,22 +119,22 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "0"
+		garbageValue = "515582700"
 	)
-	int method6053() {
+	int method6193() {
 		return this.lowX + this.highX;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "180335993"
+		garbageValue = "-500619811"
 	)
-	int method6050() {
+	int method6196() {
-		return this.highY + this.lowY;
+		return this.lowY + this.highY;
 	}
 
 	public String toString() {

runescape-client/src/main/java/Buddy.java

@@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ke")
+@ObfuscatedName("kx")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1726409249
+		intValue = 746026781
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1414783729
+		intValue = 2013337995
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -25627413
+		intValue = 1889859317
 	)
 	@Export("rank")
 	public int rank;
@@ -30,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "1769610141"
+		garbageValue = "-820539853"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -41,23 +41,140 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "734760061"
+		garbageValue = "1724193250"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-182915585"
+		garbageValue = "-279238296"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(III)I",
+		garbageValue = "562871414"
+	)
+	static int method5363(int var0, int var1) {
+		FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0);
+		FloorOverlayDefinition var2;
+		if (var3 != null) {
+			var2 = var3;
+		} else {
+			byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0);
+			var3 = new FloorOverlayDefinition();
+			if (var4 != null) {
+				var3.decode(new Buffer(var4), var0);
+			}
+
+			var3.postDecode();
+			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0);
+			var2 = var3;
+		}
+
+		if (var2 == null) {
+			return var1;
+		} else if (var2.secondaryRgb >= 0) {
+			return var2.secondaryRgb | -16777216;
+		} else {
+			int var5;
+			byte var6;
+			int var8;
+			int var9;
+			if (var2.texture >= 0) {
+				var5 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture);
+				var6 = 96;
+				if (var5 == -2) {
+					var8 = 12345678;
+				} else if (var5 == -1) {
+					if (var6 < 0) {
+						var6 = 0;
+					} else if (var6 > 127) {
+						var6 = 127;
+					}
+
+					var9 = 127 - var6;
+					var8 = var9;
+				} else {
+					var9 = var6 * (var5 & 127) / 128;
+					if (var9 < 2) {
+						var9 = 2;
+					} else if (var9 > 126) {
+						var9 = 126;
+					}
+
+					var8 = var9 + (var5 & 65408);
+				}
+
+				return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216;
+			} else if (var2.primaryRgb == 16711935) {
+				return var1;
+			} else {
+				var8 = Players.method2285(var2.hue, var2.saturation, var2.lightness);
+				var6 = 96;
+				if (var8 == -2) {
+					var5 = 12345678;
+				} else if (var8 == -1) {
+					if (var6 < 0) {
+						var6 = 0;
+					} else if (var6 > 127) {
+						var6 = 127;
+					}
+
+					var9 = 127 - var6;
+					var5 = var9;
+				} else {
+					var9 = var6 * (var8 & 127) / 128;
+					if (var9 < 2) {
+						var9 = 2;
+					} else if (var9 > 126) {
+						var9 = 126;
+					}
+
+					var5 = var9 + (var8 & 65408);
+				}
+
+				return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216;
+			}
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Lic;III)Llh;",
+		garbageValue = "214880487"
+	)
+	static IndexedSprite method5355(AbstractArchive var0, int var1, int var2) {
+		byte[] var4 = var0.takeFile(var1, var2);
+		boolean var3;
+		if (var4 == null) {
+			var3 = false;
+		} else {
+			class3.SpriteBuffer_decode(var4);
+			var3 = true;
+		}
+
+		return !var3 ? null : AttackOption.method2173();
+	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		signature = "(IS)V",
+		garbageValue = "1714"
+	)
+	static void method5349(int var0) {
+		Login.loginIndex = 12;
+		Login.field1212 = var0;
+	}
 }

runescape-client/src/main/java/BuddyRankComparator.java

@@ -3,10 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fg")
+@ObfuscatedName("fn")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
+	@Export("Tiles_hue")
+	static int[] Tiles_hue;
+	@ObfuscatedName("m")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -14,10 +17,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lke;Lke;I)I",
+		signature = "(Lkx;Lkx;I)I",
-		garbageValue = "258923483"
+		garbageValue = "1665981134"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -32,12 +35,22 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("ka")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "16"
+		garbageValue = "-1830826767"
 	)
-	public static void method3533() {
+	static String method3556(String var0) {
-		WorldMapElement.WorldMapElement_cachedSprites.clear();
+		PlayerType[] var1 = VarbitDefinition.PlayerType_values();
+
+		for (int var2 = 0; var2 < var1.length; ++var2) {
+			PlayerType var3 = var1[var2];
+			if (var3.modIcon != -1 && var0.startsWith(WorldMapRegion.method611(var3.modIcon))) {
+				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
+				break;
+			}
+		}
+
+		return var0;
 	}
 }

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("ms")
+@ObfuscatedName("mn")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lmb;"
+		signature = "Lmy;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = -6621394340155458391L
+		longValue = 183648846884359197L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -498492055
+		intValue = 1553809797
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = -915874801967299919L
+		longValue = -2985208532115456417L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 730352763
+		intValue = 457646537
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = 8841745747932636313L
+		longValue = 2498512168954711415L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		longValue = -5167130975185536305L
+		longValue = -3113265757492371609L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		longValue = -2996772461190095265L
+		longValue = 6675249402129041573L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = -2630268660887985841L
+		longValue = 1854591788033998237L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		signature = "(Lmb;II)V"
+		signature = "(Lmy;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L;
@@ -84,10 +84,10 @@ public class BufferedFile {
 		this.offset = 0L;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-859079735"
+		garbageValue = "159388731"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)J",
+		signature = "(I)J",
-		garbageValue = "65"
+		garbageValue = "243378114"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "1780472721"
+		garbageValue = "1810550632"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "1941673100"
+		garbageValue = "-4"
 	)
 	@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 && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) {
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3);
 				this.offset += (long)var3;
 				return;
@@ -146,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset;
 			int var7 = var3;
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset));
 				if (var8 > var3) {
 					var8 = var3;
@@ -184,7 +184,7 @@ public class BufferedFile {
 				this.offset += (long)var8;
 			}
 
-			if (-1L != this.writeBufferOffset) {
+			if (this.writeBufferOffset != -1L) {
 				if (this.writeBufferOffset > this.offset && var3 > 0) {
 					var8 = var2 + (int)(this.writeBufferOffset - this.offset);
 					if (var8 > var3 + var2) {
@@ -202,13 +202,13 @@ public class BufferedFile {
 				long var10 = -1L;
 				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) {
 					var13 = this.writeBufferOffset;
-				} else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) {
+				} else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) {
 					var13 = var4;
 				}
 
-				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) {
+				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) {
-					var10 = this.writeBufferOffset + (long)this.writeBufferLength;
+					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
-				} else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) {
+				} else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
 					var10 = var4 + (long)var7;
 				}
 
@@ -231,10 +231,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-2013306645"
+		garbageValue = "1659142795"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -261,23 +261,23 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "-1"
+		garbageValue = "1917244707"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		try {
 			if (this.offset + (long)var3 > this.length) {
-				this.length = this.offset + (long)var3;
+				this.length = (long)var3 + this.offset;
 			}
 
 			if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
 				this.flush();
 			}
 
-			if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) {
+			if (this.writeBufferOffset != -1L && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) {
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset));
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4);
 				this.offset += (long)var4;
@@ -289,7 +289,7 @@ public class BufferedFile {
 
 			if (var3 <= this.writeBuffer.length) {
 				if (var3 > 0) {
-					if (this.writeBufferOffset == -1L) {
+					if (-1L == this.writeBufferOffset) {
 						this.writeBufferOffset = this.offset;
 					}
 
@@ -314,21 +314,21 @@ public class BufferedFile {
 
 				long var9 = -1L;
 				long var6 = -1L;
-				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 					var9 = this.offset;
-				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) {
+				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) {
 					var9 = this.readBufferOffset;
 				}
 
 				if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) {
 					var6 = (long)var3 + this.offset;
-				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) {
+				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) {
-					var6 = (long)this.readBufferLength + this.readBufferOffset;
+					var6 = this.readBufferOffset + (long)this.readBufferLength;
 				}
 
 				if (var9 > -1L && var6 > var9) {
 					int var8 = (int)(var6 - var9);
-					System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8);
+					System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8);
 				}
 
 				this.offset += (long)var3;
@@ -339,21 +339,21 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-985506123"
+		garbageValue = "-1996252506"
 	)
 	@Export("flush")
 	void flush() throws IOException {
-		if (-1L != this.writeBufferOffset) {
+		if (this.writeBufferOffset != -1L) {
-			if (this.fileOffset != this.writeBufferOffset) {
+			if (this.writeBufferOffset != this.fileOffset) {
 				this.accessFile.seek(this.writeBufferOffset);
 				this.fileOffset = this.writeBufferOffset;
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength);
-			this.fileOffset += (long)this.writeBufferLength * 257304554331176961L;
+			this.fileOffset += (long)this.writeBufferLength * -743906103946903551L;
 			if (this.fileOffset > this.fileLength) {
 				this.fileLength = this.fileOffset;
 			}
@@ -362,14 +362,14 @@ public class BufferedFile {
 			long var3 = -1L;
 			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) {
 				var1 = this.writeBufferOffset;
-			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) {
+			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) {
 				var1 = this.readBufferOffset;
 			}
 
-			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) {
 				var3 = this.writeBufferOffset + (long)this.writeBufferLength;
-			} else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) {
-				var3 = (long)this.readBufferLength + this.readBufferOffset;
+				var3 = this.readBufferOffset + (long)this.readBufferLength;
 			}
 
 			if (var1 > -1L && var3 > var1) {

runescape-client/src/main/java/BufferedNetSocket.java

@@ -8,18 +8,18 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("lc")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Llm;"
+		signature = "Lli;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Llo;"
+		signature = "Llu;"
 	)
 	@Export("sink")
 	BufferedSink sink;
@@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "7"
+		garbageValue = "-768493590"
 	)
 	@Export("close")
 	public void close() {
@@ -51,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "1436175029"
+		garbageValue = "-8"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "195119972"
+		garbageValue = "-1942767880"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "0"
+		garbageValue = "1355091335"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "([BIIB)I",
-		garbageValue = "33"
+		garbageValue = "37"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "-2040746201"
+		garbageValue = "-105"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {

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("lo")
+@ObfuscatedName("lu")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -63285245
+		intValue = -870723035
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 238793019
+		intValue = 136248619
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1710004877
+		intValue = 961072211
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("closed")
 	boolean closed;
 
@@ -54,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(B)Z",
-		garbageValue = "86"
+		garbageValue = "49"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -79,10 +79,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "([BIIS)V",
+		signature = "([BIII)V",
-		garbageValue = "-5417"
+		garbageValue = "2083374722"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -119,10 +119,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(S)V",
-		garbageValue = "1845686279"
+		garbageValue = "7072"
 	)
 	@Export("close")
 	void close() {

runescape-client/src/main/java/BufferedSource.java

@@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lm")
+@ObfuscatedName("li")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1277158721
+		intValue = -775768789
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -555617543
+		intValue = 1204557961
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 155508897
+		intValue = -340586493
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("exception")
 	IOException exception;
 
@@ -52,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "-72"
+		garbageValue = "733897471"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "23"
+		garbageValue = "122"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,10 +110,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "0"
+		garbageValue = "400008412"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
@@ -133,10 +133,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "([BIII)I",
+		signature = "([BIIB)I",
-		garbageValue = "1983189445"
+		garbageValue = "24"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-424049486"
+		garbageValue = "-1"
 	)
 	@Export("close")
 	void close() {

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("gu")
+@ObfuscatedName("gb")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("byteArray")
 	public byte[] byteArray;
 

runescape-client/src/main/java/ByteArrayPool.java

@@ -3,49 +3,38 @@ 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("kl")
+@ObfuscatedName("kh")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1085221259
+		intValue = -1047368171
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1727061429
+		intValue = 404509009
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 13537333
+		intValue = 294344847
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("z")
-	@Export("ByteArrayPool_altSizeArrayCounts")
-	public static int[] ByteArrayPool_altSizeArrayCounts;
-	@ObfuscatedName("t")
-	@Export("ByteArrayPool_arrays")
-	public static byte[][][] ByteArrayPool_arrays;
-	@ObfuscatedName("kv")
-	@ObfuscatedSignature(
-		signature = "Lbi;"
-	)
-	@Export("localPlayer")
-	static Player localPlayer;
 
 	static {
 		ByteArrayPool_smallCount = 0;
@@ -56,10 +45,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(IZI)[B",
-		garbageValue = "1813888671"
+		garbageValue = "1801183295"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -91,14 +80,14 @@ public class ByteArrayPool {
 			return var2;
 		}
 
-		if (ByteArrayPool_arrays != null) {
+		if (Fonts.ByteArrayPool_arrays != null) {
-			for (int var4 = 0; var4 < RunException.ByteArrayPool_alternativeSizes.length; ++var4) {
+			for (int var4 = 0; var4 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var4) {
-				if (RunException.ByteArrayPool_alternativeSizes[var4] != var0) {
+				if (ParamDefinition.ByteArrayPool_alternativeSizes[var4] != var0) {
-					if (var0 < RunException.ByteArrayPool_alternativeSizes[var4]) {
+					if (var0 < ParamDefinition.ByteArrayPool_alternativeSizes[var4]) {
 					}
-				} else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+				} else if (VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
-					byte[] var3 = ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]];
+					byte[] var3 = Fonts.ByteArrayPool_arrays[var4][--VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4]];
-					ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null;
+					Fonts.ByteArrayPool_arrays[var4][VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}
@@ -106,4 +95,32 @@ public class ByteArrayPool {
 
 		return new byte[var0];
 	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;B)Ljava/lang/Class;",
+		garbageValue = "28"
+	)
+	@Export("loadClassFromDescriptor")
+	static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
+		if (var0.equals("B")) {
+			return Byte.TYPE;
+		} else if (var0.equals("I")) {
+			return Integer.TYPE;
+		} else if (var0.equals("S")) {
+			return Short.TYPE;
+		} else if (var0.equals("J")) {
+			return Long.TYPE;
+		} else if (var0.equals("Z")) {
+			return Boolean.TYPE;
+		} else if (var0.equals("F")) {
+			return Float.TYPE;
+		} else if (var0.equals("D")) {
+			return Double.TYPE;
+		} else if (var0.equals("C")) {
+			return Character.TYPE;
+		} else {
+			return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0);
+		}
+	}
 }

runescape-client/src/main/java/Calendar.java

@@ -1,20 +1,18 @@
-import java.io.IOException;
 import java.util.TimeZone;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hq")
+@ObfuscatedName("hy")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("DAYS_OF_THE_WEEK")
 	public static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("Calendar_calendar")
 	public static java.util.Calendar Calendar_calendar;
 
@@ -24,69 +22,4 @@ public class Calendar {
 		java.util.Calendar.getInstance();
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "-1975590317"
-	)
-	public static int method4033(int var0) {
-		--var0;
-		var0 |= var0 >>> 1;
-		var0 |= var0 >>> 2;
-		var0 |= var0 >>> 4;
-		var0 |= var0 >>> 8;
-		var0 |= var0 >>> 16;
-		return var0 + 1;
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-1281352540"
-	)
-	static void method4032() {
-		if (Login.clearLoginScreen) {
-			ModelData0.titleboxSprite = null;
-			GrandExchangeOfferOwnWorldComparator.titlebuttonSprite = null;
-			Login.runesSprite = null;
-			Login.leftTitleSprite = null;
-			DirectByteArrayCopier.rightTitleSprite = null;
-			class3.logoSprite = null;
-			ArchiveDisk.title_muteSprite = null;
-			class4.options_buttons_0Sprite = null;
-			Login.options_buttons_2Sprite = null;
-			class69.worldSelectBackSprites = null;
-			GrandExchangeEvent.worldSelectFlagSprites = null;
-			WorldMapDecoration.worldSelectArrows = null;
-			class348.worldSelectStars = null;
-			ItemContainer.field572 = null;
-			MilliClock.loginScreenRunesAnimation.method1909();
-			class206.field2406 = 1;
-			class206.musicTrackArchive = null;
-			class206.musicTrackGroupId = -1;
-			class206.musicTrackFileId = -1;
-			class219.musicTrackVolume = 0;
-			GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false;
-			AttackOption.field1187 = 2;
-			if (NetCache.NetCache_socket != null) {
-				try {
-					Buffer var0 = new Buffer(4);
-					var0.writeByte(2);
-					var0.writeMedium(0);
-					NetCache.NetCache_socket.write(var0.array, 0, 4);
-				} catch (IOException var3) {
-					try {
-						NetCache.NetCache_socket.close();
-					} catch (Exception var2) {
-					}
-
-					++NetCache.NetCache_ioExceptions;
-					NetCache.NetCache_socket = null;
-				}
-			}
-
-			Login.clearLoginScreen = false;
-		}
-	}
 }

runescape-client/src/main/java/Canvas.java

@@ -2,12 +2,19 @@ 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("bu")
+@ObfuscatedName("ba")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
+	@ObfuscatedName("hd")
+	@ObfuscatedGetter(
+		intValue = 1560721333
+	)
+	@Export("cameraYaw")
+	static int cameraYaw;
 	@ObfuscatedName("m")
 	@Export("component")
 	Component component;
@@ -16,39 +23,268 @@ public final class Canvas extends java.awt.Canvas {
 		this.component = var1;
 	}
 
-	public final void update(Graphics var1) {
-		this.component.update(var1);
-	}
-
 	public final void paint(Graphics var1) {
 		this.component.paint(var1);
 	}
 
-	@ObfuscatedName("k")
+	public final void update(Graphics var1) {
+		this.component.update(var1);
+	}
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(IS)I",
+		signature = "(II)Ljg;",
-		garbageValue = "-1870"
+		garbageValue = "83996779"
 	)
-	public static int method958(int var0) {
+	@Export("getObjectDefinition")
-		return var0 >> 17 & 7;
+	public static ObjectDefinition getObjectDefinition(int var0) {
+		ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0);
+			var1 = new ObjectDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			if (var1.isSolid) {
+				var1.interactType = 0;
+				var1.boolean1 = false;
+			}
+
+			ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
 	}
 
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(IIIS)I",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-22602"
+		garbageValue = "1398023724"
 	)
-	static final int method957(int var0, int var1, int var2) {
+	static final void method927(String var0) {
-		int var3 = var0 / var2;
+		StringBuilder var10000 = (new StringBuilder()).append(var0);
-		int var4 = var0 & var2 - 1;
+		Object var10001 = null;
-		int var5 = var1 / var2;
+		String var1 = var10000.append(" is already on your friend list").toString();
-		int var6 = var1 & var2 - 1;
+		ObjectSound.addGameMessage(30, "", var1);
-		int var7 = class232.method4218(var3, var5);
+	}
-		int var8 = class232.method4218(var3 + 1, var5);
+
-		int var9 = class232.method4218(var3, var5 + 1);
+	@ObfuscatedName("ga")
-		int var10 = class232.method4218(var3 + 1, var5 + 1);
+	@ObfuscatedSignature(
-		int var11 = class195.method3695(var7, var8, var4, var2);
+		signature = "(I)V",
-		int var12 = class195.method3695(var9, var10, var4, var2);
+		garbageValue = "411559133"
-		return class195.method3695(var11, var12, var6, var2);
+	)
+	static void method925() {
+		if (class60.localPlayer.x >> 7 == Client.destinationX && class60.localPlayer.y >> 7 == Client.destinationY) {
+			Client.destinationX = 0;
+		}
+
+	}
+
+	@ObfuscatedName("is")
+	@ObfuscatedSignature(
+		signature = "(III)Ljava/lang/String;",
+		garbageValue = "-266618010"
+	)
+	static final String method924(int var0, int var1) {
+		int var2 = var1 - var0;
+		if (var2 < -9) {
+			return ItemContainer.colorStartTag(16711680);
+		} else if (var2 < -6) {
+			return ItemContainer.colorStartTag(16723968);
+		} else if (var2 < -3) {
+			return ItemContainer.colorStartTag(16740352);
+		} else if (var2 < 0) {
+			return ItemContainer.colorStartTag(16756736);
+		} else if (var2 > 9) {
+			return ItemContainer.colorStartTag(65280);
+		} else if (var2 > 6) {
+			return ItemContainer.colorStartTag(4259584);
+		} else if (var2 > 3) {
+			return ItemContainer.colorStartTag(8453888);
+		} else {
+			return var2 > 0 ? ItemContainer.colorStartTag(12648192) : ItemContainer.colorStartTag(16776960);
+		}
+	}
+
+	@ObfuscatedName("iw")
+	@ObfuscatedSignature(
+		signature = "(Lhd;II)I",
+		garbageValue = "623604092"
+	)
+	static final int method923(Widget var0, int var1) {
+		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
+			try {
+				int[] var2 = var0.cs1Instructions[var1];
+				int var3 = 0;
+				int var4 = 0;
+				byte var5 = 0;
+
+				while (true) {
+					int var6 = var2[var4++];
+					int var7 = 0;
+					byte var8 = 0;
+					if (var6 == 0) {
+						return var3;
+					}
+
+					if (var6 == 1) {
+						var7 = Client.currentLevels[var2[var4++]];
+					}
+
+					if (var6 == 2) {
+						var7 = Client.levels[var2[var4++]];
+					}
+
+					if (var6 == 3) {
+						var7 = Client.experience[var2[var4++]];
+					}
+
+					int var9;
+					Widget var10;
+					int var11;
+					int var12;
+					if (var6 == 4) {
+						var9 = var2[var4++] << 16;
+						var9 += var2[var4++];
+						var10 = WorldMapSprite.getWidget(var9);
+						var11 = var2[var4++];
+						if (var11 != -1 && (!KitDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+								if (var11 + 1 == var10.itemIds[var12]) {
+									var7 += var10.itemQuantities[var12];
+								}
+							}
+						}
+					}
+
+					if (var6 == 5) {
+						var7 = Varps.Varps_main[var2[var4++]];
+					}
+
+					if (var6 == 6) {
+						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
+					}
+
+					if (var6 == 7) {
+						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
+					}
+
+					if (var6 == 8) {
+						var7 = class60.localPlayer.combatLevel;
+					}
+
+					if (var6 == 9) {
+						for (var9 = 0; var9 < 25; ++var9) {
+							if (Skills.Skills_enabled[var9]) {
+								var7 += Client.levels[var9];
+							}
+						}
+					}
+
+					if (var6 == 10) {
+						var9 = var2[var4++] << 16;
+						var9 += var2[var4++];
+						var10 = WorldMapSprite.getWidget(var9);
+						var11 = var2[var4++];
+						if (var11 != -1 && (!KitDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+								if (var11 + 1 == var10.itemIds[var12]) {
+									var7 = 999999999;
+									break;
+								}
+							}
+						}
+					}
+
+					if (var6 == 11) {
+						var7 = Client.runEnergy;
+					}
+
+					if (var6 == 12) {
+						var7 = Client.weight;
+					}
+
+					if (var6 == 13) {
+						var9 = Varps.Varps_main[var2[var4++]];
+						int var13 = var2[var4++];
+						var7 = (var9 & 1 << var13) != 0 ? 1 : 0;
+					}
+
+					if (var6 == 14) {
+						var9 = var2[var4++];
+						var7 = Widget.getVarbit(var9);
+					}
+
+					if (var6 == 15) {
+						var8 = 1;
+					}
+
+					if (var6 == 16) {
+						var8 = 2;
+					}
+
+					if (var6 == 17) {
+						var8 = 3;
+					}
+
+					if (var6 == 18) {
+						var7 = (class60.localPlayer.x >> 7) + class182.baseX;
+					}
+
+					if (var6 == 19) {
+						var7 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY;
+					}
+
+					if (var6 == 20) {
+						var7 = var2[var4++];
+					}
+
+					if (var8 == 0) {
+						if (var5 == 0) {
+							var3 += var7;
+						}
+
+						if (var5 == 1) {
+							var3 -= var7;
+						}
+
+						if (var5 == 2 && var7 != 0) {
+							var3 /= var7;
+						}
+
+						if (var5 == 3) {
+							var3 *= var7;
+						}
+
+						var5 = 0;
+					} else {
+						var5 = var8;
+					}
+				}
+			} catch (Exception var14) {
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
+
+	@ObfuscatedName("kx")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;B)V",
+		garbageValue = "-83"
+	)
+	@Export("Clan_joinChat")
+	static final void Clan_joinChat(String var0) {
+		if (!var0.equals("")) {
+			PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher);
+			var1.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0));
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+			Client.packetWriter.addNode(var1);
+		}
 	}
 }

runescape-client/src/main/java/ChatChannel.java

@@ -1,3 +1,4 @@
+import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -7,26 +8,18 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("cl")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("fc")
+	@ObfuscatedName("eh")
-	@ObfuscatedGetter(
+	@Export("secureRandom")
-		longValue = -181918079142719425L
+	static SecureRandom secureRandom;
-	)
+	@ObfuscatedName("o")
-	static long field1319;
-	@ObfuscatedName("go")
 	@ObfuscatedSignature(
-		signature = "Lla;"
+		signature = "[Lbr;"
-	)
-	@Export("compass")
-	static Sprite compass;
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "[Lby;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1013484149
+		intValue = 1880348079
 	)
 	@Export("count")
 	int count;
@@ -35,10 +28,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lby;",
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbr;",
-		garbageValue = "922420852"
+		garbageValue = "-1"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -66,111 +59,23 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IB)Lby;",
+		signature = "(II)Lbr;",
-		garbageValue = "49"
+		garbageValue = "-317582349"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-2095560133"
+		garbageValue = "-1472365930"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-570972962"
-	)
-	@Export("addChatMessage")
-	static void addChatMessage(int var0, String var1, String var2, String var3) {
-		ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0);
-		if (var4 == null) {
-			var4 = new ChatChannel();
-			Messages.Messages_channels.put(var0, var4);
-		}
-
-		Message var5 = var4.addMessage(var0, var1, var2, var3);
-		Messages.Messages_hashTable.put(var5, (long)var5.count);
-		Messages.Messages_queue.add(var5);
-		Client.chatCycle = Client.cycleCntr;
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "266221696"
-	)
-	static final void method2351() {
-		GrandExchangeEvent.method165("You can't add yourself to your own ignore list");
-	}
-
-	@ObfuscatedName("fo")
-	@ObfuscatedSignature(
-		signature = "(IZZZB)Lih;",
-		garbageValue = "109"
-	)
-	@Export("newArchive")
-	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
-		ArchiveDisk var4 = null;
-		if (JagexCache.JagexCache_dat2File != null) {
-			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, PacketBufferNode.JagexCache_idxFiles[var0], 1000000);
-		}
-
-		return new Archive(var4, WorldMapRegion.masterDisk, var0, var1, var2, var3);
-	}
-
-	@ObfuscatedName("fn")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "48"
-	)
-	@Export("playPcmPlayers")
-	static final void playPcmPlayers() {
-		if (AbstractWorldMapData.pcmPlayer1 != null) {
-			AbstractWorldMapData.pcmPlayer1.run();
-		}
-
-		if (WorldMapManager.pcmPlayer0 != null) {
-			WorldMapManager.pcmPlayer0.run();
-		}
-
-	}
-
-	@ObfuscatedName("ih")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-2027834560"
-	)
-	static void method2354() {
-		for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) {
-			if (WorldMapLabelSize.method282(Client.menuOpcodes[var0])) {
-				if (var0 < Client.menuOptionsCount - 1) {
-					for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) {
-						Client.menuActions[var1] = Client.menuActions[var1 + 1];
-						Client.menuTargets[var1] = Client.menuTargets[var1 + 1];
-						Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1];
-						Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1];
-						Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1];
-						Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1];
-						Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1];
-					}
-				}
-
-				--var0;
-				--Client.menuOptionsCount;
-			}
-		}
-
-		MusicPatchNode.method3922(WorldMapScaleHandler.menuWidth / 2 + WorldMapDecoration.menuX, PacketBufferNode.menuY);
-	}
 }

runescape-client/src/main/java/ClanChat.java

@@ -1,107 +1,165 @@
+import java.io.IOException;
+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("ko")
+@ObfuscatedName("kk")
 @Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lmx;"
+		signature = "Lmo;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lkt;"
+		signature = "Lkp;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1347537209
+		intValue = -1947222095
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 2146085943
+		intValue = -1869619471
 	)
-	int field3634;
+	int field3663;
 
 	@ObfuscatedSignature(
-		signature = "(Lmx;Lkt;)V"
+		signature = "(Lmo;Lkp;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3634 = 1;
+		this.field3663 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Ljd;",
+		signature = "(I)Ljf;",
-		garbageValue = "-1332552421"
+		garbageValue = "551595115"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljd;",
+		signature = "(II)[Ljf;",
-		garbageValue = "-667029686"
+		garbageValue = "1959965595"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "105"
+		garbageValue = "-85"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = DevicePcmPlayerProvider.method948(var1);
+		long var5 = 0L;
+		int var7 = var1.length();
+
+		for (int var8 = 0; var8 < var7; ++var8) {
+			var5 *= 37L;
+			char var9 = var1.charAt(var8);
+			if (var9 >= 'A' && var9 <= 'Z') {
+				var5 += (long)(var9 + 1 - 65);
+			} else if (var9 >= 'a' && var9 <= 'z') {
+				var5 += (long)(var9 + 1 - 97);
+			} else if (var9 >= '0' && var9 <= '9') {
+				var5 += (long)(var9 + 27 - 48);
+			}
+
+			if (var5 >= 177917621779460413L) {
+				break;
+			}
+		}
+
+		while (0L == var5 % 37L && var5 != 0L) {
+			var5 /= 37L;
+		}
+
+		String var10 = WorldMapData_0.base37DecodeLong(var5);
+		if (var10 == null) {
+			var10 = "";
+		}
+
+		this.name = var10;
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-1810188467"
+	)
+	@Export("setOwner")
+	final void setOwner(String var1) {
+		long var5 = 0L;
+		int var7 = var1.length();
+
+		for (int var8 = 0; var8 < var7; ++var8) {
+			var5 *= 37L;
+			char var9 = var1.charAt(var8);
+			if (var9 >= 'A' && var9 <= 'Z') {
+				var5 += (long)(var9 + 1 - 65);
+			} else if (var9 >= 'a' && var9 <= 'z') {
+				var5 += (long)(var9 + 1 - 97);
+			} else if (var9 >= '0' && var9 <= '9') {
+				var5 += (long)(var9 + 27 - 48);
+			}
+
+			if (var5 >= 177917621779460413L) {
+				break;
+			}
+		}
+
+		while (0L == var5 % 37L && var5 != 0L) {
+			var5 /= 37L;
+		}
+
+		String var10 = WorldMapData_0.base37DecodeLong(var5);
+		if (var10 == null) {
+			var10 = "";
+		}
+
+		this.owner = var10;
 	}
 
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Lkn;I)V",
-		garbageValue = "2103961051"
+		garbageValue = "585042716"
-	)
-	@Export("setOwner")
-	final void setOwner(String var1) {
-		this.owner = DevicePcmPlayerProvider.method948(var1);
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(Lkb;I)V",
-		garbageValue = "1675969989"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		this.readName(GameObject.method3405(var2));
+		this.readName(Frames.method3398(var2));
 		this.minKick = var1.readByte();
 		int var4 = var1.readUnsignedByte();
 		if (var4 != 255) {
@@ -110,7 +168,7 @@ public class ClanChat extends UserList {
 			for (int var5 = 0; var5 < var4; ++var5) {
 				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
 				int var7 = var1.readUnsignedShort();
-				var6.set(var7, ++this.field3634 - 1);
+				var6.set(var7, ++this.field3663 - 1);
 				var6.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
 				this.isLocalPlayer(var6);
@@ -119,12 +177,12 @@ public class ClanChat extends UserList {
 		}
 	}
 
-	@ObfuscatedName("ca")
+	@ObfuscatedName("ci")
 	@ObfuscatedSignature(
-		signature = "(Lkb;I)V",
+		signature = "(Lkn;B)V",
-		garbageValue = "-1155305071"
+		garbageValue = "-100"
 	)
-	public final void method5301(Buffer var1) {
+	public final void method5421(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -154,17 +212,17 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3634 - 1);
+			var6.set(var3, ++this.field3663 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
 
 	}
 
-	@ObfuscatedName("cj")
+	@ObfuscatedName("cu")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1797514283"
+		garbageValue = "-117"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -174,10 +232,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("cp")
+	@ObfuscatedName("cq")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1089464789"
+		garbageValue = "-23"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -187,10 +245,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("ck")
+	@ObfuscatedName("co")
 	@ObfuscatedSignature(
-		signature = "(Ljt;I)V",
+		signature = "(Lji;I)V",
-		garbageValue = "-66701208"
+		garbageValue = "244481619"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
@@ -200,28 +258,22 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		signature = "(I)Ljava/lang/String;",
+		signature = "(Ljava/net/Socket;III)Llj;",
-		garbageValue = "1033875086"
+		garbageValue = "-1116942702"
 	)
-	static String method5318() {
+	public static AbstractSocket method5441(Socket var0, int var1, int var2) throws IOException {
-		String var0;
+		return new BufferedNetSocket(var0, var1, var2);
-		if (GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername) {
+	}
-			String var2 = Login.Login_username;
-			int var4 = var2.length();
-			char[] var5 = new char[var4];
 
-			for (int var6 = 0; var6 < var4; ++var6) {
+	@ObfuscatedName("el")
-				var5[var6] = '*';
+	@ObfuscatedSignature(
-			}
+		signature = "(B)Lma;",
-
+		garbageValue = "-90"
-			String var3 = new String(var5);
+	)
-			var0 = var3;
+	@Export("getWorldMap")
-		} else {
+	static WorldMap getWorldMap() {
-			var0 = Login.Login_username;
+		return class228.worldMap;
-		}
-
-		return var0;
 	}
 }

runescape-client/src/main/java/ClanMate.java

@@ -3,18 +3,21 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jt")
+@ObfuscatedName("ji")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("x")
+	@ObfuscatedName("bk")
+	@Export("otp")
+	static String otp;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lkf;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lkf;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -24,20 +27,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "93359593"
+		garbageValue = "55"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "416982136"
+		garbageValue = "1504738052"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -48,30 +51,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-559295927"
+		garbageValue = "-2080180390"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = Projectile.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = ModeWhere.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-203044757"
+		garbageValue = "0"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-2013472471"
+		garbageValue = "10"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -82,13 +85,13 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(I)V",
-		garbageValue = "1528"
+		garbageValue = "-1156765322"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = Projectile.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = ModeWhere.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 }

runescape-client/src/main/java/ClientPreferences.java

@@ -7,40 +7,46 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cq")
+@ObfuscatedName("cz")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("x")
+	@ObfuscatedName("pv")
+	@ObfuscatedSignature(
+		signature = "Lkk;"
+	)
+	@Export("clanChat")
+	static ClanChat clanChat;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1654668565
+		intValue = -833768267
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("a")
+	@ObfuscatedName("bp")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 1650607601
+		signature = "Llh;"
 	)
-	@Export("clientTickTimeIdx")
+	@Export("worldSelectRightSprite")
-	static int clientTickTimeIdx;
+	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1989279891
+		intValue = -1665448065
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -53,11 +59,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1942(true);
+		this.method1911(true);
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkb;)V"
+		signature = "(Lkn;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -85,7 +91,6 @@ public class ClientPreferences {
 					for (int var4 = 0; var4 < var3; ++var4) {
 						int var5 = var1.readInt();
 						int var6 = var1.readInt();
-
 						this.parameters.put(var5, var6);
 					}
 				}
@@ -98,26 +103,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1942(true);
+				this.method1911(true);
 			}
 		} else {
-			this.method1942(true);
+			this.method1911(true);
 		}
 
 	}
 
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "-1802002327"
-	)
-	void method1942(boolean var1) {
-	}
-
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Lkb;",
+		signature = "(ZI)V",
-		garbageValue = "745371681"
+		garbageValue = "-943142768"
+	)
+	void method1911(boolean var1) {
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(S)Lkn;",
+		garbageValue = "128"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -140,12 +145,89 @@ public class ClientPreferences {
 		return var1;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(IIB)I",
-		garbageValue = "102"
+		garbageValue = "116"
 	)
-	static final void method1950(String var0) {
+	static final int method1914(int var0, int var1) {
-		GrandExchangeEvent.method165("Please remove " + var0 + " from your ignore list first");
+		int var2 = var0 + var1 * 57;
+		var2 ^= var2 << 13;
+		int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE;
+		return var3 >> 19 & 255;
+	}
+
+	@ObfuscatedName("ed")
+	@ObfuscatedSignature(
+		signature = "(IB)V",
+		garbageValue = "-82"
+	)
+	@Export("updateGameState")
+	static void updateGameState(int var0) {
+		if (var0 != Client.gameState) {
+			if (Client.gameState == 0) {
+				WorldMapSectionType.client.method1017();
+			}
+
+			if (var0 == 20 || var0 == 40 || var0 == 45) {
+				Client.loginState = 0;
+				Client.field705 = 0;
+				Client.field706 = 0;
+				Client.timer.method5184(var0);
+				if (var0 != 20) {
+					SequenceDefinition.method4973(false);
+				}
+			}
+
+			if (var0 != 20 && var0 != 40 && class8.field35 != null) {
+				class8.field35.close();
+				class8.field35 = null;
+			}
+
+			if (Client.gameState == 25) {
+				Client.field809 = 0;
+				Client.field822 = 0;
+				Client.field759 = 1;
+				Client.field690 = 0;
+				Client.field729 = 1;
+			}
+
+			if (var0 != 5 && var0 != 10) {
+				if (var0 == 20) {
+					WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, true, Client.gameState == 11 ? 4 : 0);
+				} else if (var0 == 11) {
+					WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, false, 4);
+				} else if (GrandExchangeOfferAgeComparator.clearLoginScreen) {
+					HealthBar.titleboxSprite = null;
+					Fonts.titlebuttonSprite = null;
+					Login.runesSprite = null;
+					Login.leftTitleSprite = null;
+					ItemContainer.rightTitleSprite = null;
+					Login.logoSprite = null;
+					Decimator.title_muteSprite = null;
+					Login.options_buttons_0Sprite = null;
+					GameShell.options_buttons_2Sprite = null;
+					class90.worldSelectBackSprites = null;
+					SpotAnimationDefinition.worldSelectFlagSprites = null;
+					GrandExchangeEvent.worldSelectArrows = null;
+					class228.worldSelectStars = null;
+					WorldMapIcon_1.field206 = null;
+					Login.loginScreenRunesAnimation.method1878();
+					class206.field2439 = 1;
+					Huffman.musicTrackArchive = null;
+					class206.musicTrackGroupId = -1;
+					MilliClock.musicTrackFileId = -1;
+					class206.musicTrackVolume = 0;
+					class336.musicTrackBoolean = false;
+					class206.field2442 = 2;
+					class41.method624(true);
+					GrandExchangeOfferAgeComparator.clearLoginScreen = false;
+				}
+			} else {
+				WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, true, 0);
+			}
+
+			Client.gameState = var0;
+		}
 	}
 }

runescape-client/src/main/java/Clock.java

@@ -3,55 +3,108 @@ 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("fb")
 @Implements("Clock")
 public abstract class Clock {
-	@ObfuscatedName("t")
+	@ObfuscatedName("nq")
 	@ObfuscatedGetter(
-		intValue = 2046484107
+		intValue = -815222231
 	)
-	static int field2061;
+	static int field2092;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "Ldo;"
+	)
+	@Export("soundCache")
+	public static SoundCache soundCache;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -357959565
+	)
+	@Export("clientTickTimeIdx")
+	static int clientTickTimeIdx;
+	@ObfuscatedName("do")
+	@ObfuscatedSignature(
+		signature = "Lig;"
+	)
+	@Export("archive2")
+	static Archive archive2;
 
 	Clock() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1351231250"
+		garbageValue = "-1017447827"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(III)I",
-		garbageValue = "-1723558008"
+		garbageValue = "-1786752641"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(ILcs;ZI)I",
-		garbageValue = "16"
+		garbageValue = "1957582234"
 	)
-	public static int method3590(int var0) {
+	static int method3641(int var0, Script var1, boolean var2) {
-		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765);
+		Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
-		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459);
+		if (var0 == ScriptOpcodes.IF_GETSCROLLX) {
-		var0 = var0 + (var0 >>> 4) & 252645135;
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollX;
-		var0 += var0 >>> 8;
+			return 1;
-		var0 += var0 >>> 16;
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) {
-		return var0 & 255;
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollY;
-	}
+			return 1;
-
+		} else if (var0 == ScriptOpcodes.IF_GETTEXT) {
-	@ObfuscatedName("ko")
+			Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.text;
-	@ObfuscatedSignature(
+			return 1;
-		signature = "(B)V",
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) {
-		garbageValue = "2"
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollWidth;
-	)
+			return 1;
-	static final void method3599() {
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) {
-		Client.field873 = Client.cycleCntr;
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollHeight;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelZoom;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleX;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleZ;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleY;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyTop;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyBot;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color2;
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETFILLMODE) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
+			return 1;
+		} else {
+			return 2;
+		}
 	}
 }

runescape-client/src/main/java/CollisionMap.java

@@ -4,34 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fm")
+@ObfuscatedName("fz")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("at")
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		signature = "Lkn;"
+	)
+	@Export("NetCache_responseArchiveBuffer")
+	public static Buffer NetCache_responseArchiveBuffer;
+	@ObfuscatedName("gs")
+	@ObfuscatedSignature(
+		signature = "[Llz;"
+	)
+	@Export("headIconPkSprites")
+	static Sprite[] headIconPkSprites;
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -1688029989
+		intValue = 2098915851
 	)
 	@Export("xInset")
-	public int xInset;
+	int xInset;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1941455175
+		intValue = 337356269
 	)
 	@Export("yInset")
-	public int yInset;
+	int yInset;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 1262495837
+		intValue = 1883511421
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("am")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -281985159
+		intValue = 1176086575
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ar")
 	@Export("flags")
 	public int[][] flags;
 
@@ -44,10 +56,10 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1624935812"
+		garbageValue = "0"
 	)
 	@Export("clear")
 	public void clear() {
@@ -63,12 +75,12 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "-1240663333"
+		garbageValue = "1939344506"
 	)
-	public void method3630(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3680(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -215,10 +227,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
+		signature = "(IIIIZI)V",
-		garbageValue = "2"
+		garbageValue = "-2000199056"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -242,10 +254,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "1257789406"
+		garbageValue = "14"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -255,10 +267,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-88147521"
+		garbageValue = "1576549082"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -268,10 +280,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(IIII)V",
-		garbageValue = "2136101912"
+		garbageValue = "-1405991942"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -279,12 +291,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "1473004141"
+		garbageValue = "2079202664"
 	)
-	public void method3635(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3702(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -431,10 +443,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(IIIIIZI)V",
+		signature = "(IIIIIZB)V",
-		garbageValue = "1811467744"
+		garbageValue = "-35"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -464,10 +476,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IIIB)V",
+		signature = "(IIII)V",
-		garbageValue = "61"
+		garbageValue = "-299380257"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -475,15 +487,31 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(IIB)V",
-		garbageValue = "-25"
+		garbageValue = "1"
 	)
-	public void method3655(int var1, int var2) {
+	public void method3689(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
+
+	@ObfuscatedName("fd")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1042513280"
+	)
+	static final void method3707() {
+		if (Client.logoutTimer > 0) {
+			MouseRecorder.logOut();
+		} else {
+			Client.timer.method5161();
+			ClientPreferences.updateGameState(40);
+			class8.field35 = Client.packetWriter.getSocket();
+			Client.packetWriter.removeSocket();
+		}
+	}
 }

runescape-client/src/main/java/Coord.java

@@ -4,37 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hj")
+@ObfuscatedName("hg")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = 301187265
-	)
-	public static int field2530;
-	@ObfuscatedName("cd")
-	public static char field2531;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 762647407
-	)
-	@Export("y")
-	public int y;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 660497933
+		intValue = -1064559233
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1808182037
+		intValue = 381144149
 	)
 	@Export("x")
 	public int x;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = -63925861
+	)
+	@Export("y")
+	public int y;
 
 	@ObfuscatedSignature(
-		signature = "(Lhj;)V"
+		signature = "(Lhg;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -59,20 +52,20 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1927907066"
+		garbageValue = "57"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lhj;I)Z",
+		signature = "(Lhg;I)Z",
-		garbageValue = "-2112462573"
+		garbageValue = "1413568323"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -85,16 +78,24 @@ public class Coord {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
+		signature = "(Ljava/lang/String;S)Ljava/lang/String;",
-		garbageValue = "404618696"
+		garbageValue = "-17265"
 	)
 	@Export("toString")
 	String toString(String var1) {
 		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63);
 	}
 
+	public int hashCode() {
+		return this.packed();
+	}
+
+	public String toString() {
+		return this.toString(",");
+	}
+
 	public boolean equals(Object var1) {
 		if (this == var1) {
 			return true;
@@ -103,235 +104,80 @@ public class Coord {
 		}
 	}
 
-	public String toString() {
+	@ObfuscatedName("am")
-		return this.toString(",");
-	}
-
-	public int hashCode() {
-		return this.packed();
-	}
-
-	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(B)[Lie;",
+		signature = "([BB)[B",
-		garbageValue = "112"
+		garbageValue = "113"
 	)
-	static VerticalAlignment[] method4084() {
+	@Export("decompressBytes")
-		return new VerticalAlignment[]{VerticalAlignment.field3193, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3196};
+	static final byte[] decompressBytes(byte[] var0) {
-	}
+		Buffer var1 = new Buffer(var0);
-
+		int var2 = var1.readUnsignedByte();
-	@ObfuscatedName("gn")
+		int var3 = var1.readInt();
-	@ObfuscatedSignature(
+		if (var3 < 0 || AbstractArchive.field3177 != 0 && var3 > AbstractArchive.field3177) {
-		signature = "(IIIII)V",
+			throw new RuntimeException();
-		garbageValue = "1911582516"
+		} else if (var2 == 0) {
-	)
+			byte[] var4 = new byte[var3];
-	@Export("drawEntities")
+			var1.readBytes(var4, 0, var3);
-	static final void drawEntities(int var0, int var1, int var2, int var3) {
+			return var4;
-		++Client.viewportDrawCount;
+		} else {
-		if (ByteArrayPool.localPlayer.x >> 7 == Client.destinationX && ByteArrayPool.localPlayer.y >> 7 == Client.destinationY) {
+			int var6 = var1.readInt();
-			Client.destinationX = 0;
+			if (var6 >= 0 && (AbstractArchive.field3177 == 0 || var6 <= AbstractArchive.field3177)) {
-		}
+				byte[] var5 = new byte[var6];
-
+				if (var2 == 1) {
-		if (Client.renderSelf) {
+					BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9);
-			class22.addPlayerToScene(ByteArrayPool.localPlayer, false);
+				} else {
-		}
+					AbstractArchive.gzipDecompressor.decompress(var1, var5);
-
-		WorldMapCacheName.method716();
-		Messages.addNpcsToScene(true);
-		int var4 = Players.Players_count;
-		int[] var5 = Players.Players_indices;
-
-		int var6;
-		for (var6 = 0; var6 < var4; ++var6) {
-			if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) {
-				class22.addPlayerToScene(Client.players[var5[var6]], true);
-			}
-		}
-
-		Messages.addNpcsToScene(false);
-
-		for (Projectile var19 = (Projectile)Client.projectiles.last(); var19 != null; var19 = (Projectile)Client.projectiles.previous()) {
-			if (var19.plane == ScriptEvent.Client_plane && Client.cycle <= var19.cycleEnd) {
-				if (Client.cycle >= var19.cycleStart) {
-					if (var19.targetIndex > 0) {
-						NPC var21 = Client.npcs[var19.targetIndex - 1];
-						if (var21 != null && var21.x >= 0 && var21.x < 13312 && var21.y >= 0 && var21.y < 13312) {
-							var19.setDestination(var21.x, var21.y, class277.getTileHeight(var21.x, var21.y, var19.plane) - var19.endHeight, Client.cycle);
-						}
-					}
-
-					if (var19.targetIndex < 0) {
-						var6 = -var19.targetIndex - 1;
-						Player var22;
-						if (var6 == Client.localPlayerIndex) {
-							var22 = ByteArrayPool.localPlayer;
-						} else {
-							var22 = Client.players[var6];
-						}
-
-						if (var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) {
-							var19.setDestination(var22.x, var22.y, class277.getTileHeight(var22.x, var22.y, var19.plane) - var19.endHeight, Client.cycle);
-						}
-					}
-
-					var19.advance(Client.field741);
-					GrandExchangeOfferWorldComparator.scene.drawEntity(ScriptEvent.Client_plane, (int)var19.x, (int)var19.y, (int)var19.z, 60, var19, var19.yaw, -1L, false);
 				}
+
+				return var5;
 			} else {
-				var19.remove();
+				throw new RuntimeException();
 			}
 		}
+	}
 
-		GrandExchangeOfferAgeComparator.method249();
+	@ObfuscatedName("iy")
-		class204.setViewportShape(var0, var1, var2, var3, true);
+	@ObfuscatedSignature(
-		var0 = Client.viewportOffsetX;
+		signature = "(Lhd;IIIIIIB)V",
-		var1 = Client.viewportOffsetY;
+		garbageValue = "-69"
-		var2 = Client.viewportWidth;
+	)
-		var3 = Client.viewportHeight;
+	static final void method4135(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
+		if (Client.field740) {
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+			Client.alternativeScrollbarWidth = 32;
+		} else {
+			Client.alternativeScrollbarWidth = 0;
+		}
+
+		Client.field740 = false;
 		int var7;
-		int var8;
+		if (MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
-		int var9;
+			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
-		int var10;
+				var0.scrollY -= 4;
-		int var11;
+				class234.invalidateWidget(var0);
-		int var12;
+			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
-		int var20;
+				var0.scrollY += 4;
-		if (!Client.isCameraLocked) {
+				class234.invalidateWidget(var0);
-			var4 = Client.camAngleX;
+			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
-			if (Client.field941 / 256 > var4) {
+				var7 = var3 * (var3 - 32) / var4;
-				var4 = Client.field941 / 256;
+				if (var7 < 8) {
-			}
+					var7 = 8;
-
-			if (Client.field926[4] && Client.field730[4] + 128 > var4) {
-				var4 = Client.field730[4] + 128;
-			}
-
-			var20 = Client.camAngleY & 2047;
-			var6 = SoundSystem.oculusOrbFocalPointX;
-			var7 = Client.field756;
-			var8 = ServerPacket.oculusOrbFocalPointY;
-			var9 = var4 * 3 + 600;
-			var10 = Varcs.method2295(var9, var3);
-			var11 = 2048 - var4 & 2047;
-			var12 = 2048 - var20 & 2047;
-			int var13 = 0;
-			int var14 = 0;
-			int var15 = var10;
-			int var16;
-			int var17;
-			int var18;
-			if (var11 != 0) {
-				var16 = Rasterizer3D.Rasterizer3D_sine[var11];
-				var17 = Rasterizer3D.Rasterizer3D_cosine[var11];
-				var18 = var14 * var17 - var16 * var10 >> 16;
-				var15 = var16 * var14 + var10 * var17 >> 16;
-				var14 = var18;
-			}
-
-			if (var12 != 0) {
-				var16 = Rasterizer3D.Rasterizer3D_sine[var12];
-				var17 = Rasterizer3D.Rasterizer3D_cosine[var12];
-				var18 = var17 * var13 + var16 * var15 >> 16;
-				var15 = var17 * var15 - var16 * var13 >> 16;
-				var13 = var18;
-			}
-
-			WorldMapRectangle.cameraX = var6 - var13;
-			GrandExchangeOfferWorldComparator.cameraY = var7 - var14;
-			class200.cameraZ = var8 - var15;
-			ApproximateRouteStrategy.cameraPitch = var4;
-			WorldMapIcon_1.cameraYaw = var20;
-			if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (SoundSystem.oculusOrbFocalPointX >> 7 != ByteArrayPool.localPlayer.x >> 7 || ServerPacket.oculusOrbFocalPointY >> 7 != ByteArrayPool.localPlayer.y >> 7)) {
-				var16 = ByteArrayPool.localPlayer.plane;
-				var17 = (SoundSystem.oculusOrbFocalPointX >> 7) + class69.baseX;
-				var18 = (ServerPacket.oculusOrbFocalPointY >> 7) + class89.baseY;
-				GrandExchangeOfferWorldComparator.method148(var17, var18, var16, true);
-			}
-		}
-
-		if (!Client.isCameraLocked) {
-			var4 = UserComparator8.method3503();
-		} else {
-			var4 = Tiles.method1238();
-		}
-
-		var20 = WorldMapRectangle.cameraX;
-		var6 = GrandExchangeOfferWorldComparator.cameraY;
-		var7 = class200.cameraZ;
-		var8 = ApproximateRouteStrategy.cameraPitch;
-		var9 = WorldMapIcon_1.cameraYaw;
-
-		for (var10 = 0; var10 < 5; ++var10) {
-			if (Client.field926[var10]) {
-				var11 = (int)(Math.random() * (double)(Client.field788[var10] * 2 + 1) - (double)Client.field788[var10] + Math.sin((double)Client.field929[var10] / 100.0D * (double)Client.field930[var10]) * (double)Client.field730[var10]);
-				if (var10 == 0) {
-					WorldMapRectangle.cameraX += var11;
 				}
 
-				if (var10 == 1) {
+				int var8 = var6 - var2 - 16 - var7 / 2;
-					GrandExchangeOfferWorldComparator.cameraY += var11;
+				int var9 = var3 - 32 - var7;
-				}
+				var0.scrollY = var8 * (var4 - var3) / var9;
-
+				class234.invalidateWidget(var0);
-				if (var10 == 2) {
+				Client.field740 = true;
-					class200.cameraZ += var11;
-				}
-
-				if (var10 == 3) {
-					WorldMapIcon_1.cameraYaw = var11 + WorldMapIcon_1.cameraYaw & 2047;
-				}
-
-				if (var10 == 4) {
-					ApproximateRouteStrategy.cameraPitch += var11;
-					if (ApproximateRouteStrategy.cameraPitch < 128) {
-						ApproximateRouteStrategy.cameraPitch = 128;
-					}
-
-					if (ApproximateRouteStrategy.cameraPitch > 383) {
-						ApproximateRouteStrategy.cameraPitch = 383;
-					}
-				}
 			}
 		}
 
-		var10 = MouseHandler.MouseHandler_x;
+		if (Client.mouseWheelRotation != 0) {
-		var11 = MouseHandler.MouseHandler_y;
+			var7 = var0.width;
-		if (MouseHandler.MouseHandler_lastButton != 0) {
+			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
-			var10 = MouseHandler.MouseHandler_lastPressedX;
+				var0.scrollY += Client.mouseWheelRotation * 45;
-			var11 = MouseHandler.MouseHandler_lastPressedY;
+				class234.invalidateWidget(var0);
-		}
+			}
-
-		if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
-			AbstractSocket.method5886(var10 - var0, var11 - var1);
-		} else {
-			GameShell.method1155();
-		}
-
-		ChatChannel.playPcmPlayers();
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
-		ChatChannel.playPcmPlayers();
-		var12 = Rasterizer3D.Rasterizer3D_zoom;
-		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
-		GrandExchangeOfferWorldComparator.scene.draw(WorldMapRectangle.cameraX, GrandExchangeOfferWorldComparator.cameraY, class200.cameraZ, ApproximateRouteStrategy.cameraPitch, WorldMapIcon_1.cameraYaw, var4);
-		Rasterizer3D.Rasterizer3D_zoom = var12;
-		ChatChannel.playPcmPlayers();
-		GrandExchangeOfferWorldComparator.scene.clearTempGameObjects();
-		MouseHandler.method1202(var0, var1, var2, var3);
-		UserComparator4.method3490(var0, var1);
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field741);
-		UserComparator5.method3523(var0, var1, var2, var3);
-		WorldMapRectangle.cameraX = var20;
-		GrandExchangeOfferWorldComparator.cameraY = var6;
-		class200.cameraZ = var7;
-		ApproximateRouteStrategy.cameraPitch = var8;
-		WorldMapIcon_1.cameraYaw = var9;
-		if (Client.isLoading && WorldMapLabelSize.method292(true, false) == 0) {
-			Client.isLoading = false;
-		}
-
-		if (Client.isLoading) {
-			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
-			AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait.", false);
 		}
 
 	}

runescape-client/src/main/java/Decimator.java

@@ -3,30 +3,35 @@ 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("dx")
+@ObfuscatedName("dv")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "[Llh;"
+	)
+	@Export("title_muteSprite")
+	static IndexedSprite[] title_muteSprite;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -591203607
+		intValue = 566194753
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -772700621
+		intValue = -690101149
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) {
-			int var3 = ModeWhere.method3763(var1, var2);
+			int var3 = class204.method3818(var1, var2);
 			var1 /= var3;
 			var2 /= var3;
 			this.inputRate = var1;
@@ -35,7 +40,7 @@ public class Decimator {
 
 			for (int var4 = 0; var4 < var1; ++var4) {
 				int[] var5 = this.table[var4];
-				double var6 = 6.0D + (double)var4 / (double)var1;
+				double var6 = (double)var4 / (double)var1 + 6.0D;
 				int var8 = (int)Math.floor(1.0D + (var6 - 7.0D));
 				if (var8 < 0) {
 					var8 = 0;
@@ -47,24 +52,24 @@ public class Decimator {
 				}
 
 				for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) {
-					double var12 = 3.141592653589793D * ((double)var8 - var6);
+					double var12 = ((double)var8 - var6) * 3.141592653589793D;
 					double var14 = var10;
 					if (var12 < -1.0E-4D || var12 > 1.0E-4D) {
 						var14 = var10 * (Math.sin(var12) / var12);
 					}
 
 					var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D);
-					var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D);
+					var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D);
 				}
 			}
 
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "([BI)[B",
-		garbageValue = "2035174504"
+		garbageValue = "880157357"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
@@ -81,7 +86,7 @@ public class Decimator {
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var4 + var9] += var8[var9] * var7;
+					var3[var9 + var4] += var8[var9] * var7;
 				}
 
 				var5 += this.outputRate;
@@ -107,10 +112,10 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(IB)I",
-		garbageValue = "65"
+		garbageValue = "124"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
@@ -121,199 +126,17 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IB)I",
-		garbageValue = "-548608122"
+		garbageValue = "70"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6;
+			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
 		}
 
 		return var1;
 	}
-
-	@ObfuscatedName("m")
-	public static boolean method2635(long var0) {
-		return var0 != 0L && !WorldMapDecorationType.method4212(var0);
-	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
-		garbageValue = "49819578"
-	)
-	static int method2649(int var0, Script var1, boolean var2) {
-		boolean var3 = true;
-		Widget var4;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var4 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			var3 = false;
-		} else {
-			var4 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130;
-		}
-
-		int var11;
-		if (var0 == ScriptOpcodes.CC_SETOP) {
-			var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1;
-			if (var11 >= 0 && var11 <= 9) {
-				var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
-				return 1;
-			} else {
-				--Interpreter.Interpreter_stringStackSize;
-				return 1;
-			}
-		} else {
-			int var6;
-			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) {
-				Interpreter.Interpreter_intStackSize -= 2;
-				var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				var4.parent = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var11, var6);
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) {
-				var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) {
-				var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) {
-				var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) {
-				var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) {
-				var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-				return 1;
-			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) {
-				var4.actions = null;
-				return 1;
-			} else if (var0 == 1308) {
-				var4.field2658 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-				return 1;
-			} else if (var0 == 1309) {
-				--Interpreter.Interpreter_intStackSize;
-				return 1;
-			} else {
-				int var7;
-				byte[] var9;
-				if (var0 != ScriptOpcodes.CC_SETOPKEY) {
-					byte var5;
-					if (var0 == ScriptOpcodes.CC_SETOPTKEY) {
-						Interpreter.Interpreter_intStackSize -= 2;
-						var5 = 10;
-						var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]};
-						byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]};
-						FontName.Widget_setKey(var4, var5, var9, var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) {
-						Interpreter.Interpreter_intStackSize -= 3;
-						var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1;
-						var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-						var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-						if (var11 >= 0 && var11 <= 9) {
-							MouseHandler.Widget_setKeyRate(var4, var11, var6, var7);
-							return 1;
-						} else {
-							throw new RuntimeException();
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) {
-						var5 = 10;
-						var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						MouseHandler.Widget_setKeyRate(var4, var5, var6, var7);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) {
-						--Interpreter.Interpreter_intStackSize;
-						var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1;
-						if (var11 >= 0 && var11 <= 9) {
-							class195.Widget_setKeyIgnoreHeld(var4, var11);
-							return 1;
-						} else {
-							throw new RuntimeException();
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) {
-						var5 = 10;
-						class195.Widget_setKeyIgnoreHeld(var4, var5);
-						return 1;
-					} else {
-						return 2;
-					}
-				} else {
-					byte[] var8 = null;
-					var9 = null;
-					if (var3) {
-						Interpreter.Interpreter_intStackSize -= 10;
-
-						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) {
-						}
-
-						if (var7 > 0) {
-							var8 = new byte[var7 / 2];
-							var9 = new byte[var7 / 2];
-
-							for (var7 -= 2; var7 >= 0; var7 -= 2) {
-								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize];
-								var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1];
-							}
-						}
-					} else {
-						Interpreter.Interpreter_intStackSize -= 2;
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]};
-						var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]};
-					}
-
-					var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1;
-					if (var7 >= 0 && var7 <= 9) {
-						FontName.Widget_setKey(var4, var7, var8, var9);
-						return 1;
-					} else {
-						throw new RuntimeException();
-					}
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "458877468"
-	)
-	public static String method2636(String var0) {
-		int var1 = var0.length();
-		char[] var2 = new char[var1];
-		byte var3 = 2;
-
-		for (int var4 = 0; var4 < var1; ++var4) {
-			char var5 = var0.charAt(var4);
-			if (var3 == 0) {
-				var5 = Character.toLowerCase(var5);
-			} else if (var3 == 2 || Character.isUpperCase(var5)) {
-				var5 = StructDefinition.method4589(var5);
-			}
-
-			if (Character.isLetter(var5)) {
-				var3 = 0;
-			} else if (var5 != '.' && var5 != '?' && var5 != '!') {
-				if (Character.isSpaceChar(var5)) {
-					if (var3 != 2) {
-						var3 = 1;
-					}
-				} else {
-					var3 = 1;
-				}
-			} else {
-				var3 = 2;
-			}
-
-			var2[var4] = var5;
-		}
-
-		return new String(var2);
-	}
 }

runescape-client/src/main/java/DefaultsGroup.java

@@ -4,26 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lf")
+@ObfuscatedName("lm")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Llf;"
-	)
-	static final DefaultsGroup field3811;
-	@ObfuscatedName("z")
-	@Export("SpriteBuffer_spritePalette")
-	static int[] SpriteBuffer_spritePalette;
 	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "Llm;"
+	)
+	static final DefaultsGroup field3822;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1057296275
+		intValue = -1462614597
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3811 = new DefaultsGroup(3);
+		field3822 = new DefaultsGroup(3);
 	}
 
 	DefaultsGroup(int var1) {

runescape-client/src/main/java/DemotingHashTable.java

@@ -3,32 +3,32 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fl")
+@ObfuscatedName("fr")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lln;"
+		signature = "Llf;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Ljz;"
+		signature = "Ljq;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Les;"
+		signature = "Lee;"
 	)
-	class155 field1980;
+	class155 field1987;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,7 +42,7 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -73,16 +73,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lfw;)V"
+		signature = "(Lfi;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -94,7 +94,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
@@ -113,8 +113,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5);
-				if (this.field1980 != null) {
+				if (this.field1987 != null) {
-					this.field1980.method3442(var5.get());
+					this.field1987.method3449(var5.get());
 				}
 			}
 
@@ -125,7 +125,7 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
@@ -146,7 +146,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

runescape-client/src/main/java/DesktopPlatformInfoProvider.java

@@ -4,38 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mp")
+@ObfuscatedName("ms")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -227672497
+		intValue = 1476161003
 	)
-	int field3923;
+	int field3925;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1926127853
+		intValue = 602625261
 	)
-	int field3919;
+	int field3926;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 326361045
+		intValue = 35397071
 	)
-	int field3924;
+	int field3927;
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)Lmq;",
+		signature = "(I)Lmc;",
-		garbageValue = "1"
+		garbageValue = "-1826697521"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (class171.field2016.startsWith("win")) {
+		if (JagexCache.field2077.startsWith("win")) {
 			var1 = 1;
-		} else if (class171.field2016.startsWith("mac")) {
+		} else if (JagexCache.field2077.startsWith("mac")) {
 			var1 = 2;
-		} else if (class171.field2016.startsWith("linux")) {
+		} else if (JagexCache.field2077.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -133,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6381(var5);
+		this.method6495(var5);
 		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1;
 		int var11;
-		if (this.field3923 > 3) {
+		if (this.field3925 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -150,55 +150,64 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3923, this.field3919, this.field3924, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
+		return new PlatformInfo(var1, var24, var7, var8, this.field3925, this.field3926, this.field3927, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-1686875071"
+	)
+	void method6495(String var1) {
+		if (var1.startsWith("1.")) {
+			this.method6484(var1);
+		} else {
+			this.method6485(var1);
+		}
+
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-1385366754"
+	)
+	void method6484(String var1) {
+		String[] var2 = var1.split("\\.");
+
+		try {
+			this.field3925 = Integer.parseInt(var2[1]);
+			var2 = var2[2].split("_");
+			this.field3926 = Integer.parseInt(var2[0]);
+			this.field3927 = Integer.parseInt(var2[1]);
+		} catch (Exception var4) {
+		}
+
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;B)V",
+		garbageValue = "1"
+	)
+	void method6485(String var1) {
+		String[] var2 = var1.split("\\.");
+
+		try {
+			this.field3925 = Integer.parseInt(var2[0]);
+			this.field3926 = Integer.parseInt(var2[1]);
+			this.field3927 = Integer.parseInt(var2[2]);
+		} catch (Exception var4) {
+		}
+
 	}
 
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(CI)Z",
-		garbageValue = "-974517530"
+		garbageValue = "2111177426"
 	)
-	void method6381(String var1) {
+	static final boolean method6481(char var0) {
-		if (var1.startsWith("1.")) {
+		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
-			this.method6379(var1);
-		} else {
-			this.method6380(var1);
-		}
-
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-312547772"
-	)
-	void method6379(String var1) {
-		String[] var2 = var1.split("\\.");
-
-		try {
-			this.field3923 = Integer.parseInt(var2[1]);
-			var2 = var2[2].split("_");
-			this.field3919 = Integer.parseInt(var2[0]);
-			this.field3924 = Integer.parseInt(var2[1]);
-		} catch (Exception var4) {
-		}
-
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "12"
-	)
-	void method6380(String var1) {
-		String[] var2 = var1.split("\\.");
-
-		try {
-			this.field3923 = Integer.parseInt(var2[0]);
-			this.field3919 = Integer.parseInt(var2[1]);
-			this.field3924 = Integer.parseInt(var2[2]);
-		} catch (Exception var4) {
-		}
-
 	}
 }

runescape-client/src/main/java/DevicePcmPlayer.java

@@ -9,77 +9,84 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bg")
+@ObfuscatedName("bb")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1537774017
+		intValue = -1034506245
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-515177845"
+		garbageValue = "2128910021"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)PcmPlayer.field1421, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)class237.field3113, 16, Messages.PcmPlayer_stereo ? 2 : 1, true, false);
-		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
+		this.byteSamples = new byte[256 << (Messages.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-1831392073"
+		garbageValue = "-14"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
 		try {
-			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
+			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (Messages.PcmPlayer_stereo ? 2 : 1));
 			this.line = (SourceDataLine)AudioSystem.getLine(var2);
 			this.line.open();
 			this.line.start();
 			this.capacity2 = var1;
-		} catch (LineUnavailableException var3) {
+		} catch (LineUnavailableException var5) {
-			if (Clock.method3590(var1) != 1) {
+			if (DynamicObject.method2375(var1) != 1) {
-				this.open(Calendar.method4033(var1));
+				int var4 = var1 - 1;
+				var4 |= var4 >>> 1;
+				var4 |= var4 >>> 2;
+				var4 |= var4 >>> 4;
+				var4 |= var4 >>> 8;
+				var4 |= var4 >>> 16;
+				int var3 = var4 + 1;
+				this.open(var3);
 			} else {
 				this.line = null;
-				throw var3;
+				throw var5;
 			}
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1722515255"
+		garbageValue = "1868944096"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
+		return this.capacity2 - (this.line.available() >> (Messages.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
-		if (PcmPlayer.PcmPlayer_stereo) {
+		if (Messages.PcmPlayer_stereo) {
 			var1 <<= 1;
 		}
 
@@ -96,10 +103,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-100"
+		garbageValue = "1900446281"
 	)
 	@Export("close")
 	protected void close() {
@@ -110,10 +117,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-801705902"
+		garbageValue = "630637593"
 	)
 	@Export("discard")
 	protected void discard() {

runescape-client/src/main/java/DevicePcmPlayerProvider.java

@@ -1,99 +1,135 @@
 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("bd")
+@ObfuscatedName("be")
 @Implements("DevicePcmPlayerProvider")
 public class DevicePcmPlayerProvider implements PlayerProvider {
+	@ObfuscatedName("rr")
+	@ObfuscatedGetter(
+		intValue = 1326431277
+	)
+	static int field435;
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "Lhz;"
+	)
+	@Export("musicTrack")
+	public static MusicTrack musicTrack;
+
 	DevicePcmPlayerProvider() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Ldw;",
+		signature = "(I)Ldt;",
-		garbageValue = "65536"
+		garbageValue = "-1371983171"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+		signature = "(Lkn;Ljava/lang/String;I)I",
-		garbageValue = "-989870675"
+		garbageValue = "-420633495"
 	)
-	public static String method948(CharSequence var0) {
+	public static int method917(Buffer var0, String var1) {
-		String var1 = Buffer.base37DecodeLong(NetCache.method4400(var0));
+		int var2 = var0.offset;
-		if (var1 == null) {
+		int var4 = var1.length();
-			var1 = "";
+		byte[] var5 = new byte[var4];
-		}
 
-		return var1;
+		for (int var6 = 0; var6 < var4; ++var6) {
-	}
+			char var7 = var1.charAt(var6);
-
+			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
-	@ObfuscatedName("v")
+				var5[var6] = (byte)var7;
-	@ObfuscatedSignature(
+			} else if (var7 == 8364) {
-		signature = "(Lch;Lch;IZB)I",
+				var5[var6] = -128;
-		garbageValue = "1"
+			} else if (var7 == 8218) {
-	)
+				var5[var6] = -126;
-	@Export("compareWorlds")
+			} else if (var7 == 402) {
-	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
+				var5[var6] = -125;
-		if (var2 == 1) {
+			} else if (var7 == 8222) {
-			int var4 = var0.population;
+				var5[var6] = -124;
-			int var5 = var1.population;
+			} else if (var7 == 8230) {
-			if (!var3) {
+				var5[var6] = -123;
-				if (var4 == -1) {
+			} else if (var7 == 8224) {
-					var4 = 2001;
+				var5[var6] = -122;
-				}
+			} else if (var7 == 8225) {
-
+				var5[var6] = -121;
-				if (var5 == -1) {
+			} else if (var7 == 710) {
-					var5 = 2001;
+				var5[var6] = -120;
-				}
+			} else if (var7 == 8240) {
-			}
+				var5[var6] = -119;
-
+			} else if (var7 == 352) {
-			return var4 - var5;
+				var5[var6] = -118;
-		} else if (var2 == 2) {
+			} else if (var7 == 8249) {
-			return var0.location - var1.location;
+				var5[var6] = -117;
-		} else if (var2 == 3) {
+			} else if (var7 == 338) {
-			if (var0.activity.equals("-")) {
+				var5[var6] = -116;
-				if (var1.activity.equals("-")) {
+			} else if (var7 == 381) {
-					return 0;
+				var5[var6] = -114;
-				} else {
+			} else if (var7 == 8216) {
-					return var3 ? -1 : 1;
+				var5[var6] = -111;
-				}
+			} else if (var7 == 8217) {
-			} else if (var1.activity.equals("-")) {
+				var5[var6] = -110;
-				return var3 ? 1 : -1;
+			} else if (var7 == 8220) {
+				var5[var6] = -109;
+			} else if (var7 == 8221) {
+				var5[var6] = -108;
+			} else if (var7 == 8226) {
+				var5[var6] = -107;
+			} else if (var7 == 8211) {
+				var5[var6] = -106;
+			} else if (var7 == 8212) {
+				var5[var6] = -105;
+			} else if (var7 == 732) {
+				var5[var6] = -104;
+			} else if (var7 == 8482) {
+				var5[var6] = -103;
+			} else if (var7 == 353) {
+				var5[var6] = -102;
+			} else if (var7 == 8250) {
+				var5[var6] = -101;
+			} else if (var7 == 339) {
+				var5[var6] = -100;
+			} else if (var7 == 382) {
+				var5[var6] = -98;
+			} else if (var7 == 376) {
+				var5[var6] = -97;
 			} else {
-				return var0.activity.compareTo(var1.activity);
+				var5[var6] = 63;
 			}
-		} else if (var2 == 4) {
-			return var0.method1871() ? (var1.method1871() ? 0 : 1) : (var1.method1871() ? -1 : 0);
-		} else if (var2 == 5) {
-			return var0.method1869() ? (var1.method1869() ? 0 : 1) : (var1.method1869() ? -1 : 0);
-		} else if (var2 == 6) {
-			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
-		} else if (var2 == 7) {
-			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
-		} else {
-			return var0.id - var1.id;
 		}
+
+		var0.writeSmartByteShort(var5.length);
+		var0.offset += class219.huffman.compress(var5, 0, var5.length, var0.array, var0.offset);
+		return var0.offset - var2;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Lkn;IB)V",
-		garbageValue = "1003949082"
+		garbageValue = "-128"
 	)
-	static final void method946(String var0) {
+	public static void method914(Buffer var0, int var1) {
-		GrandExchangeEvent.method165(var0 + " is already on your friend list");
+		if (JagexCache.JagexCache_randomDat != null) {
+			try {
+				JagexCache.JagexCache_randomDat.seek(0L);
+				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24);
+			} catch (Exception var3) {
+			}
+		}
+
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(IIII)I",
-		garbageValue = "137174344"
+		garbageValue = "-422462480"
 	)
 	@Export("hslToRgb")
 	static final int hslToRgb(int var0, int var1, int var2) {
@@ -116,4 +152,38 @@ public class DevicePcmPlayerProvider implements PlayerProvider {
 		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
 		return var3;
 	}
+
+	@ObfuscatedName("ie")
+	@ObfuscatedSignature(
+		signature = "(Lhd;B)Z",
+		garbageValue = "-86"
+	)
+	@Export("runCs1")
+	static final boolean runCs1(Widget var0) {
+		if (var0.cs1Comparisons == null) {
+			return false;
+		} else {
+			for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
+				int var2 = Canvas.method923(var0, var1);
+				int var3 = var0.cs1ComparisonValues[var1];
+				if (var0.cs1Comparisons[var1] == 2) {
+					if (var2 >= var3) {
+						return false;
+					}
+				} else if (var0.cs1Comparisons[var1] == 3) {
+					if (var2 <= var3) {
+						return false;
+					}
+				} else if (var0.cs1Comparisons[var1] == 4) {
+					if (var3 == var2) {
+						return false;
+					}
+				} else if (var2 != var3) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}
 }

runescape-client/src/main/java/DirectByteArrayCopier.java

@@ -4,29 +4,17 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hl")
+@ObfuscatedName("hk")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("z")
+	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Lla;"
-	)
-	@Export("rightTitleSprite")
-	static Sprite rightTitleSprite;
-	@ObfuscatedName("dh")
-	@ObfuscatedSignature(
-		signature = "Lih;"
-	)
-	@Export("archive1")
-	static Archive archive1;
-	@ObfuscatedName("x")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)[B",
-		garbageValue = "1422436059"
+		garbageValue = "300747627"
 	)
 	@Export("get")
 	byte[] get() {
@@ -36,10 +24,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "([BB)V",
-		garbageValue = "0"
+		garbageValue = "92"
 	)
 	@Export("set")
 	public void set(byte[] var1) {
@@ -47,4 +35,13 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		this.directBuffer.position(0);
 		this.directBuffer.put(var1);
 	}
+
+	@ObfuscatedName("gl")
+	@ObfuscatedSignature(
+		signature = "(Lcc;II)V",
+		garbageValue = "1934042219"
+	)
+	static final void method4090(Actor var0, int var1) {
+		HealthBar.worldToScreen(var0.x, var0.y, var1);
+	}
 }

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("fk")
+@ObfuscatedName("fe")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("isSoft")
 	boolean isSoft() {
 		return false;

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("ge")
+@ObfuscatedName("gf")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cz")
+	@ObfuscatedName("cq")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("co")
 	@ObfuscatedSignature(
-		signature = "Lge;"
+		signature = "Lgf;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cy")
+	@ObfuscatedName("ca")
 	@ObfuscatedSignature(
-		signature = "Lge;"
+		signature = "Lgf;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cz")
+	@ObfuscatedName("ci")
 	@Export("removeDual")
 	public void removeDual() {
 		if (this.nextDual != null) {

runescape-client/src/main/java/DualNodeDeque.java

@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jl")
+@ObfuscatedName("jd")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lge;"
+		signature = "Lgf;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lge;)V"
+		signature = "(Lgf;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lge;)V"
+		signature = "(Lgf;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "()Lge;"
+		signature = "()Lgf;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

runescape-client/src/main/java/DynamicObject.java

@@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cv")
+@ObfuscatedName("cr")
 @Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -778595855
+		intValue = 909997849
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1719688801
+		intValue = 2017652637
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1645761999
+		intValue = 1099859107
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1021480433
+		intValue = -1395519623
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1939594765
+		intValue = 1502042193
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 456415143
+		intValue = 1335019499
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ljc;"
+		signature = "Ljm;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -2053050533
+		intValue = 521544259
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1933430481
+		intValue = -1788666009
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLee;)V"
+		signature = "(IIIIIIIZLel;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -73,10 +73,10 @@ public class DynamicObject extends Entity {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var7);
+			this.sequenceDefinition = NetSocket.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field3525 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field3561 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
 				if (this.sequenceDefinition == var10.sequenceDefinition) {
 					this.frame = var10.frame;
@@ -93,10 +93,10 @@ public class DynamicObject extends Entity {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Lel;",
+		signature = "(I)Lef;",
-		garbageValue = "480835067"
+		garbageValue = "1832696685"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -126,7 +126,7 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectDefinition var12 = WorldMapSection2.getObjectDefinition(this.id);
+		ObjectDefinition var12 = Canvas.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -149,34 +149,217 @@ public class DynamicObject extends Entity {
 			int var6 = (var3 >> 1) + this.y;
 			int var7 = (var3 + 1 >> 1) + this.y;
 			int[][] var8 = Tiles.Tiles_heights[this.plane];
-			int var9 = var8[var4][var7] + var8[var5][var6] + var8[var4][var6] + var8[var5][var7] >> 2;
+			int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2;
 			int var10 = (this.x << 7) + (var2 << 6);
 			int var11 = (this.y << 7) + (var3 << 6);
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(ILlq;Lih;I)V",
+		signature = "(II)I",
-		garbageValue = "-389102765"
+		garbageValue = "1062154046"
 	)
-	static void method2342(int var0, ArchiveDisk var1, Archive var2) {
+	public static int method2375(int var0) {
-		byte[] var3 = null;
+		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765);
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459);
-			for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
+		var0 = var0 + (var0 >>> 4) & 252645135;
-				if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) {
+		var0 += var0 >>> 8;
-					var3 = var5.data;
+		var0 += var0 >>> 16;
-					break;
+		return var0 & 255;
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(Lkb;I)V",
+		garbageValue = "1312322364"
+	)
+	static final void method2373(PacketBuffer var0) {
+		int var1 = 0;
+		var0.importIndex();
+
+		byte[] var10000;
+		int var2;
+		int var3;
+		int var4;
+		int var6;
+		int var7;
+		for (var2 = 0; var2 < Players.Players_count; ++var2) {
+			var3 = Players.Players_indices[var2];
+			if ((Players.field1282[var3] & 1) == 0) {
+				if (var1 > 0) {
+					--var1;
+					var10000 = Players.field1282;
+					var10000[var3] = (byte)(var10000[var3] | 2);
+				} else {
+					var4 = var0.readBits(1);
+					if (var4 == 0) {
+						var6 = var0.readBits(2);
+						if (var6 == 0) {
+							var7 = 0;
+						} else if (var6 == 1) {
+							var7 = var0.readBits(5);
+						} else if (var6 == 2) {
+							var7 = var0.readBits(8);
+						} else {
+							var7 = var0.readBits(11);
+						}
+
+						var1 = var7;
+						var10000 = Players.field1282;
+						var10000[var3] = (byte)(var10000[var3] | 2);
+					} else {
+						class92.readPlayerUpdate(var0, var3);
+					}
 				}
 			}
 		}
 
-		if (var3 != null) {
+		var0.exportIndex();
-			var2.load(var1, var0, var3, true);
+		if (var1 != 0) {
+			throw new RuntimeException();
 		} else {
-			byte[] var4 = var1.read(var0);
+			var0.importIndex();
-			var2.load(var1, var0, var4, true);
+
+			for (var2 = 0; var2 < Players.Players_count; ++var2) {
+				var3 = Players.Players_indices[var2];
+				if ((Players.field1282[var3] & 1) != 0) {
+					if (var1 > 0) {
+						--var1;
+						var10000 = Players.field1282;
+						var10000[var3] = (byte)(var10000[var3] | 2);
+					} else {
+						var4 = var0.readBits(1);
+						if (var4 == 0) {
+							var6 = var0.readBits(2);
+							if (var6 == 0) {
+								var7 = 0;
+							} else if (var6 == 1) {
+								var7 = var0.readBits(5);
+							} else if (var6 == 2) {
+								var7 = var0.readBits(8);
+							} else {
+								var7 = var0.readBits(11);
+							}
+
+							var1 = var7;
+							var10000 = Players.field1282;
+							var10000[var3] = (byte)(var10000[var3] | 2);
+						} else {
+							class92.readPlayerUpdate(var0, var3);
+						}
+					}
+				}
+			}
+
+			var0.exportIndex();
+			if (var1 != 0) {
+				throw new RuntimeException();
+			} else {
+				var0.importIndex();
+
+				for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
+					var3 = Players.Players_emptyIndices[var2];
+					if ((Players.field1282[var3] & 1) != 0) {
+						if (var1 > 0) {
+							--var1;
+							var10000 = Players.field1282;
+							var10000[var3] = (byte)(var10000[var3] | 2);
+						} else {
+							var4 = var0.readBits(1);
+							if (var4 == 0) {
+								var6 = var0.readBits(2);
+								if (var6 == 0) {
+									var7 = 0;
+								} else if (var6 == 1) {
+									var7 = var0.readBits(5);
+								} else if (var6 == 2) {
+									var7 = var0.readBits(8);
+								} else {
+									var7 = var0.readBits(11);
+								}
+
+								var1 = var7;
+								var10000 = Players.field1282;
+								var10000[var3] = (byte)(var10000[var3] | 2);
+							} else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) {
+								var10000 = Players.field1282;
+								var10000[var3] = (byte)(var10000[var3] | 2);
+							}
+						}
+					}
+				}
+
+				var0.exportIndex();
+				if (var1 != 0) {
+					throw new RuntimeException();
+				} else {
+					var0.importIndex();
+
+					for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
+						var3 = Players.Players_emptyIndices[var2];
+						if ((Players.field1282[var3] & 1) == 0) {
+							if (var1 > 0) {
+								--var1;
+								var10000 = Players.field1282;
+								var10000[var3] = (byte)(var10000[var3] | 2);
+							} else {
+								var4 = var0.readBits(1);
+								if (var4 == 0) {
+									var6 = var0.readBits(2);
+									if (var6 == 0) {
+										var7 = 0;
+									} else if (var6 == 1) {
+										var7 = var0.readBits(5);
+									} else if (var6 == 2) {
+										var7 = var0.readBits(8);
+									} else {
+										var7 = var0.readBits(11);
+									}
+
+									var1 = var7;
+									var10000 = Players.field1282;
+									var10000[var3] = (byte)(var10000[var3] | 2);
+								} else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) {
+									var10000 = Players.field1282;
+									var10000[var3] = (byte)(var10000[var3] | 2);
+								}
+							}
+						}
+					}
+
+					var0.exportIndex();
+					if (var1 != 0) {
+						throw new RuntimeException();
+					} else {
+						Players.Players_count = 0;
+						Players.Players_emptyIdxCount = 0;
+
+						for (var2 = 1; var2 < 2048; ++var2) {
+							var10000 = Players.field1282;
+							var10000[var2] = (byte)(var10000[var2] >> 1);
+							Player var8 = Client.players[var2];
+							if (var8 != null) {
+								Players.Players_indices[++Players.Players_count - 1] = var2;
+							} else {
+								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2;
+							}
+						}
+
+					}
+				}
+			}
 		}
 	}
+
+	@ObfuscatedName("bq")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "-627685416"
+	)
+	@Export("stringCp1252NullTerminatedByteSize")
+	public static int stringCp1252NullTerminatedByteSize(String var0) {
+		return var0.length() + 1;
+	}
 }

runescape-client/src/main/java/Entity.java

@@ -3,13 +3,14 @@ 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("ee")
+@ObfuscatedName("el")
 @Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = 566997565
+		intValue = -1335402999
 	)
 	@Export("height")
 	public int height;
@@ -18,17 +19,17 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Lel;",
+		signature = "(I)Lef;",
-		garbageValue = "480835067"
+		garbageValue = "1832696685"
 	)
 	@Export("getModel")
 	protected Model getModel() {
 		return null;
 	}
 
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cz")
 	@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();
@@ -39,38 +40,299 @@ public abstract class Entity extends DualNode {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(B)V",
-		garbageValue = "-1030899417"
+		garbageValue = "67"
 	)
-	public static boolean method3374(int var0) {
+	public static void method3387() {
-		return var0 >= WorldMapDecorationType.field2719.id && var0 <= WorldMapDecorationType.field2739.id;
+		KitDefinition.KitDefinition_cached.clear();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		signature = "([BILjava/lang/CharSequence;I)I",
+		signature = "(ILcs;ZI)I",
-		garbageValue = "-304633818"
+		garbageValue = "-1309600698"
 	)
-	public static int method3372(byte[] var0, int var1, CharSequence var2) {
+	static int method3376(int var0, Script var1, boolean var2) {
-		int var3 = var2.length();
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
-		int var4 = var1;
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.publicChatMode;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
+			UrlRequester.Interpreter_intStackSize -= 3;
+			Client.publicChatMode = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+			World.privateChatMode = ItemContainer.method1232(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]);
+			if (World.privateChatMode == null) {
+				World.privateChatMode = PrivateChatMode.field3818;
+			}
 
-		for (int var5 = 0; var5 < var3; ++var5) {
+			Client.tradeChatMode = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2];
-			char var6 = var2.charAt(var5);
+			PacketBufferNode var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher);
-			if (var6 <= 127) {
+			var18.packetBuffer.writeByte(Client.publicChatMode);
-				var0[var4++] = (byte)var6;
+			var18.packetBuffer.writeByte(World.privateChatMode.field3817);
-			} else if (var6 <= 2047) {
+			var18.packetBuffer.writeByte(Client.tradeChatMode);
-				var0[var4++] = (byte)(192 | var6 >> 6);
+			Client.packetWriter.addNode(var18);
-				var0[var4++] = (byte)(128 | var6 & '?');
+			return 1;
+		} else {
+			String var3;
+			int var4;
+			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
+				var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize];
+				UrlRequester.Interpreter_intStackSize -= 2;
+				var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+				int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+				PacketBufferNode var6 = UserComparator4.getPacketBufferNode(ClientPacket.field2341, Client.packetWriter.isaacCipher);
+				var6.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var3) + 2);
+				var6.packetBuffer.writeStringCp1252NullTerminated(var3);
+				var6.packetBuffer.writeByte(var4 - 1);
+				var6.packetBuffer.writeByte(var5);
+				Client.packetWriter.addNode(var6);
+				return 1;
 			} else {
-				var0[var4++] = (byte)(224 | var6 >> '\f');
+				int var10;
-				var0[var4++] = (byte)(128 | var6 >> 6 & 63);
+				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
-				var0[var4++] = (byte)(128 | var6 & '?');
+					UrlRequester.Interpreter_intStackSize -= 2;
+					var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+					var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+					Message var15 = class3.Messages_getByChannelAndID(var10, var4);
+					if (var15 != null) {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.count;
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.cycle;
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
+					} else {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
+					var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+					Message var16 = Language.Messages_getMessage(var10);
+					if (var16 != null) {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.type;
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.cycle;
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
+					} else {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
+					if (World.privateChatMode == null) {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1;
+					} else {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = World.privateChatMode.field3817;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
+					var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize];
+					var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+					String var14 = var3.toLowerCase();
+					byte var17 = 0;
+					if (var14.startsWith("yellow:")) {
+						var17 = 0;
+						var3 = var3.substring("yellow:".length());
+					} else if (var14.startsWith("red:")) {
+						var17 = 1;
+						var3 = var3.substring("red:".length());
+					} else if (var14.startsWith("green:")) {
+						var17 = 2;
+						var3 = var3.substring("green:".length());
+					} else if (var14.startsWith("cyan:")) {
+						var17 = 3;
+						var3 = var3.substring("cyan:".length());
+					} else if (var14.startsWith("purple:")) {
+						var17 = 4;
+						var3 = var3.substring("purple:".length());
+					} else if (var14.startsWith("white:")) {
+						var17 = 5;
+						var3 = var3.substring("white:".length());
+					} else if (var14.startsWith("flash1:")) {
+						var17 = 6;
+						var3 = var3.substring("flash1:".length());
+					} else if (var14.startsWith("flash2:")) {
+						var17 = 7;
+						var3 = var3.substring("flash2:".length());
+					} else if (var14.startsWith("flash3:")) {
+						var17 = 8;
+						var3 = var3.substring("flash3:".length());
+					} else if (var14.startsWith("glow1:")) {
+						var17 = 9;
+						var3 = var3.substring("glow1:".length());
+					} else if (var14.startsWith("glow2:")) {
+						var17 = 10;
+						var3 = var3.substring("glow2:".length());
+					} else if (var14.startsWith("glow3:")) {
+						var17 = 11;
+						var3 = var3.substring("glow3:".length());
+					} else if (UserComparator9.clientLanguage != Language.Language_EN) {
+						if (var14.startsWith("yellow:")) {
+							var17 = 0;
+							var3 = var3.substring("yellow:".length());
+						} else if (var14.startsWith("red:")) {
+							var17 = 1;
+							var3 = var3.substring("red:".length());
+						} else if (var14.startsWith("green:")) {
+							var17 = 2;
+							var3 = var3.substring("green:".length());
+						} else if (var14.startsWith("cyan:")) {
+							var17 = 3;
+							var3 = var3.substring("cyan:".length());
+						} else if (var14.startsWith("purple:")) {
+							var17 = 4;
+							var3 = var3.substring("purple:".length());
+						} else if (var14.startsWith("white:")) {
+							var17 = 5;
+							var3 = var3.substring("white:".length());
+						} else if (var14.startsWith("flash1:")) {
+							var17 = 6;
+							var3 = var3.substring("flash1:".length());
+						} else if (var14.startsWith("flash2:")) {
+							var17 = 7;
+							var3 = var3.substring("flash2:".length());
+						} else if (var14.startsWith("flash3:")) {
+							var17 = 8;
+							var3 = var3.substring("flash3:".length());
+						} else if (var14.startsWith("glow1:")) {
+							var17 = 9;
+							var3 = var3.substring("glow1:".length());
+						} else if (var14.startsWith("glow2:")) {
+							var17 = 10;
+							var3 = var3.substring("glow2:".length());
+						} else if (var14.startsWith("glow3:")) {
+							var17 = 11;
+							var3 = var3.substring("glow3:".length());
+						}
+					}
+
+					var14 = var3.toLowerCase();
+					byte var7 = 0;
+					if (var14.startsWith("wave:")) {
+						var7 = 1;
+						var3 = var3.substring("wave:".length());
+					} else if (var14.startsWith("wave2:")) {
+						var7 = 2;
+						var3 = var3.substring("wave2:".length());
+					} else if (var14.startsWith("shake:")) {
+						var7 = 3;
+						var3 = var3.substring("shake:".length());
+					} else if (var14.startsWith("scroll:")) {
+						var7 = 4;
+						var3 = var3.substring("scroll:".length());
+					} else if (var14.startsWith("slide:")) {
+						var7 = 5;
+						var3 = var3.substring("slide:".length());
+					} else if (Language.Language_EN != UserComparator9.clientLanguage) {
+						if (var14.startsWith("wave:")) {
+							var7 = 1;
+							var3 = var3.substring("wave:".length());
+						} else if (var14.startsWith("wave2:")) {
+							var7 = 2;
+							var3 = var3.substring("wave2:".length());
+						} else if (var14.startsWith("shake:")) {
+							var7 = 3;
+							var3 = var3.substring("shake:".length());
+						} else if (var14.startsWith("scroll:")) {
+							var7 = 4;
+							var3 = var3.substring("scroll:".length());
+						} else if (var14.startsWith("slide:")) {
+							var7 = 5;
+							var3 = var3.substring("slide:".length());
+						}
+					}
+
+					PacketBufferNode var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.writeByte(0);
+					int var9 = var8.packetBuffer.offset;
+					var8.packetBuffer.writeByte(var4);
+					var8.packetBuffer.writeByte(var17);
+					var8.packetBuffer.writeByte(var7);
+					DevicePcmPlayerProvider.method917(var8.packetBuffer, var3);
+					var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
+					Client.packetWriter.addNode(var8);
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
+					WorldMapEvent.Interpreter_stringStackSize -= 2;
+					var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize];
+					String var12 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1];
+					PacketBufferNode var11 = UserComparator4.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher);
+					var11.packetBuffer.writeShort(0);
+					int var13 = var11.packetBuffer.offset;
+					var11.packetBuffer.writeStringCp1252NullTerminated(var3);
+					DevicePcmPlayerProvider.method917(var11.packetBuffer, var12);
+					var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
+					Client.packetWriter.addNode(var11);
+					return 1;
+				} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
+					if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.tradeChatMode;
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
+						var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = GrandExchangeEvent.Messages_getHistorySize(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
+						var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class171.Messages_getNextChatID(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
+						var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+						Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapLabel.Messages_getLastChatID(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.DOCHEAT) {
+						var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize];
+						WallDecoration.doCheat(var3);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
+						Client.field755 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize].toLowerCase().trim();
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
+						Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Client.field755;
+						return 1;
+					} else if (var0 == ScriptOpcodes.DEBUGMES) {
+						var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize];
+						System.out.println(var3);
+						return 1;
+					} else {
+						return 2;
+					}
+				} else {
+					if (class60.localPlayer != null && class60.localPlayer.username != null) {
+						var3 = class60.localPlayer.username.getName();
+					} else {
+						var3 = "";
+					}
+
+					Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3;
+					return 1;
+				}
 			}
 		}
+	}
 
-		return var4 - var1;
+	@ObfuscatedName("kl")
+	@ObfuscatedSignature(
+		signature = "(Lhd;I)Z",
+		garbageValue = "-36347772"
+	)
+	@Export("isComponentHidden")
+	static boolean isComponentHidden(Widget var0) {
+		return var0.isHidden;
 	}
 }

runescape-client/src/main/java/EnumDefinition.java

@@ -4,49 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ji")
+@ObfuscatedName("jr")
 @Implements("EnumDefinition")
 public class EnumDefinition extends DualNode {
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Lec;"
-	)
-	@Export("EnumDefinition_archive")
-	static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Leg;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1168542031
+		intValue = 296936223
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 744835807
+		intValue = -306934909
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -59,10 +53,10 @@ public class EnumDefinition extends DualNode {
 		this.outputCount = 0;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkb;I)V",
+		signature = "(Lkn;I)V",
-		garbageValue = "1803562371"
+		garbageValue = "1372956041"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -76,10 +70,10 @@ public class EnumDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(Lkn;IB)V",
-		garbageValue = "-1795608149"
+		garbageValue = "63"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -116,45 +110,13 @@ public class EnumDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(S)I",
-		garbageValue = "1493924915"
+		garbageValue = "-24655"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount;
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-530273467"
-	)
-	public static void method4614(int var0) {
-		if (var0 != -1) {
-			if (Widget.Widget_loadedInterfaces[var0]) {
-				Widget.Widget_archive.clearFilesGroup(var0);
-				if (Widget.Widget_interfaceComponents[var0] != null) {
-					boolean var1 = true;
-
-					for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) {
-						if (Widget.Widget_interfaceComponents[var0][var2] != null) {
-							if (Widget.Widget_interfaceComponents[var0][var2].type != 2) {
-								Widget.Widget_interfaceComponents[var0][var2] = null;
-							} else {
-								var1 = false;
-							}
-						}
-					}
-
-					if (var1) {
-						Widget.Widget_interfaceComponents[var0] = null;
-					}
-
-					Widget.Widget_loadedInterfaces[var0] = false;
-				}
-			}
-		}
-	}
 }

runescape-client/src/main/java/Enumerated.java

@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("go")
+@ObfuscatedName("gt")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "56"
+		garbageValue = "-995092303"
 	)
 	@Export("rsOrdinal")
 	int rsOrdinal();

runescape-client/src/main/java/EvictingDualNodeHashTable.java

@@ -3,35 +3,35 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eg")
+@ObfuscatedName("ec")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Lge;"
-	)
-	DualNode field1973;
 	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "Lgf;"
+	)
+	DualNode field1978;
+	@ObfuscatedName("o")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lln;"
+		signature = "Llf;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ljz;"
+		signature = "Ljq;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field1973 = new DualNode();
+		this.field1978 = new DualNode();
 		this.deque = new IterableDualNodeQueue();
 		this.capacity = var1;
 		this.remainingCapacity = var1;
@@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable {
 		this.hashTable = new IterableNodeHashTable(var2);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(J)Lge;"
+		signature = "(J)Lgf;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lge;J)V"
+		signature = "(Lgf;J)V"
 	)
 	@Export("put")
 	public void put(DualNode var1, long var2) {
@@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable {
 			DualNode var4 = this.deque.removeLast();
 			var4.remove();
 			var4.removeDual();
-			if (var4 == this.field1973) {
+			if (var4 == this.field1978) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1973 = new DualNode();
+		this.field1978 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

runescape-client/src/main/java/FaceNormal.java

@@ -4,30 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("er")
+@ObfuscatedName("ed")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("iz")
-	@ObfuscatedGetter(
-		intValue = -98471287
-	)
-	@Export("selectedItemId")
-	static int selectedItemId;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 62688093
-	)
-	@Export("y")
-	int y;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 152436141
+		intValue = -552913965
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 567855277
+		intValue = -1122069433
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = -256548507
 	)
 	@Export("z")
 	int z;
@@ -37,140 +31,29 @@ public class FaceNormal {
 
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lgn;Llp;I)Lgq;",
+		signature = "([Lgt;II)Lgt;",
-		garbageValue = "-1746993437"
+		garbageValue = "-707018179"
 	)
-	@Export("getPacketBufferNode")
+	@Export("findEnumerated")
-	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
+	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-		PacketBufferNode var2 = UserComparator9.method3496();
+		Enumerated[] var2 = var0;
-		var2.clientPacket = var0;
-		var2.clientPacketLength = var0.length;
-		if (var2.clientPacketLength == -1) {
-			var2.packetBuffer = new PacketBuffer(260);
-		} else if (var2.clientPacketLength == -2) {
-			var2.packetBuffer = new PacketBuffer(10000);
-		} else if (var2.clientPacketLength <= 18) {
-			var2.packetBuffer = new PacketBuffer(20);
-		} else if (var2.clientPacketLength <= 98) {
-			var2.packetBuffer = new PacketBuffer(100);
-		} else {
-			var2.packetBuffer = new PacketBuffer(260);
-		}
 
-		var2.packetBuffer.setIsaacCipher(var1);
+		for (int var3 = 0; var3 < var2.length; ++var3) {
-		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id);
+			Enumerated var4 = var2[var3];
-		var2.index = 0;
+			if (var1 == var4.rsOrdinal()) {
-		return var2;
+				return var4;
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(CLgl;B)C",
-		garbageValue = "-64"
-	)
-	@Export("standardizeChar")
-	static char standardizeChar(char var0, Language var1) {
-		if (var0 >= 192 && var0 <= 255) {
-			if (var0 >= 192 && var0 <= 198) {
-				return 'A';
-			}
-
-			if (var0 == 199) {
-				return 'C';
-			}
-
-			if (var0 >= 200 && var0 <= 203) {
-				return 'E';
-			}
-
-			if (var0 >= 204 && var0 <= 207) {
-				return 'I';
-			}
-
-			if (var0 == 209 && var1 != Language.Language_ES) {
-				return 'N';
-			}
-
-			if (var0 >= 210 && var0 <= 214) {
-				return 'O';
-			}
-
-			if (var0 >= 217 && var0 <= 220) {
-				return 'U';
-			}
-
-			if (var0 == 221) {
-				return 'Y';
-			}
-
-			if (var0 == 223) {
-				return 's';
-			}
-
-			if (var0 >= 224 && var0 <= 230) {
-				return 'a';
-			}
-
-			if (var0 == 231) {
-				return 'c';
-			}
-
-			if (var0 >= 232 && var0 <= 235) {
-				return 'e';
-			}
-
-			if (var0 >= 236 && var0 <= 239) {
-				return 'i';
-			}
-
-			if (var0 == 241 && var1 != Language.Language_ES) {
-				return 'n';
-			}
-
-			if (var0 >= 242 && var0 <= 246) {
-				return 'o';
-			}
-
-			if (var0 >= 249 && var0 <= 252) {
-				return 'u';
-			}
-
-			if (var0 == 253 || var0 == 255) {
-				return 'y';
 			}
 		}
 
-		if (var0 == 338) {
+		return null;
-			return 'O';
-		} else if (var0 == 339) {
-			return 'o';
-		} else {
-			return var0 == 376 ? 'Y' : var0;
-		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(ILiy;IIIZB)V",
+		signature = "(I)Ljava/lang/String;",
-		garbageValue = "-88"
+		garbageValue = "223741723"
 	)
-	@Export("playMusicTrack")
+	static String method3392() {
-	public static void playMusicTrack(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) {
+		return NetSocket.clientPreferences.hideUsername ? WorldMapRegion.method613(Login.Login_username) : Login.Login_username;
-		class206.field2406 = 1;
-		class206.musicTrackArchive = var1;
-		class206.musicTrackGroupId = var2;
-		class206.musicTrackFileId = var3;
-		class219.musicTrackVolume = var4;
-		GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var5;
-		AttackOption.field1187 = var0;
-	}
-
-	@ObfuscatedName("lk")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "2112938441"
-	)
-	public static boolean method3379() {
-		return Client.staffModLevel >= 2;
 	}
 }

runescape-client/src/main/java/FileSystem.java

@@ -3,18 +3,17 @@ import java.util.Hashtable;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fe")
+@ObfuscatedName("fl")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("x")
-	@Export("FileSystem_hasPermissions")
-	public static boolean FileSystem_hasPermissions;
 	@ObfuscatedName("m")
+	@Export("FileSystem_hasPermissions")
+	static boolean FileSystem_hasPermissions;
+	@ObfuscatedName("o")
 	@Export("FileSystem_cacheDir")
-	public static File FileSystem_cacheDir;
+	static File FileSystem_cacheDir;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
 
@@ -22,40 +21,4 @@ public class FileSystem {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		signature = "(IIB)Z",
-		garbageValue = "-28"
-	)
-	static final boolean method3588(int var0, int var1) {
-		ObjectDefinition var2 = WorldMapSection2.getObjectDefinition(var0);
-		if (var1 == 11) {
-			var1 = 10;
-		}
-
-		if (var1 >= 5 && var1 <= 8) {
-			var1 = 4;
-		}
-
-		return var2.method4661(var1);
-	}
-
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		signature = "(Lds;S)V",
-		garbageValue = "4477"
-	)
-	@Export("PcmStream_disable")
-	static final void PcmStream_disable(PcmStream var0) {
-		var0.active = false;
-		if (var0.sound != null) {
-			var0.sound.position = 0;
-		}
-
-		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
-			PcmStream_disable(var1);
-		}
-
-	}
 }

runescape-client/src/main/java/FloorDecoration.java

@@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eo")
+@ObfuscatedName("eu")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -1588480469
-	)
-	@Export("y")
-	int y;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -6831837537966124847L
+		longValue = 423292381861362449L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -198900691
+		intValue = 1344836879
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1743466221
+		intValue = -732713561
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -799217819
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lel;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1370776167
+		intValue = -1173464785
 	)
 	@Export("flags")
 	int flags;
@@ -47,22 +47,8 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
+	static boolean method2977(long var0) {
-		signature = "(IIB)V",
+		return class171.method3571(var0) == 2;
-		garbageValue = "-95"
-	)
-	public static void method2952(int var0, int var1) {
-		VarbitDefinition var2 = SpriteMask.method4061(var0);
-		int var3 = var2.baseVar;
-		int var4 = var2.startBit;
-		int var5 = var2.endBit;
-		int var6 = Varps.Varps_masks[var5 - var4];
-		if (var1 < 0 || var1 > var6) {
-			var1 = 0;
-		}
-
-		var6 <<= var4;
-		Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6;
 	}
 }

runescape-client/src/main/java/FloorOverlayDefinition.java

@@ -4,75 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jn")
+@ObfuscatedName("jt")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Lic;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lec;"
 	)
 	@Export("FloorOverlayDefinition_cached")
-	static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
+	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1157024387
+		intValue = -1755156673
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 512679167
+		intValue = 1396694897
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1191999743
+		intValue = 241976547
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 273345835
+		intValue = 752648345
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1834266941
+		intValue = -1759175445
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1392901101
+		intValue = 1976855017
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1368031931
+		intValue = -223897525
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1913373455
+		intValue = 1642260111
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 262091387
+		intValue = 841175665
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -81,7 +81,7 @@ public class FloorOverlayDefinition extends DualNode {
 		FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	FloorOverlayDefinition() {
+	public FloorOverlayDefinition() {
 		this.primaryRgb = 0;
 		this.texture = -1;
 		this.hideUnderlay = true;
@@ -90,11 +90,11 @@ public class FloorOverlayDefinition extends DualNode {
 
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(S)V",
-		garbageValue = "-1555097959"
+		garbageValue = "9136"
 	)
 	@Export("postDecode")
-	void postDecode() {
+	public void postDecode() {
 		if (this.secondaryRgb != -1) {
 			this.setHsl(this.secondaryRgb);
 			this.secondaryHue = this.hue;
@@ -105,13 +105,13 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(Lkn;II)V",
-		garbageValue = "-1372531887"
+		garbageValue = "1893541080"
 	)
 	@Export("decode")
-	void decode(Buffer var1, int var2) {
+	public void decode(Buffer var1, int var2) {
 		while (true) {
 			int var3 = var1.readUnsignedByte();
 			if (var3 == 0) {
@@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkb;IIB)V",
+		signature = "(Lkn;III)V",
-		garbageValue = "109"
+		garbageValue = "965813090"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-726592820"
+		garbageValue = "1"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -172,8 +172,8 @@ public class FloorOverlayDefinition extends DualNode {
 
 		double var12 = 0.0D;
 		double var14 = 0.0D;
-		double var16 = (var10 + var8) / 2.0D;
+		double var16 = (var8 + var10) / 2.0D;
-		if (var8 != var10) {
+		if (var10 != var8) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var8 + var10);
 			}
@@ -182,19 +182,19 @@ public class FloorOverlayDefinition extends DualNode {
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var2 == var10) {
+			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) {
+			} else if (var10 == var4) {
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
 			} else if (var10 == var6) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
+				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
-		this.hue = (int)(var12 * 256.0D);
+		this.hue = (int)(256.0D * var12);
-		this.saturation = (int)(var14 * 256.0D);
+		this.saturation = (int)(256.0D * var14);
-		this.lightness = (int)(256.0D * var16);
+		this.lightness = (int)(var16 * 256.0D);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -209,26 +209,12 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
-		signature = "(IB)Ljq;",
+		signature = "([BII)I",
-		garbageValue = "6"
+		garbageValue = "-2091622873"
 	)
-	@Export("StructDefinition_getStructDefinition")
+	public static int method4936(byte[] var0, int var1) {
-	public static StructDefinition StructDefinition_getStructDefinition(int var0) {
+		return Actor.method1822(var0, 0, var1);
-		StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
-			var1 = new StructDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode();
-			StructDefinition.StructDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
 	}
 }

runescape-client/src/main/java/FloorUnderlayDefinition.java

@@ -1,51 +1,62 @@
+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("if")
+@ObfuscatedName("iw")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("x")
+	@ObfuscatedName("sh")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Llp;"
+	)
+	@Export("masterDisk")
+	static ArchiveDisk masterDisk;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "Lic;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
 	public static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lec;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -982291311
+		intValue = 582353211
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1361572975
+		intValue = -50831355
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -932748815
+		intValue = 88823617
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -26214431
+		intValue = -1334094789
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -667494965
+		intValue = 1647084533
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -54,27 +65,27 @@ public class FloorUnderlayDefinition extends DualNode {
 		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	FloorUnderlayDefinition() {
+	public FloorUnderlayDefinition() {
 		this.rgb = 0;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1794462402"
+		garbageValue = "-33176492"
 	)
 	@Export("postDecode")
-	void postDecode() {
+	public void postDecode() {
 		this.setHsl(this.rgb);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(Lkn;IB)V",
-		garbageValue = "1422019917"
+		garbageValue = "17"
 	)
 	@Export("decode")
-	void decode(Buffer var1, int var2) {
+	public void decode(Buffer var1, int var2) {
 		while (true) {
 			int var3 = var1.readUnsignedByte();
 			if (var3 == 0) {
@@ -85,10 +96,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkb;III)V",
+		signature = "(Lkn;IIB)V",
-		garbageValue = "-1237610564"
+		garbageValue = "-93"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -98,10 +109,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "2124532512"
+		garbageValue = "-14"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -129,9 +140,9 @@ public class FloorUnderlayDefinition extends DualNode {
 		double var12 = 0.0D;
 		double var14 = 0.0D;
 		double var16 = (var10 + var8) / 2.0D;
-		if (var10 != var8) {
+		if (var8 != var10) {
 			if (var16 < 0.5D) {
-				var14 = (var10 - var8) / (var10 + var8);
+				var14 = (var10 - var8) / (var8 + var10);
 			}
 
 			if (var16 >= 0.5D) {
@@ -141,15 +152,15 @@ public class FloorUnderlayDefinition extends DualNode {
 			if (var2 == var10) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var10 == var4) {
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
-			} else if (var10 == var6) {
+			} else if (var6 == var10) {
 				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
 		this.saturation = (int)(256.0D * var14);
-		this.lightness = (int)(var16 * 256.0D);
+		this.lightness = (int)(256.0D * var16);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -163,7 +174,7 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 
 		if (var16 > 0.5D) {
-			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
+			this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16));
 		} else {
 			this.hueMultiplier = (int)(512.0D * var16 * var14);
 		}
@@ -172,17 +183,81 @@ public class FloorUnderlayDefinition extends DualNode {
 			this.hueMultiplier = 1;
 		}
 
-		this.hue = (int)(var12 * (double)this.hueMultiplier);
+		this.hue = (int)((double)this.hueMultiplier * var12);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Liy;Ljava/lang/String;Ljava/lang/String;I)[Lla;",
+		signature = "([BI)Llz;",
-		garbageValue = "-1984453529"
+		garbageValue = "619951505"
 	)
-	public static Sprite[] method4507(AbstractArchive var0, String var1, String var2) {
+	@Export("convertJpgToSprite")
-		int var3 = var0.getGroupId(var1);
+	public static final Sprite convertJpgToSprite(byte[] var0) {
-		int var4 = var0.getFileId(var3, var2);
+		BufferedImage var1 = null;
-		return ClientPacket.method3688(var0, var3, var4);
+
+		try {
+			var1 = ImageIO.read(new ByteArrayInputStream(var0));
+			int var2 = var1.getWidth();
+			int var3 = var1.getHeight();
+			int[] var4 = new int[var3 * var2];
+			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
+			var5.grabPixels();
+			return new Sprite(var4, var2, var3);
+		} catch (IOException var7) {
+		} catch (InterruptedException var8) {
+		}
+
+		return new Sprite(0, 0);
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/Object;ZB)[B",
+		garbageValue = "101"
+	)
+	public static byte[] method4613(Object var0, boolean var1) {
+		if (var0 == null) {
+			return null;
+		} else if (var0 instanceof byte[]) {
+			byte[] var3 = (byte[])((byte[])var0);
+			return var1 ? class195.method3748(var3) : var3;
+		} else if (var0 instanceof AbstractByteArrayCopier) {
+			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
+			return var2.get();
+		} else {
+			throw new IllegalArgumentException();
+		}
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(Llf;ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1916318659"
+	)
+	static String method4612(IterableNodeHashTable var0, int var1, String var2) {
+		if (var0 == null) {
+			return var2;
+		} else {
+			ObjectNode var3 = (ObjectNode)var0.get((long)var1);
+			return var3 == null ? var2 : (String)var3.obj;
+		}
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;IB)Z",
+		garbageValue = "3"
+	)
+	static boolean method4608(String var0, int var1) {
+		return GrandExchangeOfferTotalQuantityComparator.method165(var0, var1, "openjs");
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "(IB)Z",
+		garbageValue = "7"
+	)
+	public static boolean method4615(int var0) {
+		return (var0 >> 30 & 1) != 0;
 	}
 }

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("kx")
+@ObfuscatedName("ko")
 @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);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("drawGlyph")
 	final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2;
@@ -55,7 +55,7 @@ public final class Font extends AbstractFont {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@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;

runescape-client/src/main/java/FontName.java

@@ -1,55 +1,50 @@
-import java.util.Iterator;
+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("ka")
+@ObfuscatedName("ke")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lke;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("do")
+	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "Lih;"
-	)
-	@Export("archive4")
-	static Archive archive4;
-	@ObfuscatedName("q")
 	@Export("name")
 	String name;
 
@@ -66,143 +61,95 @@ public class FontName {
 		this.name = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)[Lka;",
+		signature = "(B)Lch;",
-		garbageValue = "-2101151753"
+		garbageValue = "-18"
 	)
-	public static FontName[] method5387() {
+	@Export("worldListStart")
-		return new FontName[]{FontName_bold12, FontName_verdana13, FontName_verdana11, FontName_plain11, FontName_plain12, FontName_verdana15};
+	static World worldListStart() {
+		World.World_listCount = 0;
+		return class3.getNextWorldListWorld();
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(IIII)V",
+		signature = "(Lhd;II)V",
-		garbageValue = "-1439449778"
+		garbageValue = "1462159307"
 	)
-	static final void method5385(int var0, int var1, int var2) {
+	@Export("Widget_setKeyIgnoreHeld")
-		int var3;
+	static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
-		for (var3 = 0; var3 < 8; ++var3) {
+		if (var0.field2647 == null) {
-			for (int var4 = 0; var4 < 8; ++var4) {
+			throw new RuntimeException();
-				Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0;
-			}
-		}
-
-		if (var1 > 0) {
-			for (var3 = 1; var3 < 8; ++var3) {
-				Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2];
-			}
-		}
-
-		if (var2 > 0) {
-			for (var3 = 1; var3 < 8; ++var3) {
-				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) {
-			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) {
-			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) {
-			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1];
-		}
-
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "27"
-	)
-	static void method5388() {
-		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
-			Login.currentLoginField = 1;
 		} else {
-			Login.currentLoginField = 0;
+			if (var0.field2723 == null) {
-		}
+				var0.field2723 = new int[var0.field2647.length];
-
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(Lhe;I[B[BI)V",
-		garbageValue = "-481571835"
-	)
-	@Export("Widget_setKey")
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
-		if (var0.field2555 == null) {
-			if (var2 == null) {
-				return;
 			}
 
-			var0.field2555 = new byte[11][];
+			var0.field2723[var1] = Integer.MAX_VALUE;
-			var0.field2643 = new byte[11][];
-			var0.field2644 = new int[11];
-			var0.field2695 = new int[11];
 		}
+	}
 
-		var0.field2555[var1] = var2;
+	@ObfuscatedName("ae")
-		if (var2 != null) {
+	@ObfuscatedSignature(
-			var0.field2641 = true;
+		signature = "(Lfm;III)Ldt;",
-		} else {
+		garbageValue = "273987431"
-			var0.field2641 = false;
+	)
+	public static final PcmPlayer method5519(TaskHandler var0, int var1, int var2) {
+		if (class237.field3113 == 0) {
+			throw new IllegalStateException();
+		} else if (var1 >= 0 && var1 < 2) {
+			if (var2 < 256) {
+				var2 = 256;
+			}
 
-			for (int var4 = 0; var4 < var0.field2555.length; ++var4) {
+			try {
-				if (var0.field2555[var4] != null) {
+				PcmPlayer var3 = HealthBarUpdate.pcmPlayerProvider.player();
-					var0.field2641 = true;
+				var3.samples = new int[256 * (Messages.PcmPlayer_stereo ? 2 : 1)];
-					break;
+				var3.field1443 = var2;
+				var3.init();
+				var3.capacity = (var2 & -1024) + 1024;
+				if (var3.capacity > 16384) {
+					var3.capacity = 16384;
 				}
+
+				var3.open(var3.capacity);
+				if (UserComparator3.field2009 > 0 && PcmPlayer.soundSystem == null) {
+					PcmPlayer.soundSystem = new SoundSystem();
+					class227.soundSystemExecutor = Executors.newScheduledThreadPool(1);
+					class227.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
+				}
+
+				if (PcmPlayer.soundSystem != null) {
+					if (PcmPlayer.soundSystem.players[var1] != null) {
+						throw new IllegalArgumentException();
+					}
+
+					PcmPlayer.soundSystem.players[var1] = var3;
+				}
+
+				return var3;
+			} catch (Throwable var4) {
+				return new PcmPlayer();
 			}
+		} else {
+			throw new IllegalArgumentException();
 		}
-
-		var0.field2643[var1] = var3;
 	}
 
-	@ObfuscatedName("jv")
+	@ObfuscatedName("hk")
-	@ObfuscatedSignature(
-		signature = "(IIIIII)V",
-		garbageValue = "2092614789"
-	)
-	@Export("drawScrollBar")
-	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
-		class232.scrollBarSprites[0].drawAt(var0, var1);
-		class232.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field742);
-		int var5 = var3 * (var3 - 32) / var4;
-		if (var5 < 8) {
-			var5 = 8;
-		}
-
-		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field747);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field745);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field745);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field745);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field745);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field744);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field744);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field744);
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field744);
-	}
-
-	@ObfuscatedName("ku")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "78601767"
+		garbageValue = "1542752856"
 	)
-	@Export("FriendSystem_invalidateIgnoreds")
+	@Export("addCancelMenuEntry")
-	static final void FriendSystem_invalidateIgnoreds() {
+	static void addCancelMenuEntry() {
-		Iterator var0 = Messages.Messages_hashTable.iterator();
+		Client.menuOptionsCount = 0;
-
+		Client.isMenuOpen = false;
-		while (var0.hasNext()) {
+		Client.menuActions[0] = "Cancel";
-			Message var1 = (Message)var0.next();
+		Client.menuTargets[0] = "";
-			var1.clearIsFromIgnored();
+		Client.menuOpcodes[0] = 1006;
-		}
+		Client.menuShiftClick[0] = false;
-
+		Client.menuOptionsCount = 1;
-		if (InterfaceParent.clanChat != null) {
-			InterfaceParent.clanChat.invalidateIgnoreds();
-		}
-
 	}
 }

runescape-client/src/main/java/Fonts.java

@@ -4,27 +4,36 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kf")
+@ObfuscatedName("kv")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("x")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Llh;"
+	)
+	@Export("titlebuttonSprite")
+	static IndexedSprite titlebuttonSprite;
+	@ObfuscatedName("a")
+	@Export("ByteArrayPool_arrays")
+	static byte[][][] ByteArrayPool_arrays;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "Lic;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Lic;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		signature = "(Liy;Liy;)V"
+		signature = "(Lic;Lic;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -32,10 +41,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "([Lka;I)Ljava/util/HashMap;",
+		signature = "([Lke;B)Ljava/util/HashMap;",
-		garbageValue = "-1813664222"
+		garbageValue = "-100"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -47,7 +56,12 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = class39.method647(this.spritesArchive, this.fontsArchive, var5.name, "");
+				AbstractArchive var7 = this.spritesArchive;
+				AbstractArchive var8 = this.fontsArchive;
+				String var9 = var5.name;
+				int var10 = var7.getGroupId(var9);
+				int var11 = var7.getFileId(var10, "");
+				Font var6 = Frames.method3394(var7, var8, var10, var11);
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);

runescape-client/src/main/java/Frames.java

@@ -1,20 +1,27 @@
 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("ef")
+@ObfuscatedName("eg")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("x")
+	@ObfuscatedName("lc")
+	@ObfuscatedGetter(
+		intValue = -2096850733
+	)
+	@Export("menuY")
+	static int menuY;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "[Leh;"
+		signature = "[Les;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		signature = "(Liy;Liy;IZ)V",
+		signature = "(Lic;Lic;IZ)V",
 		garbageValue = "0"
 	)
 	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
@@ -46,60 +53,207 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(IB)Z",
-		garbageValue = "861900150"
+		garbageValue = "-107"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("m")
+	public static String method3398(long var0) {
+		if (var0 > 0L && var0 < 6582952005840035281L) {
+			if (var0 % 37L == 0L) {
+				return null;
+			} else {
+				int var2 = 0;
+
+				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
+					++var2;
+				}
+
+				StringBuilder var5 = new StringBuilder(var2);
+
+				while (0L != var0) {
+					long var6 = var0;
+					var0 /= 37L;
+					var5.append(class298.base37Table[(int)(var6 - var0 * 37L)]);
+				}
+
+				return var5.reverse().toString();
+			}
+		} else {
+			return null;
+		}
+	}
+
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lih;IIIBZI)V",
+		signature = "(CLgz;I)C",
-		garbageValue = "-626508532"
+		garbageValue = "-959977971"
 	)
-	@Export("requestNetFile")
+	@Export("standardizeChar")
-	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
+	static char standardizeChar(char var0, Language var1) {
-		long var6 = (long)((var1 << 16) + var2);
+		if (var0 >= 192 && var0 <= 255) {
-		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
+			if (var0 >= 192 && var0 <= 198) {
-		if (var8 == null) {
+				return 'A';
-			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
+			}
-			if (var8 == null) {
+
-				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
+			if (var0 == 199) {
-				if (var8 != null) {
+				return 'C';
-					if (var5) {
+			}
-						var8.removeDual();
+
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
+			if (var0 >= 200 && var0 <= 203) {
-						--NetCache.NetCache_pendingWritesCount;
+				return 'E';
-						++NetCache.NetCache_pendingPriorityWritesCount;
+			}
+
+			if (var0 >= 204 && var0 <= 207) {
+				return 'I';
+			}
+
+			if (var0 == 209 && var1 != Language.Language_ES) {
+				return 'N';
+			}
+
+			if (var0 >= 210 && var0 <= 214) {
+				return 'O';
+			}
+
+			if (var0 >= 217 && var0 <= 220) {
+				return 'U';
+			}
+
+			if (var0 == 221) {
+				return 'Y';
+			}
+
+			if (var0 == 223) {
+				return 's';
+			}
+
+			if (var0 >= 224 && var0 <= 230) {
+				return 'a';
+			}
+
+			if (var0 == 231) {
+				return 'c';
+			}
+
+			if (var0 >= 232 && var0 <= 235) {
+				return 'e';
+			}
+
+			if (var0 >= 236 && var0 <= 239) {
+				return 'i';
+			}
+
+			if (var0 == 241 && var1 != Language.Language_ES) {
+				return 'n';
+			}
+
+			if (var0 >= 242 && var0 <= 246) {
+				return 'o';
+			}
+
+			if (var0 >= 249 && var0 <= 252) {
+				return 'u';
+			}
+
+			if (var0 == 253 || var0 == 255) {
+				return 'y';
+			}
+		}
+
+		if (var0 == 338) {
+			return 'O';
+		} else if (var0 == 339) {
+			return 'o';
+		} else if (var0 == 376) {
+			return 'Y';
+		} else {
+			return var0;
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(Lic;Lic;III)Lko;",
+		garbageValue = "-2070991083"
+	)
+	public static Font method3394(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+		byte[] var5 = var0.takeFile(var2, var3);
+		boolean var4;
+		if (var5 == null) {
+			var4 = false;
+		} else {
+			class3.SpriteBuffer_decode(var5);
+			var4 = true;
+		}
+
+		return !var4 ? null : class90.method2168(var1.takeFile(var2, var3));
+	}
+
+	@ObfuscatedName("gw")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "150036680"
+	)
+	static final void method3396() {
+		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
+			if (var0.hitpoints > 0) {
+				--var0.hitpoints;
+			}
+
+			if (var0.hitpoints == 0) {
+				if (var0.objectId >= 0) {
+					int var2 = var0.objectId;
+					int var3 = var0.field957;
+					ObjectDefinition var4 = Canvas.getObjectDefinition(var2);
+					if (var3 == 11) {
+						var3 = 10;
 					}
 
-				} else {
+					if (var3 >= 5 && var3 <= 8) {
-					if (!var5) {
+						var3 = 4;
-						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
-						if (var8 != null) {
-							return;
-						}
 					}
 
-					var8 = new NetFileRequest();
+					boolean var1 = var4.method4786(var3);
-					var8.archive = var0;
+					if (!var1) {
-					var8.crc = var3;
+						continue;
-					var8.padding = var4;
-					if (var5) {
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
-						++NetCache.NetCache_pendingPriorityWritesCount;
-					} else {
-						NetCache.NetCache_pendingWritesQueue.addFirst(var8);
-						NetCache.NetCache_pendingWrites.put(var8, var6);
-						++NetCache.NetCache_pendingWritesCount;
 					}
+				}
 
+				class1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field956, var0.field957);
+				var0.remove();
+			} else {
+				if (var0.delay > 0) {
+					--var0.delay;
+				}
+
+				if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || class7.method97(var0.id, var0.field962))) {
+					class1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field962);
+					var0.delay = -1;
+					if (var0.id == var0.objectId && var0.objectId == -1) {
+						var0.remove();
+					} else if (var0.objectId == var0.id && var0.field956 == var0.orientation && var0.field957 == var0.field962) {
+						var0.remove();
+					}
 				}
 			}
 		}
+
+	}
+
+	@ObfuscatedName("ku")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-179061034"
+	)
+	static final void method3399() {
+		Client.field943 = Client.cycleCntr;
+		class4.ClanChat_inClanChat = true;
 	}
 }

runescape-client/src/main/java/Friend.java

@@ -1,29 +1,23 @@
 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("ky")
+@ObfuscatedName("kl")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("rc")
-	@ObfuscatedGetter(
-		intValue = -1119785599
-	)
-	static int field3626;
-	@ObfuscatedName("x")
-	boolean field3625;
 	@ObfuscatedName("m")
-	boolean field3623;
+	boolean field3655;
+	@ObfuscatedName("o")
+	boolean field3654;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lky;I)I",
+		signature = "(Lkl;I)I",
-		garbageValue = "-1645564523"
+		garbageValue = "-1139109616"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -35,23 +29,23 @@ public class Friend extends Buddy {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3625 && !var1.field3625) {
+		} else if (this.field3655 && !var1.field3655) {
 			return -1;
-		} else if (!this.field3625 && var1.field3625) {
+		} else if (!this.field3655 && var1.field3655) {
 			return 1;
-		} else if (this.field3623 && !var1.field3623) {
+		} else if (this.field3654 && !var1.field3654) {
 			return -1;
-		} else if (!this.field3623 && var1.field3623) {
+		} else if (!this.field3654 && var1.field3654) {
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		signature = "(Ljd;I)I",
+		signature = "(Ljf;I)I",
-		garbageValue = "-1956183743"
+		garbageValue = "334051838"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -61,4 +55,24 @@ public class Friend extends Buddy {
 	public int compareTo(Object var1) {
 		return this.compareToFriend((Friend)var1);
 	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		signature = "(Lch;I)V",
+		garbageValue = "-463373379"
+	)
+	@Export("changeWorld")
+	static void changeWorld(World var0) {
+		if (var0.isMembersOnly() != Client.isMembersWorld) {
+			Client.isMembersWorld = var0.isMembersOnly();
+			InvDefinition.method4523(var0.isMembersOnly());
+		}
+
+		class169.worldHost = var0.host;
+		Client.worldId = var0.id;
+		Client.worldProperties = var0.properties;
+		class90.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
+		Client.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000;
+		WorldMapLabel.port3 = class90.port1;
+	}
 }

runescape-client/src/main/java/FriendLoginUpdate.java

@@ -4,30 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ki")
+@ObfuscatedName("kd")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = 1923420853
-	)
-	public int field3636;
-	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Lku;"
+		signature = "Lfb;"
+	)
+	@Export("clock")
+	protected static Clock clock;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = 1885881665
+	)
+	public int field3667;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "Lkq;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		signature = "(Lku;I)V"
+		signature = "(Lkq;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3636 = (int)(class217.currentTimeMillis() / 1000L);
+		this.field3667 = (int)(MilliClock.currentTimeMillis() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgz;I)I",
+		garbageValue = "1283981780"
+	)
+	@Export("compareStrings")
+	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
+		int var3 = var0.length();
+		int var4 = var1.length();
+		int var5 = 0;
+		int var6 = 0;
+		char var7 = 0;
+		char var8 = 0;
+
+		while (var5 - var7 < var3 || var6 - var8 < var4) {
+			if (var5 - var7 >= var3) {
+				return -1;
+			}
+
+			if (var6 - var8 >= var4) {
+				return 1;
+			}
+
+			char var9;
+			if (var7 != 0) {
+				var9 = var7;
+				boolean var14 = false;
+			} else {
+				var9 = var0.charAt(var5++);
+			}
+
+			char var10;
+			if (var8 != 0) {
+				var10 = var8;
+				boolean var15 = false;
+			} else {
+				var10 = var1.charAt(var6++);
+			}
+
+			var7 = ModelData0.method3374(var9);
+			var8 = ModelData0.method3374(var10);
+			var9 = Frames.standardizeChar(var9, var2);
+			var10 = Frames.standardizeChar(var10, var2);
+			if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
+				var9 = Character.toLowerCase(var9);
+				var10 = Character.toLowerCase(var10);
+				if (var10 != var9) {
+					return class1.lowercaseChar(var9, var2) - class1.lowercaseChar(var10, var2);
+				}
+			}
+		}
+
+		int var16 = Math.min(var3, var4);
+
+		char var12;
+		int var17;
+		for (var17 = 0; var17 < var16; ++var17) {
+			if (var2 == Language.Language_FR) {
+				var5 = var3 - 1 - var17;
+				var6 = var4 - 1 - var17;
+			} else {
+				var6 = var17;
+				var5 = var17;
+			}
+
+			char var11 = var0.charAt(var5);
+			var12 = var1.charAt(var6);
+			if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) {
+				var11 = Character.toLowerCase(var11);
+				var12 = Character.toLowerCase(var12);
+				if (var11 != var12) {
+					return class1.lowercaseChar(var11, var2) - class1.lowercaseChar(var12, var2);
+				}
+			}
+		}
+
+		var17 = var3 - var4;
+		if (var17 != 0) {
+			return var17;
+		} else {
+			for (int var18 = 0; var18 < var16; ++var18) {
+				var12 = var0.charAt(var18);
+				char var13 = var1.charAt(var18);
+				if (var12 != var13) {
+					return class1.lowercaseChar(var12, var2) - class1.lowercaseChar(var13, var2);
+				}
+			}
+
+			return 0;
+		}
+	}
 }

runescape-client/src/main/java/FriendSystem.java

@@ -1,93 +1,113 @@
+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;
 
-@ObfuscatedName("co")
+@ObfuscatedName("cg")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
-	static int[] field1086;
+	@ObfuscatedGetter(
-	@ObfuscatedName("d")
+		longValue = 6990585350022661681L
+	)
+	public static long field1093;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lmx;"
+		signature = "Lmo;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lkr;"
+		signature = "Lki;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ljb;"
+		signature = "Ljw;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 429745001
+		intValue = 132482079
 	)
-	int field1092;
+	int field1094;
 
 	@ObfuscatedSignature(
-		signature = "(Lmx;)V"
+		signature = "(Lmo;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1092 = 0;
+		this.field1094 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-1209289020"
-	)
-	boolean method1952() {
-		return this.field1092 == 2;
-	}
-
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)Z",
-		garbageValue = "104"
+		garbageValue = "-100444560"
 	)
-	final void method1953() {
+	boolean method1923() {
-		this.field1092 = 1;
+		return this.field1094 == 2;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(S)V",
-		garbageValue = "1535812566"
+		garbageValue = "-20972"
+	)
+	final void method1981() {
+		this.field1094 = 1;
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(Lkn;II)V",
+		garbageValue = "-11966056"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1092 = 2;
+		this.field1094 = 2;
-		class236.FriendSystem_invalidateFriends();
+
+		for (int var3 = 0; var3 < Players.Players_count; ++var3) {
+			Player var4 = Client.players[Players.Players_indices[var3]];
+			var4.clearIsFriend();
+		}
+
+		Iterator var5 = Messages.Messages_hashTable.iterator();
+
+		while (var5.hasNext()) {
+			Message var6 = (Message)var5.next();
+			var6.clearIsFromFriend();
+		}
+
+		if (ClientPreferences.clanChat != null) {
+			ClientPreferences.clanChat.clearFriends();
+		}
+
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1051336580"
+		garbageValue = "892305960"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3636 < class217.currentTimeMillis() / 1000L - 5L) {
+			if ((long)var1.field3667 < MilliClock.currentTimeMillis() / 1000L - 5L) {
 				if (var1.world > 0) {
-					Skeleton.addGameMessage(5, "", var1.username + " has logged in.");
+					ObjectSound.addGameMessage(5, "", var1.username + " has logged in.");
 				}
 
 				if (var1.world == 0) {
-					Skeleton.addGameMessage(5, "", var1.username + " has logged out.");
+					ObjectSound.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove();
@@ -96,38 +116,38 @@ public class FriendSystem {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-589542332"
+		garbageValue = "2071426788"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1092 = 0;
+		this.field1094 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Lku;ZI)Z",
+		signature = "(Lkq;ZI)Z",
-		garbageValue = "-1932720892"
+		garbageValue = "1031830697"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(ByteArrayPool.localPlayer.username)) {
+		} else if (var1.equals(class60.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lku;B)Z",
+		signature = "(Lkq;B)Z",
-		garbageValue = "-60"
+		garbageValue = "41"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -138,10 +158,10 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-36"
+		garbageValue = "1198783878"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -149,16 +169,16 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsListIsFull()) {
-					LoginPacket.method3692();
+					AbstractWorldMapData.method328();
-				} else if (ByteArrayPool.localPlayer.username.equals(var2)) {
+				} else if (class60.localPlayer.username.equals(var2)) {
-					GrandExchangeEvent.method165("You can't add yourself to your own friend list");
+					WorldMapLabelSize.method249();
 				} else if (this.isFriended(var2, false)) {
-					DevicePcmPlayerProvider.method946(var1);
+					Canvas.method927(var1);
 				} else if (this.isIgnored(var2)) {
-					ClientPreferences.method1950(var1);
+					class7.method95(var1);
 				} else {
-					PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2336, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
@@ -166,37 +186,43 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "2128609566"
+		garbageValue = "276950128"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field798 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field791 != 1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-110"
+		garbageValue = "467200787"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
 		if (var1 != null) {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
+				Object var10000;
+				String var4;
 				if (this.canAddIgnore()) {
-					GrandExchangeEvent.method165("Your ignore list is full. Max of 100 for free users, and 400 for members");
+					var10000 = null;
-				} else if (ByteArrayPool.localPlayer.username.equals(var2)) {
+					var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
-					ChatChannel.method2351();
+					ObjectSound.addGameMessage(30, "", var4);
+				} else if (class60.localPlayer.username.equals(var2)) {
+					var10000 = null;
+					var4 = "You can't add yourself to your own ignore list";
+					ObjectSound.addGameMessage(30, "", var4);
 				} else if (this.isIgnored(var2)) {
-					GrandExchangeEvent.method165(var1 + " is already on your ignore list");
+					WorldMapSection1.method655(var1);
 				} else if (this.isFriended(var2, false)) {
-					class195.method3696(var1);
+					TileItemPile.method2904(var1);
 				} else {
-					PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2316, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
@@ -204,20 +230,20 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "-46"
+		garbageValue = "-516025853"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field798 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field791 != 1;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-31"
+		garbageValue = "-964450223"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -225,22 +251,37 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					Clock.method3599();
+					Client.field866 = Client.cycleCntr;
-					PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				class236.FriendSystem_invalidateFriends();
+				for (int var5 = 0; var5 < Players.Players_count; ++var5) {
+					Player var4 = Client.players[Players.Players_indices[var5]];
+					var4.clearIsFriend();
+				}
+
+				Iterator var6 = Messages.Messages_hashTable.iterator();
+
+				while (var6.hasNext()) {
+					Message var7 = (Message)var6.next();
+					var7.clearIsFromFriend();
+				}
+
+				if (ClientPreferences.clanChat != null) {
+					ClientPreferences.clanChat.clearFriends();
+				}
+
 			}
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-29"
+		garbageValue = "-1026417394"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -248,26 +289,47 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					Clock.method3599();
+					Client.field866 = Client.cycleCntr;
-					PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				FontName.FriendSystem_invalidateIgnoreds();
+				WorldMapSprite.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lku;I)Z",
+		signature = "(Lkq;B)Z",
-		garbageValue = "-407468573"
+		garbageValue = "-1"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
 		Friend var2 = (Friend)this.friendsList.getByUsername(var1);
 		return var2 != null && var2.hasWorld();
 	}
+
+	@ObfuscatedName("kq")
+	@ObfuscatedSignature(
+		signature = "(Lhd;B)Lhd;",
+		garbageValue = "74"
+	)
+	static Widget method1994(Widget var0) {
+		int var1 = WorldMapDecoration.method402(KeyHandler.getWidgetClickMask(var0));
+		if (var1 == 0) {
+			return null;
+		} else {
+			for (int var2 = 0; var2 < var1; ++var2) {
+				var0 = WorldMapSprite.getWidget(var0.parentId);
+				if (var0 == null) {
+					return null;
+				}
+			}
+
+			return var0;
+		}
+	}
 }

runescape-client/src/main/java/FriendsList.java

@@ -4,61 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kr")
+@ObfuscatedName("ki")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lmx;"
+		signature = "Lmo;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -975708825
+		intValue = -6873433
 	)
-	int field3618;
+	int field3648;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Ljk;"
+		signature = "Ljn;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		signature = "(Lmx;)V"
+		signature = "(Lmo;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3618 = 1;
+		this.field3648 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Ljd;",
+		signature = "(I)Ljf;",
-		garbageValue = "-1332552421"
+		garbageValue = "551595115"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljd;",
+		signature = "(II)[Ljf;",
-		garbageValue = "-667029686"
+		garbageValue = "1959965595"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lku;ZI)Z",
+		signature = "(Lkq;ZI)Z",
-		garbageValue = "-141392117"
+		garbageValue = "2027561031"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -70,10 +70,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Lkb;IB)V",
+		signature = "(Lkn;II)V",
-		garbageValue = "51"
+		garbageValue = "-1956355163"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -98,7 +98,7 @@ public class FriendsList extends UserList {
 					Friend var11 = (Friend)this.getByCurrentUsername(var4);
 					if (var3) {
 						Friend var12 = (Friend)this.getByCurrentUsername(var5);
-						if (var12 != null && var11 != var12) {
+						if (var12 != null && var12 != var11) {
 							if (var11 != null) {
 								this.remove(var12);
 							} else {
@@ -137,17 +137,17 @@ public class FriendsList extends UserList {
 					}
 
 					if (var6 != var11.world) {
-						var11.int2 = ++this.field3618 - 1;
+						var11.int2 = ++this.field3648 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * -1563374063) * 1414783729;
+							var11.int2 = -(var11.int2 * -1924610525) * 2013337995;
 						}
 
 						var11.world = var6;
 					}
 
 					var11.rank = var7;
-					var11.field3625 = var9;
+					var11.field3655 = var9;
-					var11.field3623 = var10;
+					var11.field3654 = var10;
 					continue;
 				}
 

runescape-client/src/main/java/GZipDecompressor.java

@@ -4,19 +4,17 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mw")
+@ObfuscatedName("mu")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
 	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Liy;"
-	)
-	@Export("SequenceDefinition_animationsArchive")
-	public static AbstractArchive SequenceDefinition_animationsArchive;
-	@ObfuscatedName("x")
 	@Export("inflater")
 	Inflater inflater;
 
+	public GZipDecompressor() {
+		this(-1, 1000000, 1000000);
+	}
+
 	@ObfuscatedSignature(
 		signature = "(III)V",
 		garbageValue = "1000000"
@@ -24,14 +22,10 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	public GZipDecompressor() {
+	@ObfuscatedName("m")
-		this(-1, 1000000, 1000000);
-	}
-
-	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lkb;[BI)V",
+		signature = "(Lkn;[BI)V",
-		garbageValue = "-631538696"
+		garbageValue = "1767160394"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {

runescape-client/src/main/java/GameBuild.java

@@ -1,45 +1,53 @@
+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("ii")
+@ObfuscatedName("ij")
 @Implements("GameBuild")
 public class GameBuild {
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Lii;"
-	)
-	@Export("LIVE")
-	static final GameBuild LIVE;
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lii;"
+		signature = "Lij;"
+	)
+	@Export("LIVE")
+	public static final GameBuild LIVE;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "Lij;"
 	)
 	@Export("BUILDLIVE")
-	static final GameBuild BUILDLIVE;
+	public static final GameBuild BUILDLIVE;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lii;"
+		signature = "Lij;"
 	)
 	@Export("RC")
-	static final GameBuild RC;
+	public static final GameBuild RC;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lii;"
+		signature = "Lij;"
 	)
 	@Export("WIP")
-	static final GameBuild WIP;
+	public static final GameBuild WIP;
-	@ObfuscatedName("w")
+	@ObfuscatedName("du")
+	@ObfuscatedSignature(
+		signature = "Lig;"
+	)
+	@Export("archive13")
+	static Archive archive13;
+	@ObfuscatedName("p")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1808149537
+		intValue = -1136221783
 	)
 	@Export("buildId")
-	final int buildId;
+	public final int buildId;
 
 	static {
 		LIVE = new GameBuild("LIVE", 0);
@@ -52,4 +60,59 @@ public class GameBuild {
 		this.name = var1;
 		this.buildId = var2;
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(I)[Lgl;",
+		garbageValue = "-290108173"
+	)
+	public static class194[] method4291() {
+		return new class194[]{class194.field2357, class194.field2354, class194.field2355, class194.field2358, class194.field2353, class194.field2360, class194.field2359, class194.field2363, class194.field2361, class194.field2362};
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;B)Ljava/io/File;",
+		garbageValue = "-93"
+	)
+	@Export("getFile")
+	static File getFile(String var0) {
+		if (!FileSystem.FileSystem_hasPermissions) {
+			throw new RuntimeException("");
+		} else {
+			File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0);
+			if (var1 != null) {
+				return var1;
+			} else {
+				File var2 = new File(FileSystem.FileSystem_cacheDir, var0);
+				RandomAccessFile var3 = null;
+
+				try {
+					File var4 = new File(var2.getParent());
+					if (!var4.exists()) {
+						throw new RuntimeException("");
+					} else {
+						var3 = new RandomAccessFile(var2, "rw");
+						int var5 = var3.read();
+						var3.seek(0L);
+						var3.write(var5);
+						var3.seek(0L);
+						var3.close();
+						FileSystem.FileSystem_cacheFiles.put(var0, var2);
+						return var2;
+					}
+				} catch (Exception var8) {
+					try {
+						if (var3 != null) {
+							var3.close();
+							var3 = null;
+						}
+					} catch (Exception var7) {
+					}
+
+					throw new RuntimeException();
+				}
+			}
+		}
+	}
 }

runescape-client/src/main/java/GameObject.java

@@ -1,103 +1,98 @@
-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 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("ek")
+@ObfuscatedName("ev")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("x")
+	@ObfuscatedName("di")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -1812382241
+		signature = "Llj;"
 	)
-	@Export("centerY")
+	@Export("js5Socket")
-	int centerY;
+	static AbstractSocket js5Socket;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1894508257
+		intValue = -1824184779
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -67995329
+		intValue = 1881172017
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1055464323
+		intValue = 1546680727
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 733420337
+		intValue = -49650103
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -32489331
+	)
+	@Export("centerY")
+	int centerY;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lel;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1786771811
+		intValue = -136322441
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 983334103
+		intValue = 460055653
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 364744081
+		intValue = 198720377
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1023700223
+		intValue = -1832139769
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1872697875
+		intValue = 1766645403
 	)
-	int field1950;
+	int field1959;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -623014369
+		intValue = -665577125
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = 1416033697273847883L
+		longValue = -5581328528529906223L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 837500395
+		intValue = -234800787
 	)
 	@Export("flags")
 	int flags;
@@ -107,292 +102,13 @@ public final class GameObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljava/io/File;Ljava/io/File;S)V",
+		signature = "(CI)Z",
-		garbageValue = "1603"
+		garbageValue = "1896739320"
 	)
-	public static void method3408(File var0, File var1) {
+	@Export("isCharAlphabetic")
-		try {
+	public static boolean isCharAlphabetic(char var0) {
-			AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
+		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
-			Buffer var3 = new Buffer(500);
-			var3.writeByte(3);
-			var3.writeByte(var1 != null ? 1 : 0);
-			var3.writeCESU8(var0.getPath());
-			if (var1 != null) {
-				var3.writeCESU8("");
-			}
-
-			var2.write(var3.array, 0, var3.offset);
-			var2.close();
-		} catch (IOException var4) {
-			var4.printStackTrace();
-		}
-
-	}
-
-	@ObfuscatedName("m")
-	public static String method3405(long var0) {
-		if (var0 > 0L && var0 < 6582952005840035281L) {
-			if (var0 % 37L == 0L) {
-				return null;
-			} else {
-				int var2 = 0;
-
-				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
-					++var2;
-				}
-
-				StringBuilder var5 = new StringBuilder(var2);
-
-				while (var0 != 0L) {
-					long var6 = var0;
-					var0 /= 37L;
-					var5.append(class298.base37Table[(int)(var6 - 37L * var0)]);
-				}
-
-				return var5.reverse().toString();
-			}
-		} else {
-			return null;
-		}
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(Lkj;I)V",
-		garbageValue = "-137749117"
-	)
-	@Export("performReflectionCheck")
-	public static void performReflectionCheck(PacketBuffer var0) {
-		ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last();
-		if (var1 != null) {
-			int var2 = var0.offset;
-			var0.writeInt(var1.id);
-
-			for (int var3 = 0; var3 < var1.size; ++var3) {
-				if (var1.creationErrors[var3] != 0) {
-					var0.writeByte(var1.creationErrors[var3]);
-				} else {
-					try {
-						int var4 = var1.operations[var3];
-						Field var5;
-						int var6;
-						if (var4 == 0) {
-							var5 = var1.fields[var3];
-							var6 = Reflection.getInt(var5, (Object)null);
-							var0.writeByte(0);
-							var0.writeInt(var6);
-						} else if (var4 == 1) {
-							var5 = var1.fields[var3];
-							Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]);
-							var0.writeByte(0);
-						} else if (var4 == 2) {
-							var5 = var1.fields[var3];
-							var6 = var5.getModifiers();
-							var0.writeByte(0);
-							var0.writeInt(var6);
-						}
-
-						Method var25;
-						if (var4 != 3) {
-							if (var4 == 4) {
-								var25 = var1.methods[var3];
-								var6 = var25.getModifiers();
-								var0.writeByte(0);
-								var0.writeInt(var6);
-							}
-						} else {
-							var25 = var1.methods[var3];
-							byte[][] var10 = var1.arguments[var3];
-							Object[] var7 = new Object[var10.length];
-
-							for (int var8 = 0; var8 < var10.length; ++var8) {
-								ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
-								var7[var8] = var9.readObject();
-							}
-
-							Object var11 = Reflection.invoke(var25, (Object)null, var7);
-							if (var11 == null) {
-								var0.writeByte(0);
-							} else if (var11 instanceof Number) {
-								var0.writeByte(1);
-								var0.writeLong(((Number)var11).longValue());
-							} else if (var11 instanceof String) {
-								var0.writeByte(2);
-								var0.writeStringCp1252NullTerminated((String)var11);
-							} else {
-								var0.writeByte(4);
-							}
-						}
-					} catch (ClassNotFoundException var13) {
-						var0.writeByte(-10);
-					} catch (InvalidClassException var14) {
-						var0.writeByte(-11);
-					} catch (StreamCorruptedException var15) {
-						var0.writeByte(-12);
-					} catch (OptionalDataException var16) {
-						var0.writeByte(-13);
-					} catch (IllegalAccessException var17) {
-						var0.writeByte(-14);
-					} catch (IllegalArgumentException var18) {
-						var0.writeByte(-15);
-					} catch (InvocationTargetException var19) {
-						var0.writeByte(-16);
-					} catch (SecurityException var20) {
-						var0.writeByte(-17);
-					} catch (IOException var21) {
-						var0.writeByte(-18);
-					} catch (NullPointerException var22) {
-						var0.writeByte(-19);
-					} catch (Exception var23) {
-						var0.writeByte(-20);
-					} catch (Throwable var24) {
-						var0.writeByte(-21);
-					}
-				}
-			}
-
-			var0.writeCrc(var2);
-			var1.remove();
-		}
-	}
-
-	@ObfuscatedName("fw")
-	@ObfuscatedSignature(
-		signature = "(Lih;Ljava/lang/String;B)V",
-		garbageValue = "-1"
-	)
-	static void method3404(Archive var0, String var1) {
-		ArchiveLoader var2 = new ArchiveLoader(var0, var1);
-		Client.archiveLoaders.add(var2);
-		Client.field898 += var2.groupCount;
-	}
-
-	@ObfuscatedName("hy")
-	@ObfuscatedSignature(
-		signature = "(ZLkj;I)V",
-		garbageValue = "1045938723"
-	)
-	@Export("loadRegions")
-	static final void loadRegions(boolean var0, PacketBuffer var1) {
-		Client.isInInstance = var0;
-		int var3;
-		int var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		if (!Client.isInInstance) {
-			int var2 = var1.readUnsignedShort();
-			var3 = var1.method5564();
-			var4 = var1.readUnsignedShort();
-			UrlRequester.xteaKeys = new int[var4][4];
-
-			for (var5 = 0; var5 < var4; ++var5) {
-				for (var6 = 0; var6 < 4; ++var6) {
-					UrlRequester.xteaKeys[var5][var6] = var1.readInt();
-				}
-			}
-
-			StructDefinition.regions = new int[var4];
-			KeyHandler.regionMapArchiveIds = new int[var4];
-			WorldMapArea.regionLandArchiveIds = new int[var4];
-			WorldMapData_0.regionLandArchives = new byte[var4][];
-			class23.regionMapArchives = new byte[var4][];
-			boolean var16 = false;
-			if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
-				var16 = true;
-			}
-
-			if (var3 / 8 == 48 && var2 / 8 == 148) {
-				var16 = true;
-			}
-
-			var4 = 0;
-
-			for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) {
-				for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) {
-					var8 = var7 + (var6 << 8);
-					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
-						StructDefinition.regions[var4] = var8;
-						KeyHandler.regionMapArchiveIds[var4] = WorldMapIcon_0.archive5.getGroupId("m" + var6 + "_" + var7);
-						WorldMapArea.regionLandArchiveIds[var4] = WorldMapIcon_0.archive5.getGroupId("l" + var6 + "_" + var7);
-						++var4;
-					}
-				}
-			}
-
-			GrandExchangeOfferNameComparator.method237(var3, var2, true);
-		} else {
-			boolean var15 = var1.readUnsignedByte() == 1;
-			var3 = var1.method5564();
-			var4 = var1.method5614();
-			var5 = var1.readUnsignedShort();
-			var1.importIndex();
-
-			int var9;
-			for (var6 = 0; var6 < 4; ++var6) {
-				for (var7 = 0; var7 < 13; ++var7) {
-					for (var8 = 0; var8 < 13; ++var8) {
-						var9 = var1.readBits(1);
-						if (var9 == 1) {
-							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
-						} else {
-							Client.instanceChunkTemplates[var6][var7][var8] = -1;
-						}
-					}
-				}
-			}
-
-			var1.exportIndex();
-			UrlRequester.xteaKeys = new int[var5][4];
-
-			for (var6 = 0; var6 < var5; ++var6) {
-				for (var7 = 0; var7 < 4; ++var7) {
-					UrlRequester.xteaKeys[var6][var7] = var1.readInt();
-				}
-			}
-
-			StructDefinition.regions = new int[var5];
-			KeyHandler.regionMapArchiveIds = new int[var5];
-			WorldMapArea.regionLandArchiveIds = new int[var5];
-			WorldMapData_0.regionLandArchives = new byte[var5][];
-			class23.regionMapArchives = new byte[var5][];
-			var5 = 0;
-
-			for (var6 = 0; var6 < 4; ++var6) {
-				for (var7 = 0; var7 < 13; ++var7) {
-					for (var8 = 0; var8 < 13; ++var8) {
-						var9 = Client.instanceChunkTemplates[var6][var7][var8];
-						if (var9 != -1) {
-							int var10 = var9 >> 14 & 1023;
-							int var11 = var9 >> 3 & 2047;
-							int var12 = (var10 / 8 << 8) + var11 / 8;
-
-							int var13;
-							for (var13 = 0; var13 < var5; ++var13) {
-								if (StructDefinition.regions[var13] == var12) {
-									var12 = -1;
-									break;
-								}
-							}
-
-							if (var12 != -1) {
-								StructDefinition.regions[var5] = var12;
-								var13 = var12 >> 8 & 255;
-								int var14 = var12 & 255;
-								KeyHandler.regionMapArchiveIds[var5] = WorldMapIcon_0.archive5.getGroupId("m" + var13 + "_" + var14);
-								WorldMapArea.regionLandArchiveIds[var5] = WorldMapIcon_0.archive5.getGroupId("l" + var13 + "_" + var14);
-								++var5;
-							}
-						}
-					}
-				}
-			}
-
-			GrandExchangeOfferNameComparator.method237(var3, var4, !var15);
-		}
-
 	}
 }

runescape-client/src/main/java/GrandExchangeEvents.java

@@ -4,36 +4,25 @@ import java.util.Comparator;
 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("g")
+@ObfuscatedName("r")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("nl")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		signature = "[Lhe;"
-	)
-	static Widget[] field70;
-	@ObfuscatedName("m")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("er")
+	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 745968807
-	)
-	static int field71;
-	@ObfuscatedName("x")
 	@Export("events")
 	public final List events;
 
@@ -46,7 +35,7 @@ public class GrandExchangeEvents {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkb;Z)V",
+		signature = "(Lkn;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -68,10 +57,10 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(Ljava/util/Comparator;ZI)V",
-		garbageValue = "-1613593832"
+		garbageValue = "372755845"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -83,97 +72,27 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)Lef;",
+		signature = "(CI)Z",
-		garbageValue = "1600674213"
+		garbageValue = "819758583"
 	)
-	@Export("getFrames")
+	public static boolean method148(char var0) {
-	static Frames getFrames(int var0) {
+		if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) {
-		Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0);
+			if (var0 != 0) {
-		if (var1 != null) {
+				char[] var1 = class297.cp1252AsciiExtension;
-			return var1;
-		} else {
-			AbstractArchive var3 = GZipDecompressor.SequenceDefinition_animationsArchive;
-			AbstractArchive var4 = class92.SequenceDefinition_skeletonsArchive;
-			boolean var5 = true;
-			int[] var6 = var3.getGroupFileIds(var0);
 
-			for (int var7 = 0; var7 < var6.length; ++var7) {
+				for (int var2 = 0; var2 < var1.length; ++var2) {
-				byte[] var8 = var3.getFile(var0, var6[var7]);
+					char var3 = var1[var2];
-				if (var8 == null) {
+					if (var0 == var3) {
-					var5 = false;
+						return true;
-				} else {
-					int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
-					byte[] var10 = var4.getFile(var9, 0);
-					if (var10 == null) {
-						var5 = false;
 					}
 				}
 			}
 
-			Frames var2;
+			return false;
-			if (!var5) {
+		} else {
-				var2 = null;
+			return true;
-			} else {
-				try {
-					var2 = new Frames(var3, var4, var0, false);
-				} catch (Exception var12) {
-					var2 = null;
-				}
-			}
-
-			if (var2 != null) {
-				SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
-			}
-
-			return var2;
 		}
 	}
-
-	@ObfuscatedName("fx")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "23"
-	)
-	static final void method155() {
-		class8.method109();
-		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
-		UserComparator5.method3520();
-		PendingSpawn.method1838();
-		class277.method5038();
-		class257.method4558();
-		class92.method2155();
-		SpotAnimationDefinition.SpotAnimationDefinition_cached.clear();
-		SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear();
-		MusicPatch.method3979();
-		VarpDefinition.VarpDefinition_cached.clear();
-		HitSplatDefinition.HitSplatDefinition_cached.clear();
-		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear();
-		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear();
-		HealthBarDefinition.HealthBarDefinition_cached.clear();
-		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
-		ClientPacket.method3687();
-		ParamDefinition.ParamDefinition_cached.clear();
-		BuddyRankComparator.method3533();
-		Huffman.method4048();
-		Widget.Widget_cachedSprites.clear();
-		Widget.Widget_cachedModels.clear();
-		Widget.Widget_cachedFonts.clear();
-		Widget.Widget_cachedSpriteMasks.clear();
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear();
-		Script.Script_cached.clear();
-		ArchiveDiskAction.archive0.clearFiles();
-		DirectByteArrayCopier.archive1.clearFiles();
-		WorldMapSprite.archive3.clearFiles();
-		FontName.archive4.clearFiles();
-		WorldMapIcon_0.archive5.clearFiles();
-		AbstractWorldMapIcon.archive6.clearFiles();
-		AbstractWorldMapIcon.archive7.clearFiles();
-		class228.archive8.clearFiles();
-		SecureRandomFuture.archive9.clearFiles();
-		PlayerAppearance.archive10.clearFiles();
-		WorldMapRegion.archive11.clearFiles();
-		class41.archive12.clearFiles();
-	}
 }

runescape-client/src/main/java/GrandExchangeOffer.java

@@ -5,51 +5,50 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("b")
+@ObfuscatedName("d")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("q")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Llv;"
 	)
-	@Export("ItemDefinition_modelArchive")
+	static Bounds field87;
-	public static AbstractArchive ItemDefinition_modelArchive;
+	@ObfuscatedName("db")
-	@ObfuscatedName("dk")
 	@ObfuscatedSignature(
-		signature = "Lih;"
+		signature = "Lig;"
 	)
-	@Export("archive2")
+	@Export("archive4")
-	static Archive archive2;
+	static Archive archive4;
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1191314621
+		intValue = -1112039617
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1373983325
+		intValue = 416176327
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -435168387
+		intValue = -981210321
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1383495981
+		intValue = 1341718687
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1519014469
+		intValue = 1366605879
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -58,7 +57,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkb;Z)V",
+		signature = "(Lkn;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -70,42 +69,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1689314705"
+		garbageValue = "271165601"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1922096625"
+		garbageValue = "-2130764898"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "587802237"
+		garbageValue = "-308953741"
 	)
-	void method211(int var1) {
+	void method172(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-582599399"
+		garbageValue = "1"
 	)
-	void method187(int var1) {
+	void method173(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -113,196 +112,244 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "([Ljava/lang/String;[SIII)V",
+		signature = "([Lch;II[I[II)V",
-		garbageValue = "922781737"
+		garbageValue = "-1520869912"
 	)
-	@Export("sortItemsByName")
+	@Export("sortWorlds")
-	static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
+	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
-		if (var2 < var3) {
+		if (var1 < var2) {
-			int var4 = (var3 + var2) / 2;
+			int var5 = var1 - 1;
-			int var5 = var2;
+			int var6 = var2 + 1;
-			String var6 = var0[var4];
+			int var7 = (var2 + var1) / 2;
-			var0[var4] = var0[var3];
+			World var8 = var0[var7];
-			var0[var3] = var6;
+			var0[var7] = var0[var1];
-			short var7 = var1[var4];
+			var0[var1] = var8;
-			var1[var4] = var1[var3];
-			var1[var3] = var7;
 
-			for (int var8 = var2; var8 < var3; ++var8) {
+			while (var5 < var6) {
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
+				boolean var9 = true;
-					String var9 = var0[var8];
+
-					var0[var8] = var0[var5];
+				int var10;
-					var0[var5] = var9;
+				int var11;
-					short var10 = var1[var8];
+				int var12;
-					var1[var8] = var1[var5];
+				do {
-					var1[var5++] = var10;
+					--var6;
+
+					for (var10 = 0; var10 < 4; ++var10) {
+						if (var3[var10] == 2) {
+							var11 = var0[var6].index;
+							var12 = var8.index;
+						} else if (var3[var10] == 1) {
+							var11 = var0[var6].population;
+							var12 = var8.population;
+							if (var11 == -1 && var4[var10] == 1) {
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) {
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) {
+							var11 = var0[var6].isMembersOnly() ? 1 : 0;
+							var12 = var8.isMembersOnly() ? 1 : 0;
+						} else {
+							var11 = var0[var6].id;
+							var12 = var8.id;
+						}
+
+						if (var12 != var11) {
+							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
+								var9 = false;
+							}
+							break;
+						}
+
+						if (var10 == 3) {
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				var9 = true;
+
+				do {
+					++var5;
+
+					for (var10 = 0; var10 < 4; ++var10) {
+						if (var3[var10] == 2) {
+							var11 = var0[var5].index;
+							var12 = var8.index;
+						} else if (var3[var10] == 1) {
+							var11 = var0[var5].population;
+							var12 = var8.population;
+							if (var11 == -1 && var4[var10] == 1) {
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) {
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) {
+							var11 = var0[var5].isMembersOnly() ? 1 : 0;
+							var12 = var8.isMembersOnly() ? 1 : 0;
+						} else {
+							var11 = var0[var5].id;
+							var12 = var8.id;
+						}
+
+						if (var12 != var11) {
+							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
+								var9 = false;
+							}
+							break;
+						}
+
+						if (var10 == 3) {
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				if (var5 < var6) {
+					World var13 = var0[var5];
+					var0[var5] = var0[var6];
+					var0[var6] = var13;
 				}
 			}
 
-			var0[var3] = var0[var5];
+			sortWorlds(var0, var1, var6, var3, var4);
-			var0[var5] = var6;
+			sortWorlds(var0, var6 + 1, var2, var3, var4);
-			var1[var3] = var1[var5];
-			var1[var5] = var7;
-			sortItemsByName(var0, var1, var2, var5 - 1);
-			sortItemsByName(var0, var1, var5 + 1, var3);
 		}
 
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(ILce;ZB)I",
+		signature = "(ILcs;ZI)I",
-		garbageValue = "19"
+		garbageValue = "-2096234716"
 	)
-	static int method191(int var0, Script var1, boolean var2) {
+	static int method194(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130;
+		Widget var3;
-		if (var0 == ScriptOpcodes.CC_GETX) {
+		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x;
+			var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemId;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETY) {
+		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y;
+			var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
+			if (var3.itemId != -1) {
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemQuantity;
+			} else {
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+			}
+
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
+		} else if (var0 == ScriptOpcodes.IF_HASSUB) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width;
+			int var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5);
+			if (var4 != null) {
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1;
+			} else {
+				Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0;
+			}
+
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
+		} else if (var0 == ScriptOpcodes.IF_GETTOP) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height;
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.rootInterface;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHIDE) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETLAYER) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId;
 			return 1;
 		} else {
 			return 2;
 		}
 	}
 
-	@ObfuscatedName("hj")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		signature = "(ZLkj;B)V",
+		signature = "(II)I",
-		garbageValue = "18"
+		garbageValue = "-1566307415"
 	)
-	@Export("updateNpcs")
+	static int method176(int var0) {
-	static final void updateNpcs(boolean var0, PacketBuffer var1) {
+		return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F));
-		Client.field801 = 0;
-		Client.field851 = 0;
-		WorldMapIcon_0.method304();
-
-		int var2;
-		while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
-			var2 = var1.readBits(15);
-			if (var2 == 32767) {
-				break;
-			}
-
-			boolean var3 = false;
-			if (Client.npcs[var2] == null) {
-				Client.npcs[var2] = new NPC();
-				var3 = true;
-			}
-
-			NPC var4 = Client.npcs[var2];
-			Client.npcIndices[++Client.npcCount - 1] = var2;
-			var4.npcCycle = Client.cycle;
-			int var5;
-			if (var0) {
-				var5 = var1.readBits(8);
-				if (var5 > 127) {
-					var5 -= 256;
-				}
-			} else {
-				var5 = var1.readBits(5);
-				if (var5 > 15) {
-					var5 -= 32;
-				}
-			}
-
-			int var6 = Client.defaultRotations[var1.readBits(3)];
-			if (var3) {
-				var4.orientation = var4.rotation = var6;
-			}
-
-			int var7 = var1.readBits(1);
-			int var8 = var1.readBits(1);
-			if (var8 == 1) {
-				Client.field725[++Client.field851 - 1] = var2;
-			}
-
-			int var9;
-			if (var0) {
-				var9 = var1.readBits(8);
-				if (var9 > 127) {
-					var9 -= 256;
-				}
-			} else {
-				var9 = var1.readBits(5);
-				if (var9 > 15) {
-					var9 -= 32;
-				}
-			}
-
-			var4.definition = class237.getNpcDefinition(var1.readBits(14));
-			var4.field976 = var4.definition.size;
-			var4.field1026 = var4.definition.rotation;
-			if (var4.field1026 == 0) {
-				var4.rotation = 0;
-			}
-
-			var4.walkSequence = var4.definition.walkSequence;
-			var4.walkBackSequence = var4.definition.walkBackSequence;
-			var4.walkLeftSequence = var4.definition.walkLeftSequence;
-			var4.walkRightSequence = var4.definition.walkRightSequence;
-			var4.idleSequence = var4.definition.idleSequence;
-			var4.turnLeftSequence = var4.definition.turnLeftSequence;
-			var4.turnRightSequence = var4.definition.turnRightSequence;
-			var4.method2136(ByteArrayPool.localPlayer.pathX[0] + var9, ByteArrayPool.localPlayer.pathY[0] + var5, var7 == 1);
-		}
-
-		var1.exportIndex();
-		WorldMapSection0.method335(var1);
-
-		for (var2 = 0; var2 < Client.field801; ++var2) {
-			int var10 = Client.field918[var2];
-			if (Client.npcs[var10].npcCycle != Client.cycle) {
-				Client.npcs[var10].definition = null;
-				Client.npcs[var10] = null;
-			}
-		}
-
-		if (var1.offset != Client.packetWriter.serverPacketLength) {
-			throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
-		} else {
-			for (var2 = 0; var2 < Client.npcCount; ++var2) {
-				if (Client.npcs[Client.npcIndices[var2]] == null) {
-					throw new RuntimeException(var2 + "," + Client.npcCount);
-				}
-			}
-
-		}
 	}
 
-	@ObfuscatedName("iz")
+	@ObfuscatedName("hp")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-21"
+		garbageValue = "-1931279198"
 	)
 	@Export("Widget_runOnTargetLeave")
 	static void Widget_runOnTargetLeave() {
 		if (Client.isSpellSelected) {
-			Widget var0 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(class7.selectedSpellWidget, Client.selectedSpellChildIndex);
+			Widget var0 = WorldMapLabelSize.getWidgetChild(ItemContainer.selectedSpellWidget, Client.selectedSpellChildIndex);
 			if (var0 != null && var0.onTargetLeave != null) {
 				ScriptEvent var1 = new ScriptEvent();
 				var1.widget = var0;
 				var1.args = var0.onTargetLeave;
-				GrandExchangeOfferOwnWorldComparator.runScriptEvent(var1);
+				InterfaceParent.runScriptEvent(var1);
 			}
 
 			Client.isSpellSelected = false;
-			ItemContainer.invalidateWidget(var0);
+			class234.invalidateWidget(var0);
 		}
 	}
+
+	@ObfuscatedName("jm")
+	@ObfuscatedSignature(
+		signature = "(III)V",
+		garbageValue = "2119897094"
+	)
+	static void method189(int var0, int var1) {
+		SecureRandomCallable.method1205(class169.tempMenuAction, var0, var1);
+		class169.tempMenuAction = null;
+	}
+
+	@ObfuscatedName("jf")
+	@ObfuscatedSignature(
+		signature = "(IIIILlz;Lhh;B)V",
+		garbageValue = "105"
+	)
+	@Export("drawSpriteOnMinimap")
+	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
+		if (var4 != null) {
+			int var6 = Client.camAngleY & 2047;
+			int var7 = var3 * var3 + var2 * var2;
+			if (var7 <= 6400) {
+				int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
+				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
+				int var10 = var9 * var2 + var3 * var8 >> 16;
+				int var11 = var3 * var9 - var8 * var2 >> 16;
+				if (var7 > 2500) {
+					var4.method6408(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
+				} else {
+					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
+				}
+
+			}
+		}
+	}
+
+	@ObfuscatedName("kp")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1908400826"
+	)
+	@Export("Clan_leaveChat")
+	static final void Clan_leaveChat() {
+		PacketBufferNode var0 = UserComparator4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher);
+		var0.packetBuffer.writeByte(0);
+		Client.packetWriter.addNode(var0);
+	}
+
+	@ObfuscatedName("kj")
+	@ObfuscatedSignature(
+		signature = "(IIIZB)V",
+		garbageValue = "43"
+	)
+	public static void method191(int var0, int var1, int var2, boolean var3) {
+		PacketBufferNode var4 = UserComparator4.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher);
+		var4.packetBuffer.method5753(var1);
+		var4.packetBuffer.writeInt(var3 ? Client.field836 * 1500794883 * -1503339861 : 0);
+		var4.packetBuffer.method5898(var0);
+		var4.packetBuffer.writeIntME(var2);
+		Client.packetWriter.addNode(var4);
+	}
 }

runescape-client/src/main/java/GrandExchangeOfferNameComparator.java

@@ -3,33 +3,27 @@ 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("r")
+@ObfuscatedName("l")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("u")
+	@ObfuscatedName("fv")
 	@ObfuscatedSignature(
-		signature = "Lhe;"
+		signature = "Lko;"
 	)
-	static Widget field115;
+	@Export("fontBold12")
-	@ObfuscatedName("ea")
+	static Font fontBold12;
+	@ObfuscatedName("gt")
 	@ObfuscatedSignature(
-		signature = "Lih;"
+		signature = "Llz;"
 	)
-	@Export("archive15")
+	@Export("compass")
-	static Archive archive15;
+	static Sprite compass;
-	@ObfuscatedName("gp")
-	@ObfuscatedSignature(
-		signature = "Lla;"
-	)
-	@Export("redHintArrowSprite")
-	static Sprite redHintArrowSprite;
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;I)I",
+		signature = "(Ls;Ls;I)I",
-		garbageValue = "-1993640176"
+		garbageValue = "1584423872"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -44,537 +38,47 @@ final class GrandExchangeOfferNameComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkj;ILbi;II)V",
+		signature = "(I)[Ljc;",
-		garbageValue = "160137381"
+		garbageValue = "491674021"
 	)
-	static final void method239(PacketBuffer var0, int var1, Player var2, int var3) {
+	static HorizontalAlignment[] method207() {
-		byte var4 = -1;
+		return new HorizontalAlignment[]{HorizontalAlignment.field3492, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3488};
-		if ((var3 & 512) != 0) {
-			var2.field990 = var0.readByte();
-			var2.field1017 = var0.readByte();
-			var2.field972 = var0.method5608();
-			var2.field1018 = var0.method5606();
-			var2.field1019 = var0.method5614() + Client.cycle;
-			var2.field1020 = var0.method5614() + Client.cycle;
-			var2.field1021 = var0.readUnsignedShort();
-			if (var2.field670) {
-				var2.field990 += var2.tileX;
-				var2.field1017 += var2.tileY;
-				var2.field972 += var2.tileX;
-				var2.field1018 += var2.tileY;
-				var2.pathLength = 0;
-			} else {
-				var2.field990 += var2.pathX[0];
-				var2.field1017 += var2.pathY[0];
-				var2.field972 += var2.pathX[0];
-				var2.field1018 += var2.pathY[0];
-				var2.pathLength = 1;
-			}
-
-			var2.field1032 = 0;
-		}
-
-		int var5;
-		if ((var3 & 2048) != 0) {
-			var2.spotAnimation = var0.method5613();
-			var5 = var0.method5619();
-			var2.field1033 = var5 >> 16;
-			var2.field1013 = (var5 & 65535) + Client.cycle;
-			var2.spotAnimationFrame = 0;
-			var2.spotAnimationFrameCycle = 0;
-			if (var2.field1013 > Client.cycle) {
-				var2.spotAnimationFrame = -1;
-			}
-
-			if (var2.spotAnimation == 65535) {
-				var2.spotAnimation = -1;
-			}
-		}
-
-		int var6;
-		if ((var3 & 128) != 0) {
-			var5 = var0.method5564();
-			if (var5 == 65535) {
-				var5 = -1;
-			}
-
-			var6 = var0.method5604();
-			GrandExchangeOfferWorldComparator.performPlayerAnimation(var2, var5, var6);
-		}
-
-		if ((var3 & 2) != 0) {
-			var5 = var0.readUnsignedByte();
-			byte[] var13 = new byte[var5];
-			Buffer var7 = new Buffer(var13);
-			var0.method5622(var13, 0, var5);
-			Players.field1269[var1] = var7;
-			var2.read(var7);
-		}
-
-		if ((var3 & 32) != 0) {
-			var2.overheadText = var0.readStringCp1252NullTerminated();
-			if (var2.overheadText.charAt(0) == '~') {
-				var2.overheadText = var2.overheadText.substring(1);
-				Skeleton.addGameMessage(2, var2.username.getName(), var2.overheadText);
-			} else if (var2 == ByteArrayPool.localPlayer) {
-				Skeleton.addGameMessage(2, var2.username.getName(), var2.overheadText);
-			}
-
-			var2.isAutoChatting = false;
-			var2.overheadTextColor = 0;
-			var2.overheadTextEffect = 0;
-			var2.overheadTextCyclesRemaining = 150;
-		}
-
-		if ((var3 & 4) != 0) {
-			var2.targetIndex = var0.method5614();
-			if (var2.targetIndex == 65535) {
-				var2.targetIndex = -1;
-			}
-		}
-
-		if ((var3 & 4096) != 0) {
-			Players.field1273[var1] = var0.method5607();
-		}
-
-		int var8;
-		int var9;
-		int var12;
-		if ((var3 & 1) != 0) {
-			var5 = var0.method5613();
-			PlayerType var18 = (PlayerType)GrandExchangeEvent.findEnumerated(InterfaceParent.PlayerType_values(), var0.method5604());
-			boolean var14 = var0.method5604() == 1;
-			var8 = var0.method5603();
-			var9 = var0.offset;
-			if (var2.username != null && var2.appearance != null) {
-				boolean var10 = false;
-				if (var18.isUser && Projectile.friendSystem.isIgnored(var2.username)) {
-					var10 = true;
-				}
-
-				if (!var10 && Client.field794 == 0 && !var2.isHidden) {
-					Players.field1268.offset = 0;
-					var0.readBytes(Players.field1268.array, 0, var8);
-					Players.field1268.offset = 0;
-					String var11 = AbstractFont.escapeBrackets(Decimator.method2636(JagexCache.method3577(Players.field1268)));
-					var2.overheadText = var11.trim();
-					var2.overheadTextColor = var5 >> 8;
-					var2.overheadTextEffect = var5 & 255;
-					var2.overheadTextCyclesRemaining = 150;
-					var2.isAutoChatting = var14;
-					var2.field988 = var2 != ByteArrayPool.localPlayer && var18.isUser && "" != Client.field814 && var11.toLowerCase().indexOf(Client.field814) == -1;
-					if (var18.isPrivileged) {
-						var12 = var14 ? 91 : 1;
-					} else {
-						var12 = var14 ? 90 : 2;
-					}
-
-					if (var18.modIcon != -1) {
-						Skeleton.addGameMessage(var12, class1.method21(var18.modIcon) + var2.username.getName(), var11);
-					} else {
-						Skeleton.addGameMessage(var12, var2.username.getName(), var11);
-					}
-				}
-			}
-
-			var0.offset = var9 + var8;
-		}
-
-		if ((var3 & 256) != 0) {
-			for (var5 = 0; var5 < 3; ++var5) {
-				var2.actions[var5] = var0.readStringCp1252NullTerminated();
-			}
-		}
-
-		if ((var3 & 16) != 0) {
-			var5 = var0.readUnsignedByte();
-			int var15;
-			int var17;
-			int var19;
-			if (var5 > 0) {
-				for (var6 = 0; var6 < var5; ++var6) {
-					var8 = -1;
-					var9 = -1;
-					var17 = -1;
-					var19 = var0.readUShortSmart();
-					if (var19 == 32767) {
-						var19 = var0.readUShortSmart();
-						var9 = var0.readUShortSmart();
-						var8 = var0.readUShortSmart();
-						var17 = var0.readUShortSmart();
-					} else if (var19 != 32766) {
-						var9 = var0.readUShortSmart();
-					} else {
-						var19 = -1;
-					}
-
-					var15 = var0.readUShortSmart();
-					var2.addHitSplat(var19, var9, var8, var17, Client.cycle, var15);
-				}
-			}
-
-			var6 = var0.readUnsignedByte();
-			if (var6 > 0) {
-				for (var19 = 0; var19 < var6; ++var19) {
-					var8 = var0.readUShortSmart();
-					var9 = var0.readUShortSmart();
-					if (var9 != 32767) {
-						var17 = var0.readUShortSmart();
-						var15 = var0.readUnsignedByte();
-						var12 = var9 > 0 ? var0.method5604() : var15;
-						var2.addHealthBar(var8, Client.cycle, var9, var17, var15, var12);
-					} else {
-						var2.removeHealthBar(var8);
-					}
-				}
-			}
-		}
-
-		if ((var3 & 1024) != 0) {
-			var4 = var0.method5607();
-		}
-
-		if ((var3 & 8) != 0) {
-			var2.field1015 = var0.method5613();
-			if (var2.pathLength == 0) {
-				var2.orientation = var2.field1015;
-				var2.field1015 = -1;
-			}
-		}
-
-		if (var2.field670) {
-			if (var4 == 127) {
-				var2.resetPath(var2.tileX, var2.tileY);
-			} else {
-				byte var16;
-				if (var4 != -1) {
-					var16 = var4;
-				} else {
-					var16 = Players.field1273[var1];
-				}
-
-				var2.method1339(var2.tileX, var2.tileY, var16);
-			}
-		}
-
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(ILce;ZB)I",
+		signature = "(I)V",
-		garbageValue = "75"
+		garbageValue = "-678921308"
 	)
-	static int method238(int var0, Script var1, boolean var2) {
+	static void method213() {
-		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) {
+		Login.loginIndex = 24;
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.loadWorlds() ? 1 : 0;
+		MusicPatchPcmStream.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", "");
-			return 1;
-		} else {
-			World var3;
-			if (var0 == ScriptOpcodes.WORLDLIST_START) {
-				var3 = WorldMapDecoration.worldListStart();
-				if (var3 != null) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host;
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-				}
-
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) {
-				var3 = MouseHandler.getNextWorldListWorld();
-				if (var3 != null) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host;
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-				}
-
-				return 1;
-			} else {
-				World var4;
-				int var5;
-				int var7;
-				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) {
-					var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					var4 = null;
-
-					for (var5 = 0; var5 < World.World_count; ++var5) {
-						if (var7 == UserComparator2.World_worlds[var5].id) {
-							var4 = UserComparator2.World_worlds[var5];
-							break;
-						}
-					}
-
-					if (var4 != null) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) {
-					Interpreter.Interpreter_intStackSize -= 4;
-					var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-					boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1;
-					var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
-					boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1;
-					Player.sortWorldList(var7, var10, var5, var6);
-					return 1;
-				} else if (var0 != ScriptOpcodes.GETWORLDINFO) {
-					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {
-						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-						return 1;
-					} else {
-						int var8;
-						ParamDefinition var9;
-						if (var0 == ScriptOpcodes.NC_PARAM) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							var9 = IgnoreList.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class237.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class237.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.LC_PARAM) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							var9 = IgnoreList.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapSection2.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection2.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.OC_PARAM) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							var9 = IgnoreList.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) {
-							Interpreter.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-							var9 = IgnoreList.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = FloorOverlayDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorOverlayDefinition.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.ON_MOBILE) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.CLIENTTYPE) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType & 3;
-							return 1;
-						} else if (var0 == 6520) {
-							return 1;
-						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) {
-							return 1;
-						} else if (var0 == 6522) {
-							--Interpreter.Interpreter_stringStackSize;
-							--Interpreter.Interpreter_intStackSize;
-							return 1;
-						} else if (var0 == 6523) {
-							--Interpreter.Interpreter_stringStackSize;
-							--Interpreter.Interpreter_intStackSize;
-							return 1;
-						} else if (var0 == ScriptOpcodes.BATTERYLEVEL) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-							return 1;
-						} else if (var0 == ScriptOpcodes.BATTERYCHARGING) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-							return 1;
-						} else if (var0 == ScriptOpcodes.WIFIAVAILABLE) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
-							return 1;
-						} else {
-							return 2;
-						}
-					}
-				} else {
-					var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-					if (var7 >= 0 && var7 < World.World_count) {
-						var4 = UserComparator2.World_worlds[var7];
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				}
-			}
-		}
 	}
 
-	@ObfuscatedName("hs")
+	@ObfuscatedName("kt")
 	@ObfuscatedSignature(
-		signature = "(IIZI)V",
+		signature = "(Lkn;II)V",
-		garbageValue = "-1462729636"
+		garbageValue = "-350266063"
 	)
-	static final void method237(int var0, int var1, boolean var2) {
+	static void method214(Buffer var0, int var1) {
-		if (!var2 || var0 != class69.field585 || MouseHandler.field529 != var1) {
+		byte[] var2 = var0.array;
-			class69.field585 = var0;
+		if (Client.randomDatData == null) {
-			MouseHandler.field529 = var1;
+			Client.randomDatData = new byte[24];
-			MouseRecorder.updateGameState(25);
-			AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait.", true);
-			int var3 = class69.baseX;
-			int var4 = class89.baseY;
-			class69.baseX = (var0 - 6) * 8;
-			class89.baseY = (var1 - 6) * 8;
-			int var5 = class69.baseX - var3;
-			int var6 = class89.baseY - var4;
-			var3 = class69.baseX;
-			var4 = class89.baseY;
-
-			int var7;
-			int var9;
-			int[] var10000;
-			for (var7 = 0; var7 < 32768; ++var7) {
-				NPC var8 = Client.npcs[var7];
-				if (var8 != null) {
-					for (var9 = 0; var9 < 10; ++var9) {
-						var10000 = var8.pathX;
-						var10000[var9] -= var5;
-						var10000 = var8.pathY;
-						var10000[var9] -= var6;
-					}
-
-					var8.x -= var5 * 128;
-					var8.y -= var6 * 128;
-				}
-			}
-
-			for (var7 = 0; var7 < 2048; ++var7) {
-				Player var21 = Client.players[var7];
-				if (var21 != null) {
-					for (var9 = 0; var9 < 10; ++var9) {
-						var10000 = var21.pathX;
-						var10000[var9] -= var5;
-						var10000 = var21.pathY;
-						var10000[var9] -= var6;
-					}
-
-					var21.x -= var5 * 128;
-					var21.y -= var6 * 128;
-				}
-			}
-
-			byte var20 = 0;
-			byte var18 = 104;
-			byte var22 = 1;
-			if (var5 < 0) {
-				var20 = 103;
-				var18 = -1;
-				var22 = -1;
-			}
-
-			byte var10 = 0;
-			byte var11 = 104;
-			byte var12 = 1;
-			if (var6 < 0) {
-				var10 = 103;
-				var11 = -1;
-				var12 = -1;
-			}
-
-			int var14;
-			for (int var13 = var20; var18 != var13; var13 += var22) {
-				for (var14 = var10; var14 != var11; var14 += var12) {
-					int var15 = var5 + var13;
-					int var16 = var14 + var6;
-
-					for (int var17 = 0; var17 < 4; ++var17) {
-						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
-							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
-						} else {
-							Client.groundItems[var17][var13][var14] = null;
-						}
-					}
-				}
-			}
-
-			for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) {
-				var19.x -= var5;
-				var19.y -= var6;
-				if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) {
-					var19.remove();
-				}
-			}
-
-			if (Client.destinationX != 0) {
-				Client.destinationX -= var5;
-				Client.destinationY -= var6;
-			}
-
-			Client.soundEffectCount = 0;
-			Client.isCameraLocked = false;
-			WorldMapRectangle.cameraX -= var5 << 7;
-			class200.cameraZ -= var6 << 7;
-			SoundSystem.oculusOrbFocalPointX -= var5 << 7;
-			ServerPacket.oculusOrbFocalPointY -= var6 << 7;
-			Client.field695 = -1;
-			Client.graphicsObjects.clear();
-			Client.projectiles.clear();
-
-			for (var14 = 0; var14 < 4; ++var14) {
-				Client.collisionMaps[var14].clear();
-			}
-
 		}
+
+		class310.writeRandomDat(var2, var1, Client.randomDatData, 0, 24);
+		DevicePcmPlayerProvider.method914(var0, var1);
+	}
+
+	@ObfuscatedName("kv")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-2098531910"
+	)
+	static void method206() {
+		Client.packetWriter.addNode(UserComparator4.getPacketBufferNode(ClientPacket.field2339, Client.packetWriter.isaacCipher));
+		Client.oculusOrbState = 0;
 	}
 }

runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java

@@ -1,37 +1,30 @@
 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("bl")
+@ObfuscatedName("bj")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("sb")
+	@ObfuscatedName("g")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lcq;"
+		intValue = -1758275927
 	)
-	@Export("clientPreferences")
+	static int field666;
-	static ClientPreferences clientPreferences;
+	@ObfuscatedName("m")
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "Lle;"
-	)
-	@Export("titlebuttonSprite")
-	static IndexedSprite titlebuttonSprite;
-	@ObfuscatedName("n")
-	public static boolean field677;
-	@ObfuscatedName("x")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;B)I",
+		signature = "(Ls;Ls;I)I",
-		garbageValue = "-63"
+		garbageValue = "646157510"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -52,70 +45,99 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 		}
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("x")
+	public boolean equals(Object var1) {
-	@ObfuscatedSignature(
+		return super.equals(var1);
-		signature = "(Lbb;I)V",
-		garbageValue = "295215952"
-	)
-	@Export("runScriptEvent")
-	public static void runScriptEvent(ScriptEvent var0) {
-		PlayerAppearance.runScript(var0, 500000);
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-459151232"
-	)
-	@Export("clearItemContainer")
-	static void clearItemContainer(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var1 != null) {
-			for (int var2 = 0; var2 < var1.ids.length; ++var2) {
-				var1.ids[var2] = -1;
-				var1.quantities[var2] = 0;
-			}
-
-		}
 	}
 
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IB)Ljava/lang/String;",
+		signature = "(ILcs;ZI)I",
-		garbageValue = "120"
+		garbageValue = "987190791"
 	)
-	static final String method1385(int var0) {
+	static int method1342(int var0, Script var1, boolean var2) {
-		if (var0 < 100000) {
+		int var3 = -1;
-			return "<col=ffff00>" + var0 + "</col>";
+		Widget var4;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+			var4 = WorldMapSprite.getWidget(var3);
 		} else {
-			return var0 < 10000000 ? "<col=ffffff>" + var0 / 1000 + "K" + "</col>" : "<col=00ff80>" + var0 / 1000000 + "M" + "</col>";
+			var4 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544;
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETPOSITION) {
+			UrlRequester.Interpreter_intStackSize -= 4;
+			var4.rawX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+			var4.rawY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+			var4.xAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2];
+			var4.yAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3];
+			class234.invalidateWidget(var4);
+			WorldMapSectionType.client.alignWidget(var4);
+			if (var3 != -1 && var4.type == 0) {
+				WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
+			UrlRequester.Interpreter_intStackSize -= 4;
+			var4.rawWidth = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+			var4.rawHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+			var4.widthAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2];
+			var4.heightAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3];
+			class234.invalidateWidget(var4);
+			WorldMapSectionType.client.alignWidget(var4);
+			if (var3 != -1 && var4.type == 0) {
+				WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
+			boolean var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1;
+			if (var5 != var4.isHidden) {
+				var4.isHidden = var5;
+				class234.invalidateWidget(var4);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
+			var4.noClickThrough = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
+			var4.noScrollThrough = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1;
+			return 1;
+		} else {
+			return 2;
 		}
 	}
 
-	@ObfuscatedName("ff")
+	@ObfuscatedName("fq")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(Ljm;IIII)V",
-		garbageValue = "-90506590"
+		garbageValue = "1251688899"
 	)
-	static void method1396(int var0, int var1) {
+	@Export("addSequenceSoundEffect")
-		int[] var2 = new int[9];
+	static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) {
-
+		if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) {
-		for (int var3 = 0; var3 < var2.length; ++var3) {
+			if (var0.soundEffects != null && var1 < var0.soundEffects.length) {
-			int var4 = var3 * 32 + 15 + 128;
+				int var4 = var0.soundEffects[var1];
-			int var5 = UserComparator4.method3482(var4);
+				if (var4 != 0) {
-			int var6 = Rasterizer3D.Rasterizer3D_sine[var4];
+					int var5 = var4 >> 8;
-			var5 = Varcs.method2295(var5, var1);
+					int var6 = var4 >> 4 & 7;
-			var2[var3] = var6 * var5 >> 16;
+					int var7 = var4 & 15;
+					Client.soundEffectIds[Client.soundEffectCount] = var5;
+					Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
+					Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
+					Client.soundEffects[Client.soundEffectCount] = null;
+					int var8 = (var2 - 64) / 128;
+					int var9 = (var3 - 64) / 128;
+					Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
+					++Client.soundEffectCount;
+				}
+			}
 		}
-
-		Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
 	}
 }

runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java

@@ -1,27 +1,19 @@
-import java.awt.Component;
+import java.applet.Applet;
-import java.lang.reflect.Field;
+import java.net.URL;
-import java.lang.reflect.Method;
 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.Reflection;
+import netscape.javascript.JSObject;
 
-@ObfuscatedName("a")
+@ObfuscatedName("v")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("gy")
+	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = -591154231
-	)
-	static int field91;
-
-	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;B)I",
+		signature = "(Ls;Ls;I)I",
-		garbageValue = "-105"
+		garbageValue = "-1370720727"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -36,150 +28,64 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Ljava/awt/Component;I)V",
+		signature = "(Ljava/lang/String;ILjava/lang/String;B)Z",
-		garbageValue = "-1200132301"
+		garbageValue = "-68"
 	)
-	static void method179(Component var0) {
+	static boolean method165(String var0, int var1, String var2) {
-		var0.addMouseListener(MouseHandler.MouseHandler_instance);
-		var0.addMouseMotionListener(MouseHandler.MouseHandler_instance);
-		var0.addFocusListener(MouseHandler.MouseHandler_instance);
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(Lkb;IS)V",
-		garbageValue = "-19565"
-	)
-	@Export("readReflectionCheck")
-	public static void readReflectionCheck(Buffer var0, int var1) {
-		ReflectionCheck var2 = new ReflectionCheck();
-		var2.size = var0.readUnsignedByte();
-		var2.id = var0.readInt();
-		var2.operations = new int[var2.size];
-		var2.creationErrors = new int[var2.size];
-		var2.fields = new Field[var2.size];
-		var2.intReplaceValues = new int[var2.size];
-		var2.methods = new Method[var2.size];
-		var2.arguments = new byte[var2.size][][];
-
-		for (int var3 = 0; var3 < var2.size; ++var3) {
-			try {
-				int var4 = var0.readUnsignedByte();
-				String var5;
-				String var6;
-				int var7;
-				if (var4 != 0 && var4 != 1 && var4 != 2) {
-					if (var4 == 3 || var4 == 4) {
-						var5 = var0.readStringCp1252NullTerminated();
-						var6 = var0.readStringCp1252NullTerminated();
-						var7 = var0.readUnsignedByte();
-						String[] var8 = new String[var7];
-
-						for (int var9 = 0; var9 < var7; ++var9) {
-							var8[var9] = var0.readStringCp1252NullTerminated();
-						}
-
-						String var20 = var0.readStringCp1252NullTerminated();
-						byte[][] var10 = new byte[var7][];
-						int var12;
-						if (var4 == 3) {
-							for (int var11 = 0; var11 < var7; ++var11) {
-								var12 = var0.readInt();
-								var10[var11] = new byte[var12];
-								var0.readBytes(var10[var11], 0, var12);
-							}
-						}
-
-						var2.operations[var3] = var4;
-						Class[] var21 = new Class[var7];
-
-						for (var12 = 0; var12 < var7; ++var12) {
-							var21[var12] = class2.loadClassFromDescriptor(var8[var12]);
-						}
-
-						Class var22 = class2.loadClassFromDescriptor(var20);
-						if (class2.loadClassFromDescriptor(var5).getClassLoader() == null) {
-							throw new SecurityException();
-						}
-
-						Method[] var13 = class2.loadClassFromDescriptor(var5).getDeclaredMethods();
-						Method[] var14 = var13;
-
-						for (int var15 = 0; var15 < var14.length; ++var15) {
-							Method var16 = var14[var15];
-							if (Reflection.getMethodName(var16).equals(var6)) {
-								Class[] var17 = Reflection.getParameterTypes(var16);
-								if (var21.length == var17.length) {
-									boolean var18 = true;
-
-									for (int var19 = 0; var19 < var21.length; ++var19) {
-										if (var17[var19] != var21[var19]) {
-											var18 = false;
-											break;
-										}
-									}
-
-									if (var18 && var22 == var16.getReturnType()) {
-										var2.methods[var3] = var16;
-									}
-								}
-							}
-						}
-
-						var2.arguments[var3] = var10;
-					}
-				} else {
-					var5 = var0.readStringCp1252NullTerminated();
-					var6 = var0.readStringCp1252NullTerminated();
-					var7 = 0;
-					if (var4 == 1) {
-						var7 = var0.readInt();
-					}
-
-					var2.operations[var3] = var4;
-					var2.intReplaceValues[var3] = var7;
-					if (class2.loadClassFromDescriptor(var5).getClassLoader() == null) {
-						throw new SecurityException();
-					}
-
-					var2.fields[var3] = Reflection.findField(class2.loadClassFromDescriptor(var5), var6);
-				}
-			} catch (ClassNotFoundException var24) {
-				var2.creationErrors[var3] = -1;
-			} catch (SecurityException var25) {
-				var2.creationErrors[var3] = -2;
-			} catch (NullPointerException var26) {
-				var2.creationErrors[var3] = -3;
-			} catch (Exception var27) {
-				var2.creationErrors[var3] = -4;
-			} catch (Throwable var28) {
-				var2.creationErrors[var3] = -5;
-			}
-		}
-
-		class105.reflectionChecks.addFirst(var2);
-	}
-
-	@ObfuscatedName("ka")
-	@ObfuscatedSignature(
-		signature = "(Lhe;B)Lhe;",
-		garbageValue = "-16"
-	)
-	static Widget method181(Widget var0) {
-		int var1 = Canvas.method958(ScriptEvent.getWidgetClickMask(var0));
 		if (var1 == 0) {
-			return null;
+			try {
-		} else {
+				if (!class60.field450.startsWith("win")) {
-			for (int var2 = 0; var2 < var1; ++var2) {
+					throw new Exception();
-				var0 = MusicPatchNode.getWidget(var0.parentId);
+				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
-				if (var0 == null) {
+					throw new Exception();
-					return null;
+				} else {
+					String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
+
+					for (int var4 = 0; var4 < var0.length(); ++var4) {
+						if (var14.indexOf(var0.charAt(var4)) == -1) {
+							throw new Exception();
+						}
+					}
+
+					Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
+					return true;
 				}
+			} catch (Throwable var8) {
+				return false;
+			}
+		} else if (var1 == 1) {
+			try {
+				Applet var7 = class60.applet;
+				Object[] var5 = new Object[]{(new URL(class60.applet.getCodeBase(), var0)).toString()};
+				Object var13 = JSObject.getWindow(var7).call(var2, var5);
+				return var13 != null;
+			} catch (Throwable var9) {
+				return false;
+			}
+		} else if (var1 == 2) {
+			try {
+				class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank");
+				return true;
+			} catch (Exception var10) {
+				return false;
+			}
+		} else if (var1 == 3) {
+			try {
+				Applet var3 = class60.applet;
+				JSObject.getWindow(var3).call("loggedout", (Object[])null);
+			} catch (Throwable var12) {
 			}
 
-			return var0;
+			try {
+				class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top");
+				return true;
+			} catch (Exception var11) {
+				return false;
+			}
+		} else {
+			throw new IllegalArgumentException();
 		}
 	}
 }

runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java

@@ -1,21 +1,18 @@
-import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("l")
+@ObfuscatedName("e")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
-	@Export("musicTrackBoolean")
-	public static boolean musicTrackBoolean;
-
-	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;B)I",
+		signature = "(Ls;Ls;B)I",
-		garbageValue = "-48"
+		garbageValue = "0"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -30,145 +27,91 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(II)Ljv;",
+		signature = "(Lic;Lic;B)V",
-		garbageValue = "-600154853"
+		garbageValue = "15"
 	)
-	public static HitSplatDefinition method213(int var0) {
+	public static void method195(AbstractArchive var0, AbstractArchive var1) {
-		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
+		KitDefinition.KitDefinition_archive = var0;
-		if (var1 != null) {
+		KitDefinition.KitDefinition_modelsArchive = var1;
-			return var1;
+		KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3);
-		} else {
+	}
-			byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0);
-			var1 = new HitSplatDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
 
-			HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0);
+	@ObfuscatedName("o")
-			return var1;
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)Z",
+		garbageValue = "-1062830390"
+	)
+	static boolean method204(String var0) {
+		if (var0 == null) {
+			return false;
+		} else {
+			try {
+				new URL(var0);
+				return true;
+			} catch (MalformedURLException var2) {
+				return false;
+			}
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		signature = "(Llt;ZB)V",
+		signature = "(Ljg;S)Z",
-		garbageValue = "1"
+		garbageValue = "255"
 	)
-	public static void method222(AbstractSocket var0, boolean var1) {
+	static boolean method202(ObjectDefinition var0) {
-		if (NetCache.NetCache_socket != null) {
+		if (var0.transforms != null) {
-			try {
+			int[] var1 = var0.transforms;
-				NetCache.NetCache_socket.close();
-			} catch (Exception var8) {
-			}
 
-			NetCache.NetCache_socket = null;
+			for (int var2 = 0; var2 < var1.length; ++var2) {
-		}
+				int var3 = var1[var2];
-
+				ObjectDefinition var4 = Canvas.getObjectDefinition(var3);
-		NetCache.NetCache_socket = var0;
+				if (var4.mapIconId != -1) {
-		Buffer var2;
+					return true;
-		if (NetCache.NetCache_socket != null) {
+				}
-			try {
+			}
-				var2 = new Buffer(4);
+		} else if (var0.mapIconId != -1) {
-				var2.writeByte(var1 ? 2 : 3);
+			return true;
-				var2.writeMedium(0);
+		}
-				NetCache.NetCache_socket.write(var2.array, 0, 4);
+
-			} catch (IOException var7) {
+		return false;
-				try {
+	}
-					NetCache.NetCache_socket.close();
+
-				} catch (Exception var6) {
+	@ObfuscatedName("ix")
-				}
+	@ObfuscatedSignature(
-
+		signature = "([Lhd;IIIZB)V",
-				++NetCache.NetCache_ioExceptions;
+		garbageValue = "0"
-				NetCache.NetCache_socket = null;
+	)
-			}
+	@Export("resizeInterface")
-		}
+	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
-
+		for (int var5 = 0; var5 < var0.length; ++var5) {
-		NetCache.NetCache_responseHeaderBuffer.offset = 0;
+			Widget var6 = var0[var5];
-		NetCache.NetCache_currentResponse = null;
+			if (var6 != null && var6.parentId == var1) {
-		NetCache.NetCache_responseArchiveBuffer = null;
+				UserComparator3.alignWidgetSize(var6, var2, var3, var4);
-		NetCache.field3178 = 0;
+				WorldMapLabel.alignWidgetPosition(var6, var2, var3);
-
+				if (var6.scrollX > var6.scrollWidth - var6.width) {
-		while (true) {
+					var6.scrollX = var6.scrollWidth - var6.width;
-			NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first();
+				}
-			if (var9 == null) {
+
-				while (true) {
+				if (var6.scrollX < 0) {
-					var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first();
+					var6.scrollX = 0;
-					if (var9 == null) {
+				}
-						if (NetCache.field3163 != 0) {
+
-							try {
+				if (var6.scrollY > var6.scrollHeight - var6.height) {
-								var2 = new Buffer(4);
+					var6.scrollY = var6.scrollHeight - var6.height;
-								var2.writeByte(4);
+				}
-								var2.writeByte(NetCache.field3163);
+
-								var2.writeShort(0);
+				if (var6.scrollY < 0) {
-								NetCache.NetCache_socket.write(var2.array, 0, 4);
+					var6.scrollY = 0;
-							} catch (IOException var5) {
+				}
-								try {
+
-									NetCache.NetCache_socket.close();
+				if (var6.type == 0) {
-								} catch (Exception var4) {
+					WorldMapIcon_0.revalidateWidgetScroll(var0, var6, var4);
-								}
-
-								++NetCache.NetCache_ioExceptions;
-								NetCache.NetCache_socket = null;
-							}
-						}
-
-						NetCache.NetCache_loadTime = 0;
-						NetCache.field3165 = class217.currentTimeMillis();
-						return;
-					}
-
-					NetCache.NetCache_pendingWritesQueue.addLast(var9);
-					NetCache.NetCache_pendingWrites.put(var9, var9.key);
-					++NetCache.NetCache_pendingWritesCount;
-					--NetCache.NetCache_pendingResponsesCount;
 				}
 			}
-
-			NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key);
-			++NetCache.NetCache_pendingPriorityWritesCount;
-			--NetCache.NetCache_pendingPriorityResponsesCount;
-		}
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(III)Lhe;",
-		garbageValue = "166208311"
-	)
-	@Export("getWidgetChild")
-	public static Widget getWidgetChild(int var0, int var1) {
-		Widget var2 = MusicPatchNode.getWidget(var0);
-		if (var1 == -1) {
-			return var2;
-		} else {
-			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
-		}
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "(II)Z",
-		garbageValue = "-1968739504"
-	)
-	public static boolean method218(int var0) {
-		return (var0 >> 20 & 1) != 0;
-	}
-
-	@ObfuscatedName("aj")
-	@ObfuscatedSignature(
-		signature = "([BII)I",
-		garbageValue = "-1953007669"
-	)
-	public static int method225(byte[] var0, int var1) {
-		int var3 = -1;
-
-		for (int var4 = 0; var4 < var1; ++var4) {
-			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255];
 		}
 
-		var3 = ~var3;
-		return var3;
 	}
 }

runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java

@@ -1,167 +1,173 @@
 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("h")
+@ObfuscatedName("k")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("rb")
+	@ObfuscatedName("bf")
-	@ObfuscatedGetter(
-		intValue = 587221949
-	)
-	static int field64;
-	@ObfuscatedName("gq")
 	@ObfuscatedSignature(
-		signature = "Lej;"
+		signature = "Lib;"
 	)
-	@Export("scene")
+	static StudioGame field54;
-	static Scene scene;
-	@ObfuscatedName("hk")
-	@ObfuscatedGetter(
-		intValue = -1477050145
-	)
-	@Export("cameraY")
-	static int cameraY;
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;I)I",
+		signature = "(Ls;Ls;B)I",
-		garbageValue = "590840268"
+		garbageValue = "-1"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1);
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
 
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}
+
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
+		signature = "(ILcs;ZI)I",
-		garbageValue = "1020131485"
+		garbageValue = "1613064985"
 	)
 	static int method137(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130;
+		boolean var3 = true;
-		if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
+		Widget var4;
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX;
+		if (var0 >= 2000) {
-			return 1;
+			var0 -= 1000;
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
+			var4 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY;
+			var3 = false;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETTEXT) {
-			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETFILLMODE) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
-			return 1;
 		} else {
-			return 2;
+			var4 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544;
 		}
-	}
 
-	@ObfuscatedName("fl")
+		int var11;
-	@ObfuscatedSignature(
+		if (var0 == ScriptOpcodes.CC_SETOP) {
-		signature = "(I)I",
+			var11 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] - 1;
-		garbageValue = "-965659136"
+			if (var11 >= 0 && var11 <= 9) {
-	)
+				var4.setAction(var11, Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]);
-	static int method147() {
+				return 1;
-		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) {
+			} else {
-			int var0 = 0;
+				--WorldMapEvent.Interpreter_stringStackSize;
-
+				return 1;
-			for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) {
-				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount;
 			}
-
-			return var0 * 10000 / Client.field898;
 		} else {
-			return 10000;
+			int var6;
-		}
+			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) {
-	}
+				UrlRequester.Interpreter_intStackSize -= 2;
+				var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize];
+				var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+				var4.parent = WorldMapLabelSize.getWidgetChild(var11, var6);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) {
+				var4.isScrollBar = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1;
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) {
+				var4.dragZoneSize = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) {
+				var4.dragThreshold = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) {
+				var4.dataText = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) {
+				var4.spellActionName = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) {
+				var4.actions = null;
+				return 1;
+			} else if (var0 == 1308) {
+				var4.field2744 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1;
+				return 1;
+			} else if (var0 == 1309) {
+				--UrlRequester.Interpreter_intStackSize;
+				return 1;
+			} else {
+				int var7;
+				byte[] var9;
+				if (var0 != ScriptOpcodes.CC_SETOPKEY) {
+					byte var5;
+					if (var0 == ScriptOpcodes.CC_SETOPTKEY) {
+						UrlRequester.Interpreter_intStackSize -= 2;
+						var5 = 10;
+						var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]};
+						byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]};
+						PendingSpawn.Widget_setKey(var4, var5, var9, var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) {
+						UrlRequester.Interpreter_intStackSize -= 3;
+						var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] - 1;
+						var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1];
+						var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2];
+						if (var11 >= 0 && var11 <= 9) {
+							WorldMapRectangle.Widget_setKeyRate(var4, var11, var6, var7);
+							return 1;
+						} else {
+							throw new RuntimeException();
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) {
+						var5 = 10;
+						var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+						var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize];
+						WorldMapRectangle.Widget_setKeyRate(var4, var5, var6, var7);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) {
+						--UrlRequester.Interpreter_intStackSize;
+						var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] - 1;
+						if (var11 >= 0 && var11 <= 9) {
+							FontName.Widget_setKeyIgnoreHeld(var4, var11);
+							return 1;
+						} else {
+							throw new RuntimeException();
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) {
+						var5 = 10;
+						FontName.Widget_setKeyIgnoreHeld(var4, var5);
+						return 1;
+					} else {
+						return 2;
+					}
+				} else {
+					byte[] var8 = null;
+					var9 = null;
+					if (var3) {
+						UrlRequester.Interpreter_intStackSize -= 10;
 
-	@ObfuscatedName("gu")
+						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize] >= 0; var7 += 2) {
-	@ObfuscatedSignature(
+						}
-		signature = "(Lbi;IIB)V",
+
-		garbageValue = "8"
+						if (var7 > 0) {
-	)
+							var8 = new byte[var7 / 2];
-	@Export("performPlayerAnimation")
+							var9 = new byte[var7 / 2];
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
+
-		if (var0.sequence == var1 && var1 != -1) {
+							for (var7 -= 2; var7 >= 0; var7 -= 2) {
-			int var3 = SpotAnimationDefinition.SequenceDefinition_get(var1).field3525;
+								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize];
-			if (var3 == 1) {
+								var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize + 1];
-				var0.sequenceFrame = 0;
+							}
-				var0.sequenceFrameCycle = 0;
+						}
-				var0.sequenceDelay = var2;
+					} else {
-				var0.field1011 = 0;
+						UrlRequester.Interpreter_intStackSize -= 2;
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]};
+						var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]};
+					}
+
+					var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] - 1;
+					if (var7 >= 0 && var7 <= 9) {
+						PendingSpawn.Widget_setKey(var4, var7, var8, var9);
+						return 1;
+					} else {
+						throw new RuntimeException();
+					}
+				}
 			}
-
-			if (var3 == 2) {
-				var0.field1011 = 0;
-			}
-		} else if (var1 == -1 || var0.sequence == -1 || SpotAnimationDefinition.SequenceDefinition_get(var1).field3519 >= SpotAnimationDefinition.SequenceDefinition_get(var0.sequence).field3519) {
-			var0.sequence = var1;
-			var0.sequenceFrame = 0;
-			var0.sequenceFrameCycle = 0;
-			var0.sequenceDelay = var2;
-			var0.field1011 = 0;
-			var0.field1032 = var0.pathLength;
 		}
-
-	}
-
-	@ObfuscatedName("kl")
-	@ObfuscatedSignature(
-		signature = "(IIIZI)V",
-		garbageValue = "1791023210"
-	)
-	public static void method148(int var0, int var1, int var2, boolean var3) {
-		PacketBufferNode var4 = FaceNormal.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher);
-		var4.packetBuffer.method5727(var2);
-		var4.packetBuffer.writeInt(var3 ? Client.field762 * 166950687 * 1356416223 : 0);
-		var4.packetBuffer.method5609(var0);
-		var4.packetBuffer.writeIntME(var1);
-		Client.packetWriter.addNode(var4);
 	}
 }

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("lx")
+@ObfuscatedName("lq")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 281653791
+		intValue = -1290598403
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1495832325
+		intValue = 569826969
 	)
-	public int field3824;
+	public int field3825;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 465334207
+		intValue = -2129341785
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1124129299
+		intValue = -971970549
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -392532665
+		intValue = 495160215
 	)
-	public int field3817;
+	public int field3828;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 505847237
+		intValue = 600923109
 	)
-	public int field3818;
+	public int field3829;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -322608503
+		intValue = -1832791717
 	)
-	public int field3819;
+	public int field3830;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 1676542437
+	)
+	public int field3831;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 25471689
+	)
+	public int field3834;
 	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 91782019
+		intValue = -1227004577
 	)
-	public int field3820;
+	public int field3824;
-	@ObfuscatedName("t")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -918755557
+		intValue = -575308385
 	)
-	public int field3821;
+	public int field3832;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -1836222511
-	)
-	public int field3822;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -581916301
-	)
-	public int field3823;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3824 = -1;
+		this.field3825 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3817 = -1;
+		this.field3828 = -1;
-		this.field3818 = -1;
+		this.field3829 = -1;
-		this.field3819 = -1;
+		this.field3830 = -1;
-		this.field3820 = -1;
+		this.field3831 = -1;
-		this.field3821 = -1;
+		this.field3834 = -1;
-		this.field3822 = -1;
+		this.field3824 = -1;
-		this.field3823 = -1;
+		this.field3832 = -1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Liy;I)V",
+		signature = "(Lic;B)V",
-		garbageValue = "-1759254165"
+		garbageValue = "0"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3811.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3822.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -101,38 +101,18 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5591();
+				this.compass = var3.method5843();
-				this.field3824 = var3.method5591();
+				this.field3825 = var3.method5843();
-				this.mapScenes = var3.method5591();
+				this.mapScenes = var3.method5843();
-				this.headIconsPk = var3.method5591();
+				this.headIconsPk = var3.method5843();
-				this.field3817 = var3.method5591();
+				this.field3828 = var3.method5843();
-				this.field3818 = var3.method5591();
+				this.field3829 = var3.method5843();
-				this.field3819 = var3.method5591();
+				this.field3830 = var3.method5843();
-				this.field3820 = var3.method5591();
+				this.field3831 = var3.method5843();
-				this.field3821 = var3.method5591();
+				this.field3834 = var3.method5843();
-				this.field3822 = var3.method5591();
+				this.field3824 = var3.method5843();
-				this.field3823 = var3.method5591();
+				this.field3832 = var3.method5843();
 			}
 		}
 	}
-
-	@ObfuscatedName("x")
-	static double method5968(double var0, double var2, double var4) {
-		double var8 = (var0 - var2) / var4;
-		double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D);
-		return var6 / var4;
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(Lkb;Ljava/lang/String;B)I",
-		garbageValue = "77"
-	)
-	public static int method5966(Buffer var0, String var1) {
-		int var2 = var0.offset;
-		byte[] var3 = WorldMapCacheName.method715(var1);
-		var0.writeSmartByteShort(var3.length);
-		var0.offset += class219.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
-		return var0.offset - var2;
-	}
 }

runescape-client/src/main/java/GraphicsObject.java

@@ -1,74 +1,78 @@
-import java.io.IOException;
-import java.util.LinkedHashMap;
 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("cs")
+@ObfuscatedName("cj")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("aw")
+	@ObfuscatedName("si")
 	@ObfuscatedGetter(
-		intValue = 2069035029
+		longValue = 4282492011964986707L
 	)
-	static int field1141;
+	static long field1139;
-	@ObfuscatedName("x")
+	@ObfuscatedName("dz")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -1892453991
+		signature = "Lig;"
 	)
-	@Export("y")
+	@Export("archive10")
-	int y;
+	static Archive archive10;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -760249917
+		intValue = 555151267
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1800328217
+		intValue = 953571075
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1899634503
+		intValue = 35157473
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1416163877
+		intValue = 1616692737
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1568421589
+		intValue = -2135993151
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = -1585173771
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ljc;"
+		signature = "Ljm;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 137908093
+		intValue = 1643713967
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1659950887
+		intValue = 1415873335
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -82,20 +86,20 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = MouseHandler.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = class4.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var8);
+			this.sequenceDefinition = NetSocket.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-937691597"
+		garbageValue = "-1084299452"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -114,14 +118,14 @@ public final class GraphicsObject extends Entity {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Lel;",
+		signature = "(I)Lef;",
-		garbageValue = "480835067"
+		garbageValue = "1832696685"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = MouseHandler.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = class4.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -131,69 +135,4 @@ public final class GraphicsObject extends Entity {
 
 		return var2 == null ? null : var2;
 	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-22"
-	)
-	public static void method2121() {
-		if (MouseHandler.MouseHandler_instance != null) {
-			synchronized(MouseHandler.MouseHandler_instance) {
-				MouseHandler.MouseHandler_instance = null;
-			}
-		}
-
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "(I)[B",
-		garbageValue = "1774574647"
-	)
-	public static byte[] method2120() {
-		byte[] var0 = new byte[24];
-
-		try {
-			JagexCache.JagexCache_randomDat.seek(0L);
-			JagexCache.JagexCache_randomDat.readFully(var0);
-
-			int var1;
-			for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) {
-			}
-
-			if (var1 >= 24) {
-				throw new IOException();
-			}
-		} catch (Exception var4) {
-			for (int var2 = 0; var2 < 24; ++var2) {
-				var0[var2] = -1;
-			}
-		}
-
-		return var0;
-	}
-
-	@ObfuscatedName("ft")
-	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "1004007010"
-	)
-	static final void method2122(boolean var0) {
-		if (var0) {
-			Client.field715 = Login.field1214 ? class169.field2007 : class169.field2006;
-		} else {
-			LinkedHashMap var1 = GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters;
-			String var3 = Login.Login_username;
-			int var4 = var3.length();
-			int var5 = 0;
-
-			for (int var6 = 0; var6 < var4; ++var6) {
-				var5 = (var5 << 5) - var5 + var3.charAt(var6);
-			}
-
-			Client.field715 = var1.containsKey(var5) ? class169.field2012 : class169.field2008;
-		}
-
-	}
 }

runescape-client/src/main/java/HealthBar.java

@@ -1,42 +1,45 @@
+import java.io.File;
+import java.io.IOException;
+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("cg")
+@ObfuscatedName("ck")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("rf")
+	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1163501961
-	)
-	static int field1145;
-	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lid;"
+		signature = "Llh;"
+	)
+	@Export("titleboxSprite")
+	static IndexedSprite titleboxSprite;
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "Lik;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljx;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		signature = "(Lid;)V"
+		signature = "(Lik;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(IIIIB)V",
-		garbageValue = "86"
+		garbageValue = "-61"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -69,10 +72,10 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)Lcc;",
+		signature = "(II)Lcb;",
-		garbageValue = "1772939720"
+		garbageValue = "-200581175"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -83,7 +86,7 @@ public class HealthBar extends Node {
 				var2 = var3;
 			}
 
-			if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
+			if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
 				return var2;
 			} else {
 				var2.remove();
@@ -94,25 +97,672 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1327552245"
+		garbageValue = "1424696628"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method4891();
+		return this.updates.method5014();
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;III)V",
+		garbageValue = "1011181344"
+	)
+	public static void method2137(String var0, String var1, int var2, int var3) throws IOException {
+		WorldMapDecoration.idxCount = var3;
+		RouteStrategy.cacheGamebuild = var2;
+
+		try {
+			class225.field2587 = System.getProperty("os.name");
+		} catch (Exception var29) {
+			class225.field2587 = "Unknown";
+		}
+
+		JagexCache.field2077 = class225.field2587.toLowerCase();
+
+		try {
+			ArchiveLoader.userHomeDirectory = System.getProperty("user.home");
+			if (ArchiveLoader.userHomeDirectory != null) {
+				ArchiveLoader.userHomeDirectory = ArchiveLoader.userHomeDirectory + "/";
+			}
+		} catch (Exception var28) {
+		}
+
+		try {
+			if (JagexCache.field2077.startsWith("win")) {
+				if (ArchiveLoader.userHomeDirectory == null) {
+					ArchiveLoader.userHomeDirectory = System.getenv("USERPROFILE");
+				}
+			} else if (ArchiveLoader.userHomeDirectory == null) {
+				ArchiveLoader.userHomeDirectory = System.getenv("HOME");
+			}
+
+			if (ArchiveLoader.userHomeDirectory != null) {
+				ArchiveLoader.userHomeDirectory = ArchiveLoader.userHomeDirectory + "/";
+			}
+		} catch (Exception var27) {
+		}
+
+		if (ArchiveLoader.userHomeDirectory == null) {
+			ArchiveLoader.userHomeDirectory = "~/";
+		}
+
+		class234.field3096 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ArchiveLoader.userHomeDirectory, "/tmp/", ""};
+		InterfaceParent.field590 = new String[]{".jagex_cache_" + RouteStrategy.cacheGamebuild, ".file_store_" + RouteStrategy.cacheGamebuild};
+		int var18 = 0;
+
+		label248:
+		while (var18 < 4) {
+			String var6 = var18 == 0 ? "" : "" + var18;
+			JagexCache.JagexCache_locationFile = new File(ArchiveLoader.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat");
+			String var7 = null;
+			String var8 = null;
+			boolean var9 = false;
+			int var12;
+			int var14;
+			File var34;
+			if (JagexCache.JagexCache_locationFile.exists()) {
+				try {
+					AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
+
+					Buffer var11;
+					for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) {
+						var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset);
+						if (var12 == -1) {
+							throw new IOException();
+						}
+					}
+
+					var11.offset = 0;
+					var12 = var11.readUnsignedByte();
+					if (var12 < 1 || var12 > 3) {
+						throw new IOException("" + var12);
+					}
+
+					int var13 = 0;
+					if (var12 > 1) {
+						var13 = var11.readUnsignedByte();
+					}
+
+					if (var12 <= 2) {
+						var7 = var11.readStringCp1252NullCircumfixed();
+						if (var13 == 1) {
+							var8 = var11.readStringCp1252NullCircumfixed();
+						}
+					} else {
+						var7 = var11.readCESU8();
+						if (var13 == 1) {
+							var8 = var11.readCESU8();
+						}
+					}
+
+					var10.close();
+				} catch (IOException var31) {
+					var31.printStackTrace();
+				}
+
+				if (var7 != null) {
+					var34 = new File(var7);
+					if (!var34.exists()) {
+						var7 = null;
+					}
+				}
+
+				if (var7 != null) {
+					var34 = new File(var7, "test.dat");
+
+					boolean var37;
+					try {
+						RandomAccessFile var19 = new RandomAccessFile(var34, "rw");
+						var14 = var19.read();
+						var19.seek(0L);
+						var19.write(var14);
+						var19.seek(0L);
+						var19.close();
+						var34.delete();
+						var37 = true;
+					} catch (Exception var26) {
+						var37 = false;
+					}
+
+					if (!var37) {
+						var7 = null;
+					}
+				}
+			}
+
+			if (var7 == null && var18 == 0) {
+				label223:
+				for (int var20 = 0; var20 < InterfaceParent.field590.length; ++var20) {
+					for (int var21 = 0; var21 < class234.field3096.length; ++var21) {
+						File var22 = new File(class234.field3096[var21] + InterfaceParent.field590[var20] + File.separatorChar + var0 + File.separatorChar);
+						if (var22.exists() && class4.method58(new File(var22, "test.dat"), true)) {
+							var7 = var22.toString();
+							var9 = true;
+							break label223;
+						}
+					}
+				}
+			}
+
+			if (var7 == null) {
+				var7 = ArchiveLoader.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar;
+				var9 = true;
+			}
+
+			if (var8 != null) {
+				File var33 = new File(var8);
+				var34 = new File(var7);
+
+				try {
+					File[] var40 = var33.listFiles();
+					File[] var38 = var40;
+
+					for (var14 = 0; var14 < var38.length; ++var14) {
+						File var15 = var38[var14];
+						File var16 = new File(var34, var15.getName());
+						boolean var17 = var15.renameTo(var16);
+						if (!var17) {
+							throw new IOException();
+						}
+					}
+				} catch (Exception var30) {
+					var30.printStackTrace();
+				}
+
+				var9 = true;
+			}
+
+			if (var9) {
+				Client.method1803(new File(var7), (File)null);
+			}
+
+			File var5 = new File(var7);
+			JagexCache.cacheDir = var5;
+			if (!JagexCache.cacheDir.exists()) {
+				JagexCache.cacheDir.mkdirs();
+			}
+
+			File[] var32 = JagexCache.cacheDir.listFiles();
+			if (var32 != null) {
+				File[] var35 = var32;
+
+				for (int var23 = 0; var23 < var35.length; ++var23) {
+					File var24 = var35[var23];
+
+					boolean var39;
+					try {
+						RandomAccessFile var36 = new RandomAccessFile(var24, "rw");
+						var12 = var36.read();
+						var36.seek(0L);
+						var36.write(var12);
+						var36.seek(0L);
+						var36.close();
+						var39 = true;
+					} catch (Exception var25) {
+						var39 = false;
+					}
+
+					if (!var39) {
+						++var18;
+						continue label248;
+					}
+				}
+			}
+			break;
+		}
+
+		MusicPatch.method4025(JagexCache.cacheDir);
+		MusicPatchNode.method3970();
+		JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
+		JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
+		JagexCache.JagexCache_idxFiles = new BufferedFile[WorldMapDecoration.idxCount];
+
+		for (var18 = 0; var18 < WorldMapDecoration.idxCount; ++var18) {
+			JagexCache.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0);
+		}
+
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Lic;IIB)[Llh;",
+		garbageValue = "-91"
+	)
+	public static IndexedSprite[] method2125(AbstractArchive var0, int var1, int var2) {
+		byte[] var4 = var0.takeFile(var1, var2);
+		boolean var3;
+		if (var4 == null) {
+			var3 = false;
+		} else {
+			class3.SpriteBuffer_decode(var4);
+			var3 = true;
+		}
+
+		return !var3 ? null : class232.method4279();
+	}
+
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1544257049"
+		garbageValue = "-631398790"
 	)
-	static void method2124() {
+	public static void method2133() {
-		Login.worldSelectOpen = false;
+		VarpDefinition.VarpDefinition_cached.clear();
-		Login.leftTitleSprite.drawAt(Login.xPadding, 0);
+	}
-		DirectByteArrayCopier.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+
-		class3.logoSprite.drawAt(Login.xPadding + 382 - class3.logoSprite.subWidth / 2, 18);
+	@ObfuscatedName("eb")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-57"
+	)
+	@Export("load")
+	static void load() {
+		int var0;
+		if (Client.titleLoadingStage == 0) {
+			UserComparator3.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
+
+			for (var0 = 0; var0 < 4; ++var0) {
+				Client.collisionMaps[var0] = new CollisionMap(104, 104);
+			}
+
+			class3.sceneMinimapSprite = new Sprite(512, 512);
+			Login.Login_loadingText = "Starting game engine...";
+			Login.Login_loadingPercent = 5;
+			Client.titleLoadingStage = 20;
+		} else if (Client.titleLoadingStage == 20) {
+			Login.Login_loadingText = "Prepared visibility map";
+			Login.Login_loadingPercent = 10;
+			Client.titleLoadingStage = 30;
+		} else if (Client.titleLoadingStage == 30) {
+			MilliClock.archive0 = WorldMapSection3.newArchive(0, false, true, true);
+			Message.archive1 = WorldMapSection3.newArchive(1, false, true, true);
+			Clock.archive2 = WorldMapSection3.newArchive(2, true, false, true);
+			class105.archive3 = WorldMapSection3.newArchive(3, false, true, true);
+			GrandExchangeOffer.archive4 = WorldMapSection3.newArchive(4, false, true, true);
+			WorldMapRectangle.archive5 = WorldMapSection3.newArchive(5, true, true, true);
+			UserComparator7.archive6 = WorldMapSection3.newArchive(6, true, true, true);
+			Projectile.archive7 = WorldMapSection3.newArchive(7, false, true, true);
+			GrandExchangeEvent.archive8 = WorldMapSection3.newArchive(8, false, true, true);
+			Tile.archive9 = WorldMapSection3.newArchive(9, false, true, true);
+			GraphicsObject.archive10 = WorldMapSection3.newArchive(10, false, true, true);
+			WorldMapData_0.archive11 = WorldMapSection3.newArchive(11, false, true, true);
+			Message.archive12 = WorldMapSection3.newArchive(12, false, true, true);
+			GameBuild.archive13 = WorldMapSection3.newArchive(13, true, false, true);
+			WorldMapIcon_1.archive14 = WorldMapSection3.newArchive(14, false, true, true);
+			WorldMapLabel.archive15 = WorldMapSection3.newArchive(15, false, true, true);
+			AbstractWorldMapIcon.archive17 = WorldMapSection3.newArchive(17, true, true, true);
+			VarcInt.archive18 = WorldMapSection3.newArchive(18, false, true, true);
+			WorldMapData_0.archive19 = WorldMapSection3.newArchive(19, false, true, true);
+			ClientPacket.archive20 = WorldMapSection3.newArchive(20, false, true, true);
+			Login.Login_loadingText = "Connecting to update server";
+			Login.Login_loadingPercent = 20;
+			Client.titleLoadingStage = 40;
+		} else if (Client.titleLoadingStage == 40) {
+			byte var28 = 0;
+			var0 = var28 + MilliClock.archive0.percentage() * 4 / 100;
+			var0 += Message.archive1.percentage() * 4 / 100;
+			var0 += Clock.archive2.percentage() * 2 / 100;
+			var0 += class105.archive3.percentage() * 2 / 100;
+			var0 += GrandExchangeOffer.archive4.percentage() * 6 / 100;
+			var0 += WorldMapRectangle.archive5.percentage() * 4 / 100;
+			var0 += UserComparator7.archive6.percentage() * 2 / 100;
+			var0 += Projectile.archive7.percentage() * 56 / 100;
+			var0 += GrandExchangeEvent.archive8.percentage() * 2 / 100;
+			var0 += Tile.archive9.percentage() * 2 / 100;
+			var0 += GraphicsObject.archive10.percentage() * 2 / 100;
+			var0 += WorldMapData_0.archive11.percentage() * 2 / 100;
+			var0 += Message.archive12.percentage() * 2 / 100;
+			var0 += GameBuild.archive13.percentage() * 2 / 100;
+			var0 += WorldMapIcon_1.archive14.percentage() * 2 / 100;
+			var0 += WorldMapLabel.archive15.percentage() * 2 / 100;
+			var0 += WorldMapData_0.archive19.percentage() / 100;
+			var0 += VarcInt.archive18.percentage() / 100;
+			var0 += ClientPacket.archive20.percentage() / 100;
+			var0 += AbstractWorldMapIcon.archive17.method4456() && AbstractWorldMapIcon.archive17.isFullyLoaded() ? 1 : 0;
+			if (var0 != 100) {
+				if (var0 != 0) {
+					Login.Login_loadingText = "Checking for updates - " + var0 + "%";
+				}
+
+				Login.Login_loadingPercent = 30;
+			} else {
+				WorldMapSprite.method481(MilliClock.archive0, "Animations");
+				WorldMapSprite.method481(Message.archive1, "Skeletons");
+				WorldMapSprite.method481(GrandExchangeOffer.archive4, "Sound FX");
+				WorldMapSprite.method481(WorldMapRectangle.archive5, "Maps");
+				WorldMapSprite.method481(UserComparator7.archive6, "Music Tracks");
+				WorldMapSprite.method481(Projectile.archive7, "Models");
+				WorldMapSprite.method481(GrandExchangeEvent.archive8, "Sprites");
+				WorldMapSprite.method481(WorldMapData_0.archive11, "Music Jingles");
+				WorldMapSprite.method481(WorldMapIcon_1.archive14, "Music Samples");
+				WorldMapSprite.method481(WorldMapLabel.archive15, "Music Patches");
+				WorldMapSprite.method481(WorldMapData_0.archive19, "World Map");
+				WorldMapSprite.method481(VarcInt.archive18, "World Map Geography");
+				WorldMapSprite.method481(ClientPacket.archive20, "World Map Ground");
+				UserComparator10.spriteIds = new GraphicsDefaults();
+				UserComparator10.spriteIds.decode(AbstractWorldMapIcon.archive17);
+				Login.Login_loadingText = "Loaded update list";
+				Login.Login_loadingPercent = 30;
+				Client.titleLoadingStage = 45;
+			}
+		} else {
+			Archive var1;
+			Archive var2;
+			if (Client.titleLoadingStage == 45) {
+				class200.method3803(22050, !Client.isLowDetail, 2);
+				MidiPcmStream var31 = new MidiPcmStream();
+				var31.method3935(9, 128);
+				class2.pcmPlayer0 = FontName.method5519(GrandExchangeOfferAgeComparator.taskHandler, 0, 22050);
+				class2.pcmPlayer0.setStream(var31);
+				var1 = WorldMapLabel.archive15;
+				var2 = WorldMapIcon_1.archive14;
+				Archive var27 = GrandExchangeOffer.archive4;
+				class206.musicPatchesArchive = var1;
+				class206.musicSamplesArchive = var2;
+				class206.soundEffectsArchive = var27;
+				WorldMapSprite.midiPcmStream = var31;
+				class58.pcmPlayer1 = FontName.method5519(GrandExchangeOfferAgeComparator.taskHandler, 1, 2048);
+				class60.pcmStreamMixer = new PcmStreamMixer();
+				class58.pcmPlayer1.setStream(class60.pcmStreamMixer);
+				class197.decimator = new Decimator(22050, class237.field3113);
+				Login.Login_loadingText = "Prepared sound engine";
+				Login.Login_loadingPercent = 35;
+				Client.titleLoadingStage = 50;
+				WorldMapSection0.WorldMapElement_fonts = new Fonts(GrandExchangeEvent.archive8, GameBuild.archive13);
+			} else {
+				int var22;
+				if (Client.titleLoadingStage == 50) {
+					FontName[] var30 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11};
+					var22 = var30.length;
+					Fonts var26 = WorldMapSection0.WorldMapElement_fonts;
+					FontName[] var3 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11};
+					Client.fontsMap = var26.createMap(var3);
+					if (Client.fontsMap.size() < var22) {
+						Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var22 + "%";
+						Login.Login_loadingPercent = 40;
+					} else {
+						WorldMapLabel.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
+						MusicPatchNode2.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12);
+						GrandExchangeOfferNameComparator.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12);
+						class13.platformInfo = Client.platformInfoProvider.get();
+						Login.Login_loadingText = "Loaded fonts";
+						Login.Login_loadingPercent = 40;
+						Client.titleLoadingStage = 60;
+					}
+				} else if (Client.titleLoadingStage == 60) {
+					var0 = ArchiveDiskActionHandler.method4429(GraphicsObject.archive10, GrandExchangeEvent.archive8);
+					byte var32 = 12;
+					if (var0 < var32) {
+						Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var32 + "%";
+						Login.Login_loadingPercent = 50;
+					} else {
+						Login.Login_loadingText = "Loaded title screen";
+						Login.Login_loadingPercent = 50;
+						ClientPreferences.updateGameState(5);
+						Client.titleLoadingStage = 70;
+					}
+				} else if (Client.titleLoadingStage == 70) {
+					if (!Clock.archive2.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading config - " + Clock.archive2.loadPercent() + "%";
+						Login.Login_loadingPercent = 60;
+					} else {
+						Archive var29 = Clock.archive2;
+						FloorOverlayDefinition.FloorOverlayDefinition_archive = var29;
+						ObjectSound.method1999(Clock.archive2);
+						GrandExchangeOfferUnitPriceComparator.method195(Clock.archive2, Projectile.archive7);
+						var1 = Clock.archive2;
+						var2 = Projectile.archive7;
+						boolean var33 = Client.isLowDetail;
+						ObjectDefinition.ObjectDefinition_archive = var1;
+						ObjectDefinition.ObjectDefinition_modelsArchive = var2;
+						ObjectDefinition.ObjectDefinition_isLowDetail = var33;
+						Archive var4 = Clock.archive2;
+						Archive var5 = Projectile.archive7;
+						NPCDefinition.NpcDefinition_archive = var4;
+						NPCDefinition.NpcDefinition_modelArchive = var5;
+						class197.method3771(Clock.archive2);
+						UserComparator3.method3548(Clock.archive2, Projectile.archive7, Client.isMembersWorld, WorldMapLabel.fontPlain11);
+						Archive var6 = Clock.archive2;
+						Archive var7 = MilliClock.archive0;
+						Archive var8 = Message.archive1;
+						SequenceDefinition.SequenceDefinition_archive = var6;
+						SequenceDefinition.SequenceDefinition_animationsArchive = var7;
+						SequenceDefinition.SequenceDefinition_skeletonsArchive = var8;
+						MenuAction.method2171(Clock.archive2, Projectile.archive7);
+						Archive var9 = Clock.archive2;
+						VarbitDefinition.VarbitDefinition_archive = var9;
+						TileItem.method2256(Clock.archive2);
+						UserComparator4.method3495(class105.archive3, Projectile.archive7, GrandExchangeEvent.archive8, GameBuild.archive13);
+						Archive var10 = Clock.archive2;
+						InvDefinition.InvDefinition_archive = var10;
+						UserComparator8.method3520(Clock.archive2);
+						Archive var11 = Clock.archive2;
+						VarcInt.VarcInt_archive = var11;
+						class8.method103(Clock.archive2);
+						AttackOption.varcs = new Varcs();
+						Archive var12 = Clock.archive2;
+						Archive var13 = GrandExchangeEvent.archive8;
+						Archive var14 = GameBuild.archive13;
+						HitSplatDefinition.HitSplatDefinition_archive = var12;
+						HitSplatDefinition.field3356 = var13;
+						HitSplatDefinition.HitSplatDefinition_fontsArchive = var14;
+						Archive var15 = Clock.archive2;
+						Archive var16 = GrandExchangeEvent.archive8;
+						HealthBarDefinition.HealthBarDefinition_archive = var15;
+						HealthBarDefinition.HitSplatDefinition_spritesArchive = var16;
+						Archive var17 = Clock.archive2;
+						Archive var18 = GrandExchangeEvent.archive8;
+						WorldMapElement.WorldMapElement_archive = var18;
+						if (var17.isFullyLoaded()) {
+							WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35);
+							class257.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count];
+
+							for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) {
+								byte[] var20 = var17.takeFile(35, var19);
+								class257.WorldMapElement_cached[var19] = new WorldMapElement(var19);
+								if (var20 != null) {
+									class257.WorldMapElement_cached[var19].decode(new Buffer(var20));
+									class257.WorldMapElement_cached[var19].method4548();
+								}
+							}
+						}
+
+						Login.Login_loadingText = "Loaded config";
+						Login.Login_loadingPercent = 60;
+						Client.titleLoadingStage = 80;
+					}
+				} else if (Client.titleLoadingStage == 80) {
+					var0 = 0;
+					if (GrandExchangeOfferNameComparator.compass == null) {
+						GrandExchangeOfferNameComparator.compass = GameShell.SpriteBuffer_getSprite(GrandExchangeEvent.archive8, UserComparator10.spriteIds.compass, 0);
+					} else {
+						++var0;
+					}
+
+					if (UrlRequester.redHintArrowSprite == null) {
+						UrlRequester.redHintArrowSprite = GameShell.SpriteBuffer_getSprite(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3825, 0);
+					} else {
+						++var0;
+					}
+
+					if (UserComparator6.mapSceneSprites == null) {
+						UserComparator6.mapSceneSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.mapScenes, 0);
+					} else {
+						++var0;
+					}
+
+					if (CollisionMap.headIconPkSprites == null) {
+						CollisionMap.headIconPkSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.headIconsPk, 0);
+					} else {
+						++var0;
+					}
+
+					if (KeyHandler.headIconPrayerSprites == null) {
+						KeyHandler.headIconPrayerSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3828, 0);
+					} else {
+						++var0;
+					}
+
+					if (SoundSystem.headIconHintSprites == null) {
+						SoundSystem.headIconHintSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3829, 0);
+					} else {
+						++var0;
+					}
+
+					if (class9.mapMarkerSprites == null) {
+						class9.mapMarkerSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3830, 0);
+					} else {
+						++var0;
+					}
+
+					if (Timer.crossSprites == null) {
+						Timer.crossSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3831, 0);
+					} else {
+						++var0;
+					}
+
+					if (AttackOption.mapDotSprites == null) {
+						AttackOption.mapDotSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3834, 0);
+					} else {
+						++var0;
+					}
+
+					if (WorldMapElement.scrollBarSprites == null) {
+						WorldMapElement.scrollBarSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3824, 0);
+					} else {
+						++var0;
+					}
+
+					if (class4.modIconSprites == null) {
+						class4.modIconSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3832, 0);
+					} else {
+						++var0;
+					}
+
+					if (var0 < 11) {
+						Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%";
+						Login.Login_loadingPercent = 70;
+					} else {
+						AbstractFont.AbstractFont_modIconSprites = class4.modIconSprites;
+						UrlRequester.redHintArrowSprite.normalize();
+						var22 = (int)(Math.random() * 21.0D) - 10;
+						int var23 = (int)(Math.random() * 21.0D) - 10;
+						int var24 = (int)(Math.random() * 21.0D) - 10;
+						int var25 = (int)(Math.random() * 41.0D) - 20;
+						UserComparator6.mapSceneSprites[0].shiftColors(var25 + var22, var25 + var23, var25 + var24);
+						Login.Login_loadingText = "Loaded sprites";
+						Login.Login_loadingPercent = 70;
+						Client.titleLoadingStage = 90;
+					}
+				} else if (Client.titleLoadingStage == 90) {
+					if (!Tile.archive9.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading textures - " + "0%";
+						Login.Login_loadingPercent = 90;
+					} else {
+						UserComparator3.textureProvider = new TextureProvider(Tile.archive9, GrandExchangeEvent.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
+						Rasterizer3D.Rasterizer3D_setTextureLoader(UserComparator3.textureProvider);
+						Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
+						Client.titleLoadingStage = 100;
+					}
+				} else if (Client.titleLoadingStage == 100) {
+					var0 = UserComparator3.textureProvider.getLoadedPercentage();
+					if (var0 < 100) {
+						Login.Login_loadingText = "Loading textures - " + var0 + "%";
+						Login.Login_loadingPercent = 90;
+					} else {
+						Login.Login_loadingText = "Loaded textures";
+						Login.Login_loadingPercent = 90;
+						Client.titleLoadingStage = 110;
+					}
+				} else if (Client.titleLoadingStage == 110) {
+					class219.mouseRecorder = new MouseRecorder();
+					GrandExchangeOfferAgeComparator.taskHandler.newThreadTask(class219.mouseRecorder, 10);
+					Login.Login_loadingText = "Loaded input handler";
+					Login.Login_loadingPercent = 92;
+					Client.titleLoadingStage = 120;
+				} else if (Client.titleLoadingStage == 120) {
+					if (!GraphicsObject.archive10.tryLoadFileByNames("huffman", "")) {
+						Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
+						Login.Login_loadingPercent = 94;
+					} else {
+						Huffman var21 = new Huffman(GraphicsObject.archive10.takeFileByNames("huffman", ""));
+						class219.huffman = var21;
+						Login.Login_loadingText = "Loaded wordpack";
+						Login.Login_loadingPercent = 94;
+						Client.titleLoadingStage = 130;
+					}
+				} else if (Client.titleLoadingStage == 130) {
+					if (!class105.archive3.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading interfaces - " + class105.archive3.loadPercent() * 4 / 5 + "%";
+						Login.Login_loadingPercent = 96;
+					} else if (!Message.archive12.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading interfaces - " + (80 + Message.archive12.loadPercent() / 6) + "%";
+						Login.Login_loadingPercent = 96;
+					} else if (!GameBuild.archive13.isFullyLoaded()) {
+						Login.Login_loadingText = "Loading interfaces - " + (96 + GameBuild.archive13.loadPercent() / 50) + "%";
+						Login.Login_loadingPercent = 96;
+					} else {
+						Login.Login_loadingText = "Loaded interfaces";
+						Login.Login_loadingPercent = 98;
+						Client.titleLoadingStage = 140;
+					}
+				} else if (Client.titleLoadingStage == 140) {
+					Login.Login_loadingPercent = 100;
+					if (!WorldMapData_0.archive19.tryLoadGroupByName(WorldMapCacheName.field322.name)) {
+						Login.Login_loadingText = "Loading world map - " + WorldMapData_0.archive19.groupLoadPercentByName(WorldMapCacheName.field322.name) / 10 + "%";
+					} else {
+						if (class228.worldMap == null) {
+							class228.worldMap = new WorldMap();
+							class228.worldMap.init(WorldMapData_0.archive19, VarcInt.archive18, ClientPacket.archive20, GrandExchangeOfferNameComparator.fontBold12, Client.fontsMap, UserComparator6.mapSceneSprites);
+						}
+
+						Login.Login_loadingText = "Loaded world map";
+						Client.titleLoadingStage = 150;
+					}
+				} else if (Client.titleLoadingStage == 150) {
+					ClientPreferences.updateGameState(10);
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("go")
+	@ObfuscatedSignature(
+		signature = "(IIIS)V",
+		garbageValue = "3305"
+	)
+	@Export("worldToScreen")
+	static final void worldToScreen(int var0, int var1, int var2) {
+		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
+			int var3 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - var2;
+			var0 -= MouseHandler.cameraX;
+			var3 -= WorldMapSection3.cameraY;
+			var1 -= ObjectSound.cameraZ;
+			int var4 = Rasterizer3D.Rasterizer3D_sine[TilePaint.cameraPitch];
+			int var5 = Rasterizer3D.Rasterizer3D_cosine[TilePaint.cameraPitch];
+			int var6 = Rasterizer3D.Rasterizer3D_sine[Canvas.cameraYaw];
+			int var7 = Rasterizer3D.Rasterizer3D_cosine[Canvas.cameraYaw];
+			int var8 = var0 * var7 + var6 * var1 >> 16;
+			var1 = var7 * var1 - var0 * var6 >> 16;
+			var0 = var8;
+			var8 = var5 * var3 - var4 * var1 >> 16;
+			var1 = var5 * var1 + var3 * var4 >> 16;
+			if (var1 >= 50) {
+				Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2;
+				Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1;
+			} else {
+				Client.viewportTempX = -1;
+				Client.viewportTempY = -1;
+			}
+
+		} else {
+			Client.viewportTempX = -1;
+			Client.viewportTempY = -1;
+		}
 	}
 }

runescape-client/src/main/java/HealthBarDefinition.java

@@ -4,82 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("id")
+@ObfuscatedName("ik")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Lic;"
 	)
 	@Export("HealthBarDefinition_archive")
 	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lic;"
+	)
+	@Export("HitSplatDefinition_spritesArchive")
+	public static AbstractArchive HitSplatDefinition_spritesArchive;
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "Lec;"
 	)
 	@Export("HealthBarDefinition_cached")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lec;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
-	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
+	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("w")
+	@ObfuscatedName("io")
 	@ObfuscatedGetter(
-		intValue = -418379087
+		intValue = 1914428317
 	)
-	public int field3276;
+	@Export("oculusOrbFocalPointY")
-	@ObfuscatedName("z")
+	static int oculusOrbFocalPointY;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 257214369
+		intValue = -762582303
+	)
+	public int field3312;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1405603789
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1626711481
+		intValue = 66041617
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -519347749
+		intValue = -1238341031
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 125223577
+		intValue = 428453315
 	)
-	public int field3272;
+	public int field3317;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -211627759
+		intValue = -724830045
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1469087681
+		intValue = 1257354687
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1575037275
+		intValue = -705085889
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 411601749
+		intValue = -1995580379
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1992936291
+		intValue = -907123185
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -93,7 +105,7 @@ public class HealthBarDefinition extends DualNode {
 		this.int1 = 255;
 		this.int2 = 255;
 		this.int3 = -1;
-		this.field3272 = 1;
+		this.field3317 = 1;
 		this.int5 = 70;
 		this.frontSpriteID = -1;
 		this.backSpriteID = -1;
@@ -101,10 +113,10 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkb;I)V",
+		signature = "(Lkn;I)V",
-		garbageValue = "-1815085637"
+		garbageValue = "-2036090908"
 	)
 	@Export("decode")
 	public void decode(Buffer var1) {
@@ -118,10 +130,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(Lkn;II)V",
-		garbageValue = "1931441853"
+		garbageValue = "-2145351852"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -138,9 +150,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method5591();
+			this.frontSpriteID = var1.method5843();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5591();
+			this.backSpriteID = var1.method5843();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -151,10 +163,10 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(S)Lla;",
+		signature = "(I)Llz;",
-		garbageValue = "1701"
+		garbageValue = "65535"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
@@ -165,7 +177,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = MusicPatchNode2.SpriteBuffer_getSprite(UserComparator1.HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = GameShell.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
@@ -175,10 +187,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)Lla;",
+		signature = "(I)Llz;",
-		garbageValue = "1861000233"
+		garbageValue = "1675324789"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
@@ -189,7 +201,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = MusicPatchNode2.SpriteBuffer_getSprite(UserComparator1.HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = GameShell.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
@@ -199,20 +211,45 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)I",
+		signature = "(IIB)I",
-		garbageValue = "-906146296"
+		garbageValue = "-32"
 	)
-	@Export("hashString")
+	static int method4673(int var0, int var1) {
-	public static int hashString(CharSequence var0) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		int var1 = var0.length();
+		if (var2 == null) {
-		int var2 = 0;
+			return -1;
+		} else {
+			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
+		}
+	}
 
-		for (int var3 = 0; var3 < var1; ++var3) {
+	@ObfuscatedName("kd")
-			var2 = (var2 << 5) - var2 + TaskHandler.charToByteCp1252(var0.charAt(var3));
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZI)Ljava/lang/String;",
+		garbageValue = "-1975463268"
+	)
+	static String method4669(String var0, boolean var1) {
+		String var2 = var1 ? "https://" : "http://";
+		if (Client.gameBuild == 1) {
+			var0 = var0 + "-wtrc";
+		} else if (Client.gameBuild == 2) {
+			var0 = var0 + "-wtqa";
+		} else if (Client.gameBuild == 3) {
+			var0 = var0 + "-wtwip";
+		} else if (Client.gameBuild == 5) {
+			var0 = var0 + "-wti";
+		} else if (Client.gameBuild == 4) {
+			var0 = "local";
 		}
 
-		return var2;
+		String var3 = "";
+		if (Client.field871 != null) {
+			var3 = "/p=" + Client.field871;
+		}
+
+		String var4 = "runescape.com";
+		return var2 + var0 + "." + var4 + "/l=" + UserComparator9.clientLanguage + "/a=" + class228.field2754 + var3 + "/";
 	}
 }

runescape-client/src/main/java/HealthBarUpdate.java

@@ -1,33 +1,44 @@
+import java.awt.Image;
 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("cc")
+@ObfuscatedName("cb")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("x")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "Ldh;"
+	)
+	@Export("pcmPlayerProvider")
+	static PlayerProvider pcmPlayerProvider;
+	@ObfuscatedName("k")
+	static int[][][] field1031;
+	@ObfuscatedName("ak")
+	static Image field1033;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -186864867
+		intValue = -166528229
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 134168981
+		intValue = 1062047839
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1066019297
+		intValue = -374720445
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 442713571
+		intValue = 257618229
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -39,10 +50,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "-2054467883"
+		garbageValue = "880697270"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -51,16 +62,4 @@ public class HealthBarUpdate extends Node {
 		this.health2 = var3;
 		this.cycleOffset = var4;
 	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V",
-		garbageValue = "87"
-	)
-	@Export("setLoginResponseString")
-	static void setLoginResponseString(String var0, String var1, String var2) {
-		Login.Login_response1 = var0;
-		Login.Login_response2 = var1;
-		Login.Login_response3 = var2;
-	}
 }

runescape-client/src/main/java/HitSplatDefinition.java

@@ -4,114 +4,126 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jv")
+@ObfuscatedName("js")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Lic;"
 	)
 	@Export("HitSplatDefinition_archive")
 	public static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Lic;"
 	)
-	public static AbstractArchive field3322;
+	public static AbstractArchive field3356;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lic;"
+	)
+	@Export("HitSplatDefinition_fontsArchive")
+	public static AbstractArchive HitSplatDefinition_fontsArchive;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "Lec;"
 	)
 	@Export("HitSplatDefinition_cached")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lec;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Leg;"
+		signature = "Lec;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("p")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1275511307
+		intValue = 554677393
+	)
+	@Export("ItemDefinition_fileCount")
+	public static int ItemDefinition_fileCount;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1528040183
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1688289147
+		intValue = 1665504671
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 500240173
-	)
-	public int field3329;
 	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1934317107
+		intValue = -1892048919
 	)
-	int field3330;
+	public int field3364;
-	@ObfuscatedName("g")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -26542295
+		intValue = 1862744257
 	)
-	int field3331;
+	int field3365;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -907663429
-	)
-	int field3332;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 1874324581
-	)
-	int field3333;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 1914060719
-	)
-	public int field3338;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 56695995
-	)
-	public int field3341;
 	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -990470317
+		intValue = 173475991
 	)
-	public int field3334;
+	int field3366;
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
-	String field3337;
-	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1652547133
+		intValue = 1837345819
 	)
-	public int field3327;
+	int field3378;
-	@ObfuscatedName("j")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -6083753
+		intValue = 275308627
 	)
-	public int field3339;
+	int field3368;
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 1590717975
+	)
+	public int field3369;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -1198049763
+	)
+	public int field3370;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -796375423
+	)
+	public int field3363;
+	@ObfuscatedName("t")
+	String field3372;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -1600290491
+	)
+	public int field3373;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1529892703
+	)
+	public int field3374;
+	@ObfuscatedName("i")
 	@Export("transforms")
 	public int[] transforms;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 752219759
+		intValue = 34744135
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -250584565
+		intValue = -84298271
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -122,31 +134,31 @@ public class HitSplatDefinition extends DualNode {
 		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
 	}
 
-	HitSplatDefinition() {
+	public HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3329 = 70;
+		this.field3364 = 70;
-		this.field3330 = -1;
+		this.field3365 = -1;
-		this.field3331 = -1;
+		this.field3366 = -1;
-		this.field3332 = -1;
+		this.field3378 = -1;
-		this.field3333 = -1;
+		this.field3368 = -1;
-		this.field3338 = 0;
+		this.field3369 = 0;
-		this.field3341 = 0;
+		this.field3370 = 0;
-		this.field3334 = -1;
+		this.field3363 = -1;
-		this.field3337 = "";
+		this.field3372 = "";
-		this.field3327 = -1;
+		this.field3373 = -1;
-		this.field3339 = 0;
+		this.field3374 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lkb;I)V",
+		signature = "(Lkn;B)V",
-		garbageValue = "1621555289"
+		garbageValue = "-108"
 	)
 	@Export("decode")
-	void decode(Buffer var1) {
+	public void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -157,41 +169,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(Lkn;II)V",
-		garbageValue = "575571509"
+		garbageValue = "-2104480969"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5591();
+			this.fontId = var1.method5843();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3330 = var1.method5591();
+			this.field3365 = var1.method5843();
 		} else if (var2 == 4) {
-			this.field3332 = var1.method5591();
+			this.field3378 = var1.method5843();
 		} else if (var2 == 5) {
-			this.field3331 = var1.method5591();
+			this.field3366 = var1.method5843();
 		} else if (var2 == 6) {
-			this.field3333 = var1.method5591();
+			this.field3368 = var1.method5843();
 		} else if (var2 == 7) {
-			this.field3338 = var1.readShort();
+			this.field3369 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3337 = var1.readStringCp1252NullCircumfixed();
+			this.field3372 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3329 = var1.readUnsignedShort();
+			this.field3364 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3341 = var1.readShort();
+			this.field3370 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3334 = 0;
+			this.field3363 = 0;
 		} else if (var2 == 12) {
-			this.field3327 = var1.readUnsignedByte();
+			this.field3373 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3339 = var1.readShort();
+			this.field3374 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3334 = var1.readUnsignedShort();
+			this.field3363 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -226,16 +238,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I)Ljv;",
+		signature = "(S)Ljs;",
-		garbageValue = "-951570117"
+		garbageValue = "24687"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = Projectile.getVarbit(this.transformVarbit);
+			var1 = Widget.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -247,17 +259,36 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? GrandExchangeOfferUnitPriceComparator.method213(var2) : null;
+		if (var2 != -1) {
+			HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
+			HitSplatDefinition var3;
+			if (var4 != null) {
+				var3 = var4;
+			} else {
+				byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2);
+				var4 = new HitSplatDefinition();
+				if (var5 != null) {
+					var4.decode(new Buffer(var5));
+				}
+
+				HitSplatDefinition_cached.put(var4, (long)var2);
+				var3 = var4;
+			}
+
+			return var3;
+		} else {
+			return null;
+		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-940233797"
+		garbageValue = "2134005517"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3337;
+		String var2 = this.field3372;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -265,26 +296,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + class280.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + class298.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)Lla;",
+		signature = "(B)Llz;",
-		garbageValue = "1656176054"
+		garbageValue = "85"
 	)
-	public Sprite method4642() {
+	public Sprite method4755() {
-		if (this.field3330 < 0) {
+		if (this.field3365 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3330);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3365);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3330, 0);
+				var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3365, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3330);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3365);
 				}
 
 				return var1;
@@ -292,22 +323,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(I)Lla;",
+		signature = "(I)Llz;",
-		garbageValue = "-743591767"
+		garbageValue = "-2111693825"
 	)
-	public Sprite method4631() {
+	public Sprite method4756() {
-		if (this.field3331 < 0) {
+		if (this.field3366 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3331);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3366);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3331, 0);
+				var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3366, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3366);
 				}
 
 				return var1;
@@ -315,22 +346,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Lla;",
+		signature = "(B)Llz;",
-		garbageValue = "-1442192880"
+		garbageValue = "1"
 	)
-	public Sprite method4632() {
+	public Sprite method4752() {
-		if (this.field3332 < 0) {
+		if (this.field3378 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3378);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3332, 0);
+				var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3378, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3378);
 				}
 
 				return var1;
@@ -338,22 +369,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)Lla;",
+		signature = "(I)Llz;",
-		garbageValue = "-2137932181"
+		garbageValue = "148088504"
 	)
-	public Sprite method4633() {
+	public Sprite method4763() {
-		if (this.field3333 < 0) {
+		if (this.field3368 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3333);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3368);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3333, 0);
+				var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3368, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3333);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3368);
 				}
 
 				return var1;
@@ -361,10 +392,10 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Lkx;",
+		signature = "(B)Lko;",
-		garbageValue = "607832420"
+		garbageValue = "-13"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -375,22 +406,59 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				AbstractArchive var3 = field3322;
+				var1 = Frames.method3394(field3356, HitSplatDefinition_fontsArchive, this.fontId, 0);
-				AbstractArchive var4 = class296.HitSplatDefinition_fontsArchive;
+				if (var1 != null) {
-				int var5 = this.fontId;
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
-				Font var2;
-				if (!UserComparator7.method3516(var3, var5, 0)) {
-					var2 = null;
-				} else {
-					var2 = VertexNormal.method3094(var4.takeFile(var5, 0));
 				}
 
-				if (var2 != null) {
+				return var1;
-					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
-				}
-
-				return var2;
 			}
 		}
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Lkb;B)V",
+		garbageValue = "121"
+	)
+	@Export("updatePlayer")
+	static final void updatePlayer(PacketBuffer var0) {
+		var0.importIndex();
+		int var1 = Client.localPlayerIndex;
+		Player var2 = class60.localPlayer = Client.players[var1] = new Player();
+		var2.index = var1;
+		int var3 = var0.readBits(30);
+		byte var4 = (byte)(var3 >> 28);
+		int var5 = var3 >> 14 & 16383;
+		int var6 = var3 & 16383;
+		var2.pathX[0] = var5 - class182.baseX;
+		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6);
+		var2.pathY[0] = var6 - SecureRandomFuture.baseY;
+		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
+		TileItemPile.Client_plane = var2.plane = var4;
+		if (Players.field1279[var1] != null) {
+			var2.read(Players.field1279[var1]);
+		}
+
+		Players.Players_count = 0;
+		Players.Players_indices[++Players.Players_count - 1] = var1;
+		Players.field1282[var1] = 0;
+		Players.Players_emptyIdxCount = 0;
+
+		for (int var7 = 1; var7 < 2048; ++var7) {
+			if (var1 != var7) {
+				int var8 = var0.readBits(18);
+				int var9 = var8 >> 16;
+				int var10 = var8 >> 8 & 597;
+				int var11 = var8 & 597;
+				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
+				Players.Players_orientations[var7] = 0;
+				Players.Players_targetIndices[var7] = -1;
+				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
+				Players.field1282[var7] = 0;
+			}
+		}
+
+		var0.exportIndex();
+	}
 }

runescape-client/src/main/java/HorizontalAlignment.java

@@ -4,40 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("je")
+@ObfuscatedName("jc")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Lje;"
-	)
-	field3458(2, 0),
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lje;"
+		signature = "Ljc;"
+	)
+	field3488(2, 0),
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "Ljc;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(0, 1),
+	HorizontalAlignment_centered(1, 1),
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "Lje;"
-	)
-	field3453(1, 2);
-
 	@ObfuscatedName("q")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -1684971179
+		signature = "Ljc;"
 	)
-	static int field3456;
+	field3492(0, 2);
-	@ObfuscatedName("d")
+
+	@ObfuscatedName("bq")
+	@Export("worldListURL")
+	static String worldListURL;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1294886119
+		intValue = -1908984303
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 834302777
+		intValue = 1088861253
 	)
 	@Export("id")
 	final int id;
@@ -47,34 +45,13 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "56"
+		garbageValue = "-995092303"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(IIIB)J",
-		garbageValue = "3"
-	)
-	static long method4777(int var0, int var1, int var2) {
-		return (long)(var2 << 16 | var0 << 8 | var1);
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "([BI)[B",
-		garbageValue = "-1597872585"
-	)
-	public static byte[] method4782(byte[] var0) {
-		int var1 = var0.length;
-		byte[] var2 = new byte[var1];
-		System.arraycopy(var0, 0, var2, 0, var1);
-		return var2;
-	}
 }

runescape-client/src/main/java/Huffman.java

@@ -1,21 +1,25 @@
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
 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("hb")
+@ObfuscatedName("he")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("x")
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "Lic;"
+	)
+	@Export("musicTrackArchive")
+	public static AbstractArchive musicTrackArchive;
+	@ObfuscatedName("m")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("keys")
 	int[] keys;
 
@@ -102,10 +106,10 @@ public class Huffman {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "([BII[BIB)I",
+		signature = "([BII[BII)I",
-		garbageValue = "77"
+		garbageValue = "1506774655"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -123,7 +127,7 @@ public class Huffman {
 			int var11 = var7 >> 3;
 			int var12 = var7 & 7;
 			var6 &= -var12 >> 31;
-			int var13 = (var10 + var12 - 1 >> 3) + var11;
+			int var13 = (var12 + var10 - 1 >> 3) + var11;
 			var12 += 24;
 			var4[var11] = (byte)(var6 |= var9 >>> var12);
 			if (var11 < var13) {
@@ -153,10 +157,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "([BI[BIIB)I",
+		signature = "([BI[BIII)I",
-		garbageValue = "-45"
+		garbageValue = "-417422425"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -297,221 +301,33 @@ public class Huffman {
 		}
 	}
 
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgl;I)I",
-		garbageValue = "1131255315"
-	)
-	@Export("compareStrings")
-	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
-		int var3 = var0.length();
-		int var4 = var1.length();
-		int var5 = 0;
-		int var6 = 0;
-		byte var7 = 0;
-		byte var8 = 0;
-
-		while (var5 - var7 < var3 || var6 - var8 < var4) {
-			if (var5 - var7 >= var3) {
-				return -1;
-			}
-
-			if (var6 - var8 >= var4) {
-				return 1;
-			}
-
-			char var9;
-			if (var7 != 0) {
-				var9 = (char)var7;
-				boolean var14 = false;
-			} else {
-				var9 = var0.charAt(var5++);
-			}
-
-			char var10;
-			if (var8 != 0) {
-				var10 = (char)var8;
-				boolean var15 = false;
-			} else {
-				var10 = var1.charAt(var6++);
-			}
-
-			byte var11;
-			if (var9 == 198) {
-				var11 = 69;
-			} else if (var9 == 230) {
-				var11 = 101;
-			} else if (var9 == 223) {
-				var11 = 115;
-			} else if (var9 == 338) {
-				var11 = 69;
-			} else if (var9 == 339) {
-				var11 = 101;
-			} else {
-				var11 = 0;
-			}
-
-			var7 = var11;
-			byte var12;
-			if (var10 == 198) {
-				var12 = 69;
-			} else if (var10 == 230) {
-				var12 = 101;
-			} else if (var10 == 223) {
-				var12 = 115;
-			} else if (var10 == 338) {
-				var12 = 69;
-			} else if (var10 == 339) {
-				var12 = 101;
-			} else {
-				var12 = 0;
-			}
-
-			var8 = var12;
-			var9 = FaceNormal.standardizeChar(var9, var2);
-			var10 = FaceNormal.standardizeChar(var10, var2);
-			if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
-				var9 = Character.toLowerCase(var9);
-				var10 = Character.toLowerCase(var10);
-				if (var9 != var10) {
-					return lowercaseChar(var9, var2) - lowercaseChar(var10, var2);
-				}
-			}
-		}
-
-		int var16 = Math.min(var3, var4);
-
-		int var17;
-		char var20;
-		for (var17 = 0; var17 < var16; ++var17) {
-			if (var2 == Language.Language_FR) {
-				var5 = var3 - 1 - var17;
-				var6 = var4 - 1 - var17;
-			} else {
-				var6 = var17;
-				var5 = var17;
-			}
-
-			char var18 = var0.charAt(var5);
-			var20 = var1.charAt(var6);
-			if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
-				var18 = Character.toLowerCase(var18);
-				var20 = Character.toLowerCase(var20);
-				if (var18 != var20) {
-					return lowercaseChar(var18, var2) - lowercaseChar(var20, var2);
-				}
-			}
-		}
-
-		var17 = var3 - var4;
-		if (var17 != 0) {
-			return var17;
-		} else {
-			for (int var19 = 0; var19 < var16; ++var19) {
-				var20 = var0.charAt(var19);
-				char var13 = var1.charAt(var19);
-				if (var20 != var13) {
-					return lowercaseChar(var20, var2) - lowercaseChar(var13, var2);
-				}
-			}
-
-			return 0;
-		}
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1338498163"
-	)
-	public static void method4045() {
-		try {
-			File var0 = new File(AbstractWorldMapData.userHomeDirectory, "random.dat");
-			int var2;
-			if (var0.exists()) {
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
-			} else {
-				label35:
-				for (int var1 = 0; var1 < AbstractRasterProvider.field3871.length; ++var1) {
-					for (var2 = 0; var2 < Varps.field2522.length; ++var2) {
-						File var3 = new File(Varps.field2522[var2] + AbstractRasterProvider.field3871[var1] + File.separatorChar + "random.dat");
-						if (var3.exists()) {
-							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
-							break label35;
-						}
-					}
-				}
-			}
-
-			if (JagexCache.JagexCache_randomDat == null) {
-				RandomAccessFile var4 = new RandomAccessFile(var0, "rw");
-				var2 = var4.read();
-				var4.seek(0L);
-				var4.write(var2);
-				var4.seek(0L);
-				var4.close();
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
-			}
-		} catch (IOException var5) {
-		}
-
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(CLgl;I)I",
-		garbageValue = "1882549296"
-	)
-	@Export("lowercaseChar")
-	static int lowercaseChar(char var0, Language var1) {
-		int var2 = var0 << 4;
-		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
-			var0 = Character.toLowerCase(var0);
-			var2 = (var0 << 4) + 1;
-		}
-
-		if (var0 == 241 && var1 == Language.Language_ES) {
-			var2 = 1762;
-		}
-
-		return var2;
-	}
-
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(ILcs;ZI)I",
-		garbageValue = "-1258139515"
+		garbageValue = "-2030952139"
 	)
-	public static void method4048() {
+	static int method4099(int var0, Script var1, boolean var2) {
-		PlayerAppearance.PlayerAppearance_cachedModels.clear();
+		Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]);
-	}
+		if (var0 == ScriptOpcodes.IF_GETX) {
-
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.x;
-	@ObfuscatedName("fp")
+			return 1;
-	@ObfuscatedSignature(
+		} else if (var0 == ScriptOpcodes.IF_GETY) {
-		signature = "(I)V",
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.y;
-		garbageValue = "-1871725154"
+			return 1;
-	)
+		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) {
-	@Export("logOut")
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.width;
-	static final void logOut() {
+			return 1;
-		Client.packetWriter.close();
+		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
-		GrandExchangeEvents.method155();
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.height;
-		GrandExchangeOfferWorldComparator.scene.clear();
+			return 1;
-
+		} else if (var0 == ScriptOpcodes.IF_GETHIDE) {
-		for (int var0 = 0; var0 < 4; ++var0) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
-			Client.collisionMaps[var0].clear();
+			return 1;
+		} else if (var0 == ScriptOpcodes.IF_GETLAYER) {
+			Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.parentId;
+			return 1;
+		} else {
+			return 2;
 		}
-
-		System.gc();
-		class206.field2406 = 1;
-		class206.musicTrackArchive = null;
-		class206.musicTrackGroupId = -1;
-		class206.musicTrackFileId = -1;
-		class219.musicTrackVolume = 0;
-		GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false;
-		AttackOption.field1187 = 2;
-		Client.currentTrackGroupId = -1;
-		Client.field915 = false;
-		TriBool.method5249();
-		MouseRecorder.updateGameState(10);
 	}
 }

runescape-client/src/main/java/IgnoreList.java

@@ -2,56 +2,49 @@ 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("jb")
+@ObfuscatedName("jw")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("bt")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lgl;"
+		signature = "Lmo;"
-	)
-	@Export("clientLanguage")
-	static Language clientLanguage;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "Lmx;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		signature = "(Lmx;)V"
+		signature = "(Lmo;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Ljd;",
+		signature = "(I)Ljf;",
-		garbageValue = "-1332552421"
+		garbageValue = "551595115"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljd;",
+		signature = "(II)[Ljf;",
-		garbageValue = "-667029686"
+		garbageValue = "1959965595"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkb;II)V",
+		signature = "(Lkn;IB)V",
-		garbageValue = "1156120193"
+		garbageValue = "77"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -66,7 +59,7 @@ public class IgnoreList extends UserList {
 					Ignored var7 = (Ignored)this.getByCurrentUsername(var5);
 					if (var4) {
 						Ignored var8 = (Ignored)this.getByCurrentUsername(var6);
-						if (var8 != null && var8 != var7) {
+						if (var8 != null && var7 != var8) {
 							if (var7 != null) {
 								this.remove(var8);
 							} else {
@@ -94,394 +87,4 @@ public class IgnoreList extends UserList {
 			return;
 		}
 	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(IB)Lis;",
-		garbageValue = "44"
-	)
-	@Export("getParamDefinition")
-	public static ParamDefinition getParamDefinition(int var0) {
-		ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0);
-			var1 = new ParamDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode();
-			ParamDefinition.ParamDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("az")
-	@ObfuscatedSignature(
-		signature = "(ILce;ZI)I",
-		garbageValue = "-372062346"
-	)
-	static int method5130(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == 6600) {
-			var3 = ScriptEvent.Client_plane;
-			int var9 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX;
-			int var5 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY;
-			class13.getWorldMap().method6524(var3, var9, var5, true);
-			return 1;
-		} else {
-			WorldMapArea var11;
-			if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				String var16 = "";
-				var11 = class13.getWorldMap().getMapArea(var3);
-				if (var11 != null) {
-					var16 = var11.getExternalName();
-				}
-
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16;
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				class13.getWorldMap().setCurrentMapAreaId(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getZoomLevel();
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				class13.getWorldMap().setZoomPercentage(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().isCacheLoaded() ? 1 : 0;
-				return 1;
-			} else {
-				Coord var15;
-				if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-					class13.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-					class13.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-					class13.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-					class13.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayX();
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayY();
-					return 1;
-				} else {
-					WorldMapArea var13;
-					if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var13 = class13.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						} else {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getOrigin().packed();
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var13 = class13.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						} else {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64;
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var13 = class13.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-						} else {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1;
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
-						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						var13 = class13.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						} else {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getZoom();
-						}
-
-						return 1;
-					} else if (var0 == 6615) {
-						var15 = class13.getWorldMap().getDisplayCoord();
-						if (var15 == null) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-						} else {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.x;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.y;
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().currentMapAreaId();
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
-						var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-						var13 = class13.getWorldMap().getCurrentMapArea();
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-							Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-							return 1;
-						} else {
-							int[] var14 = var13.position(var15.plane, var15.x, var15.y);
-							if (var14 == null) {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-							} else {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[0];
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[1];
-							}
-
-							return 1;
-						}
-					} else {
-						Coord var7;
-						if (var0 == 6618) {
-							var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-							var13 = class13.getWorldMap().getCurrentMapArea();
-							if (var13 == null) {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-								return 1;
-							} else {
-								var7 = var13.coord(var15.x, var15.y);
-								if (var7 == null) {
-									Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-								} else {
-									Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed();
-								}
-
-								return 1;
-							}
-						} else {
-							Coord var12;
-							if (var0 == 6619) {
-								Interpreter.Interpreter_intStackSize -= 2;
-								var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-								var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-								class3.method57(var3, var12, false);
-								return 1;
-							} else if (var0 == 6620) {
-								Interpreter.Interpreter_intStackSize -= 2;
-								var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-								var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-								class3.method57(var3, var12, true);
-								return 1;
-							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
-								Interpreter.Interpreter_intStackSize -= 2;
-								var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-								var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-								var11 = class13.getWorldMap().getMapArea(var3);
-								if (var11 == null) {
-									Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-									return 1;
-								} else {
-									Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0;
-									return 1;
-								}
-							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayWith();
-								Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayHeight();
-								return 1;
-							} else if (var0 == 6623) {
-								var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-								var13 = class13.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
-								if (var13 == null) {
-									Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-								} else {
-									Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getId();
-								}
-
-								return 1;
-							} else if (var0 == 6624) {
-								class13.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-								return 1;
-							} else if (var0 == 6625) {
-								class13.getWorldMap().resetMaxFlashCount();
-								return 1;
-							} else if (var0 == 6626) {
-								class13.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-								return 1;
-							} else if (var0 == 6627) {
-								class13.getWorldMap().resetCyclesPerFlash();
-								return 1;
-							} else {
-								boolean var10;
-								if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
-									var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-									class13.getWorldMap().setPerpetualFlash(var10);
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
-									var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-									class13.getWorldMap().flashElement(var3);
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
-									var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-									class13.getWorldMap().flashCategory(var3);
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
-									class13.getWorldMap().stopCurrentFlashes();
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
-									var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-									class13.getWorldMap().setElementsDisabled(var10);
-									return 1;
-								} else {
-									boolean var4;
-									if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
-										Interpreter.Interpreter_intStackSize -= 2;
-										var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-										var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1;
-										class13.getWorldMap().disableElement(var3, var4);
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
-										Interpreter.Interpreter_intStackSize -= 2;
-										var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-										var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1;
-										class13.getWorldMap().setCategoryDisabled(var3, var4);
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
-										Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getElementsDisabled() ? 1 : 0;
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
-										var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-										Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().isElementDisabled(var3) ? 1 : 0;
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
-										var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-										Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().isCategoryDisabled(var3) ? 1 : 0;
-										return 1;
-									} else if (var0 == 6638) {
-										Interpreter.Interpreter_intStackSize -= 2;
-										var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-										var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-										var7 = class13.getWorldMap().method6470(var3, var12);
-										if (var7 == null) {
-											Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-										} else {
-											Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed();
-										}
-
-										return 1;
-									} else {
-										AbstractWorldMapIcon var8;
-										if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
-											var8 = class13.getWorldMap().iconStart();
-											if (var8 == null) {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-											} else {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement();
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed();
-											}
-
-											return 1;
-										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
-											var8 = class13.getWorldMap().iconNext();
-											if (var8 == null) {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-											} else {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement();
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed();
-											}
-
-											return 1;
-										} else {
-											WorldMapElement var6;
-											if (var0 == ScriptOpcodes.MEC_TEXT) {
-												var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-												var6 = class25.WorldMapElement_get(var3);
-												if (var6.name == null) {
-													Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-												} else {
-													Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name;
-												}
-
-												return 1;
-											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
-												var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-												var6 = class25.WorldMapElement_get(var3);
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.textSize;
-												return 1;
-											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) {
-												var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-												var6 = class25.WorldMapElement_get(var3);
-												if (var6 == null) {
-													Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-												} else {
-													Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.category;
-												}
-
-												return 1;
-											} else if (var0 == ScriptOpcodes.MEC_SPRITE) {
-												var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-												var6 = class25.WorldMapElement_get(var3);
-												if (var6 == null) {
-													Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-												} else {
-													Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.sprite1;
-												}
-
-												return 1;
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.worldMapEvent.mapElement;
-												return 1;
-											} else if (var0 == 6698) {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.worldMapEvent.coord1.packed();
-												return 1;
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
-												Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.worldMapEvent.coord2.packed();
-												return 1;
-											} else {
-												return 2;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("ix")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V",
-		garbageValue = "114"
-	)
-	@Export("insertMenuItemNoShift")
-	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
-		ScriptFrame.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
-	}
 }

runescape-client/src/main/java/Ignored.java

@@ -1,19 +1,15 @@
-import java.awt.FontMetrics;
 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("km")
+@ObfuscatedName("kc")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("ab")
+	@ObfuscatedName("m")
-	@Export("loginScreenFontMetrics")
-	static FontMetrics loginScreenFontMetrics;
-	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1613598915
+		intValue = 1754728745
 	)
 	@Export("id")
 	int id;
@@ -21,20 +17,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lkm;I)I",
+		signature = "(Lkc;I)I",
-		garbageValue = "105996759"
+		garbageValue = "-857572865"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		signature = "(Ljd;I)I",
+		signature = "(Ljf;I)I",
-		garbageValue = "-1956183743"
+		garbageValue = "334051838"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -44,18 +40,4 @@ public class Ignored extends User {
 	public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1);
 	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-54"
-	)
-	static void method5235() {
-		class335.SpriteBuffer_xOffsets = null;
-		StructDefinition.SpriteBuffer_yOffsets = null;
-		class335.SpriteBuffer_spriteWidths = null;
-		class335.SpriteBuffer_spriteHeights = null;
-		DefaultsGroup.SpriteBuffer_spritePalette = null;
-		class4.SpriteBuffer_pixels = null;
-	}
 }

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("le")
+@ObfuscatedName("lh")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("height")
 	public int height;
 
 	IndexedSprite() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) {
@@ -54,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) {
@@ -87,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -133,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
-	public void method6211(int var1, int var2, int var3, int var4) {
+	public void method6322(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth;
 		int var6 = this.subHeight;
 		int var7 = 0;
@@ -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);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@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);
@@ -249,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@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;

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("dp")
+@ObfuscatedName("dq")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("a")
+	@ObfuscatedName("v")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("l")
+	@ObfuscatedName("e")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("j")
+	@ObfuscatedName("b")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("y")
+	@ObfuscatedName("i")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
 	@ObfuscatedName("f")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("d")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Ldc;"
+		signature = "Lda;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lde;"
+		signature = "Lds;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
 	@Export("offset")
 	int offset;
 
@@ -146,7 +146,7 @@ public class Instrument {
 		this.offset = 0;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
 		class310.clearIntArray(Instrument_samples, 0, var1);
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("o")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkb;)V"
+		signature = "(Lkn;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -421,6 +421,6 @@ public class Instrument {
 		this.offset = var1.readUnsignedShort();
 		this.filter = new AudioFilter();
 		this.filterEnvelope = new SoundEnvelope();
-		this.filter.method2813(var1, this.filterEnvelope);
+		this.filter.method2829(var1, this.filterEnvelope);
 	}
 }

runescape-client/src/main/java/IntHashTable.java

@@ -3,12 +3,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mj")
+@ObfuscatedName("mh")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("t")
+	@ObfuscatedName("m")
-	static int[] field4034;
-	@ObfuscatedName("x")
 	@Export("array")
 	int[] array;
 
@@ -34,10 +32,10 @@ public class IntHashTable {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IB)I",
-		garbageValue = "1863702029"
+		garbageValue = "-57"
 	)
 	@Export("get")
 	public int get(int var1) {

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("gz")
+@ObfuscatedName("gc")
 @Implements("IntegerNode")
 public class IntegerNode extends Node {
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@Export("integer")
 	public int integer;